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

@@ -959,7 +959,7 @@ if (!strchr(addrstr,'/')) setTopic(addrstr,sizeof(addrstr),T_OUT,emit->valuestri
else if (strlen(scmd->valuestring))
mqttClient.publish(addrstr, scmd->valuestring, true);
} 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);
}
}

View File

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

View File

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