bluer-ugv 7.524.1__tar.gz → 7.535.1__tar.gz

{bluer_ugv-7.524.1/bluer_ugv.egg-info → bluer_ugv-7.535.1}/PKG-INFO

@@ -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 → bluer_ugv-7.535.1}/README.md

@@ -35,5 +35,5 @@ 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).
 

{bluer_ugv-7.524.1 → bluer_ugv-7.535.1}/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-7.524.1 → bluer_ugv-7.535.1}/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-7.524.1 → bluer_ugv-7.535.1}/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-7.524.1 → bluer_ugv-7.535.1}/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-7.524.1 → bluer_ugv-7.535.1}/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-7.535.1/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-7.524.1 → bluer_ugv-7.535.1}/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-7.524.1 → bluer_ugv-7.535.1}/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 → bluer_ugv-7.535.1/bluer_ugv.egg-info}/PKG-INFO

@@ -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 → bluer_ugv-7.535.1}/bluer_ugv.egg-info/SOURCES.txt

@@ -185,6 +185,7 @@ bluer_ugv/swallow/session/classical/camera/__init__.py
 bluer_ugv/swallow/session/classical/camera/generic.py
 bluer_ugv/swallow/session/classical/camera/navigation.py
 bluer_ugv/swallow/session/classical/camera/tracking.py
+bluer_ugv/swallow/session/classical/camera/void.py
 bluer_ugv/swallow/session/classical/camera/yolo.py
 bluer_ugv/swallow/session/classical/keyboard/__init__.py
 bluer_ugv/swallow/session/classical/keyboard/__main__.py