diff --git a/build_flags_mega2560-net.sh b/build_flags_mega2560-net.sh new file mode 100644 index 0000000..3f2c34c --- /dev/null +++ b/build_flags_mega2560-net.sh @@ -0,0 +1,30 @@ +#! /bin/bash +# usage: +# first make your own copy of template +# cp build_flags_template.sh build_flags_ENVNAME.sh +# then edit, change or comment something + export FLAGS="-DMY_CONFIG_SERVER=lazyhome.ru" + #export FLAGS="$FLAGS -DWATCH_DOG_TICKER_DISABLE" + #export FLAGS="$FLAGS -DUSE_1W_PIN=12" + #export FLAGS="$FLAGS -DSD_CARD_INSERTED" + export FLAGS="$FLAGS -DSERIAL_BAUD=115200" + #export FLAGS="$FLAGS -DWiz5500" + #export FLAGS="$FLAGS -DDISABLE_FREERAM_PRINT" + export FLAGS="$FLAGS -DCUSTOM_FIRMWARE_MAC=de:ad:be:ef:fe:fe" +# export FLAGS="$FLAGS -DDMX_DISABLE" +# export FLAGS="$FLAGS -DARTNET_ENABLE" +# export FLAGS="$FLAGS -DMODBUS_DISABLE" +# export FLAGS="$FLAGS -DOWIRE_DISABLE" +# export FLAGS="$FLAGS -DAVR_DMXOUT_PIN=18" +# export FLAGS="$FLAGS -DLAN_INIT_DELAY=2000" +# export FLAGS="$FLAGS -DCONTROLLINO" +# export FLAGS="$FLAGS -DESP_WIFI_AP=MYAP" +# export FLAGS="$FLAGS -DESP_WIFI_PWD=MYPWD" +# export FLAGS="$FLAGS -DWIFI_MANAGER_DISABLE" + export FLAGS="$FLAGS -DDHT_DISABLE" +# export FLAGS="$FLAGS -DRESET_PIN=5" +# export FLAGS="$FLAGS -DDHCP_RETRY_INTERVAL=60000" +# export FLAGS="$FLAGS -DRESTART_LAN_ON_MQTT_ERRORS" +# export FLAGS="$FLAGS -DW5500_CS_PIN=53" + export FLAGS="$FLAGS -DPIO_SRC_REV="$(git log --pretty=format:%h_%ad -1 --date=short) + echo $FLAGS diff --git a/custom-build-flags/build_flags_controllino.sh b/custom-build-flags/build_flags_controllino.sh index a7ec009..89f5b45 100755 --- a/custom-build-flags/build_flags_controllino.sh +++ b/custom-build-flags/build_flags_controllino.sh @@ -6,8 +6,8 @@ # nano my_build_flags.sh # and source it # source my_build_flags.sh - export FLAGS="-DMY_CONFIG_SERVER=lighthub.elistech.ru" - export FLAGS="$FLAGS -DWATCH_DOG_TICKER_DISABLE" + #export FLAGS="-DMY_CONFIG_SERVER=lighthub.elistech.ru" + #export FLAGS="$FLAGS -DWATCH_DOG_TICKER_DISABLE" #export FLAGS="$FLAGS -DUSE_1W_PIN=12" #export FLAGS="$FLAGS -DSD_CARD_INSERTED" export FLAGS="$FLAGS -DSERIAL_BAUD=115200" @@ -20,7 +20,7 @@ #export FLAGS="$FLAGS -DAVR_DMXOUT_PIN=18" #export FLAGS="$FLAGS -DCONTROLLINO" # export FLAGS="$FLAGS -DRESET_PIN=8" - export FLAGS="$FLAGS -DLAN_INIT_DELAY=2000" +# export FLAGS="$FLAGS -DLAN_INIT_DELAY=2000" # export FLAGS="$FLAGS -DESP_WIFI_AP=vent" # export FLAGS="$FLAGS -DESP_WIFI_PWD=kk007remont" # export FLAGS="$FLAGS -DSYSLOG_ENABLE" @@ -28,4 +28,4 @@ export FLAGS="$FLAGS -DDHT_COUNTER_DISABLE" #export FLAGS="$FLAGS -DWITH_DOMOTICZ" #export FLAGS="$FLAGS -DWITH_PRINTEX_LIB" - export FLAGS="$FLAGS -DPIO_SRC_REV="$(git log --pretty=format:%h_%ad -1 --date=short) \ No newline at end of file + export FLAGS="$FLAGS -DPIO_SRC_REV="$(git log --pretty=format:%h_%ad -1 --date=short) diff --git a/custom-build-flags/build_flags_mega2560-net.sh b/custom-build-flags/build_flags_mega2560-net.sh new file mode 100644 index 0000000..3f2c34c --- /dev/null +++ b/custom-build-flags/build_flags_mega2560-net.sh @@ -0,0 +1,30 @@ +#! /bin/bash +# usage: +# first make your own copy of template +# cp build_flags_template.sh build_flags_ENVNAME.sh +# then edit, change or comment something + export FLAGS="-DMY_CONFIG_SERVER=lazyhome.ru" + #export FLAGS="$FLAGS -DWATCH_DOG_TICKER_DISABLE" + #export FLAGS="$FLAGS -DUSE_1W_PIN=12" + #export FLAGS="$FLAGS -DSD_CARD_INSERTED" + export FLAGS="$FLAGS -DSERIAL_BAUD=115200" + #export FLAGS="$FLAGS -DWiz5500" + #export FLAGS="$FLAGS -DDISABLE_FREERAM_PRINT" + export FLAGS="$FLAGS -DCUSTOM_FIRMWARE_MAC=de:ad:be:ef:fe:fe" +# export FLAGS="$FLAGS -DDMX_DISABLE" +# export FLAGS="$FLAGS -DARTNET_ENABLE" +# export FLAGS="$FLAGS -DMODBUS_DISABLE" +# export FLAGS="$FLAGS -DOWIRE_DISABLE" +# export FLAGS="$FLAGS -DAVR_DMXOUT_PIN=18" +# export FLAGS="$FLAGS -DLAN_INIT_DELAY=2000" +# export FLAGS="$FLAGS -DCONTROLLINO" +# export FLAGS="$FLAGS -DESP_WIFI_AP=MYAP" +# export FLAGS="$FLAGS -DESP_WIFI_PWD=MYPWD" +# export FLAGS="$FLAGS -DWIFI_MANAGER_DISABLE" + export FLAGS="$FLAGS -DDHT_DISABLE" +# export FLAGS="$FLAGS -DRESET_PIN=5" +# export FLAGS="$FLAGS -DDHCP_RETRY_INTERVAL=60000" +# export FLAGS="$FLAGS -DRESTART_LAN_ON_MQTT_ERRORS" +# export FLAGS="$FLAGS -DW5500_CS_PIN=53" + export FLAGS="$FLAGS -DPIO_SRC_REV="$(git log --pretty=format:%h_%ad -1 --date=short) + echo $FLAGS diff --git a/custom-build-flags/build_flags_template.sh b/custom-build-flags/build_flags_template.sh old mode 100644 new mode 100755 diff --git a/lighthub/item.cpp b/lighthub/item.cpp index fd05477..fd2a046 100644 --- a/lighthub/item.cpp +++ b/lighthub/item.cpp @@ -84,7 +84,7 @@ void Item::Parse() { itemType = aJson.getArrayItem(itemArr, I_TYPE)->valueint; itemArg = aJson.getArrayItem(itemArr, I_ARG); itemVal = aJson.getArrayItem(itemArr, I_VAL); - debugSerial << F(" Item:") << itemArr->name << F(" T:") << itemType << F(" =") << getArg() << eol; +// debugSerial << F(" Item:") << itemArr->name << F(" T:") << itemType << F(" =") << getArg() << eol; } } @@ -200,6 +200,8 @@ boolean Item::getEnableCMD(int delta) { int Item::Ctrl(char * payload, boolean send){ + if (!payload) return 0; +// debugSerial<