diff --git a/cube/User/Src/mbusComm.c b/cube/User/Src/mbusComm.c index 1e12f80..550320b 100644 --- a/cube/User/Src/mbusComm.c +++ b/cube/User/Src/mbusComm.c @@ -610,11 +610,19 @@ static void mbusCommScheduler(void *handle) { if (isNetworkAvailable()) { coloredMsg(LOG_GREEN, true, "mbc mcs activate scheduler by network"); schAdd(triggerMBusRequest, NULL, 0, 100); - state = 1; + state = 2; } break; case 1: + if (mbusCommEnabled) { + coloredMsg(LOG_GREEN, true, "mbc mcs activate scheduler by request"); + schAdd(triggerMBusRequest, NULL, 0, 100); + state = 2; + } + break; + + case 2: if (! isNetworkAvailable()) { coloredMsg(LOG_GREEN, true, "mbc mcs deactivate scheduler by network"); schDel(triggerMBusRequest, NULL); @@ -625,7 +633,7 @@ static void mbusCommScheduler(void *handle) { coloredMsg(LOG_GREEN, true, "mbc mcs deactivate scheduler by request"); schDel(triggerMBusRequest, NULL); loopDisable(); - state = 2; + state = 1; } for (uint8_t i = 0; i < numOfDevices; i++) { devices[i].delay -= 1; @@ -636,14 +644,6 @@ static void mbusCommScheduler(void *handle) { } } break; - - case 2: - if (mbusCommEnabled) { - coloredMsg(LOG_GREEN, true, "mbc mcs activate scheduler by request"); - schAdd(triggerMBusRequest, NULL, 0, 100); - state = 1; - } - break; } }