Merge branch 'master' into master

lucasssvaz · web-flow · commit 6db343014e80 · 2024-07-29T11:31:58.000-03:00
diff --git a/.github/scripts/install-arduino-cli.sh b/.github/scripts/install-arduino-cli.sh
@@ -41,6 +41,12 @@ fi
 if [ ! -d "$ARDUINO_IDE_PATH" ] || [ ! -f "$ARDUINO_IDE_PATH/arduino-cli" ]; then
     echo "Installing Arduino CLI on $OS_NAME ..."
     mkdir -p "$ARDUINO_IDE_PATH"
-    curl -fsSL https://raw.githubusercontent.com/arduino/arduino-cli/master/install.sh | BINDIR="$ARDUINO_IDE_PATH" sh
+    if [ "$OS_IS_WINDOWS" == "1" ]; then
+        curl -fsSL https://downloads.arduino.cc/arduino-cli/arduino-cli_latest_Windows_64bit.zip -o arduino-cli.zip
+        unzip -q arduino-cli.zip -d "$ARDUINO_IDE_PATH"
+        rm arduino-cli.zip
+    else
+        curl -fsSL https://raw.githubusercontent.com/arduino/arduino-cli/master/install.sh | BINDIR="$ARDUINO_IDE_PATH" sh
+    fi
 fi
 
diff --git a/.github/workflows/tests_hw.yml b/.github/workflows/tests_hw.yml
@@ -12,6 +12,13 @@ on:
         description: 'Chip to run tests for'
         required: true
 
+env:
+  DEBIAN_FRONTEND: noninteractive
+
+defaults:
+  run:
+    shell: bash
+
 jobs:
   hardware-test:
     name: Hardware ${{ inputs.chip }} ${{ inputs.type }} tests
@@ -48,6 +55,13 @@ jobs:
       - name: Checkout user repository
         if: ${{ steps.check-tests.outputs.enabled == 'true' }}
         uses: actions/checkout@v4
+        with:
+          sparse-checkout: |
+            *
+
+      - name: List files
+        if: ${{ steps.check-tests.outputs.enabled == 'true' }}
+        run: ls -la
 
       # setup-python currently only works on ubuntu images
       # - uses: actions/setup-python@v5
