Merge branch 'espressif:master' into master

Author: Jason2866

.github/scripts/on-push.sh

@@ -108,7 +108,7 @@ else
     replace_script+="data['packages']['toolchain-xtensa-esp32']['optional']=True;"
     replace_script+="data['packages']['toolchain-xtensa-esp32s3']['optional']=False;"
     replace_script+="data['packages']['tool-esptoolpy']['owner']='tasmota';"
-    replace_script+="data['packages']['tool-esptoolpy']['version']='https://github.com/tasmota/esptool/releases/download/v3.3/esptool-3.3.zip';"
+    replace_script+="data['packages']['tool-esptoolpy']['version']='https://github.com/tasmota/esptool/releases/download/v4.2.1/esptool-4.2.1.zip';"
     replace_script+="fp.seek(0);fp.truncate();json.dump(data, fp, indent=2);fp.close()"
     python -c "$replace_script"
 

.github/workflows/push.yml

@@ -97,4 +97,5 @@ jobs:
         run: |
           . ${IDF_PATH}/export.sh
           idf.py create-project test
+          echo CONFIG_FREERTOS_HZ=1000 > test/sdkconfig.defaults
           idf.py -C test -DEXTRA_COMPONENT_DIRS=$PWD/components build

.gitignore

@@ -8,9 +8,17 @@ tools/esptool.exe
 tools/mkspiffs
 tools/mklittlefs
 tools/mkfatfs.exe
+
+# Ignore editor backup files and macOS system metadata
 .DS_Store
+.*.swp
+.*.swo
+*~
+
+# Ignore build folder
+/build
 
-#Ignore files built by Visual Studio/Visual Micro
+# Ignore files built by Visual Studio/Visual Micro
 [Dd]ebug*/
 [Rr]elease*/
 .vs/

CMakeLists.txt

