bluer-ugv 7.524.1__py3-none-any.whl → 7.535.1__py3-none-any.whl

bluer_ugv/.abcli/swallow/env/set.sh

@@ -5,8 +5,12 @@ function bluer_ugv_swallow_env_set() {
 
     if [[ "$var_name" == "bps" ]]; then
         var_name=BLUER_SBC_SWALLOW_HAS_BPS
+    elif [[ "$var_name" == "camera" ]]; then
+        var_name=BLUER_SBC_SWALLOW_HAS_CAMERA
     elif [[ "$var_name" == "full_keyboard" ]]; then
         var_name=BLUER_SBC_SWALLOW_HAS_FULL_KEYBOARD
+    elif [[ "$var_name" == "screen" ]]; then
+        var_name=BLUER_SBC_ENABLE_SCREEN
     elif [[ "$var_name" == "steering" ]]; then
         var_name=BLUER_SBC_SWALLOW_HAS_STEERING
     else

bluer_ugv/__init__.py

@@ -4,7 +4,7 @@ ICON = "🐬"
 
 DESCRIPTION = f"{ICON} AI x UGV."
 
-VERSION = "7.524.1"
+VERSION = "7.535.1"
 
 REPO_NAME = "bluer-ugv"
 

bluer_ugv/help/swallow/env.py

@@ -15,7 +15,7 @@ def help_cp(
             "cp",
             "[<env-name>]",
         ],
-        "cp swallow swallow-raspbian-<env-name>.env.",
+        "cp swallow-raspbian-<env-name>.env.",
         mono=mono,
     )
 
@@ -44,13 +44,15 @@ def help_set(
             "@swallow",
             "env",
             "set",
-            "bps | full_keyboard | steering",
+            "bps | camera | full_keyboard | screen | steering",
             "0 | 1",
         ],
         "set env.",
         {
             f"bps: BLUER_SBC_SWALLOW_HAS_BPS (currently: {env.BLUER_SBC_SWALLOW_HAS_BPS})": "",
+            f"camera: BLUER_SBC_SWALLOW_HAS_CAMERA (currently: {env.BLUER_SBC_SWALLOW_HAS_CAMERA})": "",
             f"full_keyboard: BLUER_SBC_SWALLOW_HAS_FULL_KEYBOARD (currently: {env.BLUER_SBC_SWALLOW_HAS_FULL_KEYBOARD})": "",
+            f" screen: BLUER_SBC_ENABLE_SCREEN (currently: {env.BLUER_SBC_ENABLE_SCREEN})"
             f"steering: BLUER_SBC_SWALLOW_HAS_STEERING (currently: {env.BLUER_SBC_SWALLOW_HAS_STEERING})": "",
         },
         mono=mono,

bluer_ugv/swallow/session/classical/camera/__init__.py

@@ -7,6 +7,9 @@ from bluer_ugv.swallow.session.classical.camera.navigation import (
 from bluer_ugv.swallow.session.classical.camera.tracking import (
     ClassicalTrackingCamera,
 )
+from bluer_ugv.swallow.session.classical.camera.void import (
+    ClassicalVoidCamera,
+)
 from bluer_ugv.swallow.session.classical.camera.yolo import (
     ClassicalYoloCamera,
 )

bluer_ugv/swallow/session/classical/camera/generic.py

@@ -2,12 +2,10 @@ from typing import Any
 
 from bluer_algo.socket.connection import SocketConnection, DEV_HOST
 from bluer_sbc.imager.camera import instance as camera
-from bluer_sbc.env import BLUER_SBC_ENV
 
 from bluer_ugv.swallow.session.classical.keyboard.classes import ClassicalKeyboard
 from bluer_ugv.swallow.session.classical.leds import ClassicalLeds
 from bluer_ugv.swallow.session.classical.setpoint.classes import ClassicalSetPoint
-from bluer_ugv.logger import logger
 
 
 class ClassicalCamera:
@@ -18,7 +16,6 @@ class ClassicalCamera:
         setpoint: ClassicalSetPoint,
         object_name: str,
     ):
