Merge remote-tracking branch 'upstream/main' into sound-generator

Author: rjtokenring

.github/workflows/docker-github-dev-build.yml

@@ -1,4 +1,4 @@
-name: DEV - build & publish Arduino dev containers
+name: DEV - build & publish Arduino dev-latest containers
 
 on:
   workflow_dispatch:
@@ -93,4 +93,4 @@ jobs:
           cache-to: type=gha,mode=max
           provenance: false
           build-args: |
-            REGISTRY=${{ env.DEV_REGISTRY_PATH }}
+            REGISTRY=${{ env.DEV_REGISTRY_PATH }}

models/models-list.yaml

@@ -18,7 +18,7 @@ models:
  - yolox-object-detection:
     runner: brick
     name : "General purpose object detection - YoloX"
-    description: "General purpose object detection model based on YoloX Nano. This model is trained on the COCO dataset and can detect 80 different object classes."
+    description: "General purpose object detection model based on YoloX-Nano. This model is trained on the COCO dataset and can detect 80 different object classes."
     model_configuration:
       "EI_OBJ_DETECTION_MODEL": "/models/ootb/ei/yolo-x-nano.eim"
     model_labels:
@@ -1115,7 +1115,7 @@ models:
  - keyword-spotting-hey-arduino:
     runner: brick
     name : "Keyword spotting - Hey Arduino!"
-    description: "A keyword-spotting model to detect the 'Hey Arduino!' in audio recordings"
+    description: "A keyword-spotting model to detect the 'Hey Arduino!' in audio streams."
     model_configuration:
       "EI_KEYWORD_SPOTTING_MODEL": "/models/ootb/ei/keyword-spotting-hey-arduino.eim"
     model_labels: 
@@ -1180,5 +1180,6 @@ models:
       ei-model-url: "https://studio.edgeimpulse.com/public/749446/live"
       source-model-id: "glass-breaking"
       source-model-url: "https://studio.edgeimpulse.com/public/749446/live"
+      private: true
     bricks:
       - arduino:audio_classifier

src/arduino/app_bricks/video_objectdetection/brick_compose.yaml

@@ -13,7 +13,7 @@ services:
     volumes:
       - "${CUSTOM_MODEL_PATH:-/home/arduino/.arduino-bricks/ei-models/}:${CUSTOM_MODEL_PATH:-/home/arduino/.arduino-bricks/ei-models/}"
       - "/run/udev:/run/udev"
-    command: ["--model-file", "${EI_OBJ_DETECTION_MODEL:-/models/ootb/ei/yolo-x-nano.eim}", "--dont-print-predictions", "--mode", "streaming", "--force-target", "--preview-original-resolution", "--camera", "${VIDEO_DEVICE:-/dev/video1}"]
+    command: ["--model-file", "${EI_OBJ_DETECTION_MODEL:-/models/ootb/ei/yolo-x-nano.eim}", "--dont-print-predictions", "--mode", "streaming", "--preview-original-resolution", "--camera", "${VIDEO_DEVICE:-/dev/video1}"]
     healthcheck:
       test: [ "CMD-SHELL", "wget -q --spider http://ei-video-obj-detection-runner:4912 || exit 1" ]
       interval: 2s