fix: cellboard versions, added datalogger

eagletrt · Apr 2, 2024 · 9ea7fa1 · 9ea7fa1
1 parent d9343c7
commit 9ea7fa1
Show file tree

Hide file tree

Showing 3 changed files with 69 additions and 74 deletions.
diff --git a/networks/primary/network.json b/networks/primary/network.json
@@ -600,86 +600,17 @@
             }
         },
         {
-            "name": "HV_CELLBOARD_0_VERSION",
+            "name": "HV_CELLBOARD_VERSION",
             "fixed_id": 705,
-            "interval": 1000,
             "sending": [
                 "HV"
             ],
             "receiving": [],
-            "description": "Hv cellboard number 0 version: build-time timestamp and canlib build-time timestamp",
-            "contents": {
-                "component_build_time": "uint32",
-                "canlib_build_time": "uint32"
-            }
-        },
-        {
-            "name": "HV_CELLBOARD_1_VERSION",
-            "fixed_id": 706,
+            "description": "Hv cellboard version: build-time timestamp and canlib build-time timestamp",
             "interval": 1000,
-            "sending": [
-                "HV"
-            ],
-            "receiving": [],
-            "description": "Hv cellboard number 1 version: build-time timestamp and canlib build-time timestamp",
             "contents": {
-                "component_build_time": "uint32",
-                "canlib_build_time": "uint32"
-            }
-        },
-        {
-            "name": "HV_CELLBOARD_2_VERSION",
-            "fixed_id": 707,
-            "interval": 1000,
-            "sending": [
-                "HV"
-            ],
-            "receiving": [],
-            "description": "Hv cellboard number 2 version: build-time timestamp and canlib build-time timestamp",
-            "contents": {
-                "component_build_time": "uint32",
-                "canlib_build_time": "uint32"
-            }
-        },
-        {
-            "name": "HV_CELLBOARD_3_VERSION",
-            "fixed_id": 708,
-            "interval": 1000,
-            "sending": [
-                "HV"
-            ],
-            "receiving": [],
-            "description": "Hv cellboard number 3 version: build-time timestamp and canlib build-time timestamp",
-            "contents": {
-                "component_build_time": "uint32",
-                "canlib_build_time": "uint32"
-            }
-        },
-        {
-            "name": "HV_CELLBOARD_4_VERSION",
-            "fixed_id": 709,
-            "interval": 1000,
-            "sending": [
-                "HV"
-            ],
-            "receiving": [],
-            "description": "Hv cellboard number 4 version: build-time timestamp and canlib build-time timestamp",
-            "contents": {
-                "component_build_time": "uint32",
-                "canlib_build_time": "uint32"
-            }
-        },
-        {
-            "name": "HV_CELLBOARD_5_VERSION",
-            "fixed_id": 710,
-            "interval": 1000,
-            "sending": [
-                "HV"
-            ],
-            "receiving": [],
-            "description": "Hv cellboard number 5 version: build-time timestamp and canlib build-time timestamp",
-            "contents": {
-                "component_build_time": "uint32",
+                "cellboard_id": "HvCellboardId",
+                "component_version": "uint16",
                 "canlib_build_time": "uint32"
             }
         },

diff --git a/networks/secondary/FS_Datalogger_Status_v0.2.dbc b/networks/secondary/FS_Datalogger_Status_v0.2.dbc
@@ -0,0 +1,64 @@
+VERSION ""
+
+
+NS_ : 
+	NS_DESC_
+	CM_
+	BA_DEF_
+	BA_
+	VAL_
+	CAT_DEF_
+	CAT_
+	FILTER
+	BA_DEF_DEF_
+	EV_DATA_
+	ENVVAR_DATA_
+	SGTYPE_
+	SGTYPE_VAL_
+	BA_DEF_SGTYPE_
+	BA_SGTYPE_
+	SIG_TYPE_REF_
+	VAL_TABLE_
+	SIG_GROUP_
+	SIG_VALTYPE_
+	SIGTYPE_VALTYPE_
+	BO_TX_BU_
+	BA_DEF_REL_
+	BA_REL_
+	BA_DEF_DEF_REL_
+	BU_SG_REL_
+	BU_EV_REL_
+	BU_BO_REL_
+	SG_MUL_VAL_
+
+BS_:
+
+BU_: FS_Datalogger
+
+
+BO_ 1877 FS_Datalogger_Reserved_6: 8 Vector__XXX
+
+BO_ 1876 FS_Datalogger_Reserved_5: 8 Vector__XXX
+
+BO_ 1875 FS_Datalogger_Reserved_4: 8 Vector__XXX
+
+BO_ 1874 FS_Datalogger_Reserved_3: 8 Vector__XXX
+
+BO_ 1873 FS_Datalogger_Reserved_2: 8 Vector__XXX
+
+BO_ 1872 FS_Datalogger_Reserved_1: 8 Vector__XXX
+
+BO_ 1072 FS_Datalogger_Status: 6 FS_Datalogger
+ SG_ Current : 32|16@1+ (64,0) [0|4194240] "mA" Vector__XXX
+ SG_ Voltage : 16|16@1+ (16,0) [0|1048560] "mV" Vector__XXX
+ SG_ Status_Triggered_Current : 11|1@1- (1,0) [0|0] "" Vector__XXX
+ SG_ Status_Triggered_Voltage : 10|1@1- (1,0) [0|0] "" Vector__XXX
+ SG_ Status_Logging : 9|1@1- (1,0) [0|0] "" Vector__XXX
+ SG_ Status_Ready : 8|1@1- (1,0) [0|0] "" Vector__XXX
+ SG_ MsgCnt : 0|8@1+ (1,0) [0|255] "" Vector__XXX
+
+
+
+BA_DEF_  "BusType" STRING ;
+BA_DEF_DEF_  "BusType" "CAN";
+
diff --git a/networks/secondary/network.json b/networks/secondary/network.json
@@ -1178,7 +1178,7 @@
       }
     },
     {
-      "name": "LINK_DEFORMATION_FL",
+      "name": "LINK_DEFORMATION",
       "topic": "HYDRA",
       "priority": 3,
       "sending": [