Merge remote-tracking branch 'origin/main' into updated

luxonis · Aug 10, 2023 · 2ba6978 · 2ba6978
2 parents 127f33f + 3a6f218
commit 2ba6978
Show file tree

Hide file tree

Showing 19 changed files with 381 additions and 16 deletions.
diff --git a/batch/eeprom/BC2087_R3M1E3_oak_d_lr.json b/batch/eeprom/BC2087_R3M1E3_oak_d_lr.json
@@ -0,0 +1,12 @@
+{
+    "batchName": "",
+    "batchTime": 0,
+    "boardConf": "nIR-C30M00-00",
+    "boardName": "BC2087",
+    "boardRev": "R3M1E3",
+    "productName": "OAK-D-LR",
+    "boardCustom": "",
+    "hardwareConf": "F1-FV04-BC000",
+    "boardOptions": 1281,
+    "version": 7
+}
diff --git a/batch/eeprom/DM2080_R3M2E3_oak_d_sr.json b/batch/eeprom/DM2080_R3M2E3_oak_d_sr.json
@@ -0,0 +1,12 @@
+{
+    "batchName": "",
+    "batchTime": 0,
+    "boardConf": "nIR-C15M00-00",
+    "boardName": "DM2080",
+    "boardRev": "R3M2E3",
+    "productName": "OAK-D-SR",
+    "boardCustom": "",
+    "hardwareConf": "F1-FV00-BC000",
+    "boardOptions": 8,
+    "version": 7
+}
diff --git a/batch/eeprom/DM2080_R4M2E4_oak_d_sr.json b/batch/eeprom/DM2080_R4M2E4_oak_d_sr.json
@@ -0,0 +1,12 @@
+{
+    "batchName": "",
+    "batchTime": 0,
+    "boardConf": "nIR-C15M00-00",
+    "boardName": "DM2080",
+    "boardRev": "R4M2E4",
+    "productName": "OAK-D-SR",
+    "boardCustom": "",
+    "hardwareConf": "F1-FV00-BC000",
+    "boardOptions": 8,
+    "version": 7
+}
diff --git a/batch/eeprom/DM3370_R5M2E5_rae.json b/batch/eeprom/DM3370_R5M2E5_rae.json
@@ -0,0 +1,12 @@
+{
+    "batchName": "",
+    "batchTime": 0,
+    "boardConf": "nIR-C00M00-00",
+    "boardName": "DM3370",
+    "boardRev": "R5M2E5",
+    "productName": "RAE",
+    "boardCustom": "",
+    "hardwareConf": "F0-FV00-BC000",
+    "boardOptions": 0,
+    "version": 7
+}
diff --git a/batch/eeprom/EL2086_R0M0E0_oak_d_sr_poe.json b/batch/eeprom/EL2086_R0M0E0_oak_d_sr_poe.json
@@ -1,7 +1,7 @@
 {
     "batchName": "Maxwell",
     "batchTime": 0,
-    "boardConf": "nIR-C80M00-00",
+    "boardConf": "nIR-C81M00-00",
     "boardName": "EL2086",
     "boardRev": "R0M0E0",
     "productName": "OAK-D-SR-POE",

diff --git a/batch/eeprom/EL2086_R1M1E1_oak_d_sr_poe.json b/batch/eeprom/EL2086_R1M1E1_oak_d_sr_poe.json
@@ -0,0 +1,12 @@
+{
+    "batchName": "Maxwell",
+    "batchTime": 0,
+    "boardConf": "nIR-C80M00-00",
+    "boardName": "EL2086",
+    "boardRev": "R1M1E1",
+    "productName": "OAK-D-SR-POE",
+    "boardCustom": "",
+    "hardwareConf": "F1-FV00-BC000",
+    "boardOptions": 257,
+    "version": 7
+}
diff --git a/batch/oak_d_lite.json b/batch/oak_d_lite.json
@@ -15,13 +15,19 @@
             "title":"OAK-D Lite AF (DM9095 R2M1E4)",
             "description": "OAK-D Lite Auto Focus, based on DM9095 R2M1E4 board",
             "eeprom":"eeprom/DM9095_R2M1E4_oak_d_lite_af.json",
-            "board_config_file": "OAK-D-LITE.json"
+            "board_config_file": "OAK-D-LITE.json",
+            "options": {
+                "imu": false
+            }
         },
         {
             "title":"OAK-D Lite FF (DM9095 R2M1E4)",
             "description": "OAK-D Lite Fixed Focus, based on DM9095 R2M1E4 board",
             "eeprom":"eeprom/DM9095_R2M1E4_oak_d_lite_ff.json",
-            "board_config_file": "OAK-D-LITE.json"
+            "board_config_file": "OAK-D-LITE.json",
+            "options": {
+                "imu": false
+            }
         },
         {
             "title":"OAK-D Lite (early batch)",

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]},
@@ -16,6 +15,12 @@
         } 
     },
     "variants": [
+        {
+            "title":"OAK-D LR (BC2087 R3M1E3)",
+            "description": "OAK-D LR, based on BC2087 R3M1E3 board",
+            "eeprom":"eeprom/BC2087_R3M1E3_oak_d_lr.json",
+            "board_config_file": "OAK-D-LR.json"
+        },
         {
             "title":"OAK-D LR (BC2087 R1M1E1)",
             "description": "OAK-D LR, based on BC2087 R1M1E1 board",

diff --git a/batch/oak_d_sr.json b/batch/oak_d_sr.json
@@ -5,6 +5,18 @@
     "test_type": "OAK-D-SR",
     "options": {"bootloader": "header_usb", "imu": true},
     "variants": [
+        {
+            "title":"OAK-D SR (DM2080 R4M2E4) (2x OV9782)",
+            "description": "OAK-D SR, based on DM2080 R4M2E4 board",
+            "eeprom":"eeprom/DM2080_R4M2E4_oak_d_sr.json",
+            "board_config_file": "OAK-D-SR.json"
+        },
+        {
+            "title":"OAK-D SR (DM2080 R3M2E3) (2x OV9782)",
+            "description": "OAK-D SR, based on DM2080 R3M2E3 board",
+            "eeprom":"eeprom/DM2080_R3M2E3_oak_d_sr.json",
+            "board_config_file": "OAK-D-SR.json"
+        },
         {
             "title":"OAK-D SR (DM2080 R1M1E1) (2x OV9782)",
             "description": "OAK-D SR, based on DM2080 R1M1E1 board",

diff --git a/batch/oak_d_sr_poe.json b/batch/oak_d_sr_poe.json
@@ -0,0 +1,21 @@
+{
+    "title": "OAK-D SR PoE",
+    "description": "OAK-D SR PoE",
+    "image": "images/oak_d_sr_poe.jpg",
+    "test_type": "OAK-D-SR-POE",
+    "options": {"bootloader": "poe", "imu": true},
+    "variants": [
+        {
+            "title":"OAK-D SR PoE (EL2086 R1M1E1)",
+            "description": "OAK-D SR PoE, based on EL2086 R1M1E1 board with ToF sensor",
+            "eeprom":"eeprom/EL2086_R1M1E1_oak_d_sr_poe.json",
+            "board_config_file": "OAK-D-SR-POE.json"
+        },
+        {
+            "title":"OAK-D SR PoE (EL2086 R0M0E0)",
+            "description": "OAK-D SR PoE, based on EL2086 R0M0E0 board with ToF sensor",
+            "eeprom":"eeprom/EL2086_R0M0E0_oak_d_sr_poe.json",
+            "board_config_file": "OAK-D-SR-POE.json"
+        }
+    ]
+}
diff --git a/batch/rae.json b/batch/rae.json
@@ -1,6 +1,6 @@
 {
-    "title": "rae",
-    "description": "rae",
+    "title": "RAE",
+    "description": "RAE",
     "test_type": "ETH",
     "options": {
         "platform": "rvc3",
@@ -12,10 +12,25 @@
         }
     },
     "variants": [
+        {
+            "title": "rae (DM3370_R5M2E5)",
+            "description": "rae (little robot)",
+            "eeprom": "eeprom/DM3370_R5M2E5_rae.json",
+            "board_config_file": "RAE-A-B-C.json",
+            "board_config_file_2": "RAE-D-E.json",
+            "configs": [
+                "config-rae.tar"
+            ],
+            "fip": "fip-dm3370-r5m2e5-1.7.1.bin",
+            "test_suite": "DM3370_R5M2E5_rae",
+            "os": "luxonisos-1.11.zip"
+        },
         {
             "title": "rae (DM3370_R4M2E4)",
             "description": "rae (little robot)",
             "eeprom": "eeprom/DM3370_R4M2E4_rae.json",
+            "board_config_file": "RAE-A-B-C.json",
+            "board_config_file_2": "RAE-D-E.json",
             "configs": [
                 "config-rae.tar"
             ],
@@ -26,10 +41,12 @@
             "title": "rae (DM3370_R1M1E1)",
             "description": "Little robot",
             "eeprom": "eeprom/DM3370_R1M1E1_rae.json",
+            "board_config_file": "RAE-A-B-C.json",
+            "board_config_file_2": "RAE-D-E.json",
             "configs": [
                 "config-rae.tar"
             ],
             "fip": "fip-rae-dm3370-r0m0e0-1.5.0.bin"
         }
     ]
-}
+}
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/OAK-D-SR-POE.json b/boards/OAK-D-SR-POE.json
@@ -0,0 +1,54 @@
+{
+    "board_config":
+    {
+        "name": "OAK-D-SR-POE",
+        "revision": "R0M0E0",
+        "cameras":{
+            "CAM_B": {
+                "name": "left",
+                "hfov": 71.86,
+                "type": "color",
+                "extrinsics": {
+                    "to_cam": "CAM_C",
+                    "specTranslation": {
+                        "x": -2.0,
+                        "y": 0,
+                        "z": 0
+                    },
+                    "rotation":{
+                        "r": 0,
+                        "p": 0,
+                        "y": 0
+                    }
+                }
+            },
+            "CAM_C": {
+                "name": "right",
+                "hfov": 71.86,
+                "type": "color",
+                "extrinsics": {
+                    "to_cam": "CAM_A",
+                    "specTranslation": {
+                        "x": -1.7382,
+                        "y": 0,
+                        "z": 0
+                    },
+                    "rotation":{
+                        "r": 0,
+                        "p": 0,
+                        "y": 0
+                    }
+                }
+            },
+            "CAM_A": {
+                "name": "rgb",
+                "hfov": 71.86,
+                "type": "tof"
+            }
+        },
+        "stereo_config":{
+            "left_cam": "CAM_B",
+            "right_cam": "CAM_C"
+        }
+    }
+}
diff --git a/boards/RAE-A-B-C.json b/boards/RAE-A-B-C.json
@@ -0,0 +1,45 @@
+{
+    "board_config":
+    {
+        "name": "TOF-FFC",
+        "revision": "R0M0E0",
+        "cameras":{
+            "CAM_A": {
+                "name": "rgb",
+                "hfov": 73,
+                "type": "color"
+            },
+            "CAM_C": {
+                "name": "left",
+                "hfov": 71.86,
+                "type": "color",
+                "extrinsics": {
+                    "to_cam": "CAM_B",
+                    "specTranslation": {
+                        "x": -7.5,
+                        "y": 0,
+                        "z": 0
+                    },
+                    "rotation":{
+                        "r": 0,
+                        "p": 0,
+                        "y": 0
+                    }
+
+                }
+
+            },
+            "CAM_B": {
+                "name": "right",
+                "hfov": 71.86,
+                "type": "color"
+            }
+
+        },
+
+        "stereo_config":{
+            "left_cam": "CAM_C",
+            "right_cam": "CAM_B"
+        }
+    }
+}
diff --git a/boards/RAE-D-E.json b/boards/RAE-D-E.json
@@ -0,0 +1,37 @@
+{
+    "board_config":
+    {
+        "name": "RAE",
+        "revision": "R0M0E0",
+        "cameras":{
+            "CAM_E": {
+                "name": "left",
+                "hfov": 71.86,
+                "type": "color",
+                "extrinsics": {
+                    "to_cam": "CAM_D",
+                    "specTranslation": {
+                        "x": -7.5,
+                        "y": 0,
+                        "z": 0
+                    },
+                    "rotation":{
+                        "r": 0,
+                        "p": 0,
+                        "y": 0
+                    }
+                }
+            },
+            "CAM_D": {
+                "name": "right",
+                "hfov": 71.86,
+                "type": "color"
+            }
+        },
+
+        "stereo_config":{
+            "left_cam": "CAM_E",
+            "right_cam": "CAM_D"
+        }
+    }
+}