dalathegreat · dalathegreat · Nov 7, 2023 · Nov 5, 2023 · Nov 5, 2023 · Nov 5, 2023
diff --git a/Software/Software.ino b/Software/Software.ino
@@ -3,23 +3,23 @@
 
 #include <Arduino.h>
 #include "HardwareSerial.h"
+#include "src/lib/adafruit-Adafruit_NeoPixel/Adafruit_NeoPixel.h"
+#include "src/lib/eModbus-eModbus/Logging.h"
+#include "src/lib/eModbus-eModbus/ModbusServerRTU.h"
+#include "src/lib/ThomasBarth-ESP32-CAN-Driver/CAN_config.h"
 #include "USER_SETTINGS.h"
-#include "config.h"
-#include "Logging.h"
-#include "mbServerFCs.h"
-#include "ModbusServerRTU.h"
-#include "ESP32CAN.h"
-#include "CAN_config.h"
-#include "Adafruit_NeoPixel.h"
-#include "BATTERIES.h"
-#include "INVERTERS.h"
+#include "src/devboard/config.h"
+#include "src/devboard/modbus/mbServerFCs.h"
+#include "src/devboard/can/ESP32CAN.h"
+#include "src/battery/BATTERIES.h"
+#include "src/inverter/INVERTERS.h"
 
 //CAN parameters
 CAN_device_t CAN_cfg; // CAN Config
 const int rx_queue_size = 10; // Receive Queue size
 
 #ifdef DUAL_CAN
-  #include "ACAN2515.h"
+  #include "src/lib/pierremolinaro-acan2515/ACAN2515.h"
   static const uint32_t QUARTZ_FREQUENCY = 8UL * 1000UL * 1000UL ; // 8 MHz
   ACAN2515 can(MCP2515_CS, SPI, MCP2515_INT);
   static ACAN2515_Buffer16 gBuffer;

diff --git a/Software/BATTERIES.h → Software/src/battery/BATTERIES.h b/Software/BATTERIES.h → Software/src/battery/BATTERIES.h
diff --git a/Software/BMW-I3-BATTERY.cpp → Software/src/battery/BMW-I3-BATTERY.cpp b/Software/BMW-I3-BATTERY.cpp → Software/src/battery/BMW-I3-BATTERY.cpp
@@ -1,6 +1,6 @@
 #include "BMW-I3-BATTERY.h"
-#include "ESP32CAN.h"
-#include "CAN_config.h"
+#include "../devboard/can/ESP32CAN.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/BMW-I3-BATTERY.h → Software/src/battery/BMW-I3-BATTERY.h b/Software/BMW-I3-BATTERY.h → Software/src/battery/BMW-I3-BATTERY.h
@@ -1,8 +1,8 @@
 #ifndef BMW_I3_BATTERY_H
 #define BMW_I3_BATTERY_H
 #include <Arduino.h>
-#include "ESP32CAN.h"
-#include "USER_SETTINGS.h"
+#include "../devboard/can/ESP32CAN.h"
+#include "../../USER_SETTINGS.h"
 
 #define ABSOLUTE_MAX_VOLTAGE 4040 // 404.4V,if battery voltage goes over this, charging is not possible (goes into forced discharge)
 #define ABSOLUTE_MIN_VOLTAGE 3100 // 310.0V if battery voltage goes under this, discharging further is disabled

diff --git a/Software/CHADEMO-BATTERY.cpp → Software/src/battery/CHADEMO-BATTERY.cpp b/Software/CHADEMO-BATTERY.cpp → Software/src/battery/CHADEMO-BATTERY.cpp
@@ -1,6 +1,6 @@
 #include "CHADEMO-BATTERY.h"
-#include "ESP32CAN.h"
-#include "CAN_config.h"
+#include "../devboard/can/ESP32CAN.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/CHADEMO-BATTERY.h → Software/src/battery/CHADEMO-BATTERY.h b/Software/CHADEMO-BATTERY.h → Software/src/battery/CHADEMO-BATTERY.h
@@ -1,8 +1,8 @@
 #ifndef CHADEMO_BATTERY_H
 #define CHADEMO_BATTERY_H
 #include <Arduino.h>
