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

Merge pull request #980 from dalathegreat/bugfix/growatt-CAN-load

Browse source 
Bugfix: Growatt HV: Refactor CAN sending to be performed in batches
This commit is contained in:
Daniel Öster 2025-03-17 21:12:00 +02:00 • committed by GitHub
commit f4613ae2d4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 55 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

76
Software/src/inverter/GROWATT-HV-CAN.cpp
View file

@ -137,6 +137,7 @@ CAN_frame GROWATT_3F00 = {.FD = false,
.data = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}; .data = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}};
static unsigned long previousMillis1s = 0; // will store last time a 1s CAN Message was send static unsigned long previousMillis1s = 0; // will store last time a 1s CAN Message was send
static unsigned long previousMillisBatchSend = 0;
static uint32_t unix_time = 0; static uint32_t unix_time = 0;
static uint16_t ampere_hours_remaining = 0; static uint16_t ampere_hours_remaining = 0;
static uint16_t ampere_hours_full = 0; static uint16_t ampere_hours_full = 0;
@ -151,7 +152,10 @@ static uint8_t ISO_detection_command = 0;
static uint8_t sleep_wakeup_control = 0; static uint8_t sleep_wakeup_control = 0;
static uint8_t PCS_working_status = 0; //00 standby, 01 operating static uint8_t PCS_working_status = 0; //00 standby, 01 operating
static uint8_t serial_number_counter = 0; //0-1-2-0-1-2... static uint8_t serial_number_counter = 0; //0-1-2-0-1-2...
static uint8_t can_message_batch_index = 0;
static const uint8_t delay_between_batches_ms = 10;
static bool inverter_alive = false; static bool inverter_alive = false;
static bool time_to_send_1s_data = false;
void update_values_can_inverter() { //This function maps all the values fetched from battery CAN to the correct CAN messages void update_values_can_inverter() { //This function maps all the values fetched from battery CAN to the correct CAN messages
@ -527,29 +531,59 @@ void transmit_can_inverter() {
unsigned long currentMillis = millis(); unsigned long currentMillis = millis();
//Send 1s periodic CAN messages //Check if 1 second has passed, then we start sending!
if (currentMillis - previousMillis1s >= INTERVAL_1_S) { if (currentMillis - previousMillis1s >= INTERVAL_1_S) {
previousMillis1s = currentMillis; previousMillis1s = currentMillis;
transmit_can_frame(&GROWATT_3110, can_config.inverter); time_to_send_1s_data = true;
transmit_can_frame(&GROWATT_3120, can_config.inverter); }
transmit_can_frame(&GROWATT_3130, can_config.inverter);
transmit_can_frame(&GROWATT_3140, can_config.inverter); // Check if enough time has passed since the last batch
transmit_can_frame(&GROWATT_3150, can_config.inverter); if (currentMillis - previousMillisBatchSend >= delay_between_batches_ms) {
transmit_can_frame(&GROWATT_3160, can_config.inverter); previousMillisBatchSend = currentMillis; // Update the time of the last message batch
transmit_can_frame(&GROWATT_3170, can_config.inverter);
transmit_can_frame(&GROWATT_3180, can_config.inverter); // Send a subset of messages per iteration to avoid overloading the CAN bus / transmit buffer
transmit_can_frame(&GROWATT_3190, can_config.inverter); switch (can_message_batch_index) {
transmit_can_frame(&GROWATT_3200, can_config.inverter); case 0:
transmit_can_frame(&GROWATT_3210, can_config.inverter); transmit_can_frame(&GROWATT_3110, can_config.inverter);
transmit_can_frame(&GROWATT_3220, can_config.inverter); transmit_can_frame(&GROWATT_3120, can_config.inverter);
transmit_can_frame(&GROWATT_3230, can_config.inverter); transmit_can_frame(&GROWATT_3130, can_config.inverter);
transmit_can_frame(&GROWATT_3240, can_config.inverter); transmit_can_frame(&GROWATT_3140, can_config.inverter);
transmit_can_frame(&GROWATT_3250, can_config.inverter); break;
transmit_can_frame(&GROWATT_3260, can_config.inverter); case 1:
transmit_can_frame(&GROWATT_3270, can_config.inverter); transmit_can_frame(&GROWATT_3150, can_config.inverter);
transmit_can_frame(&GROWATT_3280, can_config.inverter); transmit_can_frame(&GROWATT_3160, can_config.inverter);
transmit_can_frame(&GROWATT_3290, can_config.inverter); transmit_can_frame(&GROWATT_3170, can_config.inverter);
transmit_can_frame(&GROWATT_3F00, can_config.inverter); transmit_can_frame(&GROWATT_3180, can_config.inverter);
break;
case 2:
transmit_can_frame(&GROWATT_3190, can_config.inverter);
transmit_can_frame(&GROWATT_3200, can_config.inverter);
transmit_can_frame(&GROWATT_3210, can_config.inverter);
transmit_can_frame(&GROWATT_3220, can_config.inverter);
break;
case 3:
transmit_can_frame(&GROWATT_3230, can_config.inverter);
transmit_can_frame(&GROWATT_3240, can_config.inverter);
transmit_can_frame(&GROWATT_3250, can_config.inverter);
transmit_can_frame(&GROWATT_3260, can_config.inverter);
break;
case 4:
transmit_can_frame(&GROWATT_3270, can_config.inverter);
transmit_can_frame(&GROWATT_3280, can_config.inverter);
transmit_can_frame(&GROWATT_3290, can_config.inverter);
transmit_can_frame(&GROWATT_3F00, can_config.inverter);
time_to_send_1s_data = false;
break;
default:
break;
}
// Increment message index and wrap around if needed
can_message_batch_index++;
if (time_to_send_1s_data == false) {
can_message_batch_index = 0;
}
} }
} }