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

Merge branch 'dalathegreat:main' into main

Browse source
This commit is contained in:
amarofarinha 2024-05-29 20:27:53 +01:00 • committed by GitHub
commit a961a5d8d5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 197 additions and 188 deletions
Download patch file Download diff file Expand all files Collapse all files

8
README.md
View file

@ -39,12 +39,12 @@ For more examples showing wiring, see each battery types own Wiki page. For inst
1. Download the Arduino IDE: https://www.arduino.cc/en/software 1. Download the Arduino IDE: https://www.arduino.cc/en/software
2. When the Arduino IDE has been started; 2. When the Arduino IDE has been started;
Click "File" in the upper left corner -> Preferences -> Additional Development >Board Manager URL -> Enter the URL in the input box https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json Click "File" in the upper left corner -> Preferences -> Additional Development >Board Manager URL -> Enter the URL in the input box https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json
3. Go to "Boards Manager", and install the ESP32 package by Espressif Systems. **The latest confirmed compatible version is 2.0.11** 3. Go to "Boards Manager", and install the ESP32 package by Espressif Systems. **NOTE: The version depends on which release of Battery-Emulator you are running!**
⚠️ Make sure to use a 2.x.x version - preferably 2.0.11 - and not a 3.x.x version, as it is not yet supported by the libraries we include with the SW! - ⚠️ Make sure to use a 2.x.x version if you are on a release **older** than 6.0.0 (For instance ESP32 v2.0.11 when using Battery-Emulator v5.4.0)
![image](https://github.com/dalathegreat/Battery-Emulator/assets/81711263/79602ef1-1a23-4670-a638-b896b7f6cdf6) - ⚠️ Make sure to use a 3.x.x version if you are on a release **newer** than 6.0.0 (For instance ESP32 v3.0.0 when using Battery-Emulator v6.0.0)
For future migration, see this link: https://docs.espressif.com/projects/arduino-esp32/en/latest/migration_guides/2.x_to_3.0.html ![bild](https://github.com/dalathegreat/Battery-Emulator/assets/26695010/6a2414b1-f2ca-4746-8e8d-9afd78bd9252)
4. The arduino settings should be set to "ESP32 Dev Module" with the following settings; 4. The arduino settings should be set to "ESP32 Dev Module" with the following settings;
![alt text](https://github.com/Xinyuan-LilyGO/T-CAN485/blob/main/img/arduino_setting.png) ![alt text](https://github.com/Xinyuan-LilyGO/T-CAN485/blob/main/img/arduino_setting.png)

2
Software/Software.ino
View file

@ -33,7 +33,7 @@
Preferences settings; // Store user settings Preferences settings; // Store user settings
// The current software version, shown on webserver // The current software version, shown on webserver
const char* version_number = "5.11.dev"; const char* version_number = "6.0.RC";
// Interval settings // Interval settings
uint16_t intervalUpdateValues = INTERVAL_5_S; // Interval at which to update inverter values / Modbus registers uint16_t intervalUpdateValues = INTERVAL_5_S; // Interval at which to update inverter values / Modbus registers

337
Software/src/battery/NISSAN-LEAF-BATTERY.cpp
View file

@ -16,6 +16,7 @@ static unsigned long previousMillis10s = 0; // will store last time a 1s CAN Me
static uint8_t mprun10r = 0; //counter 0-20 for 0x1F2 message static uint8_t mprun10r = 0; //counter 0-20 for 0x1F2 message
static uint8_t mprun10 = 0; //counter 0-3 static uint8_t mprun10 = 0; //counter 0-3
static uint8_t mprun100 = 0; //counter 0-3 static uint8_t mprun100 = 0; //counter 0-3
static bool can_bus_alive = false;
CAN_frame_t LEAF_1F2 = {.FIR = {.B = CAN_frame_t LEAF_1F2 = {.FIR = {.B =
{ {
@ -337,6 +338,7 @@ void update_values_battery() { /* This function maps all the values fetched via
void receive_can_battery(CAN_frame_t rx_frame) { void receive_can_battery(CAN_frame_t rx_frame) {
switch (rx_frame.MsgID) { switch (rx_frame.MsgID) {
case 0x1DB: case 0x1DB:
can_bus_alive = true;
if (is_message_corrupt(rx_frame)) { if (is_message_corrupt(rx_frame)) {
datalayer.battery.status.CAN_error_counter++; datalayer.battery.status.CAN_error_counter++;
break; //Message content malformed, abort reading data from it break; //Message content malformed, abort reading data from it
@ -585,189 +587,192 @@ void receive_can_battery(CAN_frame_t rx_frame) {
} }
} }
void send_can_battery() { void send_can_battery() {
unsigned long currentMillis = millis(); if (can_bus_alive) {
//Send 10ms message unsigned long currentMillis = millis();
if (currentMillis - previousMillis10 >= INTERVAL_10_MS) {
// Check if sending of CAN messages has been delayed too much.
if ((currentMillis - previousMillis10 >= INTERVAL_10_MS_DELAYED) && (currentMillis > BOOTUP_TIME)) {
set_event(EVENT_CAN_OVERRUN, (currentMillis - previousMillis10));
}
previousMillis10 = currentMillis;
switch (mprun10) { //Send 10ms message
case 0: if (currentMillis - previousMillis10 >= INTERVAL_10_MS) {
LEAF_1D4.data.u8[4] = 0x07; // Check if sending of CAN messages has been delayed too much.
LEAF_1D4.data.u8[7] = 0x12; if ((currentMillis - previousMillis10 >= INTERVAL_10_MS_DELAYED) && (currentMillis > BOOTUP_TIME)) {
break; set_event(EVENT_CAN_OVERRUN, (currentMillis - previousMillis10));
case 1: }
LEAF_1D4.data.u8[4] = 0x47; previousMillis10 = currentMillis;
LEAF_1D4.data.u8[7] = 0xD5;
break;
case 2:
LEAF_1D4.data.u8[4] = 0x87;
LEAF_1D4.data.u8[7] = 0x19;
break;
case 3:
LEAF_1D4.data.u8[4] = 0xC7;
LEAF_1D4.data.u8[7] = 0xDE;
break;
}
ESP32Can.CANWriteFrame(&LEAF_1D4);
switch (mprun10r) { switch (mprun10) {
case (0): case 0:
LEAF_1F2.data.u8[3] = 0xB0; LEAF_1D4.data.u8[4] = 0x07;
LEAF_1F2.data.u8[6] = 0x00; LEAF_1D4.data.u8[7] = 0x12;
LEAF_1F2.data.u8[7] = 0x8F; break;
break; case 1:
case (1): LEAF_1D4.data.u8[4] = 0x47;
LEAF_1F2.data.u8[6] = 0x01; LEAF_1D4.data.u8[7] = 0xD5;
LEAF_1F2.data.u8[7] = 0x80; break;
break; case 2:
case (2): LEAF_1D4.data.u8[4] = 0x87;
LEAF_1F2.data.u8[6] = 0x02; LEAF_1D4.data.u8[7] = 0x19;
LEAF_1F2.data.u8[7] = 0x81; break;
break; case 3:
case (3): LEAF_1D4.data.u8[4] = 0xC7;
LEAF_1F2.data.u8[6] = 0x03; LEAF_1D4.data.u8[7] = 0xDE;
LEAF_1F2.data.u8[7] = 0x82; break;
break; }
case (4): ESP32Can.CANWriteFrame(&LEAF_1D4);
LEAF_1F2.data.u8[6] = 0x00;
LEAF_1F2.data.u8[7] = 0x8F; switch (mprun10r) {
break; case (0):
case (5): // Set 2 LEAF_1F2.data.u8[3] = 0xB0;
LEAF_1F2.data.u8[3] = 0xB4; LEAF_1F2.data.u8[6] = 0x00;
LEAF_1F2.data.u8[6] = 0x01; LEAF_1F2.data.u8[7] = 0x8F;
LEAF_1F2.data.u8[7] = 0x84; break;
break; case (1):
case (6): LEAF_1F2.data.u8[6] = 0x01;
LEAF_1F2.data.u8[6] = 0x02; LEAF_1F2.data.u8[7] = 0x80;
LEAF_1F2.data.u8[7] = 0x85; break;
break; case (2):
case (7): LEAF_1F2.data.u8[6] = 0x02;
LEAF_1F2.data.u8[6] = 0x03; LEAF_1F2.data.u8[7] = 0x81;
LEAF_1F2.data.u8[7] = 0x86; break;
break; case (3):
case (8): LEAF_1F2.data.u8[6] = 0x03;
LEAF_1F2.data.u8[6] = 0x00; LEAF_1F2.data.u8[7] = 0x82;
LEAF_1F2.data.u8[7] = 0x83; break;
break; case (4):
case (9): LEAF_1F2.data.u8[6] = 0x00;
LEAF_1F2.data.u8[6] = 0x01; LEAF_1F2.data.u8[7] = 0x8F;
LEAF_1F2.data.u8[7] = 0x84; break;
break; case (5): // Set 2
case (10): // Set 3 LEAF_1F2.data.u8[3] = 0xB4;
LEAF_1F2.data.u8[3] = 0xB0; LEAF_1F2.data.u8[6] = 0x01;
LEAF_1F2.data.u8[6] = 0x02; LEAF_1F2.data.u8[7] = 0x84;
LEAF_1F2.data.u8[7] = 0x81; break;
break; case (6):
case (11): LEAF_1F2.data.u8[6] = 0x02;
LEAF_1F2.data.u8[6] = 0x03; LEAF_1F2.data.u8[7] = 0x85;
LEAF_1F2.data.u8[7] = 0x82; break;
break; case (7):
case (12): LEAF_1F2.data.u8[6] = 0x03;
LEAF_1F2.data.u8[6] = 0x00; LEAF_1F2.data.u8[7] = 0x86;
LEAF_1F2.data.u8[7] = 0x8F; break;
break; case (8):
case (13): LEAF_1F2.data.u8[6] = 0x00;
LEAF_1F2.data.u8[6] = 0x01; LEAF_1F2.data.u8[7] = 0x83;
LEAF_1F2.data.u8[7] = 0x80; break;
break; case (9):
case (14): LEAF_1F2.data.u8[6] = 0x01;
LEAF_1F2.data.u8[6] = 0x02; LEAF_1F2.data.u8[7] = 0x84;
LEAF_1F2.data.u8[7] = 0x81; break;
break; case (10): // Set 3
case (15): // Set 4 LEAF_1F2.data.u8[3] = 0xB0;
LEAF_1F2.data.u8[3] = 0xB4; LEAF_1F2.data.u8[6] = 0x02;
LEAF_1F2.data.u8[6] = 0x03; LEAF_1F2.data.u8[7] = 0x81;
LEAF_1F2.data.u8[7] = 0x86; break;
break; case (11):
case (16): LEAF_1F2.data.u8[6] = 0x03;
LEAF_1F2.data.u8[6] = 0x00; LEAF_1F2.data.u8[7] = 0x82;
LEAF_1F2.data.u8[7] = 0x83; break;
break; case (12):
case (17): LEAF_1F2.data.u8[6] = 0x00;
LEAF_1F2.data.u8[6] = 0x01; LEAF_1F2.data.u8[7] = 0x8F;
LEAF_1F2.data.u8[7] = 0x84; break;
break; case (13):
case (18): LEAF_1F2.data.u8[6] = 0x01;
LEAF_1F2.data.u8[6] = 0x02; LEAF_1F2.data.u8[7] = 0x80;
LEAF_1F2.data.u8[7] = 0x85; break;
break; case (14):
case (19): LEAF_1F2.data.u8[6] = 0x02;
LEAF_1F2.data.u8[6] = 0x03; LEAF_1F2.data.u8[7] = 0x81;
LEAF_1F2.data.u8[7] = 0x86; break;
break; case (15): // Set 4
default: LEAF_1F2.data.u8[3] = 0xB4;
break; LEAF_1F2.data.u8[6] = 0x03;
} LEAF_1F2.data.u8[7] = 0x86;
break;
case (16):
LEAF_1F2.data.u8[6] = 0x00;
LEAF_1F2.data.u8[7] = 0x83;
break;
case (17):
LEAF_1F2.data.u8[6] = 0x01;
LEAF_1F2.data.u8[7] = 0x84;
break;
case (18):
LEAF_1F2.data.u8[6] = 0x02;
LEAF_1F2.data.u8[7] = 0x85;
break;
case (19):
LEAF_1F2.data.u8[6] = 0x03;
LEAF_1F2.data.u8[7] = 0x86;
break;
default:
break;
}
//Only send this message when NISSANLEAF_CHARGER is not defined (otherwise it will collide!) //Only send this message when NISSANLEAF_CHARGER is not defined (otherwise it will collide!)
#ifndef NISSANLEAF_CHARGER #ifndef NISSANLEAF_CHARGER
ESP32Can.CANWriteFrame(&LEAF_1F2); //Contains (CHG_STA_RQ == 1 == Normal Charge) ESP32Can.CANWriteFrame(&LEAF_1F2); //Contains (CHG_STA_RQ == 1 == Normal Charge)
#endif #endif
mprun10r = (mprun10r + 1) % 20; // 0x1F2 patter repeats after 20 messages. 0-1..19-0 mprun10r = (mprun10r + 1) % 20; // 0x1F2 patter repeats after 20 messages. 0-1..19-0
mprun10 = (mprun10 + 1) % 4; // mprun10 cycles between 0-1-2-3-0-1... mprun10 = (mprun10 + 1) % 4; // mprun10 cycles between 0-1-2-3-0-1...
}
// Send 100ms CAN Message
if (currentMillis - previousMillis100 >= INTERVAL_100_MS) {
previousMillis100 = currentMillis;
//When battery requests heating pack status change, ack this
if (Batt_Heater_Mail_Send_Request) {
LEAF_50B.data.u8[6] = 0x20; //Batt_Heater_Mail_Send_OK
} else {
LEAF_50B.data.u8[6] = 0x00; //Batt_Heater_Mail_Send_NG
} }
// VCM message, containing info if battery should sleep or stay awake // Send 100ms CAN Message
ESP32Can.CANWriteFrame(&LEAF_50B); // HCM_WakeUpSleepCommand == 11b == WakeUp, and CANMASK = 1 if (currentMillis - previousMillis100 >= INTERVAL_100_MS) {
previousMillis100 = currentMillis;
LEAF_50C.data.u8[3] = mprun100; //When battery requests heating pack status change, ack this
switch (mprun100) { if (Batt_Heater_Mail_Send_Request) {
case 0: LEAF_50B.data.u8[6] = 0x20; //Batt_Heater_Mail_Send_OK
LEAF_50C.data.u8[4] = 0x5D; } else {
LEAF_50C.data.u8[5] = 0xC8; LEAF_50B.data.u8[6] = 0x00; //Batt_Heater_Mail_Send_NG
break; }
case 1:
LEAF_50C.data.u8[4] = 0xB2;
LEAF_50C.data.u8[5] = 0x31;
break;
case 2:
LEAF_50C.data.u8[4] = 0x5D;
LEAF_50C.data.u8[5] = 0x63;
break;
case 3:
LEAF_50C.data.u8[4] = 0xB2;
LEAF_50C.data.u8[5] = 0x9A;
break;
}
ESP32Can.CANWriteFrame(&LEAF_50C);
mprun100 = (mprun100 + 1) % 4; // mprun100 cycles between 0-1-2-3-0-1... // VCM message, containing info if battery should sleep or stay awake
} ESP32Can.CANWriteFrame(&LEAF_50B); // HCM_WakeUpSleepCommand == 11b == WakeUp, and CANMASK = 1
//Send 10s CAN messages LEAF_50C.data.u8[3] = mprun100;
if (currentMillis - previousMillis10s >= INTERVAL_10_S) { switch (mprun100) {
previousMillis10s = currentMillis; case 0:
LEAF_50C.data.u8[4] = 0x5D;
LEAF_50C.data.u8[5] = 0xC8;
break;
case 1:
LEAF_50C.data.u8[4] = 0xB2;
LEAF_50C.data.u8[5] = 0x31;
break;
case 2:
LEAF_50C.data.u8[4] = 0x5D;
LEAF_50C.data.u8[5] = 0x63;
break;
case 3:
LEAF_50C.data.u8[4] = 0xB2;
LEAF_50C.data.u8[5] = 0x9A;
break;
}
ESP32Can.CANWriteFrame(&LEAF_50C);
//Every 10s, ask diagnostic data from the battery. Don't ask if someone is already polling on the bus (Leafspy?) mprun100 = (mprun100 + 1) % 4; // mprun100 cycles between 0-1-2-3-0-1...
if (!stop_battery_query) {
group = (group == 1) ? 2 : (group == 2) ? 4 : 1;
// Cycle between group 1, 2, and 4 using ternary operation
LEAF_GROUP_REQUEST.data.u8[2] = group;
ESP32Can.CANWriteFrame(&LEAF_GROUP_REQUEST);
} }
if (hold_off_with_polling_10seconds > 0) { //Send 10s CAN messages
hold_off_with_polling_10seconds--; if (currentMillis - previousMillis10s >= INTERVAL_10_S) {
} else { previousMillis10s = currentMillis;
stop_battery_query = false;
//Every 10s, ask diagnostic data from the battery. Don't ask if someone is already polling on the bus (Leafspy?)
if (!stop_battery_query) {
group = (group == 1) ? 2 : (group == 2) ? 4 : 1;
// Cycle between group 1, 2, and 4 using ternary operation
LEAF_GROUP_REQUEST.data.u8[2] = group;
ESP32Can.CANWriteFrame(&LEAF_GROUP_REQUEST);
}
if (hold_off_with_polling_10seconds > 0) {
hold_off_with_polling_10seconds--;
} else {
stop_battery_query = false;
}
} }
} }
} }

10
Software/src/inverter/BYD-MODBUS.cpp
View file

@ -50,7 +50,7 @@ void handle_static_data_modbus_byd() {
} }
void handle_update_data_modbusp201_byd() { void handle_update_data_modbusp201_byd() {
mbPV[202] = std::min(datalayer.battery.info.total_capacity_Wh, 60000u); //Cap capacity to 60kWh if needed mbPV[202] = std::min(datalayer.battery.info.total_capacity_Wh, static_cast<uint32_t>(60000u)); //Cap to 60kWh
mbPV[205] = (datalayer.battery.info.max_design_voltage_dV); // Max Voltage, if higher Gen24 forces discharge mbPV[205] = (datalayer.battery.info.max_design_voltage_dV); // Max Voltage, if higher Gen24 forces discharge
mbPV[206] = (datalayer.battery.info.min_design_voltage_dV); // Min Voltage, if lower Gen24 disables battery mbPV[206] = (datalayer.battery.info.min_design_voltage_dV); // Min Voltage, if lower Gen24 disables battery
} }
@ -83,10 +83,10 @@ void handle_update_data_modbusp301_byd() {
mbPV[300] = datalayer.battery.status.bms_status; mbPV[300] = datalayer.battery.status.bms_status;
mbPV[302] = 128 + bms_char_dis_status; mbPV[302] = 128 + bms_char_dis_status;
mbPV[303] = datalayer.battery.status.reported_soc; mbPV[303] = datalayer.battery.status.reported_soc;
mbPV[304] = std::min(datalayer.battery.info.total_capacity_Wh, 60000u); //Cap capacity to 60kWh if needed mbPV[304] = std::min(datalayer.battery.info.total_capacity_Wh, static_cast<uint32_t>(60000u)); //Cap to 60kWh
mbPV[305] = std::min(datalayer.battery.status.remaining_capacity_Wh, 60000u); //Cap capacity to 60kWh if needed mbPV[305] = std::min(datalayer.battery.status.remaining_capacity_Wh, static_cast<uint32_t>(60000u)); //Cap to 60kWh
mbPV[306] = std::min(max_discharge_W, 30000u); //Cap to 30000 if exceeding mbPV[306] = std::min(max_discharge_W, static_cast<uint32_t>(30000u)); //Cap to 30000 if exceeding
mbPV[307] = std::min(max_charge_W, 30000u); //Cap to 30000 if exceeding mbPV[307] = std::min(max_charge_W, static_cast<uint32_t>(30000u)); //Cap to 30000 if exceeding
mbPV[310] = datalayer.battery.status.voltage_dV; mbPV[310] = datalayer.battery.status.voltage_dV;
mbPV[312] = datalayer.battery.status.temperature_min_dC; mbPV[312] = datalayer.battery.status.temperature_min_dC;
mbPV[313] = datalayer.battery.status.temperature_max_dC; mbPV[313] = datalayer.battery.status.temperature_max_dC;

2
Software/src/lib/me-no-dev-ESPAsyncWebServer/src/AsyncEventSource.cpp
View file

@ -185,7 +185,7 @@ void AsyncEventSourceClient::_queueMessage(AsyncEventSourceMessage *dataMessage)
return; return;
} }
if(_messageQueue.length() >= SSE_MAX_QUEUED_MESSAGES){ if(_messageQueue.length() >= SSE_MAX_QUEUED_MESSAGES){
ets_printf("ERROR: Too many messages queued\n"); //ets_printf("ERROR: Too many messages queued\n");
delete dataMessage; delete dataMessage;
} else { } else {
_messageQueue.add(dataMessage); _messageQueue.add(dataMessage);

10
Software/src/lib/me-no-dev-ESPAsyncWebServer/src/AsyncWebSocket.cpp
View file

@ -548,7 +548,7 @@ void AsyncWebSocketClient::_queueMessage(AsyncWebSocketMessage *dataMessage){
return; return;
} }
if(_messageQueue.length() >= WS_MAX_QUEUED_MESSAGES){ if(_messageQueue.length() >= WS_MAX_QUEUED_MESSAGES){
ets_printf("ERROR: Too many messages queued\n"); //ets_printf("ERROR: Too many messages queued\n");
delete dataMessage; delete dataMessage;
} else { } else {
_messageQueue.add(dataMessage); _messageQueue.add(dataMessage);
@ -829,7 +829,7 @@ void AsyncWebSocketClient::binary(AsyncWebSocketMessageBuffer * buffer)
IPAddress AsyncWebSocketClient::remoteIP() { IPAddress AsyncWebSocketClient::remoteIP() {
if(!_client) { if(!_client) {
return IPAddress(0U); return IPAddress(static_cast<uint32_t>(0U));
} }
return _client->remoteIP(); return _client->remoteIP();
} }
@ -1259,9 +1259,9 @@ AsyncWebSocketResponse::AsyncWebSocketResponse(const String& key, AsyncWebSocket
(String&)key += WS_STR_UUID; (String&)key += WS_STR_UUID;
mbedtls_sha1_context ctx; mbedtls_sha1_context ctx;
mbedtls_sha1_init(&ctx); mbedtls_sha1_init(&ctx);
mbedtls_sha1_starts_ret(&ctx); mbedtls_sha1_starts(&ctx);
mbedtls_sha1_update_ret(&ctx, (const unsigned char*)key.c_str(), key.length()); mbedtls_sha1_update(&ctx, (const unsigned char*)key.c_str(), key.length());
mbedtls_sha1_finish_ret(&ctx, hash); mbedtls_sha1_finish(&ctx, hash);
mbedtls_sha1_free(&ctx); mbedtls_sha1_free(&ctx);
#endif #endif
base64_encodestate _state; base64_encodestate _state;

6
Software/src/lib/me-no-dev-ESPAsyncWebServer/src/WebAuthentication.cpp
View file

@ -71,9 +71,9 @@ static bool getMD5(uint8_t * data, uint16_t len, char * output){//33 bytes or mo
memset(_buf, 0x00, 16); memset(_buf, 0x00, 16);
#ifdef ESP32 #ifdef ESP32
mbedtls_md5_init(&_ctx); mbedtls_md5_init(&_ctx);
mbedtls_md5_starts_ret(&_ctx); mbedtls_md5_starts(&_ctx);
mbedtls_md5_update_ret(&_ctx, data, len); mbedtls_md5_update(&_ctx, data, len);
mbedtls_md5_finish_ret(&_ctx, _buf); mbedtls_md5_finish(&_ctx, _buf);
#else #else
MD5Init(&_ctx); MD5Init(&_ctx);
MD5Update(&_ctx, data, len); MD5Update(&_ctx, data, len);

10
Software/src/lib/miwagner-ESP32-Arduino-CAN/CAN.c
View file

@ -34,7 +34,7 @@
#include "freertos/FreeRTOS.h" #include "freertos/FreeRTOS.h"
#include "freertos/queue.h" #include "freertos/queue.h"
#include "esp_intr.h" #include "esp_intr_alloc.h" // Renamed when migrating ESP32 2.x -> 3.x
#include "soc/dport_reg.h" #include "soc/dport_reg.h"
#include <math.h> #include <math.h>
@ -43,6 +43,10 @@
#include "can_regdef.h" #include "can_regdef.h"
#include "CAN_config.h" #include "CAN_config.h"
#define TWAI_TX_IDX 123 // TODO: Are these OK?
// not sure what file is needed now, maybe "soc/gpio_sig_map.h" but using hard coded values for now
#define TWAI_RX_IDX 94 // TODO: Are these OK?
// CAN Filter - no acceptance filter // CAN Filter - no acceptance filter
static CAN_filter_t __filter = { Dual_Mode, 0, 0, 0, 0, 0Xff, 0Xff, 0Xff, 0Xff }; static CAN_filter_t __filter = { Dual_Mode, 0, 0, 0, 0, 0Xff, 0Xff, 0Xff, 0Xff };
@ -177,12 +181,12 @@ int CAN_init() {
// configure TX pin // configure TX pin
gpio_set_level(CAN_cfg.tx_pin_id, 1); gpio_set_level(CAN_cfg.tx_pin_id, 1);
gpio_set_direction(CAN_cfg.tx_pin_id, GPIO_MODE_OUTPUT); gpio_set_direction(CAN_cfg.tx_pin_id, GPIO_MODE_OUTPUT);
gpio_matrix_out(CAN_cfg.tx_pin_id, CAN_TX_IDX, 0, 0); gpio_matrix_out(CAN_cfg.tx_pin_id, TWAI_TX_IDX, 0, 0);
gpio_pad_select_gpio(CAN_cfg.tx_pin_id); gpio_pad_select_gpio(CAN_cfg.tx_pin_id);
// configure RX pin // configure RX pin
gpio_set_direction(CAN_cfg.rx_pin_id, GPIO_MODE_INPUT); gpio_set_direction(CAN_cfg.rx_pin_id, GPIO_MODE_INPUT);
gpio_matrix_in(CAN_cfg.rx_pin_id, CAN_RX_IDX, 0); gpio_matrix_in(CAN_cfg.rx_pin_id, TWAI_RX_IDX, 0);
gpio_pad_select_gpio(CAN_cfg.rx_pin_id); gpio_pad_select_gpio(CAN_cfg.rx_pin_id);
// set to PELICAN mode // set to PELICAN mode