From ead4b805e264eebe9c3fdceffef1ffdec018b1eb Mon Sep 17 00:00:00 2001 From: lenvm Date: Mon, 6 Nov 2023 00:26:28 +0100 Subject: [PATCH] add lib/ThomasBarth-ESP32-CAN-Driver --- Software/ESP32CAN.h | 4 ++-- Software/Software.ino | 2 +- Software/src/battery/BMW-I3-BATTERY.cpp | 2 +- Software/src/battery/CHADEMO-BATTERY.cpp | 2 +- Software/src/battery/IMIEV-CZERO-ION-BATTERY.cpp | 2 +- Software/src/battery/KIA-HYUNDAI-64-BATTERY.cpp | 2 +- Software/src/battery/NISSAN-LEAF-BATTERY.cpp | 2 +- Software/src/battery/RENAULT-ZOE-BATTERY.cpp | 2 +- Software/src/battery/TESLA-MODEL-3-BATTERY.cpp | 2 +- Software/src/inverter/BYD-CAN.cpp | 2 +- Software/src/inverter/PYLON-CAN.cpp | 2 +- Software/src/inverter/SMA-CAN.cpp | 2 +- Software/src/inverter/SOFAR-CAN.cpp | 2 +- Software/{ => src/lib/ThomasBarth-ESP32-CAN-Driver}/CAN.c | 0 Software/{ => src/lib/ThomasBarth-ESP32-CAN-Driver}/CAN.h | 0 .../{ => src/lib/ThomasBarth-ESP32-CAN-Driver}/CAN_config.h | 0 .../{ => src/lib/ThomasBarth-ESP32-CAN-Driver}/can_regdef.h | 0 17 files changed, 14 insertions(+), 14 deletions(-) rename Software/{ => src/lib/ThomasBarth-ESP32-CAN-Driver}/CAN.c (100%) rename Software/{ => src/lib/ThomasBarth-ESP32-CAN-Driver}/CAN.h (100%) rename Software/{ => src/lib/ThomasBarth-ESP32-CAN-Driver}/CAN_config.h (100%) rename Software/{ => src/lib/ThomasBarth-ESP32-CAN-Driver}/can_regdef.h (100%) diff --git a/Software/ESP32CAN.h b/Software/ESP32CAN.h index 2cdde6bc..70e8ff3d 100644 --- a/Software/ESP32CAN.h +++ b/Software/ESP32CAN.h @@ -1,8 +1,8 @@ #ifndef ESP32CAN_H #define ESP32CAN_H -#include "CAN_config.h" -#include "CAN.h" +#include "src/lib/ThomasBarth-ESP32-CAN-Driver/CAN_config.h" +#include "src/lib/ThomasBarth-ESP32-CAN-Driver/CAN.h" extern uint8_t LEDcolor; class ESP32CAN diff --git a/Software/Software.ino b/Software/Software.ino index b1cb533b..9f9621db 100644 --- a/Software/Software.ino +++ b/Software/Software.ino @@ -9,7 +9,7 @@ #include "mbServerFCs.h" #include "ModbusServerRTU.h" #include "ESP32CAN.h" -#include "CAN_config.h" +#include "src/lib/ThomasBarth-ESP32-CAN-Driver/CAN_config.h" #include "src/lib/adafruit-Adafruit_NeoPixel/Adafruit_NeoPixel.h" #include "src/battery/BATTERIES.h" #include "src/inverter/INVERTERS.h" diff --git a/Software/src/battery/BMW-I3-BATTERY.cpp b/Software/src/battery/BMW-I3-BATTERY.cpp index 2f8ddd8b..c4b9c278 100644 --- a/Software/src/battery/BMW-I3-BATTERY.cpp +++ b/Software/src/battery/BMW-I3-BATTERY.cpp @@ -1,6 +1,6 @@ #include "BMW-I3-BATTERY.h" #include "../../ESP32CAN.h" -#include "../../CAN_config.h" +#include "../lib/ThomasBarth-ESP32-CAN-Driver/CAN_config.h" //TODO before using // Map the final values in update_values_i3_battery, set some to static values if not available (current, discharge max , charge max) diff --git a/Software/src/battery/CHADEMO-BATTERY.cpp b/Software/src/battery/CHADEMO-BATTERY.cpp index 9933d22a..ce770e06 100644 --- a/Software/src/battery/CHADEMO-BATTERY.cpp +++ b/Software/src/battery/CHADEMO-BATTERY.cpp @@ -1,6 +1,6 @@ #include "CHADEMO-BATTERY.h" #include "../../ESP32CAN.h" -#include "../../CAN_config.h" +#include "../lib/ThomasBarth-ESP32-CAN-Driver/CAN_config.h" /* Do not change code below unless you are sure what you are doing */ static unsigned long previousMillis100 = 0; // will store last time a 100ms CAN Message was send diff --git a/Software/src/battery/IMIEV-CZERO-ION-BATTERY.cpp b/Software/src/battery/IMIEV-CZERO-ION-BATTERY.cpp index eed4cb3c..168e51b9 100644 --- a/Software/src/battery/IMIEV-CZERO-ION-BATTERY.cpp +++ b/Software/src/battery/IMIEV-CZERO-ION-BATTERY.cpp @@ -1,6 +1,6 @@ #include "IMIEV-CZERO-ION-BATTERY.h" #include "../../ESP32CAN.h" -#include "../../CAN_config.h" +#include "../lib/ThomasBarth-ESP32-CAN-Driver/CAN_config.h" //Code still work in progress, TODO: //Figure out if CAN messages need to be sent to keep the system happy? diff --git a/Software/src/battery/KIA-HYUNDAI-64-BATTERY.cpp b/Software/src/battery/KIA-HYUNDAI-64-BATTERY.cpp index b77fc8de..4af8cdac 100644 --- a/Software/src/battery/KIA-HYUNDAI-64-BATTERY.cpp +++ b/Software/src/battery/KIA-HYUNDAI-64-BATTERY.cpp @@ -1,6 +1,6 @@ #include "KIA-HYUNDAI-64-BATTERY.h" #include "../../ESP32CAN.h" -#include "../../CAN_config.h" +#include "../lib/ThomasBarth-ESP32-CAN-Driver/CAN_config.h" /* Do not change code below unless you are sure what you are doing */ static unsigned long previousMillis10 = 0; // will store last time a 10ms CAN Message was send diff --git a/Software/src/battery/NISSAN-LEAF-BATTERY.cpp b/Software/src/battery/NISSAN-LEAF-BATTERY.cpp index 04ca7ed4..95279217 100644 --- a/Software/src/battery/NISSAN-LEAF-BATTERY.cpp +++ b/Software/src/battery/NISSAN-LEAF-BATTERY.cpp @@ -1,6 +1,6 @@ #include "NISSAN-LEAF-BATTERY.h" #include "../../ESP32CAN.h" -#include "../../CAN_config.h" +#include "../lib/ThomasBarth-ESP32-CAN-Driver/CAN_config.h" /* Do not change code below unless you are sure what you are doing */ static unsigned long previousMillis10 = 0; // will store last time a 10ms CAN Message was send diff --git a/Software/src/battery/RENAULT-ZOE-BATTERY.cpp b/Software/src/battery/RENAULT-ZOE-BATTERY.cpp index 9946e275..36d32446 100644 --- a/Software/src/battery/RENAULT-ZOE-BATTERY.cpp +++ b/Software/src/battery/RENAULT-ZOE-BATTERY.cpp @@ -1,6 +1,6 @@ #include "RENAULT-ZOE-BATTERY.h" #include "../../ESP32CAN.h" -#include "../../CAN_config.h" +#include "../lib/ThomasBarth-ESP32-CAN-Driver/CAN_config.h" /* Do not change code below unless you are sure what you are doing */ #define LB_MAX_SOC 1000 //BMS never goes over this value. We use this info to rescale SOC% sent to Fronius diff --git a/Software/src/battery/TESLA-MODEL-3-BATTERY.cpp b/Software/src/battery/TESLA-MODEL-3-BATTERY.cpp index fb5d5c9e..21dc21ff 100644 --- a/Software/src/battery/TESLA-MODEL-3-BATTERY.cpp +++ b/Software/src/battery/TESLA-MODEL-3-BATTERY.cpp @@ -1,6 +1,6 @@ #include "TESLA-MODEL-3-BATTERY.h" #include "../../ESP32CAN.h" -#include "../../CAN_config.h" +#include "../lib/ThomasBarth-ESP32-CAN-Driver/CAN_config.h" /* Do not change code below unless you are sure what you are doing */ /* Credits: Most of the code comes from Per Carlen's bms_comms_tesla_model3.py (https://gitlab.com/pelle8/batt2gen24/) */ diff --git a/Software/src/inverter/BYD-CAN.cpp b/Software/src/inverter/BYD-CAN.cpp index 11ea1c93..7c8cf292 100644 --- a/Software/src/inverter/BYD-CAN.cpp +++ b/Software/src/inverter/BYD-CAN.cpp @@ -1,6 +1,6 @@ #include "BYD-CAN.h" #include "../../ESP32CAN.h" -#include "../../CAN_config.h" +#include "../lib/ThomasBarth-ESP32-CAN-Driver/CAN_config.h" /* Do not change code below unless you are sure what you are doing */ static unsigned long previousMillis2s = 0; // will store last time a 2s CAN Message was send diff --git a/Software/src/inverter/PYLON-CAN.cpp b/Software/src/inverter/PYLON-CAN.cpp index 73476b4a..b5f13082 100644 --- a/Software/src/inverter/PYLON-CAN.cpp +++ b/Software/src/inverter/PYLON-CAN.cpp @@ -1,6 +1,6 @@ #include "PYLON-CAN.h" #include "../../ESP32CAN.h" -#include "../../CAN_config.h" +#include "../lib/ThomasBarth-ESP32-CAN-Driver/CAN_config.h" #define SEND_0 //If defined, the messages will have ID ending with 0 (useful for some inverters) //#define SEND_1 //If defined, the messages will have ID ending with 1 (useful for some inverters) diff --git a/Software/src/inverter/SMA-CAN.cpp b/Software/src/inverter/SMA-CAN.cpp index 6ebf5501..0f4d6eb4 100644 --- a/Software/src/inverter/SMA-CAN.cpp +++ b/Software/src/inverter/SMA-CAN.cpp @@ -1,6 +1,6 @@ #include "SMA-CAN.h" #include "../../ESP32CAN.h" -#include "../../CAN_config.h" +#include "../lib/ThomasBarth-ESP32-CAN-Driver/CAN_config.h" //TODO, change CAN sending routine once confirmed that 500ms interval is OK for this battery type diff --git a/Software/src/inverter/SOFAR-CAN.cpp b/Software/src/inverter/SOFAR-CAN.cpp index 4e88449d..a3a4c7f5 100644 --- a/Software/src/inverter/SOFAR-CAN.cpp +++ b/Software/src/inverter/SOFAR-CAN.cpp @@ -1,6 +1,6 @@ #include "SOFAR-CAN.h" #include "../../ESP32CAN.h" -#include "../../CAN_config.h" +#include "../lib/ThomasBarth-ESP32-CAN-Driver/CAN_config.h" /* This implementation of the SOFAR can protocol is halfway done. What's missing is implementing the inverter replies, all the CAN messages are listed, but the can sending is missing. */ diff --git a/Software/CAN.c b/Software/src/lib/ThomasBarth-ESP32-CAN-Driver/CAN.c similarity index 100% rename from Software/CAN.c rename to Software/src/lib/ThomasBarth-ESP32-CAN-Driver/CAN.c diff --git a/Software/CAN.h b/Software/src/lib/ThomasBarth-ESP32-CAN-Driver/CAN.h similarity index 100% rename from Software/CAN.h rename to Software/src/lib/ThomasBarth-ESP32-CAN-Driver/CAN.h diff --git a/Software/CAN_config.h b/Software/src/lib/ThomasBarth-ESP32-CAN-Driver/CAN_config.h similarity index 100% rename from Software/CAN_config.h rename to Software/src/lib/ThomasBarth-ESP32-CAN-Driver/CAN_config.h diff --git a/Software/can_regdef.h b/Software/src/lib/ThomasBarth-ESP32-CAN-Driver/can_regdef.h similarity index 100% rename from Software/can_regdef.h rename to Software/src/lib/ThomasBarth-ESP32-CAN-Driver/can_regdef.h