Browse Source

fix HMS only installation

pull/1197/head
lumapu 2 years ago
parent
commit
28868a6ca6
  1. 18
      src/app.cpp

18
src/app.cpp

@ -70,11 +70,11 @@ void app::setup() {
#endif #endif
}); });
} }
if (mConfig->nrf.enabled) {
mPayload.setup(this, &mSys, &mNrfStat, mConfig->nrf.maxRetransPerPyld, &mTimestamp);
mPayload.enableSerialDebug(mConfig->serial.debug);
mPayload.addPayloadListener(std::bind(&app::payloadEventListener, this, std::placeholders::_1, std::placeholders::_2));
mPayload.setup(this, &mSys, &mNrfStat, mConfig->nrf.maxRetransPerPyld, &mTimestamp);
mPayload.enableSerialDebug(mConfig->serial.debug);
mPayload.addPayloadListener(std::bind(&app::payloadEventListener, this, std::placeholders::_1, std::placeholders::_2));
if (mConfig->nrf.enabled) {
mMiPayload.setup(this, &mSys, &mNrfRadio, &mNrfStat, mConfig->nrf.maxRetransPerPyld, &mTimestamp); mMiPayload.setup(this, &mSys, &mNrfRadio, &mNrfStat, mConfig->nrf.maxRetransPerPyld, &mTimestamp);
mMiPayload.enableSerialDebug(mConfig->serial.debug); mMiPayload.enableSerialDebug(mConfig->serial.debug);
mMiPayload.addPayloadListener(std::bind(&app::payloadEventListener, this, std::placeholders::_1, std::placeholders::_2)); mMiPayload.addPayloadListener(std::bind(&app::payloadEventListener, this, std::placeholders::_1, std::placeholders::_2));
@ -431,12 +431,10 @@ void app::tickSend(void) {
if (NULL != iv) { if (NULL != iv) {
if (iv->config->enabled) { if (iv->config->enabled) {
if(mConfig->nrf.enabled) { if((iv->ivGen == IV_MI) && mConfig->nrf.enabled)
if(iv->ivGen == IV_MI) mMiPayload.ivSend(iv);
mMiPayload.ivSend(iv); else
else mPayload.ivSend(iv);
mPayload.ivSend(iv);
}
} }
} }
} else { } else {

Loading…
Cancel
Save