From 3091f62ff7b2e2ab979a6bd21cdc488c74bd6cc1 Mon Sep 17 00:00:00 2001 From: Alexander Entinger Date: Wed, 26 Aug 2020 12:32:04 +0200 Subject: [PATCH 1/3] Only set hidden property OTA_CAP to true if the nina firmware version is >= 1.4.1 --- src/ArduinoIoTCloudTCP.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/ArduinoIoTCloudTCP.cpp b/src/ArduinoIoTCloudTCP.cpp index 6c06eff4e..85ad18b09 100644 --- a/src/ArduinoIoTCloudTCP.cpp +++ b/src/ArduinoIoTCloudTCP.cpp @@ -137,9 +137,6 @@ int ArduinoIoTCloudTCP::begin(String brokerAddress, uint16_t brokerPort) _dataTopicIn = getTopic_datain(); #if OTA_ENABLED -#if OTA_STORAGE_SNU - _ota_cap = true; -#endif addPropertyReal(_ota_cap, "OTA_CAP", Permission::Read); addPropertyReal(_ota_error, "OTA_ERROR", Permission::Read); addPropertyReal(_ota_img_sha256, "OTA_SHA256", Permission::Read); @@ -149,10 +146,15 @@ int ArduinoIoTCloudTCP::begin(String brokerAddress, uint16_t brokerPort) #if OTA_STORAGE_SNU String const nina_fw_version = WiFi.firmwareVersion(); - if (nina_fw_version < "1.4.1") { + if (nina_fw_version < "1.4.1") + { + _ota_cap = false; DBG_ERROR(F("ArduinoIoTCloudTCP::%s error nina firmware needs to be >= 1.4.1, current %s"), __FUNCTION__, nina_fw_version.c_str()); return 0; } + else { + _ota_cap = true; + } #endif /* OTA_STORAGE_SNU */ return 1; From 0c3a226179174619ef41b9f4be6dd7c9dbbfecb6 Mon Sep 17 00:00:00 2001 From: Alexander Entinger Date: Thu, 27 Aug 2020 07:50:32 +0200 Subject: [PATCH 2/3] Improve warning message in case nina firmware version is below 1.4.1 --- src/ArduinoIoTCloudTCP.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/ArduinoIoTCloudTCP.cpp b/src/ArduinoIoTCloudTCP.cpp index 85ad18b09..54751e562 100644 --- a/src/ArduinoIoTCloudTCP.cpp +++ b/src/ArduinoIoTCloudTCP.cpp @@ -146,11 +146,9 @@ int ArduinoIoTCloudTCP::begin(String brokerAddress, uint16_t brokerPort) #if OTA_STORAGE_SNU String const nina_fw_version = WiFi.firmwareVersion(); - if (nina_fw_version < "1.4.1") - { + if (nina_fw_version < "1.4.1") { _ota_cap = false; - DBG_ERROR(F("ArduinoIoTCloudTCP::%s error nina firmware needs to be >= 1.4.1, current %s"), __FUNCTION__, nina_fw_version.c_str()); - return 0; + DBG_WARNING(F("ArduinoIoTCloudTCP::%s In order to be ready for cloud OTA nina firmware needs to be >= 1.4.1, current %s"), __FUNCTION__, nina_fw_version.c_str()); } else { _ota_cap = true; From 17342211c12f8a2f5933796626ef26043ef34967 Mon Sep 17 00:00:00 2001 From: Alexander Entinger Date: Thu, 27 Aug 2020 08:00:46 +0200 Subject: [PATCH 3/3] Minor fix by @per1234 (thank you ;) ) Co-authored-by: per1234 --- src/ArduinoIoTCloudTCP.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ArduinoIoTCloudTCP.cpp b/src/ArduinoIoTCloudTCP.cpp index 54751e562..a8a01438c 100644 --- a/src/ArduinoIoTCloudTCP.cpp +++ b/src/ArduinoIoTCloudTCP.cpp @@ -148,7 +148,7 @@ int ArduinoIoTCloudTCP::begin(String brokerAddress, uint16_t brokerPort) String const nina_fw_version = WiFi.firmwareVersion(); if (nina_fw_version < "1.4.1") { _ota_cap = false; - DBG_WARNING(F("ArduinoIoTCloudTCP::%s In order to be ready for cloud OTA nina firmware needs to be >= 1.4.1, current %s"), __FUNCTION__, nina_fw_version.c_str()); + DBG_WARNING(F("ArduinoIoTCloudTCP::%s In order to be ready for cloud OTA, NINA firmware needs to be >= 1.4.1, current %s"), __FUNCTION__, nina_fw_version.c_str()); } else { _ota_cap = true;