0.8.63

* made code review * fixed endless loop #1387
lumapu · Jan 22, 2024 · 77b1f96 · 77b1f96
1 parent e039820
commit 77b1f96
Show file tree

Hide file tree

Showing 21 changed files with 290 additions and 273 deletions.
diff --git a/src/.vscode/settings.json b/src/.vscode/settings.json
@@ -84,5 +84,5 @@
     },
     "cmake.configureOnOpen": false,
     "editor.formatOnSave": false,
-    "cmake.sourceDirectory": "C:/lpusch/github/ahoy/src/.pio/libdeps/esp32-wroom32-release-prometheus/Adafruit BusIO",
-}
+    "cmake.sourceDirectory": "C:/lpusch/github/ahoy/src/.pio/libdeps/esp32-wroom32-release-prometheus/Adafruit BusIO"
+}
diff --git a/src/CHANGES.md b/src/CHANGES.md
@@ -1,5 +1,9 @@
 # Development Changes
 
+## 0.8.63 - 2024-01-22
+* made code review
+* fixed endless loop #1387
+
 ## 0.8.62 - 2024-01-21
 * updated version in footer #1381
 * repaired radio statistics #1382

diff --git a/src/app.cpp b/src/app.cpp
@@ -143,22 +143,20 @@ void app::loop(void) {
     esp_task_wdt_reset();
 
     if(mConfig->nrf.enabled)
-        mNrfActive = mNrfRadio.loop();
+        mNrfRadio.loop();
 
-    if(!mNrfActive) {
-        #if defined(ESP32)
-        if(mConfig->cmt.enabled)
-            mNrfActive = mCmtRadio.loop();
-        #endif
+    #if defined(ESP32)
+    if(mConfig->cmt.enabled)
+        mCmtRadio.loop();
+    #endif
 
-        ah::Scheduler::loop();
-        mCommunication.loop();
+    ah::Scheduler::loop();
+    mCommunication.loop();
 
-        #if defined(ENABLE_MQTT)
-        if (mMqttEnabled && mNetworkConnected)
-            mMqtt.loop();
-        #endif
-    }
+    #if defined(ENABLE_MQTT)
+    if (mMqttEnabled && mNetworkConnected)
+        mMqtt.loop();
+    #endif
     yield();
 }
 

diff --git a/src/app.h b/src/app.h
@@ -82,7 +82,7 @@ class app : public IApp, public ah::Scheduler {
         ~app() {}
 
         void setup(void);
-        void loop(void);
+        void loop(void) override;
         void onNetwork(bool gotIp);
         void regularTickers(void);
 
@@ -405,7 +405,6 @@ class app : public IApp, public ah::Scheduler {
         uint8_t mSendLastIvId;
         bool mSendFirst;
         bool mAllIvNotAvail;
-        bool mNrfActive = false;
 
         bool mNetworkConnected;
 

diff --git a/src/config/settings.h b/src/config/settings.h
@@ -824,8 +824,10 @@ class settings {
 
     #if defined(ESP32)
         void getChar(JsonObject obj, const char *key, char *dst, int maxLen) {
-            if(obj.containsKey(key))
+            if(obj.containsKey(key)) {
                 snprintf(dst, maxLen, "%s", obj[key].as<const char*>());
+                dst[maxLen-1] = '\0';
+            }
         }
 
         template<typename T=uint8_t>
@@ -835,8 +837,10 @@ class settings {
         }
     #else
         void getChar(JsonObject obj, const __FlashStringHelper *key, char *dst, int maxLen) {
-            if(obj.containsKey(key))
+            if(obj.containsKey(key)) {
                 snprintf(dst, maxLen, "%s", obj[key].as<const char*>());
+                dst[maxLen-1] = '\0';
+            }
         }
 
         template<typename T=uint8_t>

diff --git a/src/defines.h b/src/defines.h
@@ -13,7 +13,7 @@
 //-------------------------------------
 #define VERSION_MAJOR       0
 #define VERSION_MINOR       8
-#define VERSION_PATCH       62
+#define VERSION_PATCH       63
 
 //-------------------------------------
 typedef struct {

diff --git a/src/eth/ahoyeth.h b/src/eth/ahoyeth.h
@@ -1,6 +1,6 @@
 //-----------------------------------------------------------------------------
-// 2023 Ahoy, https://www.mikrocontroller.net/topic/525778
-// Creative Commons - http://creativecommons.org/licenses/by-nc-sa/3.0/de/
+// 2024 Ahoy, https://github.com/lumpapu/ahoy
+// Creative Commons - http://creativecommons.org/licenses/by-nc-sa/4.0/deed
 //-----------------------------------------------------------------------------
 
 #if defined(ETHERNET)
@@ -49,7 +49,7 @@ class ahoyeth {
         #if defined(CONFIG_IDF_TARGET_ESP32S3)
         EthSpi mEthSpi;
         #endif
-        settings_t *mConfig;
+        settings_t *mConfig = NULL;
 
         uint32_t *mUtcTimestamp;
         AsyncUDP mUdp; // for time server

diff --git a/src/hm/nrfHal.h b/src/hm/nrfHal.h
@@ -1,6 +1,6 @@
 //-----------------------------------------------------------------------------
-// 2023 Ahoy, https://www.mikrocontroller.net/topic/525778
-// Creative Commons - http://creativecommons.org/licenses/by-nc-sa/3.0/de/
+// 2024 Ahoy, https://github.com/lumpapu/ahoy
+// Creative Commons - http://creativecommons.org/licenses/by-nc-sa/4.0/deed
 //-----------------------------------------------------------------------------
 
 #ifndef __NRF_HAL_H__
@@ -144,6 +144,8 @@ class nrfHal: public RF24_hal, public SpiPatcherHandle {
         uint8_t read(uint8_t cmd, uint8_t* buf, uint8_t len) override {
             uint8_t data[NRF_MAX_TRANSFER_SZ];
             data[0] = cmd;
+            if(len > NRF_MAX_TRANSFER_SZ)
+                len = NRF_MAX_TRANSFER_SZ;
             memset(&data[1], 0xff, len);
 
             request_spi();
@@ -168,13 +170,16 @@ class nrfHal: public RF24_hal, public SpiPatcherHandle {
         }
 
         uint8_t read(uint8_t cmd, uint8_t* buf, uint8_t data_len, uint8_t blank_len) override {
-            uint8_t data[NRF_MAX_TRANSFER_SZ];
+            uint8_t data[NRF_MAX_TRANSFER_SZ + 1];
+            uint8_t len = data_len + blank_len;
             data[0] = cmd;
-            memset(&data[1], 0xff, (data_len + blank_len));
+            if(len > (NRF_MAX_TRANSFER_SZ + 1))
+                len = (NRF_MAX_TRANSFER_SZ + 1);
+            memset(&data[1], 0xff, len);
 
             request_spi();
 
-            size_t spiLen = (static_cast<size_t>(data_len) + static_cast<size_t>(blank_len) + 1u) << 3;
+            size_t spiLen = (static_cast<size_t>(len) + 1u) << 3;
             spi_transaction_t t = {
                 .flags = 0,
                 .cmd = 0,