Adaptation data structure

shining-man · Jul 4, 2023 · 2ddcd93 · 2ddcd93
1 parent 80485f4
commit 2ddcd93
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/include/BmsData.h b/include/BmsData.h
@@ -16,17 +16,17 @@ struct bmsData_s
   //                                                                                 // NEEY 4A | JbdBms | JK-BMS | 
   uint16_t   bmsCellVoltage[BT_DEVICES_COUNT+SERIAL_BMS_DEVICES_COUNT][24];          //    x    |   x    |   x    |
   //float    bmsCellResistance[BT_DEVICES_COUNT+SERIAL_BMS_DEVICES_COUNT][24];       //    x    |        |        |
-  float      bmsTotalVoltage[BT_DEVICES_COUNT+SERIAL_BMS_DEVICES_COUNT];             //    x    |   x    |   x    |
+  int16_t    bmsTotalVoltage[BT_DEVICES_COUNT+SERIAL_BMS_DEVICES_COUNT];             //    x    |   x    |   x    |
   uint16_t   bmsMaxCellDifferenceVoltage[BT_DEVICES_COUNT+SERIAL_BMS_DEVICES_COUNT]; //    x    |   x    |   x    |
   uint16_t   bmsAvgVoltage[BT_DEVICES_COUNT+SERIAL_BMS_DEVICES_COUNT];               //    x    |   x    |   x    |
-  float      bmsTotalCurrent[BT_DEVICES_COUNT+SERIAL_BMS_DEVICES_COUNT];             //         |   x    |   x    |
+  int16_t    bmsTotalCurrent[BT_DEVICES_COUNT+SERIAL_BMS_DEVICES_COUNT];             //         |   x    |   x    |
   uint16_t   bmsMaxCellVoltage[BT_DEVICES_COUNT+SERIAL_BMS_DEVICES_COUNT];           //    x    |   x    |   x    |
   uint16_t   bmsMinCellVoltage[BT_DEVICES_COUNT+SERIAL_BMS_DEVICES_COUNT];           //    x    |   x    |   x    |
   uint8_t    bmsMaxVoltageCellNumber[BT_DEVICES_COUNT+SERIAL_BMS_DEVICES_COUNT];     //    x    |        |        |
   uint8_t    bmsMinVoltageCellNumber[BT_DEVICES_COUNT+SERIAL_BMS_DEVICES_COUNT];     //    x    |        |        |
   uint8_t    bmsIsBalancingActive[BT_DEVICES_COUNT+SERIAL_BMS_DEVICES_COUNT];        //    x    |        |        |
-  float      bmsBalancingCurrent[BT_DEVICES_COUNT+SERIAL_BMS_DEVICES_COUNT];         //    x    |        |        |
-  float      bmsTempature[BT_DEVICES_COUNT+SERIAL_BMS_DEVICES_COUNT][3];             //    2    |   3    |   3    |
+  int16_t    bmsBalancingCurrent[BT_DEVICES_COUNT+SERIAL_BMS_DEVICES_COUNT];         //    x    |        |        |
+  int16_t    bmsTempature[BT_DEVICES_COUNT+SERIAL_BMS_DEVICES_COUNT][3];             //    2    |   3    |   3    |
   uint8_t    bmsChargePercentage[BT_DEVICES_COUNT+SERIAL_BMS_DEVICES_COUNT];         //         |   x    |   x    |
   uint32_t   bmsErrors[BT_DEVICES_COUNT+SERIAL_BMS_DEVICES_COUNT];                   //    *    |   x    |   x    |
   unsigned long bmsLastDataMillis[BT_DEVICES_COUNT+SERIAL_BMS_DEVICES_COUNT];        //    x    |   x    |   x    |

diff --git a/src/display.cpp b/src/display.cpp
@@ -478,8 +478,8 @@ void displayNewBscData()
     label = lv_obj_get_child(tabBmsOverview, u8_lObjCnt);
     lv_label_set_recolor(label, true);
     lv_label_set_text_fmt(label, "%d\n\n%.1f\n%.1f\n%d\n%d\n\n%d\n\n%d\n\n%.1f\n%s\n%s", u8_lObjCnt-1,
-    lDataDisp->bmsTotalVoltage[i], lDataDisp->bmsTotalCurrent[i], lDataDisp->bmsChargePercentage[i], lDataDisp->bmsMaxCellVoltage[i],
-    lDataDisp->bmsMinCellVoltage[i], lDataDisp->bmsMaxCellDifferenceVoltage[i], lDataDisp->bmsTempature[i][0], str_lIsBalance.c_str(),
+    lDataDisp->bmsTotalVoltage[i]/100.0, lDataDisp->bmsTotalCurrent[i]/100.0, lDataDisp->bmsChargePercentage[i], lDataDisp->bmsMaxCellVoltage[i],
+    lDataDisp->bmsMinCellVoltage[i], lDataDisp->bmsMaxCellDifferenceVoltage[i], lDataDisp->bmsTempature[i][0]/100.0, str_lIsBalance.c_str(),
     str_lError.c_str());
     u8_lObjCnt++;
   }

diff --git a/src/i2c.cpp b/src/i2c.cpp
@@ -71,7 +71,7 @@ void IRAM_ATTR processRxData()
           break;
 
         case BMS_TOTAL_VOLTAGE:
-          memcpy(&lData->bmsTotalVoltage[u8_lBmsNr], &i2cRxBuf[RXBUFF_OFFSET], 4);
+          memcpy(&lData->bmsTotalVoltage[u8_lBmsNr], &i2cRxBuf[RXBUFF_OFFSET], 2);
           break;
 
         case BMS_MAX_CELL_DIFFERENCE_VOLTAGE:
@@ -83,7 +83,7 @@ void IRAM_ATTR processRxData()
           break;
 
         case BMS_TOTAL_CURRENT:
-          memcpy(&lData->bmsTotalCurrent[u8_lBmsNr], &i2cRxBuf[RXBUFF_OFFSET], 4);
+          memcpy(&lData->bmsTotalCurrent[u8_lBmsNr], &i2cRxBuf[RXBUFF_OFFSET], 2);
           break;
 
         case BMS_MAX_CELL_VOLTAGE:
@@ -107,11 +107,11 @@ void IRAM_ATTR processRxData()
           break;
 
         case BMS_BALANCING_CURRENT:
-          memcpy(&lData->bmsBalancingCurrent[u8_lBmsNr], &i2cRxBuf[RXBUFF_OFFSET], 4);
+          memcpy(&lData->bmsBalancingCurrent[u8_lBmsNr], &i2cRxBuf[RXBUFF_OFFSET], 2);
           break;
 
         case BMS_TEMPERATURE:
-          memcpy(&lData->bmsTempature[u8_lBmsNr], &i2cRxBuf[RXBUFF_OFFSET], 12);
+          memcpy(&lData->bmsTempature[u8_lBmsNr], &i2cRxBuf[RXBUFF_OFFSET], 6);
           break;
 
         case BMS_CHARGE_PERCENT: