Merge pull request #106 from dalathegreat/revert-103-feature/double-l…

…ilygo

Revert "New feature: Double LilyGo!"

README.md

@@ -50,12 +50,7 @@ This video explains all the above mentioned steps:
 https://youtu.be/_mH2AjnAjDk
 
 ## Dependencies 📖
-This code uses the following libraries, already located in the lib folder for an easy start:
-- ESP32-Arduino-CAN (https://github.com/miwagner/ESP32-Arduino-CAN/) slightly modified for this usecase
-- eModbus library (https://github.com/eModbus/eModbus)
-- Adafruit Neopixel (https://github.com/adafruit/Adafruit_NeoPixel)
-- mackelec SerialDataLink (https://github.com/mackelec/SerialDataLink)
-- pierremolinaro acan2515 (https://github.com/pierremolinaro/acan2515)
+This code uses two libraries, ESP32-Arduino-CAN (https://github.com/miwagner/ESP32-Arduino-CAN/) slightly modified for this usecase, and the eModbus library (https://github.com/eModbus/eModbus). Both these are already located in the Software folder for an easy start.
 
 It is also based on the info found in the following excellent repositories/websites:
 - https://gitlab.com/pelle8/gen24

Software/Software.ino

@@ -11,15 +11,12 @@
 #include "src/lib/eModbus-eModbus/Logging.h"
 #include "src/lib/eModbus-eModbus/ModbusServerRTU.h"
 #include "src/lib/eModbus-eModbus/scripts/mbServerFCs.h"
-#include "src/lib/mackelec-SerialDataLink/SerialDataLink.h"
 #include "src/lib/miwagner-ESP32-Arduino-CAN/CAN_config.h"
 #include "src/lib/miwagner-ESP32-Arduino-CAN/ESP32CAN.h"
 
 // Interval settings
 int intervalUpdateValues = 4800;  // Interval at which to update inverter values / Modbus registers
-const int interval1 = 1;          // Interval for 1ms tasks
 const int interval10 = 10;        // Interval for 10ms tasks
-unsigned long previousMillis1ms = 0;
 unsigned long previousMillis10ms = 50;
 unsigned long previousMillisUpdateVal = 0;
 
@@ -131,9 +128,6 @@ void loop() {
 #ifdef DUAL_CAN
   receive_can2();
 #endif
-#ifdef SERIAL_LINK_TRANSMITTER_INVERTER
-  receive_serial();
-#endif
 
   // Process
   if (millis() - previousMillis10ms >= interval10)  // Every 10ms
@@ -156,9 +150,6 @@ void loop() {
 #ifdef DUAL_CAN
   send_can2();
 #endif
-#ifdef SERIAL_LINK_RECEIVER_FROM_BATTERY
-  send_serial();
-#endif
 }
 
 // Initialization functions
@@ -226,13 +217,6 @@ void init_modbus() {
   pinMode(PIN_5V_EN, OUTPUT);
   digitalWrite(PIN_5V_EN, HIGH);
 
-#if defined(SERIAL_LINK_RECEIVER_FROM_BATTERY) || defined(SERIAL_LINK_TRANSMITTER_INVERTER)
-  Serial2.begin(9600);  // If the Modbus RTU port will be used for serial link
-#if defined(BYD_MODBUS) || defined(LUNA2000_MODBUS)
-#error Modbus pins cannot be used for Serial and Modbus at the same time!
-#endif
-#endif
-
 #ifdef BYD_MODBUS
   // Init Static data to the RTU Modbus
   handle_static_data_modbus_byd();
@@ -402,26 +386,6 @@ void send_can() {
 #endif
 }
 
-#ifdef SERIAL_LINK_RECEIVER_FROM_BATTERY
-void send_serial() {
-  static unsigned long currentMillis = millis();
-  if (currentMillis - previousMillis1ms >= interval1) {
-    previousMillis1ms = currentMillis;
-    manageSerialLinkReceiver();
-  }
-}
-#endif
-
-#ifdef SERIAL_LINK_TRANSMITTER_INVERTER
-void receive_serial() {
-  static unsigned long currentMillis = millis();
-  if (currentMillis - previousMillis1ms >= interval1) {
-    previousMillis1ms = currentMillis;
-    manageSerialLinkTransmitter();
-  }
-}
-#endif
-
 #ifdef DUAL_CAN
 void receive_can2() {  // This function is similar to receive_can, but just takes care of inverters in the 2nd bus.
   // Depending on which inverter is selected, we forward this to their respective CAN routines

Software/USER_SETTINGS.h

@@ -42,7 +42,5 @@
 //#define CONTACTOR_CONTROL     //Enable this line to have pins 25,32,33 handle automatic precharge/contactor+/contactor- closing sequence
 //#define PWM_CONTACTOR_CONTROL //Enable this line to use PWM logic for contactors, which lower power consumption and heat generation
 //#define DUAL_CAN              //Enable this line to activate an isolated secondary CAN Bus using add-on MCP2515 controller (Needed for FoxESS inverters)
-//#define SERIAL_LINK_RECEIVER_FROM_BATTERY  //Enable this line to send battery data over Modbus pins to another Lilygo (This LilyGo interfaces with battery)
-//#define SERIAL_LINK_TRANSMITTER_INVERTER  //Enable this line to receive battery data over Modbus pins from another Lilygo (This LilyGo interfaces with inverter)
 
 #endif

Software/src/battery/BATTERIES.h

@@ -32,9 +32,4 @@
 #ifdef TEST_FAKE_BATTERY
 #include "TEST-FAKE-BATTERY.h"  //See this file for more Fake battery settings
 #endif
-
-#ifdef SERIAL_LINK_RECEIVER_FROM_BATTERY
-#include "SERIAL-LINK-RECEIVER-FROM-BATTERY.h"
-#endif
-
 #endif

Software/src/inverter/INVERTERS.h

@@ -29,8 +29,4 @@
 #include "SOLAX-CAN.h"
 #endif
 
-#ifdef SERIAL_LINK_TRANSMITTER_INVERTER
-#include "SERIAL-LINK-TRANSMITTER-INVERTER.h"
-#endif
-
 #endif