renamed debug signals and added device id

added acquisinator errors
eagletrt · Jul 24, 2024 · 50e4ab1 · 50e4ab1
1 parent 231b3f5
commit 50e4ab1
Show file tree

Hide file tree

Showing 2 changed files with 186 additions and 12 deletions.
diff --git a/networks/primary/network.json b/networks/primary/network.json
@@ -1,6 +1,20 @@
 {
     "version": 2.0,
     "types": {
+        "DeviceId": {
+            "type": "enum",
+            "items": [
+                "hv_mainboard",
+                "hv_cellboard",
+                "lv",
+                "ecu",
+                "tlm",
+                "traction_control",
+                "steeering_wheel",
+                "handcart",
+                "acquisinator"
+            ]
+        },
         "HvFeedbackStatus": {
             "type": "enum",
             "items": [
@@ -2544,6 +2558,7 @@
             ],
             "receiving": [],
             "contents": {
+                "device_id": "DeviceId",
                 "field_1": {
                     "type": "float32",
                     "range": [
@@ -2567,8 +2582,37 @@
                         1
                     ],
                     "force": "uint16"
+                }
+            }
+        },
+        {
+            "name": "DEBUG_SIGNAL_2",
+            "topic": "HYDRA",
+            "priority": 3,
+            "interval": 20,
+            "sending": [
+                "ANY"
+            ],
+            "receiving": [],
+            "contents": {
+                "device_id": "DeviceId",
+                "field_1": {
+                    "type": "float32",
+                    "range": [
+                        -1,
+                        1
+                    ],
+                    "force": "uint16"
+                },
+                "field_2": {
+                    "type": "float32",
+                    "range": [
+                        -1,
+                        1
+                    ],
+                    "force": "uint16"
                 },
-                "field_4": {
+                "field_3": {
                     "type": "float32",
                     "range": [
                         -1,
@@ -2579,7 +2623,7 @@
             }
         },
         {
-            "name": "DEBUG_SIGNAL_2",
+            "name": "DEBUG_SIGNAL_3",
             "topic": "HYDRA",
             "priority": 3,
             "interval": 20,
@@ -2588,6 +2632,7 @@
             ],
             "receiving": [],
             "contents": {
+                "device_id": "DeviceId",
                 "field_1": {
                     "type": "float32",
                     "range": [
@@ -2611,8 +2656,37 @@
                         1
                     ],
                     "force": "uint16"
+                }
+            }
+        },
+        {
+            "name": "DEBUG_SIGNAL_4",
+            "topic": "HYDRA",
+            "priority": 3,
+            "interval": 20,
+            "sending": [
+                "ANY"
+            ],
+            "receiving": [],
+            "contents": {
+                "device_id": "DeviceId",
+                "field_1": {
+                    "type": "float32",
+                    "range": [
+                        -1,
+                        1
+                    ],
+                    "force": "uint16"
                 },
-                "field_4": {
+                "field_2": {
+                    "type": "float32",
+                    "range": [
+                        -1,
+                        1
+                    ],
+                    "force": "uint16"
+                },
+                "field_3": {
                     "type": "float32",
                     "range": [
                         -1,

diff --git a/networks/secondary/network.json b/networks/secondary/network.json
@@ -20,6 +20,29 @@
         "F17",
         "F58"
       ]
+    },
+    "DeviceId": {
+      "type": "enum",
+      "items": [
+        "hv_mainboard",
+        "hv_cellboard",
+        "lv",
+        "ecu",
+        "tlm",
+        "traction_control",
+        "steeering_wheel",
+        "handcart",
+        "acquisinator"
+      ]
+    },
+    "AcquisinatorErrors": {
+      "type": "bitset",
+      "items": [
+        "acquisinatore_led_code_can_not_working",
+        "acquisinatore_led_code_spi_error",
+        "acquisinatore_led_code_read_write_flash",
+        "acquisinatore_led_code_flashed_firmware_with_wrong_id"
+      ]
     }
   },
   "messages": [
@@ -1702,7 +1725,7 @@
       }
     },
     {
-      "name": "ANGULAR_VELOCITY",
+      "name": "FRONT_ANGULAR_VELOCITY",
       "topic": "HYDRA",
       "priority": 3,
       "sending": [
@@ -2175,7 +2198,7 @@
         "ACQUISINATOR"
       ],
       "receiving": [],
-      "description": "Position of the ammos",
+      "description": "Ammo compressions",
       "interval": 10,
       "contents": {
         "rl": {
@@ -2220,7 +2243,7 @@
         "ACQUISINATOR"
       ],
       "receiving": [],
-      "description": "Calibration offsets for acquisinatore",
+      "description": "Calibration offsets for acquisinators",
       "interval": 1000,
       "contents": {
         "acquisinator_id": "uint8",
@@ -2242,6 +2265,21 @@
         }
       }
     },
+    {
+      "name": "ACQUISINATOR_ERRORS",
+      "topic": "HYDRA",
+      "priority": 3,
+      "sending": [
+        "ACQUISINATOR"
+      ],
+      "receiving": [],
+      "description": "Acquisinator errors",
+      "interval": 1000,
+      "contents": {
+        "acquisinator_id": "uint8",
+        "acquisinator_errors": "AcquisinatorErrors"
+      }
+    },
     {
       "name": "LINK_DEFORMATION_DEBUG_VOLTAGES",
       "topic": "HYDRA",
@@ -2382,16 +2420,17 @@
       "contents": {}
     },
     {
-      "name": "DEBUG_SIGNAL_1",
+      "name": "DEBUG_SIGNAL_5",
       "topic": "HYDRA",
       "priority": 3,
       "sending": [
-        "TLM"
+        "ANY"
       ],
       "receiving": [],
       "description": "Debug signals",
       "interval": 10,
       "contents": {
+        "device_id": "DeviceId",
         "field_1": {
           "type": "float32",
           "range": [
@@ -2415,8 +2454,38 @@
             1
           ],
           "force": "uint16"
+        }
+      }
+    },
+    {
+      "name": "DEBUG_SIGNAL_6",
+      "topic": "HYDRA",
+      "priority": 3,
+      "sending": [
+        "ANY"
+      ],
+      "receiving": [],
+      "description": "Debug signals",
+      "interval": 10,
+      "contents": {
+        "device_id": "DeviceId",
+        "field_1": {
+          "type": "float32",
+          "range": [
+            -1,
+            1
+          ],
+          "force": "uint16"
         },
-        "field_4": {
+        "field_2": {
+          "type": "float32",
+          "range": [
+            -1,
+            1
+          ],
+          "force": "uint16"
+        },
+        "field_3": {
           "type": "float32",
           "range": [
             -1,
@@ -2427,16 +2496,17 @@
       }
     },
     {
-      "name": "DEBUG_SIGNAL_2",
+      "name": "DEBUG_SIGNAL_7",
       "topic": "HYDRA",
       "priority": 3,
       "sending": [
-        "TLM"
+        "ANY"
       ],
       "receiving": [],
       "description": "Debug signals",
       "interval": 10,
       "contents": {
+        "device_id": "DeviceId",
         "field_1": {
           "type": "float32",
           "range": [
@@ -2460,8 +2530,38 @@
             1
           ],
           "force": "uint16"
+        }
+      }
+    },
+    {
+      "name": "DEBUG_SIGNAL_8",
+      "topic": "HYDRA",
+      "priority": 3,
+      "sending": [
+        "ANY"
+      ],
+      "receiving": [],
+      "description": "Debug signals",
+      "interval": 10,
+      "contents": {
+        "device_id": "DeviceId",
+        "field_1": {
+          "type": "float32",
+          "range": [
+            -1,
+            1
+          ],
+          "force": "uint16"
         },
-        "field_4": {
+        "field_2": {
+          "type": "float32",
+          "range": [
+            -1,
+            1
+          ],
+          "force": "uint16"
+        },
+        "field_3": {
           "type": "float32",
           "range": [
             -1,