building flags & small bugfix (MQTT&TOGGLE)

This commit is contained in:
2020-07-14 01:54:42 +03:00
parent fb6bb153ba
commit 10a9bb119d
8 changed files with 34 additions and 17 deletions

View File

@@ -1,3 +1,4 @@
#NO special flags -DARTNET_ENABLE
-DDMX_SMOOTH
-DSTATUSLED -DSTATUSLED
-DSYSLOG_ENABLE -DSYSLOG_ENABLE

View File

@@ -1,11 +1,13 @@
-DWIFI_ENABLE -DWIFI_ENABLE
-DDMX_DISABLE #-DDMX_DISABLE
#-DSPILED_DISABLE
#-DAC_DISABLE
#-DSYSLOG_ENABLE - udp errors
-DMODBUS_DISABLE -DMODBUS_DISABLE
#-DOWIRE_DISABLE
-DDHT_DISABLE
-DCOUNTER_DISABLE -DCOUNTER_DISABLE
-DSPILED_DISABLE
-DAC_DISABLE
#-DM5STACK
-DOTA -DOTA
-DSYSLOG_ENABLE #-DMCP23017
-DMODBUS_TX_PIN=13
#-DARTNET_ENABLE - udp rx errors ((
-DUSE_1W_PIN=16
-DW5500_CS_PIN=15

View File

@@ -5,5 +5,5 @@
-DSYSLOG_ENABLE -DSYSLOG_ENABLE
-DMCP23017 -DMCP23017
-DARTNET_ENABLE -DARTNET_ENABLE
-DUSE_1W_PIN=2 -DUSE_1W_PIN=16
-DW5500_CS_PIN=53 -DW5500_CS_PIN=15

View File

@@ -7,4 +7,4 @@
-DSPILED_DISABLE -DSPILED_DISABLE
-DAC_DISABLE -DAC_DISABLE
-DM5STACK -DM5STACK
-DSYSLOG_ENABLE #-DSYSLOG_ENABLE

View File

@@ -959,7 +959,7 @@ if (!strchr(addrstr,'/')) setTopic(addrstr,sizeof(addrstr),T_OUT,emit->valuestri
else if (strlen(scmd->valuestring)) else if (strlen(scmd->valuestring))
mqttClient.publish(addrstr, scmd->valuestring, true); mqttClient.publish(addrstr, scmd->valuestring, true);
} else { //send reset command } else { //send reset command
if (!rcmd || rcmd->type == aJson_String) mqttClient.publish(addrstr, "OFF", true); if (!rcmd || rcmd->type != aJson_String) mqttClient.publish(addrstr, "OFF", true);
else if (strlen(rcmd->valuestring))mqttClient.publish(addrstr, rcmd->valuestring, true); else if (strlen(rcmd->valuestring))mqttClient.publish(addrstr, rcmd->valuestring, true);
} }
} }

View File

@@ -1561,7 +1561,9 @@ void printFirmwareVersionAndBuildOptions() {
infoSerial<<F("\n(+)DS2482-100"); infoSerial<<F("\n(+)DS2482-100");
#endif #endif
#ifdef Wiz5500 #ifdef WIFI_ENABLE
infoSerial<<F("\n(+)WiFi");
#elif Wiz5500
infoSerial<<F("\n(+)WizNet5500"); infoSerial<<F("\n(+)WizNet5500");
#else #else
infoSerial<<F("\n(+)Wiznet5x00"); infoSerial<<F("\n(+)Wiznet5x00");
@@ -1650,6 +1652,12 @@ infoSerial<<F("\n(+)ARTNET");
infoSerial<<F("\n(-)ARTNET"); infoSerial<<F("\n(-)ARTNET");
#endif #endif
#ifdef MCP23017
infoSerial<<F("\n(+)MCP23017");
#else
infoSerial<<F("\n(-)MCP23017");
#endif
infoSerial<<endl; infoSerial<<endl;
// WDT_Disable( WDT ) ; // WDT_Disable( WDT ) ;

View File

@@ -20,7 +20,12 @@
#define ORDER BRG #define ORDER BRG
#endif #endif
#ifndef MODBUS_TX_PIN
#define TXEnablePin 13 #define TXEnablePin 13
#else
#define TXEnablePin MODBUS_TX_PIN
#endif
#define ESP_EEPROM_SIZE 2048 #define ESP_EEPROM_SIZE 2048
#ifndef AVR_DMXOUT_PIN #ifndef AVR_DMXOUT_PIN
@@ -191,6 +196,7 @@
//#undef _dmxout //#undef _dmxout
//#undef modbusSerial //#undef modbusSerial
#define modbusSerial Serial2 #define modbusSerial Serial2
#define AC_Serial Serial2
#endif #endif
#ifndef _dmxout #ifndef _dmxout

View File

@@ -34,10 +34,10 @@ default_envs =
; due-5500 ; due-5500
; ESP 8266 ; ESP 8266
esp8266-wifi ; esp8266-wifi
; ESP-32 ; ESP-32
; esp32-wifi esp32-wifi
; M5Stack core (ESP32 based) ; M5Stack core (ESP32 based)
; m5stack ; m5stack
@@ -175,7 +175,8 @@ board = esp32-evb
upload_speed = 115200 upload_speed = 115200
build_flags = !python get_build_flags.py esp32-wifi build_flags = !python get_build_flags.py esp32-wifi
lib_ignore = lib_ignore =
;DS2482_OneWire //UNCOMMENT for software 1-wire driver ;COMMENT/UNCOMMENT next line for software 1-wire driver on/off
DS2482_OneWire
DmxSimple DmxSimple
DMXSerial DMXSerial
DmxDue DmxDue
@@ -187,7 +188,6 @@ lib_ignore =
Ethernet3 Ethernet3
Ethernet5100 Ethernet5100
EEPROM EEPROM
Artnet
UIPEthernet UIPEthernet
ESP_EEPROM ESP_EEPROM
httpClient httpClient