cross-compiled & binaries

build-flags/build_flags_mega2560-optiboot

@@ -27,4 +27,4 @@
 # Example of UARTBRIDGE configuration
 #-DUARTBRIDGE_ENABLE
 -DOTA_PORT=80
--DMERCURY_ENABLE
+#-DMERCURY_ENABLE

build-flags/build_flags_nrf52840

@@ -16,4 +16,4 @@
 
 -D CORS=\"*\"
 -D REDIRECTION_URL=\"http://lazyhome.ru/pwa\"
--DMERCURY_ENABLE
+#-DMERCURY_ENABLE

build-flags/build_flags_stm32

@@ -37,4 +37,4 @@
 #HAL_ETH_MODULE_DISABLED
 #HAL_SD_MODULE_DISABLED
 #HAL_DAC_MODULE_DISABLED
--DMERCURY_ENABLE
+#-DMERCURY_ENABLE

lighthub/main.cpp

@@ -2097,7 +2097,7 @@ int16_t attachMaturaTimer()
   return maturaTimerNumber;
 }
 #else 
-int16_t attachMaturaTimer(){};
+int16_t attachMaturaTimer(){return 0;};
 #endif
 
 #if defined(WIFI_ENABLE)

lighthub/modules/out_mercury.cpp

@@ -55,7 +55,7 @@ void out_Mercury::initLine(bool full)
     #elif defined (ARDUINO_ARCH_ESP8266)
     modbusSerial.begin(baud, static_cast <SerialConfig>(serialParam));
     #elif defined (ESP32)
-    if (full) modbusSerial.begin(store->baud, (serialParam),MODBUS_UART_RX_PIN,MODBUS_UART_TX_PIN);
+    if (full) modbusSerial.begin(baud, (serialParam),MODBUS_UART_RX_PIN,MODBUS_UART_TX_PIN);
         else  modbusSerial.updateBaudRate (baud); //Some terrible error in ESP32 core with uart reinit
     #else
     modbusSerial.begin(baud, (serialParam));

platformio.ini

@@ -803,12 +803,13 @@ lib_ignore =
 	DS2482_OneWire
 	ModbusMaster
 	Syslog
-	EEPROM
+	;EEPROM
 	ClosedCube HDC1080
 	SparkFun CCS811 Arduino Library
 	M5Stack
 	ArduinoOTA
 lib_deps = 
+    EEPROM
 	https://github.com/anklimov/aJson
 	https://github.com/anklimov/CmdArduino
 	ArduinoHttpClient
@@ -891,6 +892,7 @@ lib_deps =
 	br3ttb/PID@^1.2.1
 	ArduinoMDNS
 	https://github.com/khoih-prog/TimerInterrupt_Generic.git
+	;https://github.com/anklimov/ModbusMaster
 
 monitor_speed = 115200