diff --git a/boards.txt b/boards.txt
diff --git a/cores/esp32/esp32-hal-gpio.h b/cores/esp32/esp32-hal-gpio.h
@@ -27,6 +27,7 @@ extern "C" {
 #include "esp32-hal.h"
 #include "soc/soc_caps.h"
 #include "pins_arduino.h"
+#include "driver/gpio.h"
 
 #if (CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3)
 #define NUM_OUPUT_PINS 46
diff --git a/cores/esp32/esp32-hal-timer.c b/cores/esp32/esp32-hal-timer.c
@@ -37,17 +37,28 @@ struct timer_struct_t {
 };
 
 inline uint64_t timerRead(hw_timer_t *timer) {
-
+  if (timer == NULL) {
+    log_e("Timer handle is NULL");
+    return 0;
+  }
   uint64_t value;
   gptimer_get_raw_count(timer->timer_handle, &value);
   return value;
 }
 
 void timerWrite(hw_timer_t *timer, uint64_t val) {
+  if (timer == NULL) {
+    log_e("Timer handle is NULL");
+    return;
+  }
   gptimer_set_raw_count(timer->timer_handle, val);
 }
 
 void timerAlarm(hw_timer_t *timer, uint64_t alarm_value, bool autoreload, uint64_t reload_count) {
+  if (timer == NULL) {
+    log_e("Timer handle is NULL");
+    return;
+  }
   esp_err_t err = ESP_OK;
   gptimer_alarm_config_t alarm_cfg = {
     .alarm_count = alarm_value,
@@ -61,22 +72,37 @@ void timerAlarm(hw_timer_t *timer, uint64_t alarm_value, bool autoreload, uint64
 }
 
 uint32_t timerGetFrequency(hw_timer_t *timer) {
+  if (timer == NULL) {
+    return 0;
+  }
   uint32_t frequency;
   gptimer_get_resolution(timer->timer_handle, &frequency);
   return frequency;
 }
 
 void timerStart(hw_timer_t *timer) {
+  if (timer == NULL) {
+    log_e("Timer handle is NULL");
+    return;
+  }
   gptimer_start(timer->timer_handle);
   timer->timer_started = true;
 }
 
 void timerStop(hw_timer_t *timer) {
+  if (timer == NULL) {
+    log_e("Timer handle is NULL");
+    return;
+  }
   gptimer_stop(timer->timer_handle);
   timer->timer_started = false;
 }
 
 void timerRestart(hw_timer_t *timer) {
+  if (timer == NULL) {
+    log_e("Timer handle is NULL");
+    return;
+  }
   gptimer_set_raw_count(timer->timer_handle, 0);
 }
 
@@ -129,17 +155,19 @@ hw_timer_t *timerBegin(uint32_t frequency) {
 }
 
 void timerEnd(hw_timer_t *timer) {
-  esp_err_t err = ESP_OK;
-  if (timer->timer_started == true) {
-    gptimer_stop(timer->timer_handle);
-  }
-  gptimer_disable(timer->timer_handle);
-  err = gptimer_del_timer(timer->timer_handle);
-  if (err != ESP_OK) {
-    log_e("Failed to destroy GPTimer, error num=%d", err);
-    return;
+  if (timer != NULL) {
+    esp_err_t err = ESP_OK;
+    if (timer->timer_started == true) {
+      gptimer_stop(timer->timer_handle);
+    }
+    gptimer_disable(timer->timer_handle);
+    err = gptimer_del_timer(timer->timer_handle);
+    if (err != ESP_OK) {
+      log_e("Failed to destroy GPTimer, error num=%d", err);
+      return;
+    }
+    free(timer);
   }
-  free(timer);
 }
 
 bool IRAM_ATTR timerFnWrapper(gptimer_handle_t timer, const gptimer_alarm_event_data_t *edata, void *args) {
@@ -156,6 +184,10 @@ bool IRAM_ATTR timerFnWrapper(gptimer_handle_t timer, const gptimer_alarm_event_
 }
 
 void timerAttachInterruptFunctionalArg(hw_timer_t *timer, void (*userFunc)(void *), void *arg) {
+  if (timer == NULL) {
+    log_e("Timer handle is NULL");
+    return;
+  }
   esp_err_t err = ESP_OK;
   gptimer_event_callbacks_t cbs = {
     .on_alarm = timerFnWrapper,
@@ -187,6 +219,10 @@ void timerAttachInterrupt(hw_timer_t *timer, voidFuncPtr userFunc) {
 }
 
 void timerDetachInterrupt(hw_timer_t *timer) {
+  if (timer == NULL) {
+    log_e("Timer handle is NULL");
+    return;
+  }
   esp_err_t err = ESP_OK;
   err = gptimer_set_alarm_action(timer->timer_handle, NULL);
   timer->interrupt_handle.fn = NULL;
@@ -197,18 +233,30 @@ void timerDetachInterrupt(hw_timer_t *timer) {
 }
 
 uint64_t timerReadMicros(hw_timer_t *timer) {
+  if (timer == NULL) {
+    log_e("Timer handle is NULL");
+    return 0;
+  }
   uint64_t timer_val = timerRead(timer);
   uint32_t frequency = timerGetFrequency(timer);
   return timer_val * 1000000 / frequency;
 }
 
 uint64_t timerReadMilis(hw_timer_t *timer) {
+  if (timer == NULL) {
+    log_e("Timer handle is NULL");
+    return 0;
+  }
   uint64_t timer_val = timerRead(timer);
   uint32_t frequency = timerGetFrequency(timer);
   return timer_val * 1000 / frequency;
 }
 
 double timerReadSeconds(hw_timer_t *timer) {
+  if (timer == NULL) {
+    log_e("Timer handle is NULL");
+    return 0;
+  }
   uint64_t timer_val = timerRead(timer);
   uint32_t frequency = timerGetFrequency(timer);
   return (double)timer_val / frequency;
diff --git a/libraries/NetworkClientSecure/examples/WiFiClientSecure/WiFiClientSecure.ino b/libraries/NetworkClientSecure/examples/WiFiClientSecure/WiFiClientSecure.ino
@@ -18,27 +18,37 @@ const char *server = "www.howsmyssl.com";  // Server URL
 // change it to your server root CA
 // SHA1 fingerprint is broken now!
 
-const char *test_root_ca = "-----BEGIN CERTIFICATE-----\n"
-                           "MIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/\n"
-                           "MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT\n"
-                           "DkRTVCBSb290IENBIFgzMB4XDTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVow\n"
-                           "PzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMRcwFQYDVQQD\n"
-                           "Ew5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB\n"
-                           "AN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmTrE4O\n"
-                           "rz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEq\n"
-                           "OLl5CjH9UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9b\n"
-                           "xiqKqy69cK3FCxolkHRyxXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw\n"
-                           "7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40dutolucbY38EVAjqr2m7xPi71XAicPNaD\n"
-                           "aeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNV\n"
-                           "HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQMA0GCSqG\n"
-                           "SIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69\n"
-                           "ikugdB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXr\n"
-                           "AvHRAosZy5Q6XkjEGB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZz\n"
-                           "R8srzJmwN0jP41ZL9c8PDHIyh8bwRLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5\n"
-                           "JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubSfZGL+T0yjWW06XyxV3bqxbYo\n"
-                           "Ob8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ\n"
-                           "-----END CERTIFICATE-----\n";
-
+const char *test_root_ca = R"literal(
+-----BEGIN CERTIFICATE-----
+MIIFBTCCAu2gAwIBAgIQS6hSk/eaL6JzBkuoBI110DANBgkqhkiG9w0BAQsFADBP
+MQswCQYDVQQGEwJVUzEpMCcGA1UEChMgSW50ZXJuZXQgU2VjdXJpdHkgUmVzZWFy
+Y2ggR3JvdXAxFTATBgNVBAMTDElTUkcgUm9vdCBYMTAeFw0yNDAzMTMwMDAwMDBa
+Fw0yNzAzMTIyMzU5NTlaMDMxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBF
+bmNyeXB0MQwwCgYDVQQDEwNSMTAwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQDPV+XmxFQS7bRH/sknWHZGUCiMHT6I3wWd1bUYKb3dtVq/+vbOo76vACFL
+YlpaPAEvxVgD9on/jhFD68G14BQHlo9vH9fnuoE5CXVlt8KvGFs3Jijno/QHK20a
+/6tYvJWuQP/py1fEtVt/eA0YYbwX51TGu0mRzW4Y0YCF7qZlNrx06rxQTOr8IfM4
+FpOUurDTazgGzRYSespSdcitdrLCnF2YRVxvYXvGLe48E1KGAdlX5jgc3421H5KR
+mudKHMxFqHJV8LDmowfs/acbZp4/SItxhHFYyTr6717yW0QrPHTnj7JHwQdqzZq3
+DZb3EoEmUVQK7GH29/Xi8orIlQ2NAgMBAAGjgfgwgfUwDgYDVR0PAQH/BAQDAgGG
+MB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATASBgNVHRMBAf8ECDAGAQH/
+AgEAMB0GA1UdDgQWBBS7vMNHpeS8qcbDpHIMEI2iNeHI6DAfBgNVHSMEGDAWgBR5
+tFnme7bl5AFzgAiIyBpY9umbbjAyBggrBgEFBQcBAQQmMCQwIgYIKwYBBQUHMAKG
+Fmh0dHA6Ly94MS5pLmxlbmNyLm9yZy8wEwYDVR0gBAwwCjAIBgZngQwBAgEwJwYD
+VR0fBCAwHjAcoBqgGIYWaHR0cDovL3gxLmMubGVuY3Iub3JnLzANBgkqhkiG9w0B
+AQsFAAOCAgEAkrHnQTfreZ2B5s3iJeE6IOmQRJWjgVzPw139vaBw1bGWKCIL0vIo
+zwzn1OZDjCQiHcFCktEJr59L9MhwTyAWsVrdAfYf+B9haxQnsHKNY67u4s5Lzzfd
+u6PUzeetUK29v+PsPmI2cJkxp+iN3epi4hKu9ZzUPSwMqtCceb7qPVxEbpYxY1p9
+1n5PJKBLBX9eb9LU6l8zSxPWV7bK3lG4XaMJgnT9x3ies7msFtpKK5bDtotij/l0
+GaKeA97pb5uwD9KgWvaFXMIEt8jVTjLEvwRdvCn294GPDF08U8lAkIv7tghluaQh
+1QnlE4SEN4LOECj8dsIGJXpGUk3aU3KkJz9icKy+aUgA+2cP21uh6NcDIS3XyfaZ
+QjmDQ993ChII8SXWupQZVBiIpcWO4RqZk3lr7Bz5MUCwzDIA359e57SSq5CCkY0N
+4B6Vulk7LktfwrdGNVI5BsC9qqxSwSKgRJeZ9wygIaehbHFHFhcBaMDKpiZlBHyz
+rsnnlFXCb5s8HKn5LsUgGvB24L7sGNZP2CX7dhHov+YhD+jozLW2p9W4959Bz2Ei
+RmqDtmiXLnzqTpXbI+suyCsohKRg6Un0RC47+cpiVwHiXZAW+cn8eiNIjqbVgXLx
+KPpdzvvtTnOPlC7SQZSYmdunr3Bf9b77AiC/ZidstK36dRILKz7OA54=
+-----END CERTIFICATE-----
+)literal";
 // You can use x.509 client certificates if you want
 //const char* test_client_key = "";   //to verify the client
 //const char* test_client_cert = "";  //to verify the client
diff --git a/libraries/RainMaker/examples/README.md b/libraries/RainMaker/examples/README.md
@@ -2,11 +2,13 @@
 
 While building any examples for ESP RainMaker, take care of the following:
 
-1. Change partition scheme in Arduino IDE to RainMaker (Tools -> Partition Scheme -> RainMaker).
+1. Change the partition scheme that fits your flash size in Arduino IDE to "RainMaker 4MB", "RainMaker 4MB no OTA" or "RainMaker 8MB" (Tools -> Partition Scheme -> RainMaker).
 2. Once ESP RainMaker gets started, compulsorily call `WiFi.beginProvision()` which is responsible for user-node mapping.
 3. Use the appropriate provisioning scheme as per the board.
     - ESP32 Board: BLE Provisioning
     - ESP32-C3 Board: BLE Provisioning
     - ESP32-S3 Board: BLE Provisioning
     - ESP32-S2 Board: SoftAP Provisioning
-4. Set debug level to Info (Tools -> Core Debug Level -> Info). This is recommended debug level but not mandatory to run RainMaker.
+    - ESP32-C6 Board: BLE Provisioning
+    - ESP32-H2 Board: BLE Provisioning
+4. Set debug level to Info (Tools -> Core Debug Level -> Info). This is the recommended debug level but not mandatory to run RainMaker.
diff --git a/tools/partitions/rainmaker.csv b/tools/partitions/rainmaker.csv
@@ -4,4 +4,4 @@ otadata,   data,  ota,     0xe000,   0x2000,
 ota_0,     app,   ota_0,   0x10000,  0x1E0000,
 ota_1,     app,   ota_1,   0x1F0000, 0x1E0000,
 fctry,     data,  nvs,     0x3D0000, 0x6000,
-coredump, data, coredump,  0x3F0000, 0x10000,
+coredump,  data,  coredump,0x3F0000, 0x10000,
diff --git a/tools/partitions/rainmaker_4MB_no_ota.csv b/tools/partitions/rainmaker_4MB_no_ota.csv
@@ -0,0 +1,6 @@
+# Name,   Type, SubType, Offset,  Size, Flags
+nvs,       data,  nvs,     0x9000,   0x5000,
+otadata,   data,  ota,     0xe000,   0x2000,
+ota_0,     app,   ota_0,   0x10000,  0x3DA000,
+fctry,     data,  nvs,     0x3EA000, 0x6000,
+coredump,  data,  coredump,0x3F0000, 0x10000,
diff --git a/tools/partitions/rainmaker_8MB.csv b/tools/partitions/rainmaker_8MB.csv
@@ -0,0 +1,7 @@
+# Name,   Type, SubType, Offset,  Size, Flags
+nvs,       data,  nvs,     0x9000,   0x5000,
+otadata,   data,  ota,     0xe000,   0x2000,
+ota_0,     app,   ota_0,   0x10000,  0x3ED000,
+ota_1,     app,   ota_1,   0x3FD000, 0x3ED000,
+fctry,     data,  nvs,     0x7EA000, 0x6000,
+coredump,  data,  coredump,0x7F0000, 0x10000,
diff --git a/variants/ws_esp32_s3_matrix/partitions_all_app_4MB.csv b/variants/ws_esp32_s3_matrix/partitions_all_app_4MB.csv
@@ -0,0 +1,3 @@
+# Name,    Type,  SubType,     Offset,      Size,  Flags
+nvs,       data,  nvs,         0x9000,    0x5000,
+factory,   app,   factory,    0x10000,  0x3F0000,
diff --git a/variants/ws_esp32_s3_matrix/partitions_otanofs_4MB.csv b/variants/ws_esp32_s3_matrix/partitions_otanofs_4MB.csv
@@ -0,0 +1,6 @@
+#   Name, Type,  SubType,   Offset,      Size, Flags
+     nvs, data,      nvs,   0x9000,    0x5000,
+ otadata, data,      ota,   0xE000,    0x2000,
+    app0,  app,    ota_0,  0x10000,  0x1F0000,
+    app1,  app,    ota_1, 0x200000,  0x1F0000,
+coredump, data, coredump, 0x3F0000,   0x10000,
diff --git a/variants/ws_esp32_s3_matrix/pins_arduino.h b/variants/ws_esp32_s3_matrix/pins_arduino.h
@@ -0,0 +1,77 @@
+
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include <stdint.h>
+#include "soc/soc_caps.h"
+
+// BN: ESP32 Family Device
+#define USB_VID 0x303a
+#define USB_PID 0x1001
+
+#define USB_MANUFACTURER "Waveshare"
+#define USB_PRODUCT      "ESP32-S3-Matrix"
+#define USB_SERIAL       ""
+
+// Onboard 8 x 8 Matrix panel
+#define WS_MATRIX_DIN 14
+
+// Onboard  QMI8658 IMU
+#define WS_IMU_SDA     11
+#define WS_IMU_SCL     12
+#define WS_IMU_ADDRESS 0x6B
+#define WS_IMU_INT1    10
+#define WS_IMU_INT2    13
+
+// UART0 pins
+static const uint8_t TX = 43;
+static const uint8_t RX = 44;
+
+// Def for I2C that shares the IMU I2C pins
+static const uint8_t SDA = 11;
+static const uint8_t SCL = 12;
+
+// Mapping based on the ESP32S3 data sheet - alternate for SPI2
+static const uint8_t SS = 34;    // FSPICS0
+static const uint8_t MOSI = 35;  // FSPID
+static const uint8_t MISO = 37;  // FSPIQ
+static const uint8_t SCK = 36;   // FSPICLK
+
+// Analog capable pins on the header
+static const uint8_t A0 = 1;
+static const uint8_t A1 = 2;
+static const uint8_t A2 = 3;
+static const uint8_t A3 = 4;
+static const uint8_t A4 = 5;
+static const uint8_t A5 = 6;
+static const uint8_t A6 = 7;
+
+// GPIO capable pins on the header
+static const uint8_t D0 = 7;
+static const uint8_t D1 = 6;
+static const uint8_t D2 = 5;
+static const uint8_t D3 = 4;
+static const uint8_t D4 = 3;
+static const uint8_t D5 = 2;
+static const uint8_t D6 = 1;
+static const uint8_t D7 = 44;
+static const uint8_t D8 = 43;
+static const uint8_t D9 = 40;
+static const uint8_t D10 = 39;
+static const uint8_t D11 = 38;
+static const uint8_t D12 = 37;
+static const uint8_t D13 = 36;
+static const uint8_t D14 = 35;
+static const uint8_t D15 = 34;
+static const uint8_t D16 = 33;
+
+// Touch input capable pins on the header
+static const uint8_t T1 = 1;
+static const uint8_t T2 = 2;
+static const uint8_t T3 = 3;
+static const uint8_t T4 = 4;
+static const uint8_t T5 = 5;
+static const uint8_t T6 = 6;
+static const uint8_t T7 = 7;
+
+#endif /* Pins_Arduino_h */

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+# Name, Type, SubType, Offset, Size, Flags`
	`2`	`+nvs, data, nvs, 0x9000, 0x5000,`
	`3`	`+factory, app, factory, 0x10000, 0x3F0000,`