pre-release bin & small fixes

build-flags/build_flags_esp32-wifi

@@ -5,7 +5,7 @@
 #-DAC_DISABLE
 -DMODBUS_DISABLE
 #-DMBUS_DISABLE
--DCOUNTER_DISABLE
+#-DCOUNTER_DISABLE
 -DSYSLOG_ENABLE
 # - udp errors
 -DOTA
@@ -57,4 +57,4 @@
 -DMQTT_SOCKET_TIMEOUT=20
 -D CORS=\"*\"
 -D REDIRECTION_URL=\"http://lazyhome.ru/pwa\"
--DMERCURY_ENABLE
+#-DMERCURY_ENABLE

build-flags/build_flags_esp8266-wifi

@@ -7,7 +7,6 @@
 -DARTNET_ENABLE
 -DUSE_1W_PIN=16
 -DW5500_CS_PIN=15
-#-DPID_DISABLE
 -DARDUINO_OTA_MDNS_DISABLE
 -DMDNS_ENABLE
 -DWM_MDNS
@@ -23,3 +22,25 @@
 
 #oct22 - violation in Publish/OnMQTTConnect while publish homie info
 -DNO_HOMIE
+
+#options to fit firmware to Sonoff-S26 (uncomment it)
+
+##Disabling debug log and move I2C to 1-3 pins
+#-DnoSerial
+#-D TWI_SCL=1
+#-D TWI_SDA=3
+##Slimming firmware to fit 50% of 1m flash
+-DDMX_DISABLE
+-UDARTNET_ENABLE
+-DMODBUS_DISABLE
+-DMBUS_DISABLE
+-DOWIRE_DISABLE
+-DCOUNTER_DISABLE
+-DAC_DISABLE
+-DMOTOR_DISABLE
+-DMULTIVENT_DISABLE
+-DHSV_DISABLE
+-UMCP23017
+-D BEARSSL_SSL_BASIC
+-D SPILED_DISABLE 
+-D PWM_DISABLE

compiled/esp32-wifi/uploadCFG.sh

@@ -1,2 +1,2 @@
 ~/.platformio/packages/tool-mkspiffs/mkspiffs_espressif32_arduino -s 20480 -c data data.bin
-../tools/mac/arduinoOTA -v -address 192.168.88.50 -port 65280 -username arduino -password password -sketch data.bin  -upload /data -b
+../tools/mac/arduinoOTA -v -address 192.168.88.50 -port 80 -username arduino -password password -sketch data.bin  -upload /data -b

compiled/esp32-wifi/uploadOTA.sh

@@ -1 +1 @@
-../tools/mac/arduinoOTA -v -address 192.168.88.50 -port 65280 -username arduino -password password -sketch firmware.bin  -upload /sketch -b
+../tools/mac/arduinoOTA -v -address 192.168.11.207 -port 80 -username arduino -password password -sketch firmware.bin  -upload /sketch -b

compiled/esp8266-wifi/esp12-noserial/options.txt

@@ -0,0 +1,31 @@
+Компактная сборка с набором опций, умещающаяся в 50 процентов flash ESP12
+CLI и отладочная информация на serial0 отключена для возможности использования PIN0-1
+
+(-)MULTIVENT
+(+)PWM_RELAY
+(+)MDNS
+(-)UARTBRIDGE
+(+)SYSLOG
+(+)PID
+(-)MCP23017
+(-)ARTNET
+(+)OTA
+(-)SPI LED
+(-)MOTOR CTR
+(+)AC HAIER 
+(+)CCS811 & HDC1080
+(+)RESTART_LAN_ON_MQTT_ERRORS
+(-)HARDRESET, using soft
+(-)COUNTER
+(+)DHT
+(-)OWIRE
+(-)IPMODBUS
+(-)MODBUS
+(-)DMX
+(+)WiFi
+(+)FreeRam printing
+(+)WATCHDOG
+
+Config server:lazyhome.ru
+201703L C++ 
+version:e9355ef_2023-10-31

compiled/esp8266-wifi/full/options.txt

@@ -0,0 +1,32 @@
+Полная версия прошивки
+
+(+)MULTIVENT
+(+)PWM_RELAY
+(+)MDNS
+(-)UARTBRIDGE
+(+)SYSLOG
+(+)PID
+(+)MCP23017
+(+)ARTNET
+(+)OTA
+(+)SPI LED
+(+)MOTOR CTR
+(+)AC HAIER 
+(+)CCS811 & HDC1080
+(+)RESTART_LAN_ON_MQTT_ERRORS
+(-)HARDRESET, using soft
+(+)COUNTER
+(+)DHT
+(-)DS2482-100 USE_1W_PIN
+(+)OWIRE
+(-)IPMODBUS
+(+)MODBUS SERIAL_8N1 at Serial1 speed:9600
+(+)ADAFRUIT LED
+(+)DMX
+(+)WiFi
+(+)FreeRam printing
+(+)WATCHDOG
+
+lazyhome.ru
+Config server:
+201703L C++ version:e9355ef_2023-10-31

compiled/esp8266-wifi/full/ota.sh

@@ -0,0 +1 @@
+../../tools/mac/arduinoOTA -address 192.168.11.208 -port 80 -username arduino -password password -b -upload /sketch -sketch firmware.bin 

compiled/esp8266-wifi/ota.bat

@@ -1 +1 @@
-arduinoOTA -address 192.168.88.54 -port 80 -username arduino -password password -b -upload /sketch -sketch firmware.bin 
+arduinoOTA -address 192.168.11.208 -port 80 -username arduino -password password -b -upload /sketch -sketch firmware.bin 

compiled/esp8266-wifi/ota.sh

@@ -0,0 +1 @@
+../tools/mac/arduinoOTA -address 192.168.11.208 -port 80 -username arduino -password password -b -upload /sketch -sketch firmware.bin 

lighthub/main.cpp

@@ -2229,7 +2229,7 @@ while  ((digitalRead(CONFIG_CLEAN_PIN)==LOW) && !needClean)
                 cmdFunctionClearEEPROM(0, NULL);
                 //sysConf.clear();
                 } 
-       else  debugSerialPort << F("EEPROM signature ok")<<endl;                          
+       else  debugSerial << F("EEPROM signature ok")<<endl;                          
   //  scan_i2c_bus();
 
   serialDebugLevel=sysConf.getSerialDebuglevel();

lighthub/owTerm.cpp

@@ -53,10 +53,10 @@ char * getReadableNote(aJsonObject * owObj)
      {
        if (owObj->child->type==aJson_String && owObj->child->valuestring) return owObj->child->valuestring;
        if (owObj->child->child && owObj->child->child->type==aJson_String && owObj->child->child->valuestring) return owObj->child->child->valuestring;
-       return NULL;
-     }
    
      }
+    return NULL;
+}
 void processTemp(aJsonObject * owObj, float currentTemp) {
     if (!owObj || !owArr) return;
     char* note = getReadableNote(owObj);