Merge branch 'master' into esp_to_secret

Author: facchinm

library.properties

@@ -1,5 +1,5 @@
 name=ArduinoIoTCloud
-version=1.11.0
+version=1.11.1
 author=Arduino
 maintainer=Arduino <[email protected]>
 sentence=This library allows connecting to the Arduino IoT Cloud service.

src/AIoTC_Config.h

@@ -126,7 +126,7 @@
   #define HAS_TCP
 #endif
 
-#if defined(ARDUINO_NICLA_VISION)
+#if defined(ARDUINO_NICLA_VISION) || defined(ARDUINO_PORTENTA_C33)
   #define BOARD_HAS_SE050
   #define HAS_TCP
 #endif
@@ -141,7 +141,7 @@
   #define HAS_LORA
 #endif
 
-#if defined(ARDUINO_ESP8266_ESP12) || defined(ARDUINO_ARCH_ESP32) || defined(ESP8266) || defined(ESP32)
+#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
   #define BOARD_ESP
   #define BOARD_HAS_SECRET_KEY
   #define HAS_TCP
@@ -168,6 +168,6 @@
 #define AIOT_CONFIG_RP2040_OTA_HTTP_HEADER_RECEIVE_TIMEOUT_ms   (10*1000UL)
 #define AIOT_CONFIG_RP2040_OTA_HTTP_DATA_RECEIVE_TIMEOUT_ms   (4*60*1000UL)
 
-#define AIOT_CONFIG_LIB_VERSION "1.11.0"
+#define AIOT_CONFIG_LIB_VERSION "1.11.1"
 
 #endif /* ARDUINO_AIOTC_CONFIG_H_ */

src/ArduinoIoTCloudTCP.cpp

@@ -166,6 +166,9 @@ int ArduinoIoTCloudTCP::begin(bool const enable_watchdog, String brokerAddress,
 
 #if defined(BOARD_HAS_ECCX08)
   _sslClient.setClient(_connection->getClient());
+#elif defined(ARDUINO_PORTENTA_C33)
+  _sslClient.setClient(_connection->getClient());
+  _sslClient.setCACert(AIoTSSCert);
 #elif defined(BOARD_HAS_SE050)
   _sslClient.appendCustomCACert(AIoTSSCert);
 #elif defined(BOARD_ESP)

src/ArduinoIoTCloudTCP.h

@@ -31,6 +31,9 @@
   #include "tls/utility/CryptoUtil.h"
 #elif defined(BOARD_ESP)
   #include <WiFiClientSecure.h>
+#elif defined(ARDUINO_PORTENTA_C33)
+  #include "tls/utility/CryptoUtil.h"
+  #include <SSLClient.h>
 #elif defined(BOARD_HAS_SE050)
   #include "tls/utility/CryptoUtil.h"
   #include <WiFiSSLSE050Client.h>
@@ -145,6 +148,10 @@ class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass
     CryptoUtil _crypto;
     #elif defined(BOARD_ESP)
     WiFiClientSecure _sslClient;
+    #elif defined(ARDUINO_PORTENTA_C33)
+    ArduinoIoTCloudCertClass _cert;
+    SSLClient _sslClient;
+    CryptoUtil _crypto;
     #elif defined(BOARD_HAS_SE050)
     ArduinoIoTCloudCertClass _cert;
     WiFiSSLSE050Client _sslClient;

src/utility/time/RTCMillis.cpp

@@ -54,9 +54,8 @@ unsigned long RTCMillis::get()
 {
   unsigned long current_tick = millis();
   unsigned long const elapsed_s = (current_tick - _last_rtc_update_tick) / 1000;
-  if(elapsed_s) {
-    set(_last_rtc_update_value + elapsed_s);
-  }
+  _last_rtc_update_value += elapsed_s;
+  _last_rtc_update_tick += elapsed_s * 1000;
   return _last_rtc_update_value;
 }
 

src/utility/time/TimeService.cpp

@@ -38,6 +38,10 @@
   #include "RTCMillis.h"
 #endif
 
+#ifdef ARDUINO_ARCH_RENESAS
+  #include "RTC.h"
+#endif
+
 /**************************************************************************************
  * GLOBAL VARIABLES
  **************************************************************************************/
@@ -86,6 +90,12 @@ void esp8266_setRTC(unsigned long time);
 unsigned long esp8266_getRTC();
 #endif
 
+#ifdef ARDUINO_ARCH_RENESAS
+void renesas_initRTC();
+void renesas_setRTC(unsigned long time);
+unsigned long renesas_getRTC();
+#endif
+
 /**************************************************************************************
  * CONSTANTS
  **************************************************************************************/
@@ -330,8 +340,10 @@ void TimeServiceClass::initRTC()
   stm32h7_initRTC();
 #elif defined (ARDUINO_ARCH_ESP32)
   esp32_initRTC();
-#elif ARDUINO_ARCH_ESP8266
+#elif defined (ARDUINO_ARCH_ESP8266)
   esp8266_initRTC();
+#elif defined (ARDUINO_ARCH_RENESAS)
+  renesas_initRTC();
 #else
   #error "RTC not available for this architecture"
 #endif
@@ -347,8 +359,10 @@ void TimeServiceClass::setRTC(unsigned long time)
   stm32h7_setRTC(time);
 #elif defined (ARDUINO_ARCH_ESP32)
   esp32_setRTC(time);
-#elif ARDUINO_ARCH_ESP8266
+#elif defined (ARDUINO_ARCH_ESP8266)
   esp8266_setRTC(time);
+#elif defined (ARDUINO_ARCH_RENESAS)
+  renesas_setRTC(time);
 #else
   #error "RTC not available for this architecture"
 #endif
@@ -364,8 +378,10 @@ unsigned long TimeServiceClass::getRTC()
   return stm32h7_getRTC();
 #elif defined (ARDUINO_ARCH_ESP32)
   return esp32_getRTC();
-#elif ARDUINO_ARCH_ESP8266
+#elif defined (ARDUINO_ARCH_ESP8266)
   return esp8266_getRTC();
+#elif defined (ARDUINO_ARCH_RENESAS)
+  return renesas_getRTC();
 #else
   #error "RTC not available for this architecture"
 #endif
@@ -491,6 +507,26 @@ unsigned long esp8266_getRTC()
 }
 #endif
 
+#ifdef ARDUINO_ARCH_RENESAS
+void renesas_initRTC()
+{
+  RTC.begin();
+}
+
+void renesas_setRTC(unsigned long time)
+{
+  RTCTime t(time);
+  RTC.setTime(t);
+}
+
+unsigned long renesas_getRTC()
+{
+  RTCTime t;
+  RTC.getTime(t);
+  return t.getUnixTime();
+}
+#endif
+
 /******************************************************************************
  * EXTERN DEFINITION
  ******************************************************************************/