Added adapter settings for ATL/Phiplips-us4r4 adapter.

us4useu · Nov 14, 2021 · 562f919 · 562f919
1 parent 1a80e2d
commit 562f919
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 41 deletions.
diff --git a/arrus/cfg/default.dict b/arrus/cfg/default.dict
@@ -310,6 +310,47 @@ probe_adapter_models: [
 			   120, 121, 122, 123, 124, 125, 126, 127]
             }
         ]
+    },
+    {
+        id: {
+            manufacturer: "us4us"
+            name: "atl/philips-us4r4"
+        }
+        n_channels: 128
+        channel_mapping_regions: [
+        {
+            # BLUE, A
+            us4oem: 0
+            channels: [31, 30, 29, 28, 27, 26, 25, 24,
+                       23, 22, 21, 20, 19, 18, 17, 15,
+                       16, 14, 13, 12, 11, 10, 9,  8,
+                       7,  6,  5,  4,  3,  2,  1,  0]
+        },
+        {
+            # BLUE, C
+            us4oem: 1
+            channels: [31, 30, 29, 28, 27, 26, 25, 24,
+                       23, 22, 21, 20, 19, 18, 17, 15,
+                       16, 14, 13, 12, 11, 10, 9,  8,
+                       7,  6,  5,  4,  3,  2,  1,  0]
+        },
+        {
+            # GREEN, H
+            us4oem: 2
+            channels: [31, 30, 29, 28, 27, 26, 25, 24,
+                       23, 22, 21, 20, 19, 18, 17, 15,
+                       16, 14, 13, 12, 11, 10, 9,  8,
+                       7,  6,  5,  4,  3,  2,  1,  0]
+        },
+        {
+            # GREEN, F
+            us4oem: 3
+            channels: [31, 30, 29, 28, 27, 26, 25, 24,
+                       23, 22, 21, 20, 19, 18, 17, 15,
+                       16, 14, 13, 12, 11, 10, 9,  8,
+                       7,  6,  5,  4,  3,  2,  1,  0]
+        }
+        ]
     }
 ]
 probe_models: [
@@ -721,6 +762,10 @@ probe_to_adapter_connections: [
             {
                 manufacturer: "us4us"
                 name: "atl/philips"
+            },
+            {
+                manufacturer: "us4us"
+                name: "atl/philips-us4r4"
             }
         ]
         channel_mapping_ranges: {

diff --git a/arrus/core/io/test-data/dictionary.prototxt b/arrus/core/io/test-data/dictionary.prototxt
@@ -225,47 +225,6 @@ probe_adapter_models: [
 			   120, 121, 122, 123, 124, 125, 126, 127]
             }
         ]
-    },
-    {
-        id: {
-            manufacturer: "us4us"
-            name: "atl/philips-us4r4"
-        }
-        n_channels: 128
-        channel_mapping_regions: [
-        {
-            # BLUE, A
-            us4oem: 0
-            channels: [31, 30, 29, 28, 27, 26, 25, 24,
-                       23, 22, 21, 20, 19, 18, 17, 15,
-                       16, 14, 13, 12, 11, 10, 9,  8,
-                       7,  6,  5,  4,  3,  2,  1,  0]
-        },
-        {
-            # BLUE, C
-            us4oem: 1
-            channels: [31, 30, 29, 28, 27, 26, 25, 24,
-                       23, 22, 21, 20, 19, 18, 17, 15,
-                       16, 14, 13, 12, 11, 10, 9,  8,
-                       7,  6,  5,  4,  3,  2,  1,  0]
-        },
-        {
-            # GREEN, H
-            us4oem: 2
-            channels: [31, 30, 29, 28, 27, 26, 25, 24,
-                       23, 22, 21, 20, 19, 18, 17, 15,
-                       16, 14, 13, 12, 11, 10, 9,  8,
-                       7,  6,  5,  4,  3,  2,  1,  0]
-            },
-            {
-            # GREEN, F
-            us4oem: 3
-            channels: [31, 30, 29, 28, 27, 26, 25, 24,
-                       23, 22, 21, 20, 19, 18, 17, 15,
-                       16, 14, 13, 12, 11, 10, 9,  8,
-                       7,  6,  5,  4,  3,  2,  1,  0]
-            }
-         ]
     }
 ]
 probe_models: [