-#include "ESP32CAN.h"
-#include "USER_SETTINGS.h"
+#include "../devboard/can/ESP32CAN.h"
+#include "../../USER_SETTINGS.h"
 
 #define ABSOLUTE_MAX_VOLTAGE 4040 // 404.4V,if battery voltage goes over this, charging is not possible (goes into forced discharge)
 #define ABSOLUTE_MIN_VOLTAGE 3100 // 310.0V if battery voltage goes under this, discharging further is disabled

diff --git a/Software/IMIEV-CZERO-ION-BATTERY.cpp → ...e/src/battery/IMIEV-CZERO-ION-BATTERY.cpp b/Software/IMIEV-CZERO-ION-BATTERY.cpp → ...e/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 "../devboard/can/ESP32CAN.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/IMIEV-CZERO-ION-BATTERY.h → ...are/src/battery/IMIEV-CZERO-ION-BATTERY.h b/Software/IMIEV-CZERO-ION-BATTERY.h → ...are/src/battery/IMIEV-CZERO-ION-BATTERY.h
@@ -1,8 +1,8 @@
 #ifndef IMIEV_CZERO_ION_BATTERY_H
 #define IMIEV_CZERO_ION_BATTERY_H
 #include <Arduino.h>
-#include "ESP32CAN.h"
-#include "USER_SETTINGS.h"
+#include "../devboard/can/ESP32CAN.h"
+#include "../../USER_SETTINGS.h"
 
 #define ABSOLUTE_MAX_VOLTAGE 4040 // 404.4V,if battery voltage goes over this, charging is not possible (goes into forced discharge)
 #define ABSOLUTE_MIN_VOLTAGE 3100 // 310.0V if battery voltage goes under this, discharging further is disabled

diff --git a/Software/KIA-HYUNDAI-64-BATTERY.cpp → ...re/src/battery/KIA-HYUNDAI-64-BATTERY.cpp b/Software/KIA-HYUNDAI-64-BATTERY.cpp → ...re/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 "../devboard/can/ESP32CAN.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/KIA-HYUNDAI-64-BATTERY.h → ...ware/src/battery/KIA-HYUNDAI-64-BATTERY.h b/Software/KIA-HYUNDAI-64-BATTERY.h → ...ware/src/battery/KIA-HYUNDAI-64-BATTERY.h
@@ -1,8 +1,8 @@
 #ifndef KIA_HYUNDAI_64_BATTERY_H
 #define KIA_HYUNDAI_64_BATTERY_H
 #include <Arduino.h>
-#include "ESP32CAN.h"
-#include "USER_SETTINGS.h"
+#include "../devboard/can/ESP32CAN.h"
+#include "../../USER_SETTINGS.h"
 
 #define ABSOLUTE_MAX_VOLTAGE 4040 // 404.4V,if battery voltage goes over this, charging is not possible (goes into forced discharge)
 #define ABSOLUTE_MIN_VOLTAGE 3100 // 310.0V if battery voltage goes under this, discharging further is disabled

diff --git a/Software/NISSAN-LEAF-BATTERY.cpp → Software/src/battery/NISSAN-LEAF-BATTERY.cpp b/Software/NISSAN-LEAF-BATTERY.cpp → Software/src/battery/NISSAN-LEAF-BATTERY.cpp
@@ -1,6 +1,6 @@
 #include "NISSAN-LEAF-BATTERY.h"
-#include "ESP32CAN.h"
-#include "CAN_config.h"
+#include "../devboard/can/ESP32CAN.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/NISSAN-LEAF-BATTERY.h → Software/src/battery/NISSAN-LEAF-BATTERY.h b/Software/NISSAN-LEAF-BATTERY.h → Software/src/battery/NISSAN-LEAF-BATTERY.h
@@ -1,8 +1,8 @@
 #ifndef NISSAN_LEAF_BATTERY_H
 #define NISSAN_LEAF_BATTERY_H
 #include <Arduino.h>
-#include "ESP32CAN.h"
-#include "USER_SETTINGS.h"
+#include "../devboard/can/ESP32CAN.h"
+#include "../../USER_SETTINGS.h"
 
 #define ABSOLUTE_MAX_VOLTAGE 4040 // 404.4V,if battery voltage goes over this, charging is not possible (goes into forced discharge)
 #define ABSOLUTE_MIN_VOLTAGE 3100 // 310.0V if battery voltage goes under this, discharging further is disabled

