mirror of
https://github.com/anklimov/lighthub
synced 2025-12-06 03:39:49 +03:00
building flags & small bugfix (MQTT&TOGGLE)
This commit is contained in:
@@ -1,3 +1,4 @@
|
||||
#NO special flags
|
||||
-DARTNET_ENABLE
|
||||
-DDMX_SMOOTH
|
||||
-DSTATUSLED
|
||||
-DSYSLOG_ENABLE
|
||||
|
||||
@@ -1,11 +1,13 @@
|
||||
-DWIFI_ENABLE
|
||||
-DDMX_DISABLE
|
||||
#-DDMX_DISABLE
|
||||
#-DSPILED_DISABLE
|
||||
#-DAC_DISABLE
|
||||
#-DSYSLOG_ENABLE - udp errors
|
||||
-DMODBUS_DISABLE
|
||||
#-DOWIRE_DISABLE
|
||||
-DDHT_DISABLE
|
||||
-DCOUNTER_DISABLE
|
||||
-DSPILED_DISABLE
|
||||
-DAC_DISABLE
|
||||
#-DM5STACK
|
||||
-DOTA
|
||||
-DSYSLOG_ENABLE
|
||||
#-DMCP23017
|
||||
-DMODBUS_TX_PIN=13
|
||||
#-DARTNET_ENABLE - udp rx errors ((
|
||||
-DUSE_1W_PIN=16
|
||||
-DW5500_CS_PIN=15
|
||||
|
||||
@@ -5,5 +5,5 @@
|
||||
-DSYSLOG_ENABLE
|
||||
-DMCP23017
|
||||
-DARTNET_ENABLE
|
||||
-DUSE_1W_PIN=2
|
||||
-DW5500_CS_PIN=53
|
||||
-DUSE_1W_PIN=16
|
||||
-DW5500_CS_PIN=15
|
||||
|
||||
@@ -7,4 +7,4 @@
|
||||
-DSPILED_DISABLE
|
||||
-DAC_DISABLE
|
||||
-DM5STACK
|
||||
-DSYSLOG_ENABLE
|
||||
#-DSYSLOG_ENABLE
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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 ) ;
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -34,10 +34,10 @@ default_envs =
|
||||
; due-5500
|
||||
|
||||
; ESP 8266
|
||||
esp8266-wifi
|
||||
; esp8266-wifi
|
||||
|
||||
; ESP-32
|
||||
; esp32-wifi
|
||||
esp32-wifi
|
||||
|
||||
; M5Stack core (ESP32 based)
|
||||
; m5stack
|
||||
@@ -175,7 +175,8 @@ board = esp32-evb
|
||||
upload_speed = 115200
|
||||
build_flags = !python get_build_flags.py esp32-wifi
|
||||
lib_ignore =
|
||||
;DS2482_OneWire //UNCOMMENT for software 1-wire driver
|
||||
;COMMENT/UNCOMMENT next line for software 1-wire driver on/off
|
||||
DS2482_OneWire
|
||||
DmxSimple
|
||||
DMXSerial
|
||||
DmxDue
|
||||
@@ -187,7 +188,6 @@ lib_ignore =
|
||||
Ethernet3
|
||||
Ethernet5100
|
||||
EEPROM
|
||||
Artnet
|
||||
UIPEthernet
|
||||
ESP_EEPROM
|
||||
httpClient
|
||||
|
||||
Reference in New Issue
Block a user