@@ -161,7 +161,7 @@ set(BLE_SRCS
   )
 
 set(includedirs
-  variants/${IDF_TARGET}/
+  variants/${CONFIG_ARDUINO_VARIANT}/
   cores/esp32/
   libraries/ArduinoOTA/src
   libraries/AsyncUDP/src
@@ -202,13 +202,19 @@ set(priv_requires fatfs nvs_flash app_update spiffs bootloader_support openssl b
 
 idf_component_register(INCLUDE_DIRS ${includedirs} PRIV_INCLUDE_DIRS ${priv_includes} SRCS ${srcs} REQUIRES ${requires} PRIV_REQUIRES ${priv_requires})
 
-string(TOUPPER ${CONFIG_IDF_TARGET} idf_target_caps)
+if(NOT CONFIG_FREERTOS_HZ EQUAL 1000 AND NOT "$ENV{ARDUINO_SKIP_TICK_CHECK}")
+    # See delay() in cores/esp32/esp32-hal-misc.c.
+    message(FATAL_ERROR "esp32-arduino requires CONFIG_FREERTOS_HZ=1000 "
+                        "(currently ${CONFIG_FREERTOS_HZ})")
+endif()
+
+string(TOUPPER ${CONFIG_ARDUINO_VARIANT} idf_target_caps)
 target_compile_options(${COMPONENT_TARGET} PUBLIC
     -DARDUINO=10812
     -DARDUINO_${idf_target_caps}_DEV
     -DARDUINO_ARCH_ESP32
     -DARDUINO_BOARD="${idf_target_caps}_DEV"
-    -DARDUINO_VARIANT="${CONFIG_IDF_TARGET}"
+    -DARDUINO_VARIANT="${CONFIG_ARDUINO_VARIANT}"
     -DESP32)
 
 if(CONFIG_AUTOSTART_ARDUINO)

Kconfig.projbuild

@@ -1,5 +1,14 @@
 menu "Arduino Configuration"
 
+config ARDUINO_VARIANT
+    string "Arduino target variant (board)"
+    default IDF_TARGET
+    help
+        The name of a target variant (e.g., a specific board) in the variants/
+        folder, e.g.  "heltec_wifi_lora_32_V2". The name is case sensitive.
+        Specifying a variant name different from the target enables additional
+        customization, for example the definition of GPIO pins.
+
 config ENABLE_ARDUINO_DEPENDS
     bool
     select LWIP_SO_RCVBUF

boards.txt

@@ -140,8 +140,7 @@ If you are writing code that does not require Arduino to compile and you want yo
 FreeRTOS Tick Rate (Hz)
 -----------------------
 
-You might notice that Arduino-esp32's `delay()` function will only work in multiples of 10ms. That is because, by default, esp-idf handles task events 100 times per second.
-To fix that behavior, you need to set FreeRTOS tick rate to 1000Hz in `make menuconfig` -> `Component config` -> `FreeRTOS` -> `Tick rate`.
+The Arduino component requires the FreeRTOS tick rate `CONFIG_FREERTOS_HZ` set to 1000Hz in `make menuconfig` -> `Component config` -> `FreeRTOS` -> `Tick rate`.
 
 Compilation Errors
 ------------------

docs/source/esp-idf_component.rst

@@ -34,7 +34,7 @@
 
 // Global copy of slave
 esp_now_peer_info_t slave;
-#define CHANNEL 3
+#define CHANNEL 1
 #define PRINTSCANRESULTS 0
 #define DELETEBEFOREPAIR 0
 

libraries/ESP32/examples/ESPNow/Basic/Master/Master.ino

@@ -1551,8 +1551,6 @@ void HTTPClient::setCookie(String date, String headerValue)
     String value;
     int pos1, pos2;
 
-    headerValue.toLowerCase();
-
     struct tm tm;
     strptime(date.c_str(), HTTP_TIME_PATTERN, &tm);
     cookie.date = mktime(&tm);
@@ -1567,6 +1565,9 @@ void HTTPClient::setCookie(String date, String headerValue)
         return;     // invalid cookie header
     }
 
+    // only Cookie Attributes are case insensitive from this point on
+    headerValue.toLowerCase();
+
     // expires
     if (headerValue.indexOf("expires=") >= 0){
         pos1 = headerValue.indexOf("expires=") + strlen("expires=");

libraries/HTTPClient/src/HTTPClient.cpp

@@ -31,20 +31,20 @@ LightSwitch switch_ch1 = {gpio_switch1, false};
 LightSwitch switch_ch2 = {gpio_switch2, false};
 
 //The framework provides some standard device types like switch, lightbulb, fan, temperature sensor.
-static Switch my_switch1("Switch_ch1", &gpio_relay1);
-static Switch my_switch2("Switch_ch2", &gpio_relay2);
+static Switch my_switch1;
+static Switch my_switch2;
 
 void sysProvEvent(arduino_event_t *sys_event)
 {
-    switch (sys_event->event_id) {      
+    switch (sys_event->event_id) {
         case ARDUINO_EVENT_PROV_START:
 #if CONFIG_IDF_TARGET_ESP32
         Serial.printf("\nProvisioning Started with name \"%s\" and PoP \"%s\" on BLE\n", service_name, pop);
         printQR(service_name, pop, "ble");
 #else
         Serial.printf("\nProvisioning Started with name \"%s\" and PoP \"%s\" on SoftAP\n", service_name, pop);
         printQR(service_name, pop, "softap");
-#endif        
+#endif
         break;
         case ARDUINO_EVENT_WIFI_STA_CONNECTED:
         Serial.printf("\nConnected to Wi-Fi!\n");
@@ -60,18 +60,18 @@ void write_callback(Device *device, Param *param, const param_val_t val, void *p
     const char *param_name = param->getParamName();
 
     if(strcmp(device_name, "Switch_ch1") == 0) {
-      
+
       Serial.printf("Lightbulb = %s\n", val.val.b? "true" : "false");
-      
+
       if(strcmp(param_name, "Power") == 0) {
           Serial.printf("Received value = %s for %s - %s\n", val.val.b? "true" : "false", device_name, param_name);
         switch_state_ch1 = val.val.b;
         (switch_state_ch1 == false) ? digitalWrite(gpio_relay1, LOW) : digitalWrite(gpio_relay1, HIGH);
         param->updateAndReport(val);
       }
-      
+
     } else if(strcmp(device_name, "Switch_ch2") == 0) {
-      
+
       Serial.printf("Switch value = %s\n", val.val.b? "true" : "false");
 
       if(strcmp(param_name, "Power") == 0) {
@@ -80,9 +80,9 @@ void write_callback(Device *device, Param *param, const param_val_t val, void *p
         (switch_state_ch2 == false) ? digitalWrite(gpio_relay2, LOW) : digitalWrite(gpio_relay2, HIGH);
         param->updateAndReport(val);
       }
-  
+
     }
- 
+
 }
 
 void ARDUINO_ISR_ATTR isr(void* arg) {
@@ -92,8 +92,9 @@ void ARDUINO_ISR_ATTR isr(void* arg) {
 
 void setup()
 {
+
     uint32_t chipId = 0;
-    
+
     Serial.begin(115200);
 
     // Configure the input GPIOs
@@ -102,7 +103,7 @@ void setup()
     attachInterruptArg(switch_ch1.pin, isr, &switch_ch1, CHANGE);
     pinMode(switch_ch2.pin, INPUT_PULLUP);
     attachInterruptArg(switch_ch2.pin, isr, &switch_ch2, CHANGE);
-    
+
     // Set the Relays GPIOs as output mode
     pinMode(gpio_relay1, OUTPUT);
     pinMode(gpio_relay2, OUTPUT);
@@ -112,20 +113,24 @@ void setup()
     digitalWrite(gpio_relay2, DEFAULT_POWER_MODE);
     digitalWrite(gpio_led, false);
 
-    Node my_node;    
+    Node my_node;
     my_node = RMaker.initNode("Sonoff Dual R3");
 
+    //Initialize switch device
+    my_switch1 = Switch("Switch_ch1", &gpio_relay1);
+    my_switch2 = Switch("Switch_ch2", &gpio_relay2);
+
     //Standard switch device
     my_switch1.addCb(write_callback);
     my_switch2.addCb(write_callback);
 
-    //Add switch device to the node   
+    //Add switch device to the node
     my_node.addDevice(my_switch1);
     my_node.addDevice(my_switch2);
 
-    //This is optional 
+    //This is optional
     RMaker.enableOTA(OTA_USING_PARAMS);
-    //If you want to enable scheduling, set time zone for your region using setTimeZone(). 
+    //If you want to enable scheduling, set time zone for your region using setTimeZone().
     //The list of available values are provided here https://rainmaker.espressif.com/docs/time-service.html
     // RMaker.setTimeZone("Asia/Shanghai");
     // Alternatively, enable the Timezone service and let the phone apps set the appropriate timezone