diff --git a/Software/RENAULT-ZOE-BATTERY.cpp → Software/src/battery/RENAULT-ZOE-BATTERY.cpp b/Software/RENAULT-ZOE-BATTERY.cpp → Software/src/battery/RENAULT-ZOE-BATTERY.cpp
@@ -1,6 +1,6 @@
 #include "RENAULT-ZOE-BATTERY.h"
-#include "ESP32CAN.h"
-#include "CAN_config.h"
+#include "../devboard/can/ESP32CAN.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/RENAULT-ZOE-BATTERY.h → Software/src/battery/RENAULT-ZOE-BATTERY.h b/Software/RENAULT-ZOE-BATTERY.h → Software/src/battery/RENAULT-ZOE-BATTERY.h
@@ -1,8 +1,8 @@
 #ifndef RENAULT_ZOE_BATTERY_H
 #define RENAULT_ZOE_BATTERY_H
 #include <Arduino.h>
-#include "ESP32CAN.h"
-#include "USER_SETTINGS.h"
+#include "../devboard/can/ESP32CAN.h"
+#include "../../USER_SETTINGS.h"
 
 #define ABSOLUTE_MAX_VOLTAGE 4040 // 404.4V,if battery voltage goes over this, charging is not possible (goes into forced discharge)
 #define ABSOLUTE_MIN_VOLTAGE 3100 // 310.0V if battery voltage goes under this, discharging further is disabled

diff --git a/Software/TESLA-MODEL-3-BATTERY.cpp → ...are/src/battery/TESLA-MODEL-3-BATTERY.cpp b/Software/TESLA-MODEL-3-BATTERY.cpp → ...are/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 "../devboard/can/ESP32CAN.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/TESLA-MODEL-3-BATTERY.h → Software/src/battery/TESLA-MODEL-3-BATTERY.h b/Software/TESLA-MODEL-3-BATTERY.h → Software/src/battery/TESLA-MODEL-3-BATTERY.h
@@ -1,8 +1,8 @@
 #ifndef TESLA_MODEL_3_BATTERY_H
 #define TESLA_MODEL_3_BATTERY_H
 #include <Arduino.h>
-#include "ESP32CAN.h"
-#include "USER_SETTINGS.h"
+#include "../devboard/can/ESP32CAN.h"
+#include "../../USER_SETTINGS.h"
 
 #define ABSOLUTE_MAX_VOLTAGE 4030 // 403.0V,if battery voltage goes over this, charging is not possible (goes into forced discharge)
 #define ABSOLUTE_MIN_VOLTAGE 2450 // 245.0V if battery voltage goes under this, discharging further is disabled

diff --git a/Software/ESP32CAN.cpp → Software/src/devboard/can/ESP32CAN.cpp b/Software/ESP32CAN.cpp → Software/src/devboard/can/ESP32CAN.cpp
diff --git a/Software/ESP32CAN.h → Software/src/devboard/can/ESP32CAN.h b/Software/ESP32CAN.h → Software/src/devboard/can/ESP32CAN.h
@@ -1,8 +1,8 @@
 #ifndef ESP32CAN_H
 #define ESP32CAN_H
 
-#include "CAN_config.h"
-#include "CAN.h"
+#include "../../lib/ThomasBarth-ESP32-CAN-Driver/CAN_config.h"
+#include "../../lib/ThomasBarth-ESP32-CAN-Driver/CAN.h"
 extern uint8_t LEDcolor;
 
 class ESP32CAN

