Remove include.h, does not build yet

Software/Software.ino

@@ -26,7 +26,10 @@
 #include "src/devboard/utils/value_mapping.h"
 #include "src/devboard/webserver/webserver.h"
 #include "src/devboard/wifi/wifi.h"
-#include "src/include.h"
+
+#if !defined(HW_LILYGO) && !defined(HW_STARK) && !defined(HW_3LB) && !defined(HW_DEVKIT)
+#error You must select a target hardware in the USER_SETTINGS.h file!
+#endif
 
 #ifdef PERIODIC_BMS_RESET_AT
 #include "src/devboard/utils/ntp_time.h"

Software/src/battery/BATTERIES.cpp

@@ -1,5 +1,4 @@
-#include "../include.h"
+#include "BATTERIES.h"
-
 #include "../datalayer/datalayer_extended.h"
 #include "CanBattery.h"
 #include "RS485Battery.h"

Software/src/battery/BMW-I3-BATTERY.cpp

@@ -3,7 +3,6 @@
 #include "../datalayer/datalayer.h"
 #include "../datalayer/datalayer_extended.h"
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 /* Do not change code below unless you are sure what you are doing */
 

Software/src/battery/BMW-I3-BATTERY.h

@@ -2,7 +2,6 @@
 #define BMW_I3_BATTERY_H
 
 #include "../datalayer/datalayer.h"
-#include "../include.h"
 #include "BMW-I3-HTML.h"
 #include "CanBattery.h"
 

Software/src/battery/BMW-I3-HTML.cpp

@@ -1,5 +1,4 @@
 #include "BMW-I3-HTML.h"
-#include "../include.h"
 #include "BMW-I3-BATTERY.h"
 
 // Helper function for safe array access

Software/src/battery/BMW-IX-BATTERY.cpp

