From 0f594d13c80008738a9602b4513fad97dbebb6da Mon Sep 17 00:00:00 2001 From: lumapu Date: Sun, 4 Jun 2023 17:30:43 +0200 Subject: [PATCH] fix esp8266 --- src/app.cpp | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/src/app.cpp b/src/app.cpp index 88ad2bd4..3f3452dc 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -118,7 +118,7 @@ void app::loop(void) { void app::loopStandard(void) { ah::Scheduler::loop(); - if (mNrfRadio.loop()) { + if (mNrfRadio.loop() && mConfig->nrf.enabled) { while (!mNrfRadio.mBufCtrl.empty()) { packet_t *p = &mNrfRadio.mBufCtrl.front(); @@ -146,7 +146,7 @@ void app::loopStandard(void) { mMiPayload.process(true); } #if defined(ESP32) - if (mCmtRadio.loop()) { + if (mCmtRadio.loop() && mConfig->cmt.enabled) { while (!mCmtRadio.mBufCtrl.empty()) { hmsPacket_t *p = &mCmtRadio.mBufCtrl.front(); if (mConfig->serial.debug) { @@ -418,13 +418,17 @@ void app::tickSend(void) { if (NULL != iv) { if (iv->config->enabled) { - if (iv->ivGen == IV_HM) - mPayload.ivSend(iv); - else if(iv->ivGen == IV_MI) - mMiPayload.ivSend(iv); + if(mConfig->nrf.enabled) { + if (iv->ivGen == IV_HM) + mPayload.ivSend(iv); + else if(iv->ivGen == IV_MI) + mMiPayload.ivSend(iv); + } #if defined(ESP32) - else if((iv->ivGen == IV_HMS) || (iv->ivGen == IV_HMT)) - mHmsPayload.ivSend(iv); + if(mCmtRadio.enabled) { + if((iv->ivGen == IV_HMS) || (iv->ivGen == IV_HMT)) + mHmsPayload.ivSend(iv); + } #endif } } @@ -502,4 +506,4 @@ void app::updateLed(void) { digitalWrite(mConfig->led.led1, led_off); } } -} \ No newline at end of file +}