bluer-sbc 8.163.1__py3-none-any.whl → 8.173.1__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of bluer-sbc might be problematic. Click here for more details.

Files changed (14) hide show
  1. bluer_sbc/.abcli/alias.sh +2 -0
  2. bluer_sbc/.abcli/rpi/fake_display.sh +19 -0
  3. bluer_sbc/.abcli/rpi.sh +16 -0
  4. bluer_sbc/.abcli/tests/help.sh +3 -0
  5. bluer_sbc/README.py +1 -0
  6. bluer_sbc/__init__.py +1 -1
  7. bluer_sbc/help/functions.py +2 -0
  8. bluer_sbc/help/rpi.py +25 -0
  9. bluer_sbc/session/classes.py +3 -3
  10. {bluer_sbc-8.163.1.dist-info → bluer_sbc-8.173.1.dist-info}/METADATA +10 -7
  11. {bluer_sbc-8.163.1.dist-info → bluer_sbc-8.173.1.dist-info}/RECORD +14 -11
  12. {bluer_sbc-8.163.1.dist-info → bluer_sbc-8.173.1.dist-info}/WHEEL +0 -0
  13. {bluer_sbc-8.163.1.dist-info → bluer_sbc-8.173.1.dist-info}/licenses/LICENSE +0 -0
  14. {bluer_sbc-8.163.1.dist-info → bluer_sbc-8.173.1.dist-info}/top_level.txt +0 -0
bluer_sbc/.abcli/alias.sh CHANGED
@@ -4,4 +4,6 @@ alias @camera=bluer_sbc_camera
4
4
 
5
5
  alias grove=bluer_sbc_grove
6
6
 
7
+ alias @rpi=bluer_sbc_rpi
8
+
7
9
  alias @sbc=bluer_sbc
bluer_sbc/.abcli/rpi/fake_display.sh ADDED
@@ -0,0 +1,19 @@
1
+ #! /usr/bin/env bash
2
+
3
+ function bluer_sbc_rpi_fake_display() {
4
+ local options=$1
5
+ local do_dryrun=$(bluer_ai_option_int "$options" dryrun 0)
6
+
7
+ if [[ "$abcli_is_rpi" == false ]]; then
8
+ bluer_ai_log_warning "rpi not found."
9
+ return 0
10
+ fi
11
+
12
+ sudo apt-get install -y xvfb
13
+ [[ $? -ne 0 ]] && return 1
14
+
15
+ Xvfb :99 -screen 0 640x480x24 &
16
+ [[ $? -ne 0 ]] && return 1
17
+
18
+ export DISPLAY=:99
19
+ }
bluer_sbc/.abcli/rpi.sh ADDED
@@ -0,0 +1,16 @@
1
+ #! /usr/bin/env bash
2
+
3
+ function bluer_sbc_rpi() {
4
+ local task=$1
5
+
6
+ local function_name=bluer_sbc_rpi_$task
7
+ if [[ $(type -t $function_name) == "function" ]]; then
8
+ $function_name "${@:2}"
9
+ return
10
+ fi
11
+
12
+ bluer_ai_log_error "@rpi: $task: command not found."
13
+ return 1
14
+ }
15
+
16
+ bluer_ai_source_caller_suffix_path /rpi
bluer_sbc/.abcli/tests/help.sh CHANGED
@@ -5,6 +5,9 @@ function test_bluer_sbc_help() {
5
5
 
6
6
  local module
7
7
  for module in \
8
+ "@rpi" \
9
+ "@rpi fake_display" \
10
+ \
8
11
  "@sbc" \
9
12
  \
10
13
  "@sbc adafruit_rgb_matrix" \
bluer_sbc/README.py CHANGED
@@ -57,6 +57,7 @@ def build():
57
57
  for item in [
58
58
  "camera",
59
59
  "hardware",
60
+ "rpi",
60
61
  ]
61
62
  ]
62
63
  )
bluer_sbc/__init__.py CHANGED
@@ -4,7 +4,7 @@ ICON = "🌀"
4
4
 
5
5
  DESCRIPTION = f"{ICON} AI for single board computers."
6
6
 
