Fixed cellboard ID issue

eagletrt · Jun 2, 2023 · 67bed55 · 67bed55
1 parent a0572ff
commit 67bed55
Showing 1 changed file with 21 additions and 50 deletions.
diff --git a/networks/bms/network.json b/networks/bms/network.json
@@ -1,6 +1,17 @@
 {
   "version": 1.2,
   "types": {
+    "Cellboard": {
+      "type": "enum",
+      "items": [
+        "CELLBOARD_0",
+        "CELLBOARD_1",
+        "CELLBOARD_2",
+        "CELLBOARD_3",
+        "CELLBOARD_4",
+        "CELLBOARD_5"
+      ]
+    },
     "Errors": {
       "type": "bitset",
       "items": [
@@ -49,17 +60,11 @@
       "name": "BOARD_STATUS",
       "topic": "STATUS",
       "priority": 1,
-      "sending": [
-        "CELLBOARD0",
-        "CELLBOARD1",
-        "CELLBOARD2",
-        "CELLBOARD3",
-        "CELLBOARD4",
-        "CELLBOARD5"
-      ],
+      "sending": ["CELLBOARD"],
       "receiving": ["MAINBOARD"],
       "description": "Cellboard's status",
       "contents": {
+        "cellboard_id": "Cellboard",
         "errors": "Errors",
         "balancing_status": "BalancingStatus"
       }
@@ -68,17 +73,11 @@
       "name": "TEMPERATURES",
       "topic": "TEMPERATURE_INFO",
       "priority": 2,
-      "sending": [
-        "CELLBOARD0",
-        "CELLBOARD1",
-        "CELLBOARD2",
-        "CELLBOARD3",
-        "CELLBOARD4",
-        "CELLBOARD5"
-      ],
+      "sending": ["CELLBOARD"],
       "receiving": ["MAINBOARD"],
       "description": "Cells' temperatures",
       "contents": {
+        "cellboard_id": "Cellboard",
         "start_index": "uint8",
         "temp0": {
           "type": "float32",
@@ -99,34 +98,18 @@
           "type": "float32",
           "range": [-20, 80],
           "force": "uint8"
-        },
-        "temp4": {
-          "type": "float32",
-          "range": [-20, 80],
-          "force": "uint8"
-        },
-        "temp5": {
-          "type": "float32",
-          "range": [-20, 80],
-          "force": "uint8"
         }
       }
     },
     {
       "name": "VOLTAGES",
       "topic": "VOLTAGE_INFO",
       "priority": 5,
-      "sending": [
-        "CELLBOARD0",
-        "CELLBOARD1",
-        "CELLBOARD2",
-        "CELLBOARD3",
-        "CELLBOARD4",
-        "CELLBOARD5"
-      ],
+      "sending": ["CELLBOARD"],
       "receiving": ["MAINBOARD"],
       "description": "Cells' voltages",
       "contents": {
+        "cellboard_id": "Cellboard",
         "start_index": "uint8",
         "voltage0": {
           "type": "float32",
@@ -150,16 +133,10 @@
       "topic": "BALANCING",
       "priority": 5,
       "sending": ["MAINBOARD"],
-      "receiving": [
-        "CELLBOARD0",
-        "CELLBOARD1",
-        "CELLBOARD2",
-        "CELLBOARD3",
-        "CELLBOARD4",
-        "CELLBOARD5"
-      ],
+      "receiving": ["CELLBOARD"],
       "description": "Set discharging status for cells",
       "contents": {
+        "cellboard_id": "Cellboard",
         "board_index": "uint8",
         "cells": "BalancingCells"
       }
@@ -168,16 +145,10 @@
       "name": "FW_UPDATE",
       "fixed_id": 10,
       "sending": ["MAINBOARD"],
-      "receiving": [
-        "CELLBOARD0",
-        "CELLBOARD1",
-        "CELLBOARD2",
-        "CELLBOARD3",
-        "CELLBOARD4",
-        "CELLBOARD5"
-      ],
+      "receiving": ["CELLBOARD"],
       "description": "Starts firmware update",
       "contents": {
+        "cellboard_id": "Cellboard",
         "board_index": "uint8"
       }
     },