artnet hung fixed

This commit is contained in:
2019-02-09 23:58:30 +03:00
parent e7f376196c
commit 772f3ab28c
2 changed files with 6 additions and 6 deletions

View File

@@ -1,6 +1,6 @@
#! /bin/bash
export FLAGS="$FLAGS -DWiz5500"
#export FLAGS="$FLAGS -DARTNET_ENABLE"
export FLAGS="$FLAGS -DARTNET_ENABLE"
CUSTOM_BUILD_FLAGS_FILE=custom-build-flags/build_flags_due-5500.sh
if [ -f $CUSTOM_BUILD_FLAGS_FILE ]; then
source $CUSTOM_BUILD_FLAGS_FILE

View File

@@ -258,9 +258,6 @@ lan_status lanLoop() {
if (!configOk)
lanStatus = loadConfigFromHttp(0, NULL);
else lanStatus = IP_READY_CONFIG_LOADED_CONNECTING_TO_BROKER;
#ifdef _artnet
if (artnet) artnet->begin();
#endif
break;
case IP_READY_CONFIG_LOADED_CONNECTING_TO_BROKER:
@@ -623,6 +620,9 @@ void onInitialStateInitLAN() {
debugSerial<<F("Got IP address:");
printIPAddress(Ethernet.localIP());
lanStatus = HAVE_IP_ADDRESS;//1;
#ifdef _artnet
if (artnet) artnet->begin();
#endif
}
}
#endif
@@ -759,7 +759,7 @@ void applyConfig() {
dmxArr = aJson.getObjectItem(root, "dmxin");
if (dmxArr && (itemsCount = aJson.getArraySize(dmxArr))) {
DMXinSetup(itemsCount * 4);
debugSerial<<F("DMX in started. Channels:")<<itemsCount * 4;
debugSerial<<F("DMX in started. Channels:")<<itemsCount * 4<<endl;
}
#endif
#ifdef _dmxout
@@ -812,7 +812,7 @@ void applyConfig() {
int k;
pinMode(pin, OUTPUT);
digitalWrite(pin, k = ((cmd == CMD_ON) ? HIGH : LOW));
debugSerial<<F("Pin:")<<pin<<F("=")<<k;
debugSerial<<F("Pin:")<<pin<<F("=")<<k<<F(",");
}
break;
} //switch