@@ -3,7 +3,6 @@
 #include "../datalayer/datalayer.h"
 #include "../datalayer/datalayer_extended.h"
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 // Function to check if a value has gone stale over a specified time period
 bool BmwIXBattery::isStale(int16_t currentValue, uint16_t& lastValue, unsigned long& lastChangeTime) {

Software/src/battery/BMW-IX-BATTERY.h

@@ -1,7 +1,6 @@
 #ifndef BMW_IX_BATTERY_H
 #define BMW_IX_BATTERY_H
 #include <Arduino.h>
-#include "../include.h"
 #include "BMW-IX-HTML.h"
 #include "CanBattery.h"
 

Software/src/battery/BMW-IX-HTML.cpp

@@ -1,5 +1,4 @@
 #include "BMW-IX-HTML.h"
-#include "../include.h"
 #include "BMW-IX-BATTERY.h"
 
 String BmwIXHtmlRenderer::get_status_html() {

Software/src/battery/BMW-PHEV-BATTERY.cpp

@@ -3,7 +3,6 @@
 #include "../datalayer/datalayer.h"
 #include "../datalayer/datalayer_extended.h"
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 const unsigned char crc8_table[256] =
     {  // CRC8_SAE_J1850_ZER0 formula,0x1D Poly,initial value 0x3F,Final XOR value varies

Software/src/battery/BMW-PHEV-BATTERY.h

@@ -1,7 +1,6 @@
 #ifndef BMW_PHEV_BATTERY_H
 #define BMW_PHEV_BATTERY_H
 #include <Arduino.h>
-#include "../include.h"
 #include "BMW-PHEV-HTML.h"
 #include "CanBattery.h"
 

Software/src/battery/BMW-SBOX.cpp

@@ -1,7 +1,6 @@
 #include "BMW-SBOX.h"
 #include "../communication/can/comm_can.h"
 #include "../datalayer/datalayer.h"
-#include "../include.h"
 
 uint8_t reverse_bits(uint8_t byte) {
   uint8_t reversed = 0;

Software/src/battery/BMW-SBOX.h

@@ -1,6 +1,5 @@
 #ifndef BMW_SBOX_CONTROL_H
 #define BMW_SBOX_CONTROL_H
-#include "../include.h"
 
 #ifdef BMW_SBOX
 #define SELECTED_SHUNT_CLASS BmwSbox

Software/src/battery/BOLT-AMPERA-BATTERY.cpp

@@ -3,7 +3,6 @@
 #include "../datalayer/datalayer.h"
 #include "../datalayer/datalayer_extended.h"
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 /*
 TODOs left for this implementation

Software/src/battery/BOLT-AMPERA-BATTERY.h

@@ -1,7 +1,6 @@
 #ifndef BOLT_AMPERA_BATTERY_H
 #define BOLT_AMPERA_BATTERY_H
 #include <Arduino.h>
-#include "../include.h"
 
 #include "BOLT-AMPERA-HTML.h"
 #include "CanBattery.h"

Software/src/battery/BYD-ATTO-3-BATTERY.cpp

@@ -3,7 +3,6 @@
 #include "../datalayer/datalayer.h"
 #include "../datalayer/datalayer_extended.h"
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 /* Notes
 SOC% by default is now ESTIMATED.

Software/src/battery/BYD-ATTO-3-BATTERY.h

@@ -3,7 +3,6 @@
 
 #include "../datalayer/datalayer.h"
 #include "../datalayer/datalayer_extended.h"
-#include "../include.h"
 
 #include "BYD-ATTO-3-HTML.h"
 #include "CanBattery.h"

Software/src/battery/CELLPOWER-BMS.cpp

@@ -3,7 +3,6 @@
 #include "../datalayer/datalayer.h"
 #include "../datalayer/datalayer_extended.h"  //For "More battery info" webpage
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 void CellPowerBms::update_values() {
 

Software/src/battery/CELLPOWER-BMS.h

@@ -1,7 +1,6 @@
 #ifndef CELLPOWER_BMS_H
 #define CELLPOWER_BMS_H
 #include <Arduino.h>
-#include "../include.h"
 #include "CELLPOWER-HTML.h"
 #include "CanBattery.h"
 

Software/src/battery/CHADEMO-BATTERY.cpp

@@ -1,7 +1,6 @@
 #include "CHADEMO-BATTERY.h"
 #include "../datalayer/datalayer.h"
 #include "../devboard/utils/events.h"
-#include "../include.h"
 #include "CHADEMO-SHUNTS.h"
 
 //This function maps all the values fetched via CAN to the correct parameters used for the inverter

Software/src/battery/CHADEMO-BATTERY.h

@@ -3,7 +3,6 @@
 #include <Arduino.h>
 #include "../datalayer/datalayer.h"
 #include "../datalayer/datalayer_extended.h"
-#include "../include.h"
 #include "CHADEMO-BATTERY-HTML.h"
 #include "CanBattery.h"
 

Software/src/battery/CHADEMO-SHUNTS.cpp

@@ -21,7 +21,6 @@
 #include "CHADEMO-SHUNTS.h"
 #include "../datalayer/datalayer.h"
 #include "../devboard/utils/events.h"
-#include "../include.h"
 #include "CHADEMO-BATTERY.h"
 
 /* Initial frames received from ISA shunts provide invalid during initialization */

Software/src/battery/CMFA-EV-BATTERY.cpp

@@ -3,7 +3,6 @@
 #include "../datalayer/datalayer.h"
 #include "../datalayer/datalayer_extended.h"
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 /* The raw SOC value sits at 90% when the battery is full, so we should report back 100% once this value is reached
 Same goes for low point, when 10% is reached we report 0% */

Software/src/battery/CMFA-EV-BATTERY.h

@@ -1,6 +1,5 @@
 #ifndef CMFA_EV_BATTERY_H
 #define CMFA_EV_BATTERY_H
-#include "../include.h"
 
 #include "CMFA-EV-HTML.h"
 #include "CanBattery.h"

Software/src/battery/CanBattery.cpp

@@ -1,5 +1,4 @@
 #include "CanBattery.h"
-#include "../../src/include.h"
 
 CanBattery::CanBattery(CAN_Speed speed) {
   can_interface = can_config.battery;

Software/src/battery/DALY-BMS.cpp

@@ -2,7 +2,6 @@
 #include <cstdint>
 #include "../datalayer/datalayer.h"
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 /* Do not change code below unless you are sure what you are doing */
 

Software/src/battery/ECMP-BATTERY.cpp

@@ -3,7 +3,6 @@
 #include "../datalayer/datalayer.h"
 #include "../datalayer/datalayer_extended.h"  //For More Battery Info page
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 /* TODO:
 This integration is still ongoing. Here is what still needs to be done in order to use this battery type

Software/src/battery/ECMP-BATTERY.h

@@ -1,7 +1,6 @@
 #ifndef STELLANTIS_ECMP_BATTERY_H
 #define STELLANTIS_ECMP_BATTERY_H
 #include <Arduino.h>
-#include "../include.h"
 
 #include "CanBattery.h"
 #include "ECMP-HTML.h"

Software/src/battery/FOXESS-BATTERY.cpp

@@ -2,7 +2,6 @@
 #include "../communication/can/comm_can.h"
 #include "../datalayer/datalayer.h"
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 /*
 Can bus @ 500k - all Extended ID, little endian

Software/src/battery/FOXESS-BATTERY.h

@@ -1,7 +1,6 @@
 #ifndef FOXESS_BATTERY_H
 #define FOXESS_BATTERY_H
 #include <Arduino.h>
-#include "../include.h"
 
 #include "CanBattery.h"
 

Software/src/battery/GEELY-GEOMETRY-C-BATTERY.cpp

@@ -3,7 +3,6 @@
 #include "../datalayer/datalayer.h"
 #include "../datalayer/datalayer_extended.h"  //For "More battery info" webpage
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 /* TODO
 - Contactor closing: CAN log needed from complete H-CAN of Geely Geometry C vehicle. We are not sure what needs to be sent towards the battery yet to get contactor closing working. DTC readout complains that a "Power CAN BUS Data Missing" message is still missing

Software/src/battery/GEELY-GEOMETRY-C-BATTERY.h

@@ -2,7 +2,6 @@
 #define GEELY_GEOMETRY_C_BATTERY_H
 #include "../datalayer/datalayer.h"
 #include "../datalayer/datalayer_extended.h"
-#include "../include.h"
 #include "CanBattery.h"
 #include "GEELY-GEOMETRY-C-HTML.h"
 

Software/src/battery/IMIEV-CZERO-ION-BATTERY.cpp

@@ -2,7 +2,6 @@
 #include "../communication/can/comm_can.h"
 #include "../datalayer/datalayer.h"
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 //Code still work in progress, TODO:
 //Figure out if CAN messages need to be sent to keep the system happy?

Software/src/battery/IMIEV-CZERO-ION-BATTERY.h

@@ -1,7 +1,6 @@
 #ifndef IMIEV_CZERO_ION_BATTERY_H
 #define IMIEV_CZERO_ION_BATTERY_H
 #include <Arduino.h>
-#include "../include.h"
 
 #include "CanBattery.h"
 

Software/src/battery/JAGUAR-IPACE-BATTERY.cpp

@@ -2,7 +2,6 @@
 #include "../communication/can/comm_can.h"
 #include "../datalayer/datalayer.h"
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 /* Do not change code below unless you are sure what you are doing */
 static unsigned long previousMillisKeepAlive = 0;

Software/src/battery/KIA-E-GMP-BATTERY.cpp

@@ -2,7 +2,6 @@
 #include "../communication/can/comm_can.h"
 #include "../datalayer/datalayer.h"
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 const unsigned char crc8_table[256] =
     {  // CRC8_SAE_J1850_ZER0 formula,0x1D Poly,initial value 0x3F,Final XOR value varies

Software/src/battery/KIA-E-GMP-BATTERY.h

@@ -1,7 +1,6 @@
 #ifndef KIA_E_GMP_BATTERY_H
 #define KIA_E_GMP_BATTERY_H
 #include <Arduino.h>
-#include "../include.h"
 #include "CanBattery.h"
 
 #define ESTIMATE_SOC_FROM_CELLVOLTAGE

Software/src/battery/KIA-HYUNDAI-64-BATTERY.cpp

@@ -3,7 +3,6 @@
 #include "../datalayer/datalayer.h"
 #include "../datalayer/datalayer_extended.h"
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 void KiaHyundai64Battery::
     update_values() {  //This function maps all the values fetched via CAN to the correct parameters used for modbus

Software/src/battery/KIA-HYUNDAI-64-BATTERY.h

@@ -3,7 +3,6 @@
 #include <Arduino.h>
 #include "../datalayer/datalayer.h"
 #include "../datalayer/datalayer_extended.h"
-#include "../include.h"
 #include "CanBattery.h"
 #include "KIA-HYUNDAI-64-HTML.h"
 

Software/src/battery/KIA-HYUNDAI-HYBRID-BATTERY.cpp

@@ -2,7 +2,6 @@
 #include "../communication/can/comm_can.h"
 #include "../datalayer/datalayer.h"
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 /* TODO: 
 - The HEV battery seems to turn off after 1 minute of use. When this happens SOC% stops updating.

Software/src/battery/KIA-HYUNDAI-HYBRID-BATTERY.h

@@ -1,7 +1,6 @@
 #ifndef KIA_HYUNDAI_HYBRID_BATTERY_H
 #define KIA_HYUNDAI_HYBRID_BATTERY_H
 #include <Arduino.h>
-#include "../include.h"
 
 #include "CanBattery.h"
 

Software/src/battery/MEB-BATTERY.cpp

@@ -5,7 +5,6 @@
 #include "../datalayer/datalayer.h"
 #include "../datalayer/datalayer_extended.h"  //For "More battery info" webpage
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 /*
 TODO list

Software/src/battery/MEB-BATTERY.h

@@ -1,7 +1,6 @@
 #ifndef MEB_BATTERY_H
 #define MEB_BATTERY_H
 #include <Arduino.h>
-#include "../include.h"
 #include "CanBattery.h"
 #include "MEB-HTML.h"
 

Software/src/battery/MG-5-BATTERY.cpp

@@ -2,7 +2,6 @@
 #include "../communication/can/comm_can.h"
 #include "../datalayer/datalayer.h"
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 /* TODO: 
 - Get contactor closing working

Software/src/battery/MG-5-BATTERY.h

@@ -1,7 +1,6 @@
 #ifndef MG_5_BATTERY_H
 #define MG_5_BATTERY_H
 #include <Arduino.h>
-#include "../include.h"
 
 #include "CanBattery.h"
 

Software/src/battery/MG-HS-PHEV-BATTERY.cpp

@@ -1,10 +1,9 @@
-#include "../include.h"
 #ifdef MG_HS_PHEV_BATTERY_H
+#include "MG-HS-PHEV-BATTERY.h"
 #include "../communication/can/comm_can.h"
 #include "../communication/contactorcontrol/comm_contactorcontrol.h"
 #include "../datalayer/datalayer.h"
 #include "../devboard/utils/events.h"
-#include "MG-HS-PHEV-BATTERY.h"
 
 /*
 MG HS PHEV 16.6kWh battery integration

Software/src/battery/MG-HS-PHEV-BATTERY.h

@@ -1,7 +1,6 @@
 #ifndef MG_HS_PHEV_BATTERY_H
 #define MG_HS_PHEV_BATTERY_H
 #include <Arduino.h>
-#include "../include.h"
 
 #include "CanBattery.h"
 

Software/src/battery/NISSAN-LEAF-BATTERY.cpp

@@ -4,7 +4,6 @@
 #include "../datalayer/datalayer_extended.h"  //For "More battery info" webpage
 #include "../devboard/utils/events.h"
 #include "../devboard/utils/logging.h"
-#include "../include.h"
 
 #include "../charger/CanCharger.h"
 

Software/src/battery/NISSAN-LEAF-BATTERY.h

@@ -3,7 +3,6 @@
 
 #include "../datalayer/datalayer.h"
 #include "../datalayer/datalayer_extended.h"
-#include "../include.h"
 #include "CanBattery.h"
 #include "NISSAN-LEAF-HTML.h"
 

Software/src/battery/ORION-BMS.cpp

@@ -2,7 +2,6 @@
 #include "../communication/can/comm_can.h"
 #include "../datalayer/datalayer.h"
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 void findMinMaxCellvoltages(const uint16_t arr[], size_t size, uint16_t& Minimum_Cell_Voltage,
                             uint16_t& Maximum_Cell_Voltage) {

Software/src/battery/ORION-BMS.h

@@ -1,7 +1,6 @@
 #ifndef ORION_BMS_H
 #define ORION_BMS_H
 #include <Arduino.h>
-#include "../include.h"
 
 #include "CanBattery.h"
 

Software/src/battery/PYLON-BATTERY.cpp

@@ -2,7 +2,6 @@
 #include "../communication/can/comm_can.h"
 #include "../datalayer/datalayer.h"
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 void PylonBattery::update_values() {
 

Software/src/battery/PYLON-BATTERY.h

@@ -3,7 +3,6 @@
 #include <Arduino.h>
 
 #include "../datalayer/datalayer.h"
-#include "../include.h"
 #include "CanBattery.h"
 
 #ifdef PYLON_BATTERY

Software/src/battery/RANGE-ROVER-PHEV-BATTERY.cpp

@@ -2,7 +2,6 @@
 #include "../communication/can/comm_can.h"
 #include "../datalayer/datalayer.h"
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 /* TODO
 - LOG files from vehicle needed to determine CAN content needed to send towards battery!

Software/src/battery/RANGE-ROVER-PHEV-BATTERY.h

@@ -1,7 +1,6 @@
 #ifndef RANGE_ROVER_PHEV_BATTERY_H
 #define RANGE_ROVER_PHEV_BATTERY_H
 #include <Arduino.h>
-#include "../include.h"
 
 #include "CanBattery.h"
 

Software/src/battery/RENAULT-KANGOO-BATTERY.cpp

@@ -2,7 +2,6 @@
 #include "../communication/can/comm_can.h"
 #include "../datalayer/datalayer.h"
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 /* TODO:
 There seems to be some values on the Kangoo that differ between the 22/33 kWh version

Software/src/battery/RENAULT-KANGOO-BATTERY.h

@@ -1,7 +1,6 @@
 #ifndef RENAULT_KANGOO_BATTERY_H
 #define RENAULT_KANGOO_BATTERY_H
 #include <Arduino.h>
-#include "../include.h"
 
 #include "CanBattery.h"
 

Software/src/battery/RENAULT-TWIZY.cpp

@@ -2,7 +2,6 @@
 #include <cstdint>
 #include "../datalayer/datalayer.h"
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 int16_t max_value(int16_t* entries, size_t len) {
   int result = INT16_MIN;

Software/src/battery/RENAULT-TWIZY.h

@@ -1,6 +1,5 @@
 #ifndef RENAULT_TWIZY_BATTERY_H
 #define RENAULT_TWIZY_BATTERY_H
-#include "../include.h"
 #include "CanBattery.h"
 
 #ifdef RENAULT_TWIZY_BATTERY

Software/src/battery/RENAULT-ZOE-GEN1-BATTERY.cpp

@@ -2,7 +2,6 @@
 #include "../datalayer/datalayer.h"
 #include "../datalayer/datalayer_extended.h"
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 void transmit_can_frame(CAN_frame* tx_frame, int interface);
 

Software/src/battery/RENAULT-ZOE-GEN2-BATTERY.cpp

@@ -3,7 +3,6 @@
 #include "../datalayer/datalayer.h"
 #include "../datalayer/datalayer_extended.h"  //For "More battery info" webpage
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 /* TODO
 - Add //NVROL Reset

Software/src/battery/RENAULT-ZOE-GEN2-BATTERY.h

@@ -1,6 +1,5 @@
 #ifndef RENAULT_ZOE_GEN2_BATTERY_H
 #define RENAULT_ZOE_GEN2_BATTERY_H
-#include "../include.h"
 
 #include "CanBattery.h"
 #include "RENAULT-ZOE-GEN2-HTML.h"

Software/src/battery/RJXZS-BMS.cpp

@@ -2,7 +2,6 @@
 #include "../communication/can/comm_can.h"
 #include "../datalayer/datalayer.h"
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 void RjxzsBms::update_values() {
 

Software/src/battery/RJXZS-BMS.h

@@ -1,7 +1,6 @@
 #ifndef RJXZS_BMS_H
 #define RJXZS_BMS_H
 #include <Arduino.h>
-#include "../include.h"
 
 #include "CanBattery.h"
 

Software/src/battery/SANTA-FE-PHEV-BATTERY.cpp

@@ -2,7 +2,6 @@
 #include "../communication/can/comm_can.h"
 #include "../datalayer/datalayer.h"
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 /* Credits go to maciek16c for these findings!
 https://github.com/maciek16c/hyundai-santa-fe-phev-battery

Software/src/battery/SANTA-FE-PHEV-BATTERY.h

@@ -2,7 +2,6 @@
 #define SANTA_FE_PHEV_BATTERY_H
 #include <Arduino.h>
 #include "../datalayer/datalayer.h"
-#include "../include.h"
 #include "CanBattery.h"
 
 #ifdef SANTA_FE_PHEV_BATTERY

Software/src/battery/SIMPBMS-BATTERY.cpp

@@ -1,7 +1,6 @@
 #include "SIMPBMS-BATTERY.h"
 #include "../datalayer/datalayer.h"
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 void SimpBmsBattery::update_values() {
 

Software/src/battery/SIMPBMS-BATTERY.h

@@ -1,7 +1,6 @@
 #ifndef SIMPBMS_BATTERY_H
 #define SIMPBMS_BATTERY_H
 #include <Arduino.h>
-#include "../include.h"
 
 #include "CanBattery.h"
 

Software/src/battery/SONO-BATTERY.cpp

@@ -2,7 +2,6 @@
 #include "../communication/can/comm_can.h"
 #include "../datalayer/datalayer.h"
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 void SonoBattery::
     update_values() {  //This function maps all the values fetched via CAN to the correct parameters used for modbus

Software/src/battery/SONO-BATTERY.h

@@ -1,7 +1,6 @@
 #ifndef SONO_BATTERY_H
 #define SONO_BATTERY_H
 #include <Arduino.h>
-#include "../include.h"
 
 #include "CanBattery.h"
 

Software/src/battery/Shunt.h

@@ -4,6 +4,7 @@
 #include "src/communication/Transmitter.h"
 #include "src/communication/can/CanReceiver.h"
 #include "src/communication/can/comm_can.h"
+#include "src/devboard/safety/safety.h"
 #include "src/devboard/utils/types.h"
 
 enum class ShuntType { None = 0, BmwSbox = 1, Highest };

Software/src/battery/Shunts.cpp

@@ -1,4 +1,3 @@
-#include "../include.h"
 #include "Shunt.h"
 
 CanShunt* shunt = nullptr;

Software/src/battery/TESLA-BATTERY.cpp

@@ -3,7 +3,6 @@
 #include "../datalayer/datalayer.h"
 #include "../datalayer/datalayer_extended.h"  //For Advanced Battery Insights webpage
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 /* Credits: */
 /* Some of the original CAN frame parsing code below comes from Per Carlen's bms_comms_tesla_model3.py (https://gitlab.com/pelle8/batt2gen24/) */

Software/src/battery/TESLA-BATTERY.h

@@ -1,7 +1,6 @@
 #ifndef TESLA_BATTERY_H
 #define TESLA_BATTERY_H
 #include "../datalayer/datalayer.h"
-#include "../include.h"
 #include "CanBattery.h"
 #include "TESLA-HTML.h"
 

Software/src/battery/TEST-FAKE-BATTERY.cpp

@@ -1,6 +1,5 @@
 #include "TEST-FAKE-BATTERY.h"
 #include "../datalayer/datalayer.h"
-#include "../include.h"
 
 static void print_units(const char* header, int value, const char* units) {
   logging.print(header);

Software/src/battery/TEST-FAKE-BATTERY.h

@@ -1,7 +1,6 @@
 #ifndef TEST_FAKE_BATTERY_H
 #define TEST_FAKE_BATTERY_H
 #include "../datalayer/datalayer.h"
-#include "../include.h"
 #include "CanBattery.h"
 
 #ifdef TEST_FAKE_BATTERY

Software/src/battery/VOLVO-SPA-BATTERY.cpp

@@ -3,7 +3,6 @@
 #include "../datalayer/datalayer.h"
 #include "../datalayer/datalayer_extended.h"  //For "More battery info" webpage
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 void VolvoSpaBattery::
     update_values() {  //This function maps all the values fetched via CAN to the correct parameters used for the inverter

Software/src/battery/VOLVO-SPA-BATTERY.h

@@ -1,7 +1,6 @@
 #ifndef VOLVO_SPA_BATTERY_H
 #define VOLVO_SPA_BATTERY_H
 #include <Arduino.h>
-#include "../include.h"
 
 #include "CanBattery.h"
 #include "VOLVO-SPA-HTML.h"

Software/src/battery/VOLVO-SPA-HYBRID-BATTERY.cpp

@@ -3,7 +3,6 @@
 #include "../datalayer/datalayer.h"
 #include "../datalayer/datalayer_extended.h"  //For "More battery info" webpage
 #include "../devboard/utils/events.h"
-#include "../include.h"
 
 void VolvoSpaHybridBattery::
     update_values() {  //This function maps all the values fetched via CAN to the correct parameters used for the inverter

Software/src/battery/VOLVO-SPA-HYBRID-BATTERY.h

@@ -1,7 +1,6 @@
 #ifndef VOLVO_SPA_HYBRID_BATTERY_H
 #define VOLVO_SPA_HYBRID_BATTERY_H
 #include <Arduino.h>
-#include "../include.h"
 
 #include "CanBattery.h"
 #include "VOLVO-SPA-HYBRID-HTML.h"

Software/src/charger/CHARGERS.cpp

@@ -1,4 +1,3 @@
-#include "../include.h"
 
 CanCharger* charger = nullptr;
 

Software/src/charger/CHEVY-VOLT-CHARGER.cpp

@@ -1,7 +1,6 @@
 #include "CHEVY-VOLT-CHARGER.h"
 #include "../communication/can/comm_can.h"
 #include "../datalayer/datalayer.h"
-#include "../include.h"
 
 /* This implements Chevy Volt / Ampera charger support (2011-2015 model years).
  *

Software/src/charger/CHEVY-VOLT-CHARGER.h

@@ -2,7 +2,6 @@
 #define CHEVYVOLT_CHARGER_H
 #include <Arduino.h>
 #include "../datalayer/datalayer.h"
-#include "../include.h"
 #include "CanCharger.h"
 
 #ifdef CHEVYVOLT_CHARGER

Software/src/charger/NISSAN-LEAF-CHARGER.cpp

@@ -1,7 +1,6 @@
 #include "NISSAN-LEAF-CHARGER.h"
 #include "../communication/can/comm_can.h"
 #include "../datalayer/datalayer.h"
-#include "../include.h"
 
 /* This implements Nissan LEAF PDM charger support. 2013-2024 Gen2/3 PDMs are supported
  *

Software/src/charger/NISSAN-LEAF-CHARGER.h

@@ -1,7 +1,6 @@
 #ifndef NISSANLEAF_CHARGER_H
 #define NISSANLEAF_CHARGER_H
 #include <Arduino.h>
-#include "../include.h"
 
 #include "CanCharger.h"
 

Software/src/communication/can/comm_can.cpp

@@ -1,7 +1,6 @@
 #include "comm_can.h"
 #include <algorithm>
 #include <map>
-#include "../../include.h"
 #include "../../lib/miwagner-ESP32-Arduino-CAN/ESP32CAN.h"
 #include "../../lib/pierremolinaro-ACAN2517FD/ACAN2517FD.h"
 #include "../../lib/pierremolinaro-acan2515/ACAN2515.h"

Software/src/communication/can/obd.h

@@ -1,7 +1,6 @@
 #ifndef _OBD_H_
 #define _OBD_H_
 
-#include "../../include.h"
 #include "../../lib/miwagner-ESP32-Arduino-CAN/ESP32CAN.h"
 
 void handle_obd_frame(CAN_frame& rx_frame);

Software/src/communication/contactorcontrol/comm_contactorcontrol.cpp

@@ -1,5 +1,4 @@
 #include "comm_contactorcontrol.h"
-#include "../../include.h"
 
 #ifdef CONTACTOR_CONTROL
 const bool contactor_control_enabled_default = true;

Software/src/communication/contactorcontrol/comm_contactorcontrol.h

@@ -1,8 +1,6 @@
 #ifndef _COMM_CONTACTORCONTROL_H_
 #define _COMM_CONTACTORCONTROL_H_
 
-#include "../../include.h"
-
 #include "../../datalayer/datalayer.h"
 #include "../../devboard/utils/events.h"
 

Software/src/communication/equipmentstopbutton/comm_equipmentstopbutton.cpp

@@ -1,5 +1,4 @@
 #include "comm_equipmentstopbutton.h"
-#include "../../include.h"
 
 STOP_BUTTON_BEHAVIOR equipment_stop_behavior = stop_button_default_behavior;
 

Software/src/communication/nvm/comm_nvm.cpp

@@ -2,7 +2,6 @@
 #include "../../communication/can/comm_can.h"
 #include "../../devboard/mqtt/mqtt.h"
 #include "../../devboard/wifi/wifi.h"
-#include "../../include.h"
 #include "../contactorcontrol/comm_contactorcontrol.h"
 
 // Parameters

Software/src/communication/nvm/comm_nvm.h

@@ -1,8 +1,6 @@
 #ifndef _COMM_NVM_H_
 #define _COMM_NVM_H_
 
-#include "../../include.h"
-
 #include <limits>
 #include "../../datalayer/datalayer.h"
 #include "../../devboard/utils/events.h"

Software/src/communication/precharge_control/precharge_control.cpp

@@ -1,7 +1,6 @@
 #include "precharge_control.h"
 #include "../../datalayer/datalayer.h"
 #include "../../datalayer/datalayer_extended.h"
-#include "../../include.h"
 
 #ifdef PRECHARGE_CONTROL
 const bool precharge_control_enabled_default = true;

Software/src/communication/precharge_control/precharge_control.h

@@ -1,8 +1,6 @@
 #ifndef _PRECHARGE_CONTROL_H_
 #define _PRECHARGE_CONTROL_H_
 
-#include "../../include.h"
-
 #include "../../devboard/utils/events.h"
 
 /**

Software/src/communication/rs485/comm_rs485.cpp

@@ -1,5 +1,4 @@
 #include "comm_rs485.h"
-#include "../../include.h"
 
 #include <list>
 

Software/src/datalayer/datalayer.cpp

@@ -1,4 +1,3 @@
 #include "datalayer.h"
-#include "../include.h"
 
 DataLayer datalayer;

Software/src/datalayer/datalayer_extended.cpp

@@ -1,4 +1,3 @@
 #include "datalayer_extended.h"
-#include "../include.h"
 
 DataLayerExtended datalayer_extended;

Software/src/devboard/mqtt/mqtt.h

@@ -36,7 +36,6 @@
 
 #include <Arduino.h>
 #include <vector>
-#include "../../include.h"
 
 #define MQTT_MSG_BUFFER_SIZE (1024)
 

Software/src/devboard/safety/safety.cpp

@@ -1,6 +1,5 @@
 #include "safety.h"
 #include "../../datalayer/datalayer.h"
-#include "../../include.h"
 #include "../utils/events.h"
 
 static uint16_t cell_deviation_mV = 0;

Software/src/devboard/sdcard/sdcard.cpp

@@ -1,5 +1,4 @@
 #include "sdcard.h"
-#include "../../include.h"
 #include "freertos/ringbuf.h"
 
 File can_log_file;

Software/src/devboard/utils/events.cpp

@@ -1,6 +1,5 @@
 #include "events.h"
 #include "../../datalayer/datalayer.h"
-#include "../../include.h"
 
 #include "../../../USER_SETTINGS.h"