Merge branch 'main' into rae_wip

luxonis · Aug 9, 2023 · c522e6c · c522e6c
2 parents f131050 + 8d3c82b
commit c522e6c
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/batch/oak_d_lr.json b/batch/oak_d_lr.json
@@ -6,7 +6,6 @@
     "options": {
         "bootloader": "poe",
         "imu": true,
-        "environment": "oak_d_lr",
         "tv_calibration": {
             "camera_settings": {
                 "left": {"isp_scale": [2,3]},

diff --git a/batch/rae.json b/batch/rae.json
@@ -21,8 +21,9 @@
             "configs": [
                 "config-rae.tar"
             ],
-            "fip": "fip-dm3370-r5m2e5-1.6.0.bin",
-            "test_suite": "DM3370_R4M2E4_rae"
+            "fip": "fip-dm3370-r5m2e5-1.7.1.bin",
+            "test_suite": "DM3370_R5M2E5_rae",
+            "os": "luxonisos-1.11.zip"
         },
         {
             "title": "rae (DM3370_R4M2E4)",

diff --git a/boards/DM2097-C11.json b/boards/DM2097-C11.json
@@ -34,7 +34,7 @@
                 "extrinsics": {
                     "to_cam": "CAM_A",
                     "specTranslation": {
-                        "x": 7,
+                        "x": 1.3,
                         "y": 0,
                         "z": 0
                     },

diff --git a/boards/DM2097.json b/boards/DM2097.json
@@ -34,7 +34,7 @@
                 "extrinsics": {
                     "to_cam": "CAM_A",
                     "specTranslation": {
-                        "x": 7,
+                        "x": 1.3,
                         "y": 0,
                         "z": 0
                     },

diff --git a/boards_reader.py b/boards_reader.py
@@ -141,6 +141,9 @@ class VariantConfig(BaseModel):
 	fip: Optional[str] = None
 	""" Name of the FIP fipe to be flashed."""
 
+	os: Optional[str] = None
+	"""Name of the OS zip to be flashed."""
+
 	configs: Optional[List[str]] = None
 	""" List of config tars names to be flashed. """
 
@@ -310,4 +313,4 @@ def get_variant_by_eeprom_typed(calibration):
 		f"Variant with eeprom data 'productName: {eeprom.productName}, \
 			boardName: {eeprom.boardName}, boardRev: {eeprom.boardRev}, \
 			boardConf: {eeprom.boardConf} \
-				hardwareConf: {eeprom.hardwareConf}' not found")
+				hardwareConf: {eeprom.hardwareConf}' not found")