Merge branch 'main' into main

Author: BenjaminDannegard

.github/workflows/compile-examples.yml

@@ -38,19 +38,26 @@ jobs:
         - libraries/RTC/examples/Test_RTC
         - libraries/SoftwareSerial
         - libraries/WDT
+      SKETCHES_REPORTS_PATH: sketches-reports
 
     strategy:
       fail-fast: false
 
       matrix:
-        board: [
-          {"fqbn": "arduino:renesas_portenta:portenta_c33"},
-          {"fqbn": "arduino:renesas_uno:minima"},
-          {"fqbn": "arduino:renesas_uno:unor4wifi"},
-          {"fqbn": "arduino-git:renesas:portenta_c33"},
-          {"fqbn": "arduino-git:renesas:minima"},
-          {"fqbn": "arduino-git:renesas:unor4wifi"},
-        ]
+        board:
+          - fqbn: arduino:renesas_portenta:portenta_c33
+            id: c33
+          - fqbn: arduino:renesas_uno:minima
+            id: minima
+          - fqbn: arduino:renesas_uno:unor4wifi
+            id: wifi
+          - fqbn: arduino-git:renesas:portenta_c33
+            id: git_c33
+          - fqbn: arduino-git:renesas:minima
+            id: git_minima
+          - fqbn: arduino-git:renesas:unor4wifi
+            id: git_wifi
+
 
         # make board type-specific customizations to the matrix jobs
         include:
@@ -106,11 +113,11 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # The source files are in a subfolder of the ArduinoCore-API repository, so it's not possible to clone it directly to the final destination in the core
       - name: Checkout ArduinoCore-API
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: arduino/ArduinoCore-API
           path: extras/ArduinoCore-API
@@ -125,7 +132,7 @@ jobs:
         if: steps.checkapi.outputs.IS_API == 'true'
 
       - name: Checkout Basic examples
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: arduino/arduino-examples
           path: examples
@@ -173,9 +180,10 @@ jobs:
           enable-deltas-report: 'false'
           verbose: 'true'
           github-token: ${{ secrets.GITHUB_TOKEN }}
+          sketches-report-path: ${{ env.SKETCHES_REPORTS_PATH }}
 
       - name: Save memory usage change report as artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: sketches-reports
-          path: sketches-reports
+          path: ${{ env.SKETCHES_REPORTS_PATH }}
+          name: sketches-reports-${{ matrix.board.id }}

libraries/WiFiS3/src/Modem.cpp

@@ -30,14 +30,18 @@ ModemClass::~ModemClass() {
 }
 
 /* -------------------------------------------------------------------------- */
-void ModemClass::begin(int badurate){
+void ModemClass::begin(int badurate, int retry){
 /* -------------------------------------------------------------------------- */
    if(_serial != nullptr && !beginned) {
       _serial->begin(badurate);
-      beginned = true;
       string res = "";
       _serial->flush();
-      modem.write(string(PROMPT(_SOFTRESETWIFI)),res, "%s" , CMD(_SOFTRESETWIFI));
+      modem.timeout(500);
+      while(!beginned && retry > 0) {
+         beginned = modem.write(string(PROMPT(_SOFTRESETWIFI)),res, "%s" , CMD(_SOFTRESETWIFI));
+         retry -= 1;
+      }
+      modem.timeout(MODEM_TIMEOUT);
    }
 }
 

libraries/WiFiS3/src/Modem.h

@@ -45,12 +45,13 @@ class ModemClass {
    */
   ~ModemClass();
 
+
   /**
    * @brief Initializes the modem communication with a specified baud rate.
    * 
    * @param[in] `badurate` sets the baud rate for the serial connection.
    */
-  void begin(int badurate = 115200);
+  void begin(int badurate = 115200, int retry = 3);
 
   /** 
    * @brief Ends the modem communication.

libraries/WiFiS3/src/WiFiClient.cpp

@@ -185,15 +185,11 @@ int WiFiClient::read(uint8_t *buf, size_t size) {
 /* -------------------------------------------------------------------------- */
 int WiFiClient::peek() {
 /* -------------------------------------------------------------------------- */
-   int rv = -1;
-   if(_sock >= 0) {
-      string res = "";
-      modem.begin();
-      if(modem.write(string(PROMPT(_PEEK)),res, "%s%d\r\n" , CMD_WRITE(_PEEK), _sock)) {
-         rv = atoi(res.c_str());
-      }
+   read_if_needed(1);
+   if(_sock >= 0 && rx_buffer != nullptr) {
+      return rx_buffer->peek();
    }
-   return rv;
+   return -1;
 }