From bcae3c9d5024a524030affa926f68d4bedf94dba Mon Sep 17 00:00:00 2001 From: Andrey Date: Sun, 28 Jan 2024 16:19:45 +0300 Subject: [PATCH] artnet hung, sensors loop, inputs, multivent --- lighthub/main.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/lighthub/main.cpp b/lighthub/main.cpp index ffe0144..ce95d28 100644 --- a/lighthub/main.cpp +++ b/lighthub/main.cpp @@ -627,12 +627,14 @@ lan_status lanLoop() { if (!initializedListeners) { setupSyslog(); + debugSerial<begin(); #endif #ifdef IPMODBUS + debugSerial<read(); ///hung if network not initialized + if (artnet && initializedListeners) artnet->read(); ///hung if network not initialized #endif #ifdef MDNS_ENABLE #ifndef WIFI_ENABLE @@ -2740,7 +2742,7 @@ if (initializedListeners) ipmodbusLoop(); void owIdle(void) { // timerCtr++; #ifdef _artnet - if (artnet && (lanStatus>=HAVE_IP_ADDRESS)) artnet->read(); + if (artnet && initializedListeners && (lanStatus>=HAVE_IP_ADDRESS)) artnet->read(); #endif wdt_res(); @@ -2799,7 +2801,7 @@ void modbusIdle(void) { yield(); mqttClient.loop(); #ifdef _artnet - if (artnet) artnet->read(); + if (artnet && initializedListeners) artnet->read(); #endif #if defined(OTA) yield(); @@ -2871,9 +2873,10 @@ inputLoopBusy--; void inputSensorsLoop() { if (!inputs || inputLoopBusy) return; //inputLoopBusy++; -configLocked++; +//configLocked++; if (isTimeOver(timerSensorCheck,millis(),INTERVAL_CHECK_SENSOR)) { + configLocked++; aJsonObject *input = inputs->child; while (input) { if ((input->type == aJson_Object)) { @@ -2885,8 +2888,9 @@ configLocked++; input = input->next; } timerSensorCheck = millis(); + configLocked--; } -configLocked--; +//configLocked--; //inputLoopBusy--; }