fixed conflicts

2022-02-05 16:17:01 +01:00
parent abeb4cdbb1 6543264691
commit bb8ccd2842
31 changed files with 1632 additions and 832 deletions
--- a/common/config/commonObjects.h
+++ b/common/config/commonObjects.h
@ -25,6 +25,7 @@ enum commonObjects: uint32_t {
    PDU1_HANDLER = 0x44250001,
    PDU2_HANDLER = 0x44250002,
    ACU_HANDLER = 0x44250003,
+    BPX_BATT_HANDLER = 0x44260000,
    TMP1075_HANDLER_1 = 0x44420004,
    TMP1075_HANDLER_2 = 0x44420005,
    MGM_0_LIS3_HANDLER = 0x44120006,