diff --git a/Software/src/inverter/FERROAMP-CAN.cpp b/Software/src/inverter/FERROAMP-CAN.cpp index edcc4815..eb41f1ac 100644 --- a/Software/src/inverter/FERROAMP-CAN.cpp +++ b/Software/src/inverter/FERROAMP-CAN.cpp @@ -29,20 +29,20 @@ CAN_frame PYLON_7311 = {.FD = false, .DLC = 8, .ID = 0x7311, .data = {0x01, 0x00, 0x02, 0x01, 0x01, 0x02, 0x00, 0x00}}; -CAN_frame PYLON_7320 = { - .FD = false, - .ext_ID = true, - .DLC = 8, - .ID = 0x7320, - .data = {TOTAL_CELL_AMOUNT, (uint8_t)(TOTAL_CELL_AMOUNT >> 8), MODULES_IN_SERIES, CELLS_PER_MODULE, VOLTAGE_LEVEL, - (uint8_t)(VOLTAGE_LEVEL >> 8), AH_CAPACITY, (uint8_t)(AH_CAPACITY >> 8)}}; -CAN_frame PYLON_7321 = { - .FD = false, - .ext_ID = true, - .DLC = 8, - .ID = 0x7321, - .data = {TOTAL_CELL_AMOUNT, (uint8_t)(TOTAL_CELL_AMOUNT >> 8), MODULES_IN_SERIES, CELLS_PER_MODULE, VOLTAGE_LEVEL, - (uint8_t)(VOLTAGE_LEVEL >> 8), AH_CAPACITY, (uint8_t)(AH_CAPACITY >> 8)}}; +CAN_frame PYLON_7320 = {.FD = false, + .ext_ID = true, + .DLC = 8, + .ID = 0x7320, + .data = {TOTAL_CELL_AMOUNT, (uint8_t)(TOTAL_CELL_AMOUNT >> 8), MODULES_IN_SERIES, + CELLS_PER_MODULE, (uint8_t)(VOLTAGE_LEVEL & 0x00FF), (uint8_t)(VOLTAGE_LEVEL >> 8), + AH_CAPACITY, (uint8_t)(AH_CAPACITY >> 8)}}; +CAN_frame PYLON_7321 = {.FD = false, + .ext_ID = true, + .DLC = 8, + .ID = 0x7321, + .data = {TOTAL_CELL_AMOUNT, (uint8_t)(TOTAL_CELL_AMOUNT >> 8), MODULES_IN_SERIES, + CELLS_PER_MODULE, (uint8_t)(VOLTAGE_LEVEL & 0x00FF), (uint8_t)(VOLTAGE_LEVEL >> 8), + AH_CAPACITY, (uint8_t)(AH_CAPACITY >> 8)}}; CAN_frame PYLON_4210 = {.FD = false, .ext_ID = true, .DLC = 8, diff --git a/Software/src/inverter/PYLON-CAN.cpp b/Software/src/inverter/PYLON-CAN.cpp index c55c737f..463ee8a9 100644 --- a/Software/src/inverter/PYLON-CAN.cpp +++ b/Software/src/inverter/PYLON-CAN.cpp @@ -29,20 +29,20 @@ CAN_frame PYLON_7311 = {.FD = false, .DLC = 8, .ID = 0x7311, .data = {0x01, 0x00, 0x02, 0x01, 0x01, 0x02, 0x00, 0x00}}; -CAN_frame PYLON_7320 = { - .FD = false, - .ext_ID = true, - .DLC = 8, - .ID = 0x7320, - .data = {TOTAL_CELL_AMOUNT, (uint8_t)(TOTAL_CELL_AMOUNT >> 8), MODULES_IN_SERIES, CELLS_PER_MODULE, VOLTAGE_LEVEL, - (uint8_t)(VOLTAGE_LEVEL >> 8), AH_CAPACITY, (uint8_t)(AH_CAPACITY >> 8)}}; -CAN_frame PYLON_7321 = { - .FD = false, - .ext_ID = true, - .DLC = 8, - .ID = 0x7321, - .data = {TOTAL_CELL_AMOUNT, (uint8_t)(TOTAL_CELL_AMOUNT >> 8), MODULES_IN_SERIES, CELLS_PER_MODULE, VOLTAGE_LEVEL, - (uint8_t)(VOLTAGE_LEVEL >> 8), AH_CAPACITY, (uint8_t)(AH_CAPACITY >> 8)}}; +CAN_frame PYLON_7320 = {.FD = false, + .ext_ID = true, + .DLC = 8, + .ID = 0x7320, + .data = {TOTAL_CELL_AMOUNT, (uint8_t)(TOTAL_CELL_AMOUNT >> 8), MODULES_IN_SERIES, + CELLS_PER_MODULE, (uint8_t)(VOLTAGE_LEVEL & 0x00FF), (uint8_t)(VOLTAGE_LEVEL >> 8), + AH_CAPACITY, (uint8_t)(AH_CAPACITY >> 8)}}; +CAN_frame PYLON_7321 = {.FD = false, + .ext_ID = true, + .DLC = 8, + .ID = 0x7321, + .data = {TOTAL_CELL_AMOUNT, (uint8_t)(TOTAL_CELL_AMOUNT >> 8), MODULES_IN_SERIES, + CELLS_PER_MODULE, (uint8_t)(VOLTAGE_LEVEL & 0x00FF), (uint8_t)(VOLTAGE_LEVEL >> 8), + AH_CAPACITY, (uint8_t)(AH_CAPACITY >> 8)}}; CAN_frame PYLON_4210 = {.FD = false, .ext_ID = true, .DLC = 8,