Merge branch 'main' into new_features_24

shining-man · Feb 9, 2024 · 82abde5 · 82abde5
2 parents cb34567 + ff6d885
commit 82abde5
Show file tree

Hide file tree

Showing 57 changed files with 715 additions and 708 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -4,5 +4,6 @@
         "string": "cpp",
         "*.tcc": "cpp",
         "streambuf": "cpp"
-    }
+    },
+    "files.trimTrailingWhitespace": true
 }
diff --git a/include/BleHandler.h b/include/BleHandler.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2022 tobias
-// 
+//
 // This software is released under the MIT License.
 // https://opensource.org/licenses/MIT
 
@@ -32,7 +32,7 @@ struct bleDevice {
 class BleHandler {
 public:
   BleHandler();
-  
+
   void init();
   void start();
   void stop();
@@ -50,7 +50,7 @@ class BleHandler {
 private:
   uint8_t timer_startScan;
   bool bo_mStartManualScan;
-  
+
   bool handleConnectionToDevices();
   void handleDisconnectionToDevices();
 };

diff --git a/include/BmsData.h b/include/BmsData.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2022 Tobias Himmler
-// 
+//
 // This software is released under the MIT License.
 // https://opensource.org/licenses/MIT
 
@@ -51,20 +51,20 @@ struct bmsData_s
 
 //bmsErrors
 #define BMS_ERR_STATUS_OK                0
-#define BMS_ERR_STATUS_CELL_OVP          1   //bit0  single cell overvoltage protection 
-#define BMS_ERR_STATUS_CELL_UVP          2   //bit1  single cell undervoltage protection    
-#define BMS_ERR_STATUS_BATTERY_OVP       4   //bit2  whole pack overvoltage protection 
-#define BMS_ERR_STATUS_BATTERY_UVP       8   //bit3  Whole pack undervoltage protection     
-#define BMS_ERR_STATUS_CHG_OTP          16   //bit4  charging over temperature protection 
-#define BMS_ERR_STATUS_CHG_UTP          32   //bit5  charging low temperature protection 
-#define BMS_ERR_STATUS_DSG_OTP          64   //bit6  Discharge over temperature protection  
-#define BMS_ERR_STATUS_DSG_UTP         128   //bit7  discharge low temperature protection   
-#define BMS_ERR_STATUS_CHG_OCP         256   //bit8  charging overcurrent protection 
-#define BMS_ERR_STATUS_DSG_OCP         512   //bit9  Discharge overcurrent protection       
-#define BMS_ERR_STATUS_SHORT_CIRCUIT  1024   //bit10 short circuit protection              
-#define BMS_ERR_STATUS_AFE_ERROR      2048   //bit11 Front-end detection IC error 
-#define BMS_ERR_STATUS_SOFT_LOCK      4096   //bit12 software lock MOS 
-#define BMS_ERR_STATUS_RESERVED1      8192   //bit13 Reserved 
+#define BMS_ERR_STATUS_CELL_OVP          1   //bit0  single cell overvoltage protection
+#define BMS_ERR_STATUS_CELL_UVP          2   //bit1  single cell undervoltage protection
+#define BMS_ERR_STATUS_BATTERY_OVP       4   //bit2  whole pack overvoltage protection
+#define BMS_ERR_STATUS_BATTERY_UVP       8   //bit3  Whole pack undervoltage protection
+#define BMS_ERR_STATUS_CHG_OTP          16   //bit4  charging over temperature protection
+#define BMS_ERR_STATUS_CHG_UTP          32   //bit5  charging low temperature protection
+#define BMS_ERR_STATUS_DSG_OTP          64   //bit6  Discharge over temperature protection
+#define BMS_ERR_STATUS_DSG_UTP         128   //bit7  discharge low temperature protection
+#define BMS_ERR_STATUS_CHG_OCP         256   //bit8  charging overcurrent protection
+#define BMS_ERR_STATUS_DSG_OCP         512   //bit9  Discharge overcurrent protection
+#define BMS_ERR_STATUS_SHORT_CIRCUIT  1024   //bit10 short circuit protection
+#define BMS_ERR_STATUS_AFE_ERROR      2048   //bit11 Front-end detection IC error
+#define BMS_ERR_STATUS_SOFT_LOCK      4096   //bit12 software lock MOS
+#define BMS_ERR_STATUS_RESERVED1      8192   //bit13 Reserved
 #define BMS_ERR_STATUS_RESERVED2     16384   //bit14 Reserved
 #define BMS_ERR_STATUS_RESERVED3     32768   //bit15 Reserved
 

diff --git a/include/BscSerial.h b/include/BscSerial.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2022 tobias
-// 
+//
 // This software is released under the MIT License.
 // https://opensource.org/licenses/MIT
 
@@ -20,12 +20,12 @@ class BscSerial {
   void setSoftSerial(uint8_t u8_devNr, uint32_t baudrate);
   void setSerialBaudrate(uint8_t u8_devNr);
   void setSerialRxBufferSize(uint8_t u8_devNr, uint16_t rxBufSize);
-  
+
   void cyclicRun();
 
   void setReadBmsFunktion(uint8_t u8_devNr, uint8_t funktionsTyp);
-  
-  
+
+
 private:
   SemaphoreHandle_t mSerialMutex = NULL;
 

diff --git a/include/Canbus.h b/include/Canbus.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2022 Tobias Himmler
-// 
+//
 // This software is released under the MIT License.
 // https://opensource.org/licenses/MIT
 

diff --git a/include/Json.h b/include/Json.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2022 Tobias Himmler
-// 
+//
 // This software is released under the MIT License.
 // https://opensource.org/licenses/MIT
 
@@ -11,7 +11,7 @@
 class Json {
 public:
   Json();
-  
+
   uint16_t getArraySize(const char *json, long startPos);
   bool getValue(const char *json, int idx, String name, uint32_t searchStartPos, String& retValue, uint32_t& arrayStart);
 

diff --git a/include/Ow.h b/include/Ow.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2022 Tobias Himmler
-// 
+//
 // This software is released under the MIT License.
 // https://opensource.org/licenses/MIT
 

diff --git a/include/WebSettings.h b/include/WebSettings.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2022 tobias
-// 
+//
 // This software is released under the MIT License.
 // https://opensource.org/licenses/MIT
 
@@ -35,7 +35,7 @@
 #define HTML_SEPARATION                   13
 //Max Type = 15
 
-#define BACKGROUND_COLOR "#ffffff" 
+#define BACKGROUND_COLOR "#ffffff"
 
 #define BUTTON_SAVE  0
 #define BUTTON_1     1
@@ -51,7 +51,7 @@ class WebSettings {
   //Parameterfile
   boolean deleteConfig();
   boolean writeConfig();
-  
+
   static String   getString(uint16_t name, boolean fromFlash, uint8_t u8_dataType);
   static String   getString(uint16_t name, uint8_t groupNr);
   static int32_t  getInt(uint16_t name, uint8_t u8_dataType);
@@ -80,7 +80,7 @@ class WebSettings {
   void registerOnButton1(void (*callback)());
   void registerOnButton2(void (*callback)());
   void registerOnButton3(void (*callback)());
-  
+
   void setTimerHandlerName(String handlerName, uint16_t timerSec=1000);
   void handleHtmlFormRequest(WebServer * server);
   void handleGetValues(WebServer *server);
@@ -90,7 +90,7 @@ class WebSettings {
 
   static uint16_t getParmId(uint16_t id, uint8_t groupIdx);
   static void     getIdFromParamId(uint16_t paramId, uint16_t &id, uint8_t &groupIdx);
-  
+
 private:
   const char *parameterFile;
   String   str_mConfName;

diff --git a/include/bscTime.h b/include/bscTime.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2022 Tobias Himmler
-// 
+//
 // This software is released under the MIT License.
 // https://opensource.org/licenses/MIT
 

diff --git a/include/crc.h b/include/crc.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2023 Tobias Himmler
-// 
+//
 // This software is released under the MIT License.
 // https://opensource.org/licenses/MIT
 

diff --git a/include/devices/DalyBms.h b/include/devices/DalyBms.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2022 tobias
-// 
+//
 // This software is released under the MIT License.
 // https://opensource.org/licenses/MIT
 
@@ -31,4 +31,4 @@
 bool DalyBms_readBmsData(Stream *port, uint8_t devNr, void (*callback)(uint8_t, uint8_t), serialDevData_s *devData);
 
 
-#endif 
+#endif
diff --git a/include/devices/JbdBms.h b/include/devices/JbdBms.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2022 tobias
-// 
+//
 // This software is released under the MIT License.
 // https://opensource.org/licenses/MIT
 
@@ -34,22 +34,22 @@
 
 //Protection State
 #define JBDBMS_STATUS_OK                0
-#define JBDBMS_STATUS_CELL_OVP          1   //bit0 single cell overvoltage protection 
-#define JBDBMS_STATUS_CELL_UVP          2   //bit1 single cell undervoltage protection    
-#define JBDBMS_STATUS_PACK_OVP          4   //bit2 whole pack overvoltage protection 
-#define JBDBMS_STATUS_PACK_UVP          8   //bit3 Whole pack undervoltage protection     
-#define JBDBMS_STATUS_CHG_OTP          16   //bit4 charging over-temperature protection 
-#define JBDBMS_STATUS_CHG_UTP          32   //bit5 charging low temperature protection 
-#define JBDBMS_STATUS_DSG_OTP          64   //bit6 Discharge over temperature protection  
-#define JBDBMS_STATUS_DSG_UTP         128   //bit7 discharge low temperature protection   
-#define JBDBMS_STATUS_CHG_OCP         256   //bit8 charging overcurrent protection 
-#define JBDBMS_STATUS_DSG_OCP         512   //bit9 Discharge overcurrent protection       
-#define JBDBMS_STATUS_SHORT_CIRCUIT  1024   //bit10 short circuit protection              
-#define JBDBMS_STATUS_AFE_ERROR      2048   //bit11 Front-end detection IC error 
-#define JBDBMS_STATUS_SOFT_LOCK      4096   //bit12 software lock MOS 
-#define JBDBMS_STATUS_RESERVED1      8192   //bit13 Reserved 
-#define JBDBMS_STATUS_RESERVED2     16384   //bit14 Reserved                                             
-#define JBDBMS_STATUS_RESERVED3     32768   //bit15 Reserved 
+#define JBDBMS_STATUS_CELL_OVP          1   //bit0 single cell overvoltage protection
+#define JBDBMS_STATUS_CELL_UVP          2   //bit1 single cell undervoltage protection
+#define JBDBMS_STATUS_PACK_OVP          4   //bit2 whole pack overvoltage protection
+#define JBDBMS_STATUS_PACK_UVP          8   //bit3 Whole pack undervoltage protection
+#define JBDBMS_STATUS_CHG_OTP          16   //bit4 charging over-temperature protection
+#define JBDBMS_STATUS_CHG_UTP          32   //bit5 charging low temperature protection
+#define JBDBMS_STATUS_DSG_OTP          64   //bit6 Discharge over temperature protection
+#define JBDBMS_STATUS_DSG_UTP         128   //bit7 discharge low temperature protection
+#define JBDBMS_STATUS_CHG_OCP         256   //bit8 charging overcurrent protection
+#define JBDBMS_STATUS_DSG_OCP         512   //bit9 Discharge overcurrent protection
+#define JBDBMS_STATUS_SHORT_CIRCUIT  1024   //bit10 short circuit protection
+#define JBDBMS_STATUS_AFE_ERROR      2048   //bit11 Front-end detection IC error
+#define JBDBMS_STATUS_SOFT_LOCK      4096   //bit12 software lock MOS
+#define JBDBMS_STATUS_RESERVED1      8192   //bit13 Reserved
+#define JBDBMS_STATUS_RESERVED2     16384   //bit14 Reserved
+#define JBDBMS_STATUS_RESERVED3     32768   //bit15 Reserved
 
 
 
@@ -60,4 +60,4 @@
 
 bool JbdBms_readBmsData(Stream *port, uint8_t devNr, void (*callback)(uint8_t, uint8_t), serialDevData_s *devData);
 
-#endif 
+#endif
diff --git a/include/devices/JkBms.h b/include/devices/JkBms.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2022 tobias
-// 
+//
 // This software is released under the MIT License.
 // https://opensource.org/licenses/MIT
 
@@ -15,4 +15,4 @@
 
 bool JkBms_readBmsData(Stream *port, uint8_t devNr, void (*callback)(uint8_t, uint8_t), serialDevData_s *devData);
 
-#endif 
+#endif
diff --git a/include/devices/JkBmsBt.h b/include/devices/JkBmsBt.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2022 tobias
-// 
+//
 // This software is released under the MIT License.
 // https://opensource.org/licenses/MIT
 

diff --git a/include/devices/JkBmsV13.h b/include/devices/JkBmsV13.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2022 tobias
-// 
+//
 // This software is released under the MIT License.
 // https://opensource.org/licenses/MIT
 
@@ -16,4 +16,4 @@
 bool JkBmsV13_readBmsData(Stream *port, uint8_t devNr, void (*callback)(uint8_t, uint8_t), serialDevData_s *devData);
 
 
-#endif 
+#endif
diff --git a/include/devices/NeeyBalancer.h b/include/devices/NeeyBalancer.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2022 tobias
-// 
+//
 // This software is released under the MIT License.
 // https://opensource.org/licenses/MIT
 

diff --git a/include/devices/SeplosBms.h b/include/devices/SeplosBms.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2022 tobias
-// 
+//
 // This software is released under the MIT License.
 // https://opensource.org/licenses/MIT
 
@@ -14,4 +14,4 @@
 
 bool SeplosBms_readBmsData(Stream *port, uint8_t devNr, void (*callback)(uint8_t, uint8_t), serialDevData_s *devData);
 
-#endif 
+#endif
diff --git a/include/devices/SmartShunt.h b/include/devices/SmartShunt.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2022 tobias
-// 
+//
 // This software is released under the MIT License.
 // https://opensource.org/licenses/MIT
 
@@ -21,4 +21,4 @@
 
 bool SmartShunt_readBmsData(Stream *port, uint8_t devNr, void (*callback)(uint8_t, uint8_t), serialDevData_s *devData);
 
-#endif 
+#endif
diff --git a/include/devices/SylcinBms.h b/include/devices/SylcinBms.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2023 nsc2001
-// 
+//
 // This software is released under the MIT License.
 // https://opensource.org/licenses/MIT
 
@@ -14,4 +14,4 @@
 
 bool SylcinBms_readBmsData(Stream *port, uint8_t devNr, void (*callback)(uint8_t, uint8_t), serialDevData_s *devData);
 
-#endif 
+#endif
diff --git a/include/devices/serialDevData.h b/include/devices/serialDevData.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2022 tobias
-// 
+//
 // This software is released under the MIT License.
 // https://opensource.org/licenses/MIT
 
@@ -16,10 +16,10 @@ struct serialDevData_s
   uint8_t  u8_BmsDataAdr;
   bool     bo_sendMqttMsg;
 
-  bool               bo_writeData;    
+  bool               bo_writeData;
   serialDataRwTyp_e  rwDataTyp;
   uint8_t            rwDataLen;
   uint8_t            *rwData;
 };
 
-#endif 
+#endif
diff --git a/include/dio.h b/include/dio.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2022 Tobias Himmler
-// 
+//
 // This software is released under the MIT License.
 // https://opensource.org/licenses/MIT
 

diff --git a/include/i2c.h b/include/i2c.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2022 Tobias Himmler
-// 
+//
 // This software is released under the MIT License.
 // https://opensource.org/licenses/MIT
 

diff --git a/include/log.h b/include/log.h
@@ -1,13 +1,13 @@
 // Copyright (c) 2022 Tobias Himmler
-// 
+//
 // This software is released under the MIT License.
 // https://opensource.org/licenses/MIT
 
 #ifndef LOG_H
 #define LOG_H
 
 #include <Arduino.h>
-  
+
 void debugInit();
 
 #ifdef DEBUG_ON_FS

diff --git a/include/mqtt_t.h b/include/mqtt_t.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2022 Tobias Himmler
-// 
+//
 // This software is released under the MIT License.
 // https://opensource.org/licenses/MIT
 
@@ -10,7 +10,7 @@
 
 void initMqtt();
 bool mqttLoop();
-  
+
 bool mqttConnect();
 void mqttDisconnect();
 bool mqttConnected();