diff --git a/Software/config.h → Software/src/devboard/config.h b/Software/config.h → Software/src/devboard/config.h
diff --git a/Software/debug.cfg → Software/src/devboard/debug/debug.cfg b/Software/debug.cfg → Software/src/devboard/debug/debug.cfg
diff --git a/Software/debug_custom.json → ...ware/src/devboard/debug/debug_custom.json b/Software/debug_custom.json → ...ware/src/devboard/debug/debug_custom.json
diff --git a/Software/esp.c → Software/src/devboard/esp.c b/Software/esp.c → Software/src/devboard/esp.c
diff --git a/Software/esp32.svd → Software/src/devboard/esp32.svd b/Software/esp32.svd → Software/src/devboard/esp32.svd
diff --git a/Software/mbServerFCs.cpp → Software/src/devboard/modbus/mbServerFCs.cpp b/Software/mbServerFCs.cpp → Software/src/devboard/modbus/mbServerFCs.cpp
@@ -1,5 +1,5 @@
 #include "mbServerFCs.h"
-#include "Logging.h"
+#include "../../lib/eModbus-eModbus/Logging.h"
 
 //modbus register memory - declared in main.cpp
 

diff --git a/Software/mbServerFCs.h → Software/src/devboard/modbus/mbServerFCs.h b/Software/mbServerFCs.h → Software/src/devboard/modbus/mbServerFCs.h
@@ -1,4 +1,4 @@
-#include "ModbusServerRTU.h"
+#include "../../lib/eModbus-eModbus/ModbusServerRTU.h"
 
 #define MBTCP_ID 21 // modbus TCP server ID
 #define MBPV_MAX 30000

diff --git a/Software/BYD-CAN.cpp → Software/src/inverter/BYD-CAN.cpp b/Software/BYD-CAN.cpp → Software/src/inverter/BYD-CAN.cpp
@@ -1,6 +1,6 @@
 #include "BYD-CAN.h"
-#include "ESP32CAN.h"
-#include "CAN_config.h"
+#include "../devboard/can/ESP32CAN.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/BYD-CAN.h → Software/src/inverter/BYD-CAN.h b/Software/BYD-CAN.h → Software/src/inverter/BYD-CAN.h
@@ -1,8 +1,8 @@
 #ifndef BYD_CAN_H
 #define BYD_CAN_H
 #include <Arduino.h>
-#include "ESP32CAN.h"
-#include "USER_SETTINGS.h"
+#include "../devboard/can/ESP32CAN.h"
+#include "../../USER_SETTINGS.h"
 
 extern uint16_t SOC;
 extern uint16_t StateOfHealth;

diff --git a/Software/INVERTERS.h → Software/src/inverter/INVERTERS.h b/Software/INVERTERS.h → Software/src/inverter/INVERTERS.h
diff --git a/Software/MODBUS-BYD.cpp → Software/src/inverter/MODBUS-BYD.cpp b/Software/MODBUS-BYD.cpp → Software/src/inverter/MODBUS-BYD.cpp
diff --git a/Software/MODBUS-BYD.h → Software/src/inverter/MODBUS-BYD.h b/Software/MODBUS-BYD.h → Software/src/inverter/MODBUS-BYD.h
diff --git a/Software/MODBUS-LUNA2000.cpp → Software/src/inverter/MODBUS-LUNA2000.cpp b/Software/MODBUS-LUNA2000.cpp → Software/src/inverter/MODBUS-LUNA2000.cpp
diff --git a/Software/MODBUS-LUNA2000.h → Software/src/inverter/MODBUS-LUNA2000.h b/Software/MODBUS-LUNA2000.h → Software/src/inverter/MODBUS-LUNA2000.h
diff --git a/Software/PYLON-CAN.cpp → Software/src/inverter/PYLON-CAN.cpp b/Software/PYLON-CAN.cpp → Software/src/inverter/PYLON-CAN.cpp
@@ -1,6 +1,6 @@
 #include "PYLON-CAN.h"
-#include "ESP32CAN.h"
-#include "CAN_config.h"
+#include "../devboard/can/ESP32CAN.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/PYLON-CAN.h → Software/src/inverter/PYLON-CAN.h b/Software/PYLON-CAN.h → Software/src/inverter/PYLON-CAN.h
@@ -1,8 +1,8 @@
 #ifndef PYLON_CAN_H
 #define PYLON_CAN_H
 #include <Arduino.h>
-#include "ESP32CAN.h"
-#include "USER_SETTINGS.h"
+#include "../devboard/can/ESP32CAN.h"
+#include "../../USER_SETTINGS.h"
 
 extern uint16_t SOC;
 extern uint16_t StateOfHealth;

