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

Refactor for merge to main

Browse source
This commit is contained in:
Daniel 2023-08-27 12:33:12 +03:00
parent 961e33033e
commit f9ca90b20e
3 changed files with 109 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Software/SOLAX-CAN.cpp
View file

@ -31,18 +31,18 @@ CAN_frame_t SOLAX_100A001 = {.FIR = {.B = {.DLC = 0,.FF = CAN_frame_ext,}},.MsgI
void CAN_WriteFrame(CAN_frame_t* tx_frame)
{
#ifdef DUAL_CAN
CANMessage MCP2515Frame; //Struct with ACAN2515 library format, needed to use the MCP2515 library
MCP2515Frame.id = tx_frame->MsgID;
MCP2515Frame.ext = tx_frame->FIR.B.FF;
MCP2515Frame.len = tx_frame->FIR.B.DLC;
for (uint8_t i=0 ; i<MCP2515Frame.len ; i++) {
MCP2515Frame.data[i] = tx_frame->data.u8[i];
}
can.tryToSend(MCP2515Frame);
//Serial.println("Solax CAN Frame sent in Bus 2");
CANMessage MCP2515Frame; //Struct with ACAN2515 library format, needed to use the MCP2515 library
MCP2515Frame.id = tx_frame->MsgID;
MCP2515Frame.ext = tx_frame->FIR.B.FF;
MCP2515Frame.len = tx_frame->FIR.B.DLC;
for (uint8_t i=0 ; i<MCP2515Frame.len ; i++) {
MCP2515Frame.data[i] = tx_frame->data.u8[i];
}
can.tryToSend(MCP2515Frame);
//Serial.println("Solax CAN Frame sent in Bus 2");
#else
ESP32Can.CANWriteFrame(tx_frame);
//Serial.println("Solax CAN Frame sent in Bus 1");
ESP32Can.CANWriteFrame(tx_frame);
//Serial.println("Solax CAN Frame sent in Bus 1");
#endif
}
@ -92,7 +92,6 @@ void update_values_can_solax()
}
//Put the values into the CAN messages
//BMS_Limits
SOLAX_1872.data.u8[0] = (uint8_t) max_volt_solax_can; //Todo, scaling OK?
SOLAX_1872.data.u8[1] = (max_volt_solax_can >> 8);
@ -155,11 +154,6 @@ void update_values_can_solax()
}
void send_can_solax() {
// Deprecated - All transmissions should be initiated in response to inverter polling.
}
void receive_can_solax(CAN_frame_t rx_frame)
{
if (rx_frame.MsgID == 0x1871) {