Fixes from malcolm regarding pairing

This commit is contained in:
Daniel Öster 2024-09-09 23:39:39 +03:00
parent 2c8acd8a17
commit 2d552db613

View file

@ -51,7 +51,7 @@ CAN_frame SMA_598 = {.FD = false,
.ext_ID = false,
.DLC = 8,
.ID = 0x598,
.data = {0x00, 0xD3, 0x00, 0x01, 0x5C, 0x98, 0xB6, 0xEE}};
.data = {0x00, 0x01, 0x0F, 0x2C, 0x5C, 0x98, 0xB6, 0xEE}};
CAN_frame SMA_5D8 = {.FD = false,
.ext_ID = false,
.DLC = 8,
@ -221,12 +221,14 @@ void receive_can_inverter(CAN_frame rx_frame) {
break;
case 0x420: //Message originating from SMA inverter - Timestamp
//Frame0-3 Timestamp
/*
transmit_can(&SMA_158, can_config.inverter);
transmit_can(&SMA_358, can_config.inverter);
transmit_can(&SMA_3D8, can_config.inverter);
transmit_can(&SMA_458, can_config.inverter);
transmit_can(&SMA_518, can_config.inverter);
transmit_can(&SMA_4D8, can_config.inverter);
*/
break;
case 0x5E0: //Message originating from SMA inverter - String
break;
@ -254,15 +256,17 @@ void receive_can_inverter(CAN_frame rx_frame) {
void send_can_inverter() {
unsigned long currentMillis = millis();
// Send CAN Message every 60s
if (currentMillis - previousMillis60s >= INTERVAL_60_S) {
previousMillis60s = currentMillis;
transmit_can(&SMA_158, can_config.inverter);
transmit_can(&SMA_358, can_config.inverter);
transmit_can(&SMA_3D8, can_config.inverter);
transmit_can(&SMA_458, can_config.inverter);
transmit_can(&SMA_518, can_config.inverter);
transmit_can(&SMA_4D8, can_config.inverter);
// Send CAN Message every 100ms if we're enabled
if (datalayer.system.status.inverter_allows_contactor_closing) {
if (currentMillis - previousMillis60s >= 100) {
previousMillis60s = currentMillis;
transmit_can(&SMA_158, can_config.inverter);
transmit_can(&SMA_358, can_config.inverter);
transmit_can(&SMA_3D8, can_config.inverter);
transmit_can(&SMA_458, can_config.inverter);
transmit_can(&SMA_518, can_config.inverter);
transmit_can(&SMA_4D8, can_config.inverter);
}
}
}
#endif