diff --git a/Software/SMA-CAN.cpp → Software/src/inverter/SMA-CAN.cpp b/Software/SMA-CAN.cpp → Software/src/inverter/SMA-CAN.cpp
@@ -1,6 +1,6 @@
 #include "SMA-CAN.h"
-#include "ESP32CAN.h"
-#include "CAN_config.h"
+#include "../devboard/can/ESP32CAN.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/SMA-CAN.h → Software/src/inverter/SMA-CAN.h b/Software/SMA-CAN.h → Software/src/inverter/SMA-CAN.h
@@ -1,8 +1,8 @@
 #ifndef SMA_CAN_H
 #define SMA_CAN_H
 #include <Arduino.h>
-#include "ESP32CAN.h"
-#include "USER_SETTINGS.h"
+#include "../devboard/can/ESP32CAN.h"
+#include "../../USER_SETTINGS.h"
 
 extern uint16_t SOC;						            //SOC%, 0-100.00 (0-10000)
 extern uint16_t StateOfHealth; 				      //SOH%, 0-100.00 (0-10000)

diff --git a/Software/SOFAR-CAN.cpp → Software/src/inverter/SOFAR-CAN.cpp b/Software/SOFAR-CAN.cpp → Software/src/inverter/SOFAR-CAN.cpp
@@ -1,6 +1,6 @@
 #include "SOFAR-CAN.h"
-#include "ESP32CAN.h"
-#include "CAN_config.h"
+#include "../devboard/can/ESP32CAN.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/SOFAR-CAN.h → Software/src/inverter/SOFAR-CAN.h b/Software/SOFAR-CAN.h → Software/src/inverter/SOFAR-CAN.h
@@ -1,8 +1,8 @@
 #ifndef SOFAR_CAN_H
 #define SOFAR_CAN_H
 #include <Arduino.h>
-#include "ESP32CAN.h"
-#include "USER_SETTINGS.h"
+#include "../devboard/can/ESP32CAN.h"
+#include "../../USER_SETTINGS.h"
 
 // These parameters need to be mapped for the inverter
 extern uint16_t SOC;                          //SOC%, 0-100.00 (0-10000)

diff --git a/Software/SOLAX-CAN.cpp → Software/src/inverter/SOLAX-CAN.cpp b/Software/SOLAX-CAN.cpp → Software/src/inverter/SOLAX-CAN.cpp
diff --git a/Software/SOLAX-CAN.h → Software/src/inverter/SOLAX-CAN.h b/Software/SOLAX-CAN.h → Software/src/inverter/SOLAX-CAN.h
@@ -1,11 +1,11 @@
 #ifndef SOLAX_CAN_H
 #define SOLAX_CAN_H
 #include <Arduino.h>
-#include "ESP32CAN.h"
-#include "config.h"
-#include "USER_SETTINGS.h"
+#include "../devboard/can/ESP32CAN.h"
+#include "../devboard/config.h"
+#include "../../USER_SETTINGS.h"
 
-#include "ACAN2515.h"
+#include "../lib/pierremolinaro-acan2515/ACAN2515.h"
 extern ACAN2515 can;
 
 extern uint16_t SOC;

