From be59d2410f4c6cc022a2c888e9a978d1d81aa4f5 Mon Sep 17 00:00:00 2001 From: pennam Date: Tue, 25 Jun 2024 15:52:57 +0200 Subject: [PATCH 1/2] OTA: UNO R4 WiFi fix magic number --- src/ota/OTA.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/ota/OTA.h b/src/ota/OTA.h index c1a56194a..019fc889d 100644 --- a/src/ota/OTA.h +++ b/src/ota/OTA.h @@ -50,8 +50,7 @@ using ArduinoCloudOTA = ESP32OTACloudProcess; #include "implementation/OTAUnoR4.h" using ArduinoCloudOTA = UNOR4OTACloudProcess; -// TODO Check if a macro already exist -constexpr uint32_t OtaMagicNumber = 0x234110020; // TODO check this value is correct +constexpr uint32_t OtaMagicNumber = 0x23411002; #else #error "This Board doesn't support OTA" From 605e16bd7f17f028383905b62f02727da7804986 Mon Sep 17 00:00:00 2001 From: pennam Date: Tue, 25 Jun 2024 15:54:36 +0200 Subject: [PATCH 2/2] UNO R4 WiFi suppress unused variable warning --- src/tls/utility/TLSClientMqtt.cpp | 1 + src/tls/utility/TLSClientOta.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/src/tls/utility/TLSClientMqtt.cpp b/src/tls/utility/TLSClientMqtt.cpp index 8c6c3f529..374618163 100644 --- a/src/tls/utility/TLSClientMqtt.cpp +++ b/src/tls/utility/TLSClientMqtt.cpp @@ -58,6 +58,7 @@ void TLSClientMqtt::begin(ConnectionHandler & connection) { * also present in older firmware revisions * https://github.com/arduino/uno-r4-wifi-usb-bridge/blob/f09ca94fdcab845b8368d4435fdac9f6999d21d2/certificates/certificates.pem#L852 */ + (void)connection; #elif defined(ARDUINO_ARCH_ESP32) setCACertBundle(x509_crt_bundle); #elif defined(ARDUINO_ARCH_ESP8266) diff --git a/src/tls/utility/TLSClientOta.cpp b/src/tls/utility/TLSClientOta.cpp index 8aabf652e..77096b6f2 100644 --- a/src/tls/utility/TLSClientOta.cpp +++ b/src/tls/utility/TLSClientOta.cpp @@ -54,6 +54,7 @@ void TLSClientOta::begin(ConnectionHandler &connection) { /* AWS Root CAs are configured in uno-r4-wifi-usb-bridge/libraries/Arduino_ESP32_OTA * https://github.com/arduino-libraries/Arduino_ESP32_OTA/blob/fc755e7d1d3946232107e2590662ee08d6ccdec4/src/tls/amazon_root_ca.h */ + (void)connection; #elif defined(ARDUINO_ARCH_ESP32) setCACertBundle(x509_crt_bundle); #elif defined(ARDUINO_ARCH_ESP8266)