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

Update KOSTAL-RS485.cpp

Browse source
This commit is contained in:
mbuhansen 2025-08-20 21:01:54 +02:00 • committed by GitHub
parent 93556780eb
commit 56bfcbe664
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Software/src/inverter/KOSTAL-RS485.cpp
View file

@ -232,7 +232,7 @@ void KostalInverterProtocol::receive() // Runs as fast as possible to handle th
if (check_kostal_frame_crc(rx_index)) { if (check_kostal_frame_crc(rx_index)) {
incoming_message_counter = RS485_HEALTHY; incoming_message_counter = RS485_HEALTHY;
if (RS485_RXFRAME[1] == 0x63) { if (RS485_RXFRAME[1] == 'c' && info_sent) {
if (RS485_RXFRAME[6] == 0x47) { if (RS485_RXFRAME[6] == 0x47) {
// Set time function - Do nothing. // Set time function - Do nothing.
send_kostal(ACK_FRAME, 8); // ACK send_kostal(ACK_FRAME, 8); // ACK
@ -251,9 +251,6 @@ void KostalInverterProtocol::receive() // Runs as fast as possible to handle th
send_kostal(ACK_FRAME, 8); // ACK send_kostal(ACK_FRAME, 8); // ACK
contactortestTimerStart = millis(); contactortestTimerStart = millis();
contactortestTimerActive = true; contactortestTimerActive = true;
} else if (RS485_RXFRAME[7] == 0x00) {
// ERROR STATE, ACK sent
send_kostal(ACK_FRAME, 8); // ACK
} else if (RS485_RXFRAME[7] == 0xFF) { } else if (RS485_RXFRAME[7] == 0xFF) {
// no ACK sent // no ACK sent
} else { } else {
@ -266,7 +263,7 @@ void KostalInverterProtocol::receive() // Runs as fast as possible to handle th
//Reverse polarity, do nothing //Reverse polarity, do nothing
} else { } else {
int code = RS485_RXFRAME[6] + RS485_RXFRAME[7] * 0x100; int code = RS485_RXFRAME[6] + RS485_RXFRAME[7] * 0x100;
if (code == 0x44a) { if (code == 0x44a && info_sent) {
//Send cyclic data //Send cyclic data
// TODO: Probably not a good idea to use the battery object here like this. // TODO: Probably not a good idea to use the battery object here like this.
if (battery) { if (battery) {
@ -276,7 +273,7 @@ void KostalInverterProtocol::receive() // Runs as fast as possible to handle th
if (f2_startup_count < 15) { if (f2_startup_count < 15) {
f2_startup_count++; f2_startup_count++;
} }
byte tmpframe[64]; //copy values to prevent data manipulation during rewrite/crc calculation uint8_t tmpframe[64]; //copy values to prevent data manipulation during rewrite/crc calculation
memcpy(tmpframe, CYCLIC_DATA, 64); memcpy(tmpframe, CYCLIC_DATA, 64);
tmpframe[62] = calculate_kostal_crc(tmpframe, 62); tmpframe[62] = calculate_kostal_crc(tmpframe, 62);
null_stuffer(tmpframe, 64); null_stuffer(tmpframe, 64);
@ -285,7 +282,7 @@ void KostalInverterProtocol::receive() // Runs as fast as possible to handle th
} }
if (code == 0x84a) { if (code == 0x84a) {
//Send battery info //Send battery info
byte tmpframe[40]; //copy values to prevent data manipulation during rewrite/crc calculation uint8_t tmpframe[40]; //copy values to prevent data manipulation during rewrite/crc calculation
memcpy(tmpframe, BATTERY_INFO, 40); memcpy(tmpframe, BATTERY_INFO, 40);
tmpframe[38] = calculate_kostal_crc(tmpframe, 38); tmpframe[38] = calculate_kostal_crc(tmpframe, 38);
null_stuffer(tmpframe, 40); null_stuffer(tmpframe, 40);
@ -300,7 +297,7 @@ void KostalInverterProtocol::receive() // Runs as fast as possible to handle th
} }
if (code == 0x353) { if (code == 0x353) {
//Send battery error/status //Send battery error/status
byte tmpframe[9]; //copy values to prevent data manipulation during rewrite/crc calculation uint8_t tmpframe[9]; //copy values to prevent data manipulation during rewrite/crc calculation
memcpy(tmpframe, STATUS_FRAME, 9); memcpy(tmpframe, STATUS_FRAME, 9);
tmpframe[7] = calculate_kostal_crc(tmpframe, 7); tmpframe[7] = calculate_kostal_crc(tmpframe, 7);
null_stuffer(tmpframe, 9); null_stuffer(tmpframe, 9);