-        logger.info(f"sbc.env: {BLUER_SBC_ENV}")
 
         self.keyboard = keyboard
         self.leds = leds

bluer_ugv/swallow/session/classical/camera/void.py

@@ -0,0 +1,9 @@
+from bluer_ugv.swallow.session.classical.camera.generic import ClassicalCamera
+
+
+class ClassicalVoidCamera(ClassicalCamera):
+    def initialize(self) -> bool:
+        return True
+
+    def cleanup(self):
+        pass

bluer_ugv/swallow/session/classical/screen/classes.py

@@ -1,5 +1,7 @@
 from bluer_options.host.functions import is_headless
 
+from bluer_sbc.env import BLUER_SBC_ENABLE_SCREEN
+
 from bluer_ugv import env
 from bluer_ugv.swallow.session.classical.screen.video.player import VideoPlayer
 from bluer_ugv.swallow.session.classical.screen.video.playlist import PlayList
@@ -8,7 +10,9 @@ from bluer_ugv.logger import logger
 
 class ClassicalScreen:
     def __init__(self):
-        self.video_player = None if is_headless() else VideoPlayer()
+        self.video_player = (
+            None if (is_headless() or BLUER_SBC_ENABLE_SCREEN == 0) else VideoPlayer()
+        )
 
         self.playlist = PlayList(env.RANGIN_VIDEO_LIST_OBJECT)
 

bluer_ugv/swallow/session/classical/session.py

@@ -4,12 +4,13 @@ from bluer_options import string
 from bluer_options.timing.classes import Timing
 from bluer_objects.env import abcli_object_name
 from bluer_objects.metadata import post_to_object
-from bluer_sbc.env import BLUER_SBC_ENV, BLUER_SBC_SWALLOW_HAS_STEERING
+from bluer_sbc.env import BLUER_SBC_CAMERA_KIND, BLUER_SBC_SWALLOW_HAS_STEERING
 
 from bluer_ugv.swallow.session.classical.camera import (
     ClassicalCamera,
     ClassicalNavigationCamera,
     ClassicalTrackingCamera,
+    ClassicalVoidCamera,
     ClassicalYoloCamera,
 )
 from bluer_ugv.swallow.session.classical.push_button import ClassicalPushButton
@@ -94,19 +95,28 @@ class ClassicalSession:
         )
 
         camera_class = (
-            ClassicalYoloCamera
-            if BLUER_SBC_ENV == "yolo"
+            ClassicalVoidCamera
+            if BLUER_SBC_CAMERA_KIND == "void"
             else (
-                ClassicalTrackingCamera
-                if BLUER_SBC_ENV == "tracking"
+                ClassicalYoloCamera
+                if BLUER_SBC_CAMERA_KIND == "yolo"
                 else (
-                    ClassicalNavigationCamera
-                    if BLUER_SBC_ENV == "navigation"
-                    else ClassicalCamera
+                    ClassicalTrackingCamera
+                    if BLUER_SBC_CAMERA_KIND == "tracking"
+                    else (
+                        ClassicalNavigationCamera
+                        if BLUER_SBC_CAMERA_KIND == "navigation"
+                        else ClassicalCamera
+                    )
                 )
             )
         )
