fix: lv feedbacks, ecu set status

fix: hv feedbacks, lv feedbacks fix
eagletrt · Mar 31, 2024 · d9343c7 · d9343c7
1 parent b13be9a
commit d9343c7
Showing 1 changed file with 72 additions and 44 deletions.
diff --git a/networks/primary/network.json b/networks/primary/network.json
@@ -226,6 +226,14 @@
                 "fsm"
             ]
         },
+        "EcuSetStatus": {
+            "type": "enum",
+            "items": [
+                "idle",
+                "ready",
+                "drive"
+            ]
+        },
         "EcuFeedbacks": {
             "type": "bitset",
             "items": [
@@ -769,15 +777,7 @@
                 "HANDCART"
             ],
             "contents": {
-                "fans_override": "Toggle",
-                "fans_speed": {
-                    "type": "float32",
-                    "range": [
-                        0,
-                        1
-                    ],
-                    "force": "uint16"
-                }
+                "feedbacks": "HvFeedbacks"
             }
         },
         {
@@ -943,7 +943,7 @@
                 "HV"
             ],
             "contents": {
-                "hv_status_set": "HvStatus"
+                "hv_status_set": "Toggle"
             }
         },
         {
@@ -957,7 +957,7 @@
                 "HV"
             ],
             "contents": {
-                "hv_status_set": "HvStatus"
+                "hv_status_set": "Toggle"
             }
         },
         {
@@ -1029,7 +1029,14 @@
                 "HANDCART"
             ],
             "contents": {
-                "radiator_speed": "float32"
+                "radiator_speed": {
+                    "type": "float32",
+                    "range": [
+                        -1,
+                        1
+                    ],
+                    "precision": 0.1
+                }
             }
         },
         {
@@ -1042,7 +1049,14 @@
             ],
             "receiving": [],
             "contents": {
-                "pumps_speed": "float32"
+                "pumps_speed": {
+                    "type": "float32",
+                    "range": [
+                        -1,
+                        1
+                    ],
+                    "precision": 0.1
+                }
             }
         },
         {
@@ -1056,7 +1070,14 @@
                 "LV"
             ],
             "contents": {
-                "radiator_speed": "float32"
+                "radiator_speed": {
+                    "type": "float32",
+                    "range": [
+                        -1,
+                        1
+                    ],
+                    "precision": 0.1
+                }
             }
         },
         {
@@ -1070,7 +1091,14 @@
                 "LV"
             ],
             "contents": {
-                "pumps_speed": "float32"
+                "pumps_speed": {
+                    "type": "float32",
+                    "range": [
+                        -1,
+                        1
+                    ],
+                    "precision": 0.1
+                }
             }
         },
         {
@@ -1105,33 +1133,33 @@
                     "type": "float32",
                     "range": [
                         0,
-                        3.3
+                        14
                     ],
-                    "force": "uint8"
+                    "precision": 0.005
                 },
-                "imd": {
+                "hvd": {
                     "type": "float32",
                     "range": [
                         0,
-                        3.3
+                        14
                     ],
-                    "force": "uint8"
+                    "precision": 0.005
                 },
-                "hvd": {
+                "invc_interlock": {
                     "type": "float32",
                     "range": [
                         0,
-                        3.3
+                        14
                     ],
-                    "force": "uint8"
+                    "precision": 0.005
                 },
                 "ams": {
                     "type": "float32",
                     "range": [
                         0,
-                        3.3
+                        14
                     ],
-                    "force": "uint8"
+                    "precision": 0.005
                 }
             }
         },
@@ -1151,38 +1179,38 @@
                     "type": "float32",
                     "range": [
                         0,
-                        3.3
+                        14
                     ],
-                    "force": "uint8"
+                    "precision": 0.005
                 },
                 "lvms": {
                     "type": "float32",
                     "range": [
                         0,
-                        3.3
+                        14
                     ],
-                    "force": "uint8"
+                    "precision": 0.005
                 },
                 "interlock": {
                     "type": "float32",
                     "range": [
                         0,
-                        3.3
+                        14
                     ],
-                    "force": "uint8"
+                    "precision": 0.005
                 },
                 "sd_start": {
                     "type": "float32",
                     "range": [
                         0,
-                        3.3
+                        14
                     ],
-                    "force": "uint8"
+                    "precision": 0.005
                 }
             }
         },
         {
-            "name": "LV_FEEDBACK_ECLOSURE_VOLTAGE",
+            "name": "LV_FEEDBACK_ENCLOSURE_VOLTAGE",
             "topic": "HYDRA",
             "priority": 1,
             "interval": 50,
@@ -1197,33 +1225,33 @@
                     "type": "float32",
                     "range": [
                         0,
-                        3.3
+                        14
                     ],
-                    "force": "uint8"
+                    "precision": 0.005
                 },
-                "hv_encl_1": {
+                "invc_lid": {
                     "type": "float32",
                     "range": [
                         0,
-                        3.3
+                        14
                     ],
-                    "force": "uint8"
+                    "precision": 0.005
                 },
                 "hv_encl_2": {
                     "type": "float32",
                     "range": [
                         0,
-                        3.3
+                        14
                     ],
-                    "force": "uint8"
+                    "precision": 0.005
                 },
                 "backplate": {
                     "type": "float32",
                     "range": [
                         0,
-                        3.3
+                        14
                     ],
-                    "force": "uint8"
+                    "precision": 0.005
                 }
             }
         },
@@ -1449,7 +1477,7 @@
                 "ECU"
             ],
             "contents": {
-                "status": "EcuStatus"
+                "status": "EcuSetStatus"
             }
         },
         {