yetangitu/Battery-Emulator
1
0
Fork 0
mirror of https://github.com/dalathegreat/Battery-Emulator.git synced 2025-10-05 10:49:42 +02:00
Code Issues Projects Releases Packages Wiki Activity

Add event for SMA pairing event to aid troubleshooting

Browse source
This commit is contained in:
Daniel Öster 2025-06-09 22:00:31 +03:00
parent 74591cd9a2
commit 702149f388
8 changed files with 16 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Software/src/devboard/utils/events.cpp
View file

@ -101,6 +101,7 @@ void init_events(void) {
events.entries[EVENT_SERIAL_RX_FAILURE].level = EVENT_LEVEL_ERROR; events.entries[EVENT_SERIAL_RX_FAILURE].level = EVENT_LEVEL_ERROR;
events.entries[EVENT_SERIAL_TX_FAILURE].level = EVENT_LEVEL_ERROR; events.entries[EVENT_SERIAL_TX_FAILURE].level = EVENT_LEVEL_ERROR;
events.entries[EVENT_SERIAL_TRANSMITTER_FAILURE].level = EVENT_LEVEL_ERROR; events.entries[EVENT_SERIAL_TRANSMITTER_FAILURE].level = EVENT_LEVEL_ERROR;
events.entries[EVENT_SMA_PAIRING].level = EVENT_LEVEL_INFO;
events.entries[EVENT_RESET_UNKNOWN].level = EVENT_LEVEL_INFO; events.entries[EVENT_RESET_UNKNOWN].level = EVENT_LEVEL_INFO;
events.entries[EVENT_RESET_POWERON].level = EVENT_LEVEL_INFO; events.entries[EVENT_RESET_POWERON].level = EVENT_LEVEL_INFO;
events.entries[EVENT_RESET_EXT].level = EVENT_LEVEL_INFO; events.entries[EVENT_RESET_EXT].level = EVENT_LEVEL_INFO;
@ -305,6 +306,8 @@ const char* get_event_message_string(EVENTS_ENUM_TYPE event) {
return "Error in serial function: No ACK from receiver!"; return "Error in serial function: No ACK from receiver!";
case EVENT_SERIAL_TRANSMITTER_FAILURE: case EVENT_SERIAL_TRANSMITTER_FAILURE:
return "Error in serial function: Some ERROR level fault in transmitter, received by receiver"; return "Error in serial function: Some ERROR level fault in transmitter, received by receiver";
case EVENT_SMA_PAIRING:
return "SMA inverter trying to pair, contactors will close and open according to Enable line";
case EVENT_OTA_UPDATE: case EVENT_OTA_UPDATE:
return "OTA update started!"; return "OTA update started!";
case EVENT_OTA_UPDATE_TIMEOUT: case EVENT_OTA_UPDATE_TIMEOUT:

1
Software/src/devboard/utils/events.h
View file

@ -74,6 +74,7 @@
XX(EVENT_SERIAL_RX_FAILURE) \ XX(EVENT_SERIAL_RX_FAILURE) \
XX(EVENT_SERIAL_TX_FAILURE) \ XX(EVENT_SERIAL_TX_FAILURE) \
XX(EVENT_SERIAL_TRANSMITTER_FAILURE) \ XX(EVENT_SERIAL_TRANSMITTER_FAILURE) \
XX(EVENT_SMA_PAIRING) \
XX(EVENT_TASK_OVERRUN) \ XX(EVENT_TASK_OVERRUN) \
XX(EVENT_RESET_UNKNOWN) \ XX(EVENT_RESET_UNKNOWN) \
XX(EVENT_RESET_POWERON) \ XX(EVENT_RESET_POWERON) \

2
Software/src/inverter/SMA-BYD-H-CAN.cpp
View file

@ -216,6 +216,8 @@ void SmaBydHInverter::map_can_frame_to_variable(CAN_frame rx_frame) {
#ifdef DEBUG_LOG #ifdef DEBUG_LOG
logging.println("Received 0x5E7: SMA pairing request"); logging.println("Received 0x5E7: SMA pairing request");
#endif // DEBUG_LOG #endif // DEBUG_LOG
pairing_events++;
set_event(EVENT_SMA_PAIRING, pairing_events);
datalayer.system.status.CAN_inverter_still_alive = CAN_STILL_ALIVE; datalayer.system.status.CAN_inverter_still_alive = CAN_STILL_ALIVE;
transmit_can_init(); transmit_can_init();
break; break;

1
Software/src/inverter/SMA-BYD-H-CAN.h
View file

@ -24,6 +24,7 @@ class SmaBydHInverter : public CanInverterProtocol {
unsigned long previousMillis100ms = 0; unsigned long previousMillis100ms = 0;
uint8_t pairing_events = 0;
uint32_t inverter_time = 0; uint32_t inverter_time = 0;
uint16_t inverter_voltage = 0; uint16_t inverter_voltage = 0;
int16_t inverter_current = 0; int16_t inverter_current = 0;

2
Software/src/inverter/SMA-BYD-HVS-CAN.cpp
View file

@ -206,6 +206,8 @@ void SmaBydHvsInverter::map_can_frame_to_variable(CAN_frame rx_frame) {
#ifdef DEBUG_LOG #ifdef DEBUG_LOG
logging.println("Received 0x5E7: SMA pairing request"); logging.println("Received 0x5E7: SMA pairing request");
#endif // DEBUG_LOG #endif // DEBUG_LOG
pairing_events++;
set_event(EVENT_SMA_PAIRING, pairing_events);
datalayer.system.status.CAN_inverter_still_alive = CAN_STILL_ALIVE; datalayer.system.status.CAN_inverter_still_alive = CAN_STILL_ALIVE;
transmit_can_init = true; transmit_can_init = true;
break; break;

1
Software/src/inverter/SMA-BYD-HVS-CAN.h
View file

@ -28,6 +28,7 @@ class SmaBydHvsInverter : public CanInverterProtocol {
7; //TODO, tweak to as low as possible before performance issues/crashes appear 7; //TODO, tweak to as low as possible before performance issues/crashes appear
bool transmit_can_init = false; bool transmit_can_init = false;
uint8_t pairing_events = 0;
uint32_t inverter_time = 0; uint32_t inverter_time = 0;
uint16_t inverter_voltage = 0; uint16_t inverter_voltage = 0;
int16_t inverter_current = 0; int16_t inverter_current = 0;

5
Software/src/inverter/SMA-TRIPOWER-CAN.cpp
View file

@ -100,6 +100,11 @@ void SmaTripowerInverter::map_can_frame_to_variable(CAN_frame rx_frame) {
//Inverter brand (frame1-3 = 0x53 0x4D 0x41) = SMA //Inverter brand (frame1-3 = 0x53 0x4D 0x41) = SMA
break; break;
case 0x660: //Message originating from SMA inverter - Pairing request case 0x660: //Message originating from SMA inverter - Pairing request
#ifdef DEBUG_LOG
logging.println("Received 0x660: SMA pairing request");
#endif // DEBUG_LOG
pairing_events++;
set_event(EVENT_SMA_PAIRING, pairing_events);
datalayer.system.status.CAN_inverter_still_alive = CAN_STILL_ALIVE; datalayer.system.status.CAN_inverter_still_alive = CAN_STILL_ALIVE;
transmit_can_init(); transmit_can_init();
break; break;

1
Software/src/inverter/SMA-TRIPOWER-CAN.h
View file

@ -42,6 +42,7 @@ class SmaTripowerInverter : public CanInverterProtocol {
uint32_t inverter_time = 0; uint32_t inverter_time = 0;
uint16_t inverter_voltage = 0; uint16_t inverter_voltage = 0;
int16_t inverter_current = 0; int16_t inverter_current = 0;
uint8_t pairing_events = 0;
bool pairing_completed = false; bool pairing_completed = false;
int16_t temperature_average = 0; int16_t temperature_average = 0;
uint16_t ampere_hours_remaining = 0; uint16_t ampere_hours_remaining = 0;