-        logger.info(f"camera: {camera_class.__name__}")
+        logger.info(
+            "camera: {} [{}]".format(
+                camera_class.__name__,
+                BLUER_SBC_CAMERA_KIND,
+            )
+        )
         self.camera = camera_class(
             keyboard=self.keyboard,
             leds=self.leds,

{bluer_ugv-7.524.1.dist-info → bluer_ugv-7.535.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bluer_ugv
-Version: 7.524.1
+Version: 7.535.1
 Summary: 🐬 AI x UGV.
 Home-page: https://github.com/kamangir/bluer-ugv
 Author: Arash Abadpour (Kamangir)
@@ -64,7 +64,7 @@ pip install bluer_ugv
 
 [![pylint](https://github.com/kamangir/bluer-ugv/actions/workflows/pylint.yml/badge.svg)](https://github.com/kamangir/bluer-ugv/actions/workflows/pylint.yml) [![pytest](https://github.com/kamangir/bluer-ugv/actions/workflows/pytest.yml/badge.svg)](https://github.com/kamangir/bluer-ugv/actions/workflows/pytest.yml) [![bashtest](https://github.com/kamangir/bluer-ugv/actions/workflows/bashtest.yml/badge.svg)](https://github.com/kamangir/bluer-ugv/actions/workflows/bashtest.yml) [![PyPI version](https://img.shields.io/pypi/v/bluer-ugv.svg)](https://pypi.org/project/bluer-ugv/) [![PyPI - Downloads](https://img.shields.io/pypi/dd/bluer-ugv)](https://pypistats.org/packages/bluer-ugv)
 
-built by 🌀 [`bluer README`](https://github.com/kamangir/bluer-objects/tree/main/bluer_objects/README), based on 🐬 [`bluer_ugv-7.524.1`](https://github.com/kamangir/bluer-ugv).
+built by 🌀 [`bluer README`](https://github.com/kamangir/bluer-objects/tree/main/bluer_objects/README), based on 🐬 [`bluer_ugv-7.535.1`](https://github.com/kamangir/bluer-ugv).
 
 
 built by 🌀 [`blueness-3.118.1`](https://github.com/kamangir/blueness).

{bluer_ugv-7.524.1.dist-info → bluer_ugv-7.535.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-bluer_ugv/__init__.py,sha256=558bcRjfjRM_CjBeUUDeWdglclU5H4JkVgCOdpecfG8,288
+bluer_ugv/__init__.py,sha256=LwG-Rnw19ebzmNxf9-kLqNew2kqLKGJq78HWshMXPXc,288
 bluer_ugv/__main__.py,sha256=77TquqyMca7qHk0XtCixGVyzfW3_9ywnl5oXEPERlls,374
 bluer_ugv/config.env,sha256=I718Cfy1GaGqVI80vb7iYsoJ0P7SKLW8USaBYb2sub4,1055
 bluer_ugv/env.py,sha256=oEJiyKf1cCJ9kgZqgwnWemT0U_cO2RmCN3MRSS2vitY,1875
@@ -27,7 +27,7 @@ bluer_ugv/.abcli/swallow/dataset/list.sh,sha256=-hqgmThG2JfheFSYIe6Z3UH05X5hrSuI
 bluer_ugv/.abcli/swallow/dataset/upload.sh,sha256=KM33QM4rIQpltbd_V49wPWear9Wi8cJNo0bBBeCEENU,577
 bluer_ugv/.abcli/swallow/env/cp.sh,sha256=vWBlG9n4Q6m_lBWcot9nyN6kc7-uil5skCjfJWHCfrY,168
 bluer_ugv/.abcli/swallow/env/list.sh,sha256=pT-hRS0ZfmogAfAMfm-hh0raGoUAnl66U5VuqgyeIwE,173
-bluer_ugv/.abcli/swallow/env/set.sh,sha256=hMl5qO_nsV_C3Yvn4KDpw2lY7QD8aESzPsIH0zg0BAo,640
+bluer_ugv/.abcli/swallow/env/set.sh,sha256=ed6NCkhYK9LNhSYU_iJUNYXuyQFzmH9mydQ5agihhvA,817
 bluer_ugv/.abcli/swallow/keyboard/test.sh,sha256=B04AO-Er3_utzULPziyKD0aybuN2bry7h9wrQBEJ0tA,218
 bluer_ugv/.abcli/swallow/ultrasonic/review.sh,sha256=XoKwUliTcH-yTHrIo1cc9RSxL3tYQsBfWf1XOJ6YtOI,717
 bluer_ugv/.abcli/swallow/ultrasonic/test.sh,sha256=WRq4jnm2lv6q7fAw-_6Xg7DD8kgki48t8ilwXA-SsBM,582
@@ -145,7 +145,7 @@ bluer_ugv/help/git.py,sha256=4CcaA8lHoplrrFgF5lolwVT79SLr3gE2iqXpAIfzH64,319
 bluer_ugv/help/swallow/__init__.py,sha256=t65DuR-96-29wNylRysfId86OLNxsW4AM2YnN4V4DbM,755
 bluer_ugv/help/swallow/dataset.py,sha256=59D5XLQG1PRWfPwfM73Jz1-f0qh_cO0q18qLtsxXtj0,2495
 bluer_ugv/help/swallow/debug.py,sha256=70krqg-YtjxPjPwWnx4J1Fxlvw46hHyAYq7pA7yPt50,481
-bluer_ugv/help/swallow/env.py,sha256=AwNGF7ZcwQz7-Q8uKaLuajyIMXpi9yGMS27Xq0-QvUs,1325
+bluer_ugv/help/swallow/env.py,sha256=0CZyXIMWV2cpV_VbgdSEXigc63UNvQ-L2tjb-5Edwe8,1531
 bluer_ugv/help/swallow/keyboard.py,sha256=YNkGWvE7tN3agCaL2R30FSIF2zw6oXa5ZJdnTJQA3Hk,518
 bluer_ugv/help/swallow/select_target.py,sha256=s1-v2IyT6thAncIzo4wKnU8hFJ-rDyi-IDzx2kMaJrs,390
 bluer_ugv/help/swallow/ultrasonic_sensor.py,sha256=rhxHQWDU7orCvqC_TeJWMCJFrm4qyJyHdiUIUIpZmhU,1223
@@ -168,11 +168,12 @@ bluer_ugv/swallow/session/classical/mode.py,sha256=6rFe1IIpfijuI7Xd-wcGKhYQ7EdQx
 bluer_ugv/swallow/session/classical/mousepad.py,sha256=LI7yvmtrZZaGUgPGpxNU7zcPkW8D5ykHlY_O-4H2STs,1871
 bluer_ugv/swallow/session/classical/position.py,sha256=gNeNzNpUG8zkDrcwibxaYStPNKUN1_DV5RjHu_pHMIg,913
 bluer_ugv/swallow/session/classical/push_button.py,sha256=s8sPart_dECjLK-gfsJi0UorRYcFYf3ofLqjmG8PoA8,2397
-bluer_ugv/swallow/session/classical/session.py,sha256=qtVnnXT7mpO7y0uXssL3ZHuP9xfXJyBtD1e7ZcwFEiI,5540
-bluer_ugv/swallow/session/classical/camera/__init__.py,sha256=KOehn6qHKj3EMbV5uGXKIfN_v4D5-E2xH9aCWqbNlAI,375
-bluer_ugv/swallow/session/classical/camera/generic.py,sha256=xmztClNYkosYo2TcIS2Ax4Bessc8lx4hlt9LnMcobfU,1216
+bluer_ugv/swallow/session/classical/session.py,sha256=zdP5pUy6u35BBptkQM8kn1w1P-bduFWQNiSju3ftlaM,5858
+bluer_ugv/swallow/session/classical/camera/__init__.py,sha256=2GchuT19_Ns0uYRS5aUMz4pBwbK3y5XoFxoAlAnJKh8,464
+bluer_ugv/swallow/session/classical/camera/generic.py,sha256=V_PdQkVfs7kJvjzjD7xVV8Zommx8eVBVGIfvL1vl86M,1091
 bluer_ugv/swallow/session/classical/camera/navigation.py,sha256=HoeTlifGEfnedb6o8P-O0TcP1bNDRJ0M7vWupQh1pL4,6790
 bluer_ugv/swallow/session/classical/camera/tracking.py,sha256=fXDCA7UCQT0I6_djk16AgRdulySVEjJSKOgD8bDpQng,3651
+bluer_ugv/swallow/session/classical/camera/void.py,sha256=IJkJQgTgVucTYagFIwKEchNf3Vcjl99EdCdSdvKaeJo,216
 bluer_ugv/swallow/session/classical/camera/yolo.py,sha256=i-lEsLpqlmm1v3sa5azQYk7LCgU9Me5y28-LSPurc7g,6412
 bluer_ugv/swallow/session/classical/keyboard/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bluer_ugv/swallow/session/classical/keyboard/__main__.py,sha256=tdX-a8MC9ix6aQ9isZXfnIqa9SuiYGr73Yy05RwvdCs,603
@@ -186,7 +187,7 @@ bluer_ugv/swallow/session/classical/motor/rear.py,sha256=mIBpUxBeiw1me5WY3jbtMya
 bluer_ugv/swallow/session/classical/motor/right.py,sha256=3BwCXA6VxxyRBG3rsnRXGviS5gIda14UCqaELGMOJNk,539
 bluer_ugv/swallow/session/classical/motor/steering.py,sha256=-_-6C9cGYFgt_WH3hwTSV8jL5I_qkxc2O45Ck8SlFCo,545
 bluer_ugv/swallow/session/classical/screen/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bluer_ugv/swallow/session/classical/screen/classes.py,sha256=LeQOY_UeNfy5JJSMmlLvAdN-Ob0pChrdQRzm8Z0XexU,1202
+bluer_ugv/swallow/session/classical/screen/classes.py,sha256=EzMJOcI5b153pHYAzTeNKU82CHc9AKyNS5ZfudoBvTo,1311
 bluer_ugv/swallow/session/classical/screen/video/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bluer_ugv/swallow/session/classical/screen/video/__main__.py,sha256=2uyKoxnZ9LwYWlEP_KDEyvIrwRL31SjK7I-xvM-eZpI,2190
 bluer_ugv/swallow/session/classical/screen/video/engine.py,sha256=-P_VSdqBjP2KBooMzcc-izWP-GMfl4q07t4Fyc6CQH4,3752
@@ -206,8 +207,8 @@ bluer_ugv/swallow/session/classical/ultrasonic_sensor/pack.py,sha256=bVcG8V0P6Sl
 bluer_ugv/swallow/session/classical/ultrasonic_sensor/review.py,sha256=_iQmec2VSq-ORkTVpXSNJg08hrSz2M1O8LzNZEtoT9U,959
 bluer_ugv/swallow/session/classical/ultrasonic_sensor/sensor.py,sha256=En-J8BRTiR8k9p2CBbW0cOUuw8nctD5DOXDm5uhCNO4,3987
 bluer_ugv/swallow/session/classical/ultrasonic_sensor/testing.py,sha256=yj2MY_Jo1FzeXnR_JoFAXsb9eHEVhicDiHEsUa8z03U,1525
-bluer_ugv-7.524.1.dist-info/licenses/LICENSE,sha256=ogEPNDSH0_dhiv_lT3ifVIdgIzHAqNA_SemnxUfPBJk,7048
-bluer_ugv-7.524.1.dist-info/METADATA,sha256=LXyLgoEDp8JBDUyslHlU6R2r8Gz_uDZOJfQTg3WQHr0,5579
-bluer_ugv-7.524.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-bluer_ugv-7.524.1.dist-info/top_level.txt,sha256=_MlDhFvIPpher9Zs7xyJTHgO2xJJTbfR1dzncz3LQnk,10
-bluer_ugv-7.524.1.dist-info/RECORD,,
+bluer_ugv-7.535.1.dist-info/licenses/LICENSE,sha256=ogEPNDSH0_dhiv_lT3ifVIdgIzHAqNA_SemnxUfPBJk,7048
+bluer_ugv-7.535.1.dist-info/METADATA,sha256=sjwgJVJwbggRjg53rGM0sIGelSr9zzvmU5bSTtt1AiE,5579
+bluer_ugv-7.535.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+bluer_ugv-7.535.1.dist-info/top_level.txt,sha256=_MlDhFvIPpher9Zs7xyJTHgO2xJJTbfR1dzncz3LQnk,10
+bluer_ugv-7.535.1.dist-info/RECORD,,