improved MQTT

This commit is contained in:
lumapu 2022-11-23 21:09:57 +01:00
parent 65c34f26e0
commit 573bd31f0a
3 changed files with 102 additions and 80 deletions

View file

@ -27,6 +27,11 @@ void app::setup(uint32_t timeout) {
mSettings.getPtr(mConfig);
DPRINTLN(DBG_INFO, F("Settings valid: ") + String((mSettings.getValid()) ? F("true") : F("false")));
mSys = new HmSystemType();
mSys->enableDebug();
mSys->setup(mConfig->nrf.amplifierPower, mConfig->nrf.pinIrq, mConfig->nrf.pinCe, mConfig->nrf.pinCs);
mSys->addInverters(&mConfig->inst);
#if !defined(AP_ONLY)
mMqtt.setup(&mConfig->mqtt, mConfig->sys.deviceName, mVersion, mSys, &mUtcTimestamp, &mSunrise, &mSunset);
#endif
@ -34,10 +39,6 @@ void app::setup(uint32_t timeout) {
mWifi = new ahoywifi(mConfig);
mWifi->setup(timeout, mSettings.getValid());
mSys = new HmSystemType();
mSys->enableDebug();
mSys->setup(mConfig->nrf.amplifierPower, mConfig->nrf.pinIrq, mConfig->nrf.pinCe, mConfig->nrf.pinCs);
mSys->addInverters(&mConfig->inst);
mPayload.setup(mSys);
mPayload.enableSerialDebug(mConfig->serial.debug);
@ -222,6 +223,9 @@ void app::resetSystem(void) {
mUtcTimestamp = 0;
#endif
mSunrise = 0;
mSunset = 0;
mHeapStatCnt = 0;
mSendTicker = 0xffff;