diff --git a/Software/CAN.c → ...rc/lib/ThomasBarth-ESP32-CAN-Driver/CAN.c b/Software/CAN.c → ...rc/lib/ThomasBarth-ESP32-CAN-Driver/CAN.c
diff --git a/Software/CAN.h → ...rc/lib/ThomasBarth-ESP32-CAN-Driver/CAN.h b/Software/CAN.h → ...rc/lib/ThomasBarth-ESP32-CAN-Driver/CAN.h
diff --git a/Software/CAN_config.h → ...ThomasBarth-ESP32-CAN-Driver/CAN_config.h b/Software/CAN_config.h → ...ThomasBarth-ESP32-CAN-Driver/CAN_config.h
diff --git a/Software/can_regdef.h → ...ThomasBarth-ESP32-CAN-Driver/can_regdef.h b/Software/can_regdef.h → ...ThomasBarth-ESP32-CAN-Driver/can_regdef.h
diff --git a/Software/Adafruit_NeoPixel.cpp → ...t-Adafruit_NeoPixel/Adafruit_NeoPixel.cpp b/Software/Adafruit_NeoPixel.cpp → ...t-Adafruit_NeoPixel/Adafruit_NeoPixel.cpp
diff --git a/Software/Adafruit_NeoPixel.h → ...uit-Adafruit_NeoPixel/Adafruit_NeoPixel.h b/Software/Adafruit_NeoPixel.h → ...uit-Adafruit_NeoPixel/Adafruit_NeoPixel.h
diff --git a/Software/CoilData.cpp → ...ware/src/lib/eModbus-eModbus/CoilData.cpp b/Software/CoilData.cpp → ...ware/src/lib/eModbus-eModbus/CoilData.cpp
diff --git a/Software/CoilData.h → Software/src/lib/eModbus-eModbus/CoilData.h b/Software/CoilData.h → Software/src/lib/eModbus-eModbus/CoilData.h
diff --git a/Software/Logging.cpp → Software/src/lib/eModbus-eModbus/Logging.cpp b/Software/Logging.cpp → Software/src/lib/eModbus-eModbus/Logging.cpp
diff --git a/Software/Logging.h → Software/src/lib/eModbus-eModbus/Logging.h b/Software/Logging.h → Software/src/lib/eModbus-eModbus/Logging.h
diff --git a/Software/ModbusBridgeEthernet.h → ...ib/eModbus-eModbus/ModbusBridgeEthernet.h b/Software/ModbusBridgeEthernet.h → ...ib/eModbus-eModbus/ModbusBridgeEthernet.h
diff --git a/Software/ModbusBridgeRTU.h → ...src/lib/eModbus-eModbus/ModbusBridgeRTU.h b/Software/ModbusBridgeRTU.h → ...src/lib/eModbus-eModbus/ModbusBridgeRTU.h
diff --git a/Software/ModbusBridgeTemp.h → ...rc/lib/eModbus-eModbus/ModbusBridgeTemp.h b/Software/ModbusBridgeTemp.h → ...rc/lib/eModbus-eModbus/ModbusBridgeTemp.h
diff --git a/Software/ModbusBridgeWiFi.h → ...rc/lib/eModbus-eModbus/ModbusBridgeWiFi.h b/Software/ModbusBridgeWiFi.h → ...rc/lib/eModbus-eModbus/ModbusBridgeWiFi.h
diff --git a/Software/ModbusClient.cpp → .../src/lib/eModbus-eModbus/ModbusClient.cpp b/Software/ModbusClient.cpp → .../src/lib/eModbus-eModbus/ModbusClient.cpp
diff --git a/Software/ModbusClient.h → ...re/src/lib/eModbus-eModbus/ModbusClient.h b/Software/ModbusClient.h → ...re/src/lib/eModbus-eModbus/ModbusClient.h
diff --git a/Software/ModbusClientRTU.cpp → ...c/lib/eModbus-eModbus/ModbusClientRTU.cpp b/Software/ModbusClientRTU.cpp → ...c/lib/eModbus-eModbus/ModbusClientRTU.cpp
diff --git a/Software/ModbusClientRTU.h → ...src/lib/eModbus-eModbus/ModbusClientRTU.h b/Software/ModbusClientRTU.h → ...src/lib/eModbus-eModbus/ModbusClientRTU.h
diff --git a/Software/ModbusError.h → ...are/src/lib/eModbus-eModbus/ModbusError.h b/Software/ModbusError.h → ...are/src/lib/eModbus-eModbus/ModbusError.h
diff --git a/Software/ModbusMessage.cpp → ...src/lib/eModbus-eModbus/ModbusMessage.cpp b/Software/ModbusMessage.cpp → ...src/lib/eModbus-eModbus/ModbusMessage.cpp
diff --git a/Software/ModbusMessage.h → ...e/src/lib/eModbus-eModbus/ModbusMessage.h b/Software/ModbusMessage.h → ...e/src/lib/eModbus-eModbus/ModbusMessage.h
diff --git a/Software/ModbusServer.cpp → .../src/lib/eModbus-eModbus/ModbusServer.cpp b/Software/ModbusServer.cpp → .../src/lib/eModbus-eModbus/ModbusServer.cpp
diff --git a/Software/ModbusServer.h → ...re/src/lib/eModbus-eModbus/ModbusServer.h b/Software/ModbusServer.h → ...re/src/lib/eModbus-eModbus/ModbusServer.h
diff --git a/Software/ModbusServerEthernet.h → ...ib/eModbus-eModbus/ModbusServerEthernet.h b/Software/ModbusServerEthernet.h → ...ib/eModbus-eModbus/ModbusServerEthernet.h
diff --git a/Software/ModbusServerRTU.cpp → ...c/lib/eModbus-eModbus/ModbusServerRTU.cpp b/Software/ModbusServerRTU.cpp → ...c/lib/eModbus-eModbus/ModbusServerRTU.cpp
diff --git a/Software/ModbusServerRTU.h → ...src/lib/eModbus-eModbus/ModbusServerRTU.h b/Software/ModbusServerRTU.h → ...src/lib/eModbus-eModbus/ModbusServerRTU.h
diff --git a/Software/ModbusServerWiFi.h → ...rc/lib/eModbus-eModbus/ModbusServerWiFi.h b/Software/ModbusServerWiFi.h → ...rc/lib/eModbus-eModbus/ModbusServerWiFi.h
diff --git a/Software/ModbusTypeDefs.cpp → ...rc/lib/eModbus-eModbus/ModbusTypeDefs.cpp b/Software/ModbusTypeDefs.cpp → ...rc/lib/eModbus-eModbus/ModbusTypeDefs.cpp
diff --git a/Software/ModbusTypeDefs.h → .../src/lib/eModbus-eModbus/ModbusTypeDefs.h b/Software/ModbusTypeDefs.h → .../src/lib/eModbus-eModbus/ModbusTypeDefs.h
diff --git a/Software/RTUutils.cpp → ...ware/src/lib/eModbus-eModbus/RTUutils.cpp b/Software/RTUutils.cpp → ...ware/src/lib/eModbus-eModbus/RTUutils.cpp
diff --git a/Software/RTUutils.h → Software/src/lib/eModbus-eModbus/RTUutils.h b/Software/RTUutils.h → Software/src/lib/eModbus-eModbus/RTUutils.h
diff --git a/Software/options.h → Software/src/lib/eModbus-eModbus/options.h b/Software/options.h → Software/src/lib/eModbus-eModbus/options.h
diff --git a/Software/ACAN2515.cpp → .../lib/pierremolinaro-acan2515/ACAN2515.cpp b/Software/ACAN2515.cpp → .../lib/pierremolinaro-acan2515/ACAN2515.cpp
diff --git a/Software/ACAN2515.h → ...rc/lib/pierremolinaro-acan2515/ACAN2515.h b/Software/ACAN2515.h → ...rc/lib/pierremolinaro-acan2515/ACAN2515.h
diff --git a/Software/ACAN2515Settings.cpp → ...rremolinaro-acan2515/ACAN2515Settings.cpp b/Software/ACAN2515Settings.cpp → ...rremolinaro-acan2515/ACAN2515Settings.cpp
diff --git a/Software/ACAN2515Settings.h → ...ierremolinaro-acan2515/ACAN2515Settings.h b/Software/ACAN2515Settings.h → ...ierremolinaro-acan2515/ACAN2515Settings.h
diff --git a/Software/ACAN2515_Buffer16.h → ...erremolinaro-acan2515/ACAN2515_Buffer16.h b/Software/ACAN2515_Buffer16.h → ...erremolinaro-acan2515/ACAN2515_Buffer16.h
diff --git a/Software/ACANBuffer.h → .../lib/pierremolinaro-acan2515/ACANBuffer.h b/Software/ACANBuffer.h → .../lib/pierremolinaro-acan2515/ACANBuffer.h
diff --git a/Software/CANMessage.h → .../lib/pierremolinaro-acan2515/CANMessage.h b/Software/CANMessage.h → .../lib/pierremolinaro-acan2515/CANMessage.h
diff --git a/Software/MCP2515ReceiveFilters.h → ...molinaro-acan2515/MCP2515ReceiveFilters.h b/Software/MCP2515ReceiveFilters.h → ...molinaro-acan2515/MCP2515ReceiveFilters.h