7
- VERSION = "8.163.1"
7
+ VERSION = "8.173.1"
8
8
 
9
9
  REPO_NAME = "bluer-sbc"
10
10
 
bluer_sbc/help/functions.py CHANGED
@@ -10,6 +10,7 @@ from bluer_sbc.help.camera import help_functions as help_camera
10
10
  from bluer_sbc.help.grove import help_functions as help_grove
11
11
  from bluer_sbc.help.hat import help_functions as help_hat
12
12
  from bluer_sbc.help.lepton import help_functions as help_lepton
13
+ from bluer_sbc.help.rpi import help_functions as help_rpi
13
14
  from bluer_sbc.help.scroll_phat_hd import help_functions as help_scroll_phat_hd
14
15
  from bluer_sbc.help.sparkfun_top_phat import help_functions as help_sparkfun_top_phat
15
16
  from bluer_sbc.help.unicorn_16x16 import help_functions as help_unicorn_16x16
@@ -25,6 +26,7 @@ help_functions.update(
25
26
  "grove": help_grove,
26
27
  "hat": help_hat,
27
28
  "lepton": help_lepton,
29
+ "rpi": help_rpi,
28
30
  "scroll_phat_hd": help_scroll_phat_hd,
29
31
  "sparkfun_top_phat": help_sparkfun_top_phat,
30
32
  "unicorn_16x16": help_unicorn_16x16,
bluer_sbc/help/rpi.py ADDED
@@ -0,0 +1,25 @@
1
+ from typing import List
2
+
3
+ from bluer_options.terminal import show_usage, xtra
4
+
5
+
6
+ def help_fake_display(
7
+ tokens: List[str],
8
+ mono: bool,
9
+ ) -> str:
10
+ options = xtra("dryrun", mono=mono)
11
+
12
+ return show_usage(
13
+ [
14
+ "@rpi",
15
+ "fake_display",
16
+ f"[{options}]",
17
+ ],
18
+ "fake the display on an rpi.",
19
+ mono=mono,
20
+ )
21
+
22
+
23
+ help_functions = {
24
+ "fake_display": help_fake_display,
25
+ }
bluer_sbc/session/classes.py CHANGED
@@ -29,9 +29,9 @@ NAME = module.name(__file__, NAME)
29
29
  class Session:
30
30
  def __init__(self):
31
31
  self.bash_keys = {
32
- "e": "exit",
33
- "r": "reboot",
34
- "s": "shutdown",
32
+ "i": "exit",
33
+ "o": "shutdown",
34
+ "p": "reboot",
35
35
  "u": "update",
36
36
  }
37
37
 
{bluer_sbc-8.163.1.dist-info → bluer_sbc-8.173.1.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: bluer_sbc
3
- Version: 8.163.1
3
+ Version: 8.173.1
4
4
  Summary: 🌀 AI for single board computers.
5
5
  Home-page: https://github.com/kamangir/bluer-sbc
6
6
  Author: Arash Abadpour (Kamangir)
@@ -27,6 +27,8 @@ Dynamic: summary
27
27
 
28
28
  🌀 `bluer-sbc` is a [`bluer-ai`](https://github.com/kamangir/bluer-ai) plugin for edge computing on [single board computers](https://github.com/kamangir/blue-bracket).
29
29
 
30
+ ## installation
31
+
30
32
  ```bash
31
33
  pip install bluer_sbc
32
34
 
@@ -34,17 +36,18 @@ pip install bluer_sbc
34
36
  @env dot cp <env-name> local
35
37
  ```
36
38
 
39
+ ## aliases
40
+
41
+ [@camera](https://github.com/kamangir/bluer-sbc/blob/main/bluer_sbc/docs/aliases/camera.md),
42
+ [@rpi](https://github.com/kamangir/bluer-sbc/blob/main/bluer_sbc/docs/aliases/rpi.md),
43
+ [@sbc <hardware>](https://github.com/kamangir/bluer-sbc/blob/main/bluer_sbc/docs/aliases/hardware.md).
44
+
37
45
  | | | |
38
46
  | --- | --- | --- |
39
47
  | [`cheshmak`](https://github.com/kamangir/bluer-sbc/blob/main/bluer_sbc/docs/cheshmak.md) [![image](https://github.com/kamangir/assets2/blob/main/cheshmak/01.png?raw=true)](https://github.com/kamangir/bluer-sbc/blob/main/bluer_sbc/docs/cheshmak.md) | [`bluer-swallow`](https://github.com/kamangir/bluer-sbc/blob/main/bluer_sbc/docs/bluer-swallow.md) [![image](https://github.com/kamangir/assets2/blob/main/bluer-swallow/design/06.jpg?raw=true)](https://github.com/kamangir/bluer-sbc/blob/main/bluer_sbc/docs/bluer-swallow.md) | [`bryce`](https://github.com/kamangir/bluer-sbc/blob/main/bluer_sbc/docs/bryce.md) [![image](https://github.com/kamangir/assets2/blob/main/bryce/08.jpg?raw=true)](https://github.com/kamangir/bluer-sbc/blob/main/bluer_sbc/docs/bryce.md) |
40
48
  | [`blue3`](https://github.com/kamangir/blue-bracket/blob/main/designs/blue3.md) [![image](https://github.com/kamangir/blue-bracket/raw/main/images/blue3-1.jpg)](https://github.com/kamangir/blue-bracket/blob/main/designs/blue3.md) | [`chenar-grove`](https://github.com/kamangir/blue-bracket/blob/main/designs/chenar-grove.md) [![image](https://github.com/kamangir/blue-bracket/raw/main/images/chenar-grove-1.jpg)](https://github.com/kamangir/blue-bracket/blob/main/designs/chenar-grove.md) | [`cube`](https://github.com/kamangir/blue-bracket/blob/main/designs/cube.md) [![image](https://github.com/kamangir/blue-bracket/raw/main/images/cube-1.jpg)](https://github.com/kamangir/blue-bracket/blob/main/designs/cube.md) |
41
49
  | [`eye_nano`](https://github.com/kamangir/blue-bracket/blob/main/designs/eye_nano.md) [![image](https://github.com/kamangir/blue-bracket/raw/main/images/eye_nano-1.jpg)](https://github.com/kamangir/blue-bracket/blob/main/designs/eye_nano.md) | | |
42
50
 
43
- # aliases
44
-
45
- [@camera](https://github.com/kamangir/bluer-sbc/blob/main/bluer_sbc/docs/aliases/camera.md),
46
- [@sbc <hardware>](https://github.com/kamangir/bluer-sbc/blob/main/bluer_sbc/docs/aliases/hardware.md).
47
-
48
51
  ---
49
52
 
50
53
  > 🌀 [`blue-sbc`](https://github.com/kamangir/blue-sbc) for the [Global South](https://github.com/kamangir/bluer-south).
@@ -54,7 +57,7 @@ pip install bluer_sbc
54
57
 
55
58
  [![pylint](https://github.com/kamangir/bluer-sbc/actions/workflows/pylint.yml/badge.svg)](https://github.com/kamangir/bluer-sbc/actions/workflows/pylint.yml) [![pytest](https://github.com/kamangir/bluer-sbc/actions/workflows/pytest.yml/badge.svg)](https://github.com/kamangir/bluer-sbc/actions/workflows/pytest.yml) [![bashtest](https://github.com/kamangir/bluer-sbc/actions/workflows/bashtest.yml/badge.svg)](https://github.com/kamangir/bluer-sbc/actions/workflows/bashtest.yml) [![PyPI version](https://img.shields.io/pypi/v/bluer-sbc.svg)](https://pypi.org/project/bluer-sbc/) [![PyPI - Downloads](https://img.shields.io/pypi/dd/bluer-sbc)](https://pypistats.org/packages/bluer-sbc)
56
59
 
57
- built by 🌀 [`bluer README`](https://github.com/kamangir/bluer-objects/tree/main/bluer_objects/README), based on 🌀 [`bluer_sbc-8.163.1`](https://github.com/kamangir/bluer-sbc).
60
+ built by 🌀 [`bluer README`](https://github.com/kamangir/bluer-objects/tree/main/bluer_objects/README), based on 🌀 [`bluer_sbc-8.173.1`](https://github.com/kamangir/bluer-sbc).
58
61
 
59
62
 
60
63
  built by 🌀 [`blueness-3.118.1`](https://github.com/kamangir/blueness).
{bluer_sbc-8.163.1.dist-info → bluer_sbc-8.173.1.dist-info}/RECORD RENAMED
@@ -1,5 +1,5 @@
1
- bluer_sbc/README.py,sha256=YfR_hf9vF9bRaS1fStDyYKkhBQ1_9FcDpNbqQvWjkuI,1939
2
- bluer_sbc/__init__.py,sha256=P3eN1pw5jLaPsqiPo1Qd-T7VBn1S7lDfgPk9zCHSBkg,292
1
+ bluer_sbc/README.py,sha256=JXrYB22rYLtH1IG7uqrhUczKlgp6VFT2jIDrpOkqFRY,1962
2
+ bluer_sbc/__init__.py,sha256=nHp0LooOhku5TR2M5MROFbNlbXVP7odb0aAwMPzsUZg,292
3
3
  bluer_sbc/__main__.py,sha256=JV8oYpZDQbvcDpKJtbjU0hDeMJkzsDLGlhIWLmRpDQ4,348
4
4
  bluer_sbc/config.env,sha256=Lp91dQZrPDtMO-87-pAw1wOqLMIYEI1MlNrXhvKMaoE,706
5
5
  bluer_sbc/env.py,sha256=tTSjAmpGmg2Q2YSXOpSwVYHFrrqpqwN1ovw2ulVhnqg,1666
@@ -10,12 +10,13 @@ bluer_sbc/urls.py,sha256=Bjdewssljt0LIefjixBem9JN0kkghPvmrIETj3GdXbY,17
10
10
  bluer_sbc/.abcli/abcli.sh,sha256=Q_YRZUeFjN4UT9zT8lzrNIQSuORPie4Cp5CW5O2pX5w,290
11
11
  bluer_sbc/.abcli/actions.sh,sha256=P4d9lOzxdvkISZ0M3lZKH9JlmrcWTJ_HeEQAhIRLvC8,224
12
12
  bluer_sbc/.abcli/adafruit_rgb_matrix.sh,sha256=DwPJeuDXYa_F0r4nIWNeBYVtodyHYT2tV9JxPbWxhAM,382
13
- bluer_sbc/.abcli/alias.sh,sha256=PsTwzDXyeSvXGY-0LRF3U8df3AQVvPU35MOKQ4lx7xo,104
13
+ bluer_sbc/.abcli/alias.sh,sha256=d_oC5BldNKkhtXLurWwJg_3GoTJuYuy3TtgGNx49RNA,130
14
14
  bluer_sbc/.abcli/blue_sbc.sh,sha256=4O_0C56Xj5P7FjSTet5k7hvaNa-SIKpBUsz4MkBUc84,198
15
15
  bluer_sbc/.abcli/camera.sh,sha256=cmDDqUoy-YaO-nwKoTcsgrX-KbZ1JtXiPA3RVBoUb3s,447
16
16
  bluer_sbc/.abcli/grove.sh,sha256=6Lf4TiQzZj9uStCY9ezd8djcqVthzbybkmgmZ8Kr9wE,1180
17
17
  bluer_sbc/.abcli/hat.sh,sha256=ggMb9XOFA3t3sBTGalQK4x7yNuAgK3jA6UkFDWAnndM,449
18
18
  bluer_sbc/.abcli/lepton.sh,sha256=e7bzeYC8JpZMTTWkIfIscPfsoGYPb1ONWaTdDrglfRc,327
19
+ bluer_sbc/.abcli/rpi.sh,sha256=6OOHHUPQBQXmTD3TUrq4jeMisUnH-aqlRudkILlXJ8s,339
19
20
  bluer_sbc/.abcli/scroll_phat_hd.sh,sha256=AUD38PfNMCA-88GjHa-xV4OM7IS8mg5ECNFjAzLJ8AQ,331
20
21
  bluer_sbc/.abcli/seed.sh,sha256=9azGhOe8g9FEAsI87AkJfKpLp-tF4Ej1x2dgcJ0sa5I,63
21
22
  bluer_sbc/.abcli/session.sh,sha256=90Y-2pzZnM3YZO9sYeshS83oiLUE38WqCl-gA_RfWT0,1003
@@ -28,6 +29,7 @@ bluer_sbc/.abcli/install/scroll_phat_hd.sh,sha256=CxMLLh34C1i9FRyaD9JTUI9chTik18
28
29
  bluer_sbc/.abcli/install/sparkfun_top_phat.sh,sha256=3kOMZXBafLm2RqHXXgTx2Ez5WwY5ebKx6hdIK2TN2V0,1298
29
30
  bluer_sbc/.abcli/install/template.sh,sha256=Qqj6JKZlaxAqUGbY88gkNn-v-_aTUtKzpyi-lw353aY,215
30
31
  bluer_sbc/.abcli/install/unicorn_16x16.sh,sha256=zt6VN6c6cLQ59m7GiUNdV7aPTfO8CRoYtSs4VIuEJFw,496
32
+ bluer_sbc/.abcli/rpi/fake_display.sh,sha256=3GWrqk8Dqwtg_ufDBDQzBilk7bi_Y_4_aw7-v6IJGDI,420
31
33
  bluer_sbc/.abcli/seed/headless_rpi.sh,sha256=Sen1-Spg6lvBAzAqacLw42iJgME-v3yVs5T1qMuSO6c,2298
32
34
  bluer_sbc/.abcli/seed/headless_rpi_64_bit.sh,sha256=1DzrVSSNIvKLW8J1fI7Iqepk1cB2fvHpvez3EW-Dscw,1363
33
35
  bluer_sbc/.abcli/seed/headless_ubuntu_rpi.sh,sha256=QQRkOLstdWequW4eutQPimhKwT1yHtHNRUJNhKN3FZ0,2512
@@ -36,7 +38,7 @@ bluer_sbc/.abcli/seed/rpi.sh,sha256=HzCcPnuC2DneMtiHawD6tjcgLuyCstljl-A90kmpDeg,
36
38
  bluer_sbc/.abcli/seed/swallow_raspbian.sh,sha256=QK9YSkLA0_j5D_r8cp5DENLKhnczUj4a40O4w68ER98,363
37
39
  bluer_sbc/.abcli/tests/README.sh,sha256=0hp3y_URdsFtnYw5Ujty6xy5SNhNHGEVPqpQoYxu0WA,142
38
40
  bluer_sbc/.abcli/tests/camera.sh,sha256=NRr-RbyNORMSHYxNu6VUpVzHIJ2Qy-5NQr2qh54kqUg,1013
39
- bluer_sbc/.abcli/tests/help.sh,sha256=sfbx43OBqXwviy4yjVYTz38eTRijbWKWJlH2v4HvdSA,1359
41
+ bluer_sbc/.abcli/tests/help.sh,sha256=C0xlLMpYfSO2nZU-QD1OSHXmcgHuf36CRduAkANmOuE,1416
40
42
  bluer_sbc/.abcli/tests/seed.sh,sha256=NQUQzgHQZITgaq2aFkiZkaLT0VKmIsrl3aTqSkr8670,392
41
43
  bluer_sbc/.abcli/tests/version.sh,sha256=odDOmAFlzH7KtsAYWOmyLsQ6GAws6XadNlZ6H-NZuzc,147
42
44
  bluer_sbc/ROS/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
@@ -66,10 +68,11 @@ bluer_sbc/help/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
66
68
  bluer_sbc/help/__main__.py,sha256=Aj_lNOTJiCYZK3MrOlETIiFWiFPjZ2vaGzDk0Q3uTYA,229
67
69
  bluer_sbc/help/adafruit_rgb_matrix.py,sha256=VPQkAPb17K9AP2rMpH8yDPIXVG_dXiPZ0C8qtjZKTB8,384
68
70
  bluer_sbc/help/camera.py,sha256=uWMbQJuxPIz5KafNL6uSJqcRs6tH91pawui7TP7wd-4,1067
69
- bluer_sbc/help/functions.py,sha256=kS7EkZvhpuRrRYqyj2urIidyspZBCiqq_lgXt5ZB7m4,1183
71
+ bluer_sbc/help/functions.py,sha256=WhqDhBHMDAm4suAJ10rx-6Tr-yhx3JdjtyR9NOxk080,1266
70
72
  bluer_sbc/help/grove.py,sha256=4CM3_RUeu6hMr1zmkz4f-V7Mzb75vcYv0dfoQKw2KJI,1026
71
73
  bluer_sbc/help/hat.py,sha256=fhiEFoWYolmh-loZ87fYghEJK-XLUpkUc4pDj2WWdAE,885
72
74
  bluer_sbc/help/lepton.py,sha256=NNJY9f1gkZCD7fGf0chFjncbLOSpb79VLyZ2jxj4rG4,618
75
+ bluer_sbc/help/rpi.py,sha256=ZHxQQ0QSPYFOTk8ywWa5XLXRdh9wKZVXkVsj7RxApOE,438
73
76
  bluer_sbc/help/scroll_phat_hd.py,sha256=pLMIGMKIzRgN2LcNjIPNQiJ0mIowKjxkBhS40PIst1c,374
74
77
  bluer_sbc/help/sparkfun_top_phat.py,sha256=4JQMqzapnx5PBtzfw8RqpqgXtnF0HqDWxuTssK0OHUo,445
75
78
  bluer_sbc/help/unicorn_16x16.py,sha256=0uKABkkY7VGfmUj2U8g0fA0AvXDBlloVzGQXbx_mPO8,378
@@ -87,10 +90,10 @@ bluer_sbc/imager/lepton/classes.py,sha256=CnWEwaBZC2hAFuYkv32SAu7GaIK1A-PiLEppAg
87
90
  bluer_sbc/imager/lepton/python2.py,sha256=1jAHHzmda_bmqKj0b0X-2KONW5s9umxKaTY4ZieoaCI,1600
88
91
  bluer_sbc/session/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
89
92
  bluer_sbc/session/__main__.py,sha256=O2Tv6HgE8Bos7ASIViYludpWVi6EEc9XRoP8jYC2-2Q,534
90
- bluer_sbc/session/classes.py,sha256=vap_vDWwZtecBY2G65IYPee0PQX7OlNcjLzfFu4rW-8,9355
93
+ bluer_sbc/session/classes.py,sha256=6pEh-TBjekUZBbWj_zKh3LAntAoGfcMHtS2SJ77nyC8,9355
91
94
  bluer_sbc/session/functions.py,sha256=eRJKSczRjKn3Fo2jv8_4EMAZwfJBj5cIPg2WqHkC2Q8,481
92
- bluer_sbc-8.163.1.dist-info/licenses/LICENSE,sha256=ogEPNDSH0_dhiv_lT3ifVIdgIzHAqNA_SemnxUfPBJk,7048
93
- bluer_sbc-8.163.1.dist-info/METADATA,sha256=2HUvYfzzHyLgN-THeeR5XreRWTkCdGuQqLT0KtqLSXQ,4018
94
- bluer_sbc-8.163.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
95
- bluer_sbc-8.163.1.dist-info/top_level.txt,sha256=DsLDHFiTeAj2mctGVmCSgWUhzCznWSQoUmQ1VyEmnT0,10
96
- bluer_sbc-8.163.1.dist-info/RECORD,,
95
+ bluer_sbc-8.173.1.dist-info/licenses/LICENSE,sha256=ogEPNDSH0_dhiv_lT3ifVIdgIzHAqNA_SemnxUfPBJk,7048
96
+ bluer_sbc-8.173.1.dist-info/METADATA,sha256=KnZbkCM8Ogx8SuVhNJbmcljrbnhPGmXw-J7dTTboKfY,4124
97
+ bluer_sbc-8.173.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
98
+ bluer_sbc-8.173.1.dist-info/top_level.txt,sha256=DsLDHFiTeAj2mctGVmCSgWUhzCznWSQoUmQ1VyEmnT0,10
99
+ bluer_sbc-8.173.1.dist-info/RECORD,,