Merge branch 'development03' into development03

src/CHANGES.md

@@ -2,6 +2,9 @@
 
 (starting from release version `0.5.66`)
 
+## 0.5.83
+* fix MQTT publishing, `callback` was set but reset by following `setup()`
+
 ## 0.5.82
 * fixed communication error #652
 * reset values is no bound to MQTT any more, setting moved to `inverter` #649

src/app.cpp

@@ -27,7 +27,6 @@ void app::setup() {
 
     mSys.enableDebug();
     mSys.setup(mConfig->nrf.amplifierPower, mConfig->nrf.pinIrq, mConfig->nrf.pinCe, mConfig->nrf.pinCs);
-    mPayload.addPayloadListener(std::bind(&app::payloadEventListener, this, std::placeholders::_1));
 
     #if defined(AP_ONLY)
     mInnerLoopCb = std::bind(&app::loopStandard, this);
@@ -43,6 +42,7 @@ void app::setup() {
     mSys.addInverters(&mConfig->inst);
     mPayload.setup(this, &mSys, &mStat, mConfig->nrf.maxRetransPerPyld, &mTimestamp);
     mPayload.enableSerialDebug(mConfig->serial.debug);
+    mPayload.addPayloadListener(std::bind(&app::payloadEventListener, this, std::placeholders::_1));
 
     mMiPayload.setup(this, &mSys, &mStat, mConfig->nrf.maxRetransPerPyld, &mTimestamp);
     mMiPayload.enableSerialDebug(mConfig->serial.debug);

src/defines.h

@@ -13,7 +13,7 @@
 //-------------------------------------
 #define VERSION_MAJOR       0
 #define VERSION_MINOR       5
-#define VERSION_PATCH       821
+#define VERSION_PATCH       83
 
 //-------------------------------------
 typedef struct {
@@ -69,7 +69,7 @@ union serial_u {
     uint8_t  b[8];
 };
 
-#define MIN_SERIAL_INTERVAL     2 // 5
+#define MIN_SERIAL_INTERVAL     5
 #define MIN_SEND_INTERVAL       15
 #define MIN_MQTT_INTERVAL       60