Merge branch 'develop' into provision/force-ca-validation

Author: M65649

Jenkinsfilek8s

@@ -44,6 +44,7 @@
 
             stage('install-libraries') {
                 steps {
+                    sh 'arduino-cli core update-index --additional-urls "http://drazzy.com/package_drazzy.com_index.json"'
                     sh 'arduino-cli core install --additional-urls "http://drazzy.com/package_drazzy.com_index.json" DxCore:megaavr'
                     sh 'arduino-cli lib install ArduinoJson'
                     sh 'arduino-cli lib install "Adafruit GPS Library"'

examples/http_get_time/http_get_time.ino

@@ -47,7 +47,7 @@ void setup() {
     HttpResponse response;
     response = HttpClient.get(TIMEZONE_URI);
     if (response.status_code != HttpClient.STATUS_OK) {
-        Log.errorf("Error when performing a GET request on %s/%s. Got status "
+        Log.errorf("Error when performing a GET request on %s%s. Got status "
                    "code = %d. Exiting...\r\n",
                    TIMEZONE_URL,
                    TIMEZONE_URI,

examples/mqtt_with_connection_loss_handling/mqtt_with_connection_loss_handling.ino

@@ -99,12 +99,9 @@ void setup() {
     }
 
     Lte.onDisconnect(disconnectedFromNetwork);
+
     MqttClient.onConnectionStatusChange(connectedToBroker,
                                         disconnectedFromBroker);
-
-    SequansController.begin();
-
-    SequansController.writeCommand("at+cmee=2");
 }
 
 /**

src/log.cpp

@@ -90,6 +90,7 @@ void LogClass::infof(const char* format, ...) {
 
         va_start(ap, nFormat);
         vfprintf(&f, nFormat, ap);
+        va_end(ap);
     }
 }
 
@@ -116,6 +117,7 @@ void LogClass::debugf(const char* format, ...) {
         fdev_set_udata(&f, this->uart);
         va_start(ap, nFormat);
         vfprintf(&f, nFormat, ap);
+        va_end(ap);
     }
 }
 
@@ -131,6 +133,7 @@ void LogClass::rawf(const char* format, ...) {
     fdev_set_udata(&f, this->uart);
     va_start(ap, format);
     vfprintf(&f, format, ap);
+    va_end(ap);
 }
 
 void LogClass::error(const char str[]) {
@@ -155,6 +158,7 @@ void LogClass::errorf(const char* format, ...) {
         fdev_set_udata(&f, this->uart);
         va_start(ap, nFormat);
         vfprintf(&f, nFormat, ap);
+        va_end(ap);
     }
 }
 
@@ -180,6 +184,7 @@ void LogClass::warnf(const char* format, ...) {
         fdev_set_udata(&f, this->uart);
         va_start(ap, nFormat);
         vfprintf(&f, nFormat, ap);
+        va_end(ap);
     }
 }
 

src/log.h

@@ -7,42 +7,42 @@ enum class LogLevel { NONE = 0, ERROR, WARN, INFO, DEBUG };
 
 class LogClass {
   private:
-    UartClass *uart;
+    UartClass* uart;
     LogLevel log_level;
 
-    void print(const char *str, const char level[]);
+    void print(const char* str, const char level[]);
 
   public:
-    LogClass(UartClass *uart);
+    LogClass(UartClass* uart);
 
-    void setOutputUart(UartClass *uart);
+    void setOutputUart(UartClass* uart);
 
     void setLogLevel(const LogLevel log_level);
-    bool setLogLevelStr(const char *log_level);
+    bool setLogLevelStr(const char* log_level);
     LogLevel getLogLevel();
 
     void begin(const uint32_t baud_rate);
     void end();
 
     void error(const char str[]);
     void error(const String str);
-    void errorf(const char *format, ...);
+    void errorf(const char* format, ...);
 
     void warn(const char str[]);
     void warn(const String str);
-    void warnf(const char *format, ...);
+    void warnf(const char* format, ...);
 
     void info(const char str[]);
     void info(const String str);
-    void infof(const char *format, ...);
+    void infof(const char* format, ...);
 
     void debug(const char str[]);
     void debug(const String str);
-    void debugf(const char *format, ...);
+    void debugf(const char* format, ...);
 
     void raw(const char str[]);
     void raw(const String str);
-    void rawf(const char *format, ...);
+    void rawf(const char* format, ...);
 };
 
 extern LogClass Log;

src/low_power.cpp

@@ -302,7 +302,9 @@ static void enablePIT(void) {
     temp = CLKCTRL.XOSC32KCTRLA;
     temp &= ~CLKCTRL_ENABLE_bm;
     _PROTECTED_WRITE(CLKCTRL.XOSC32KCTRLA, temp);
-    while (CLKCTRL.MCLKSTATUS & CLKCTRL_XOSC32KS_bm) {}
+    while (CLKCTRL.MCLKSTATUS & CLKCTRL_XOSC32KS_bm) {
+        __asm__ __volatile__("nop\n\t");
+    }
 
     // We want the external crystal to run in standby and in low power mode
     temp = CLKCTRL.XOSC32KCTRLA;
@@ -317,7 +319,7 @@ static void enablePIT(void) {
     _PROTECTED_WRITE(CLKCTRL.XOSC32KCTRLA, temp);
 
     // Wait for registers to synchronize
-    while (RTC.PITSTATUS) { delay(1); }
+    while (RTC.PITSTATUS) { __asm__ __volatile__("nop\n\t"); }
 
     RTC.CLKSEL |= RTC_CLKSEL_XOSC32K_gc;
     RTC.PITINTCTRL |= RTC_PI_bm;
@@ -326,7 +328,7 @@ static void enablePIT(void) {
     // The first PIT intterupt will not necessarily be at the period specified,
     // so we just wait until it has triggered and track the reminaing time from
     // there
-    while (!pit_triggered) { delay(1); }
+    while (!pit_triggered) { __asm__ __volatile__("nop\n\t"); }
     pit_triggered = false;
 }
 
@@ -442,9 +444,6 @@ static void powerDownPeripherals(const bool keep_modem_active) {
 
     savePinState();
 
-    // Disable millis() timer
-    stop_millis();
-
     // For low power, the following configuration should be used.
     // If no comment is specified, the pin is set to input with input buffer
     // disabled and pull-up on
@@ -604,8 +603,6 @@ static void powerUpPeripherals() {
 
     restorePinState();
 
-    restart_millis();
-
     // ADC for analogRead
     init_ADC0();
 }
@@ -723,11 +720,8 @@ void LowPowerClass::powerSave(void) {
 
             retrieved_period = true;
         }
-
-        // Retrieving the operator sleep time will call CEREG, which will
-        // trigger led ctrl, so we just disable it again.
-        // LedCtrl.off(Led::CELL, true);
     }
+
     if (!attemptToEnterPowerSaveModeForModem(30000)) {
         Log.error(
             "Failed to put cellular modem in sleep. Power save functionality "
@@ -739,8 +733,15 @@ void LowPowerClass::powerSave(void) {
         SLPCTRL.CTRLA |= SLPCTRL_SMODE_PDOWN_gc | SLPCTRL_SEN_bm;
 
         enableLDO();
+
+        // It's important that we stop the millis after enabling the LDO, as it
+        // uses delay() to wait for the LDO mode to settle
+        stop_millis();
+
         sleep_cpu();
 
+        restart_millis();
+
         // Will sleep here until we get the RING line activity and wake up
         disableLDO();
 
@@ -750,8 +751,6 @@ void LowPowerClass::powerSave(void) {
         modem_is_in_power_save = false;
     }
 
-    // LedCtrl.on(Led::CELL, true);
-
     SequansController.setPowerSaveMode(0, NULL);
 }
 
@@ -761,12 +760,15 @@ void LowPowerClass::powerDown(const uint32_t power_down_time_seconds) {
 
     Lte.end();
 
-    // TODO: somehow this prevents the modem to sleep...
     powerDownPeripherals(false);
 
     enablePIT();
     enableLDO();
 
+    // It's important that we stop the millis after enabling the LDO, as it uses
+    // delay() to wait for the LDO mode to settle
+    stop_millis();
+
     uint32_t remaining_time_seconds = power_down_time_seconds;
 
     while (remaining_time_seconds > 0) {
@@ -782,6 +784,8 @@ void LowPowerClass::powerDown(const uint32_t power_down_time_seconds) {
         }
     }
 
+    restart_millis();
+
     disableLDO();
     disablePIT();
     SLPCTRL.CTRLA &= ~SLPCTRL_SEN_bm;

src/lte.cpp

@@ -121,7 +121,7 @@ bool LteClass::begin(const uint32_t timeout_ms, const bool print_messages) {
     SequansController.writeCommand(AT_ENABLE_CEREG_URC);
     SequansController.writeCommand(AT_CONNECT);
 
-    char response_buffer[48] = "";
+    char response_buffer[64] = "";
     char value_buffer[32]    = "";
 
     // Wait for CEREG URC before checking SIM