Merge branch 'espressif:master' into Tasmota/207

Author: Jason2866

cores/esp32/Print.cpp

@@ -57,7 +57,7 @@ size_t Print::printf(const char *format, ...)
     if(len < 0) {
         va_end(arg);
         return 0;
-    };
+    }
     if(len >= (int)sizeof(loc_buf)){  // comparation of same sign type for the compiler
         temp = (char*) malloc(len+1);
         if(temp == NULL) {

libraries/SD_MMC/src/SD_MMC.cpp

@@ -72,8 +72,8 @@ bool SDMMCFS::setPins(int clk, int cmd, int d0, int d1, int d2, int d3)
         (d0 == (int)SDMMC_SLOT1_IOMUX_PIN_NUM_D0) &&
         (((d1 == -1) && (d2 == -1) && (d3 == -1)) ||
          ((d1 == (int)SDMMC_SLOT1_IOMUX_PIN_NUM_D1) &&
-         (d1 == (int)SDMMC_SLOT1_IOMUX_PIN_NUM_D2) &&
-         (d1 == (int)SDMMC_SLOT1_IOMUX_PIN_NUM_D3)));
+         (d2 == (int)SDMMC_SLOT1_IOMUX_PIN_NUM_D2) &&
+         (d3 == (int)SDMMC_SLOT1_IOMUX_PIN_NUM_D3)));
     if (!pins_ok) {
         log_e("SDMMCFS: specified pins are not supported by this chip.");
         return false;

libraries/Ticker/examples/Arguments/Arguments.ino

@@ -1,25 +1,49 @@
+/*
+ * This example demonstrates used of Ticker with arguments.
+ * You can call the same callback function with different argument on different times.
+ * Based on the argument the callback can perform different tasks.
+ */
+
 #include <Arduino.h>
 #include <Ticker.h>
 
-// attach a LED to GPIO 21
-#define LED_PIN 21
+// Arguments for the function must remain valid (not run out of scope) otherwise the function would read garbage data.
+int LED_PIN_1 = 4;
+#ifdef LED_BUILTIN
+  int LED_PIN_2 = LED_BUILTIN;
+#else
+  int LED_PIN_2 = 8;
+#endif
 
 Ticker tickerSetHigh;
 Ticker tickerSetLow;
 
-void setPin(int state) {
-  digitalWrite(LED_PIN, state);
+// Argument to callback must always be passed a reference
+void swapState(int *pin) {
+  static int led_1_state = 1;
+  static int led_2_state = 1;
+  if(*pin == LED_PIN_1){
+    Serial.printf("[%lu ms] set pin %d to state: %d\n", millis(), *pin, led_1_state);
+    digitalWrite(*pin, led_1_state);
+    led_1_state = led_1_state ? 0 : 1; // reverse for next pass
+  }else if(*pin == LED_PIN_2){
+    Serial.printf("[%lu ms] set pin %d to state: %d\n", millis(), *pin, led_2_state);
+    digitalWrite(*pin, led_2_state);
+    led_2_state = led_2_state ? 0 : 1; // reverse for next pass
+  }
 }
 
 void setup() {
-  pinMode(LED_PIN, OUTPUT);
-  digitalWrite(1, LOW);
+  Serial.begin(115200);
+  pinMode(LED_PIN_1, OUTPUT);
+  pinMode(LED_PIN_2, OUTPUT);
+  //digitalWrite(1, LOW);
 
-  // every 25 ms, call setPin(0) 
-  tickerSetLow.attach_ms(25, setPin, 0);
+  // Blink LED every 500 ms on LED_PIN_1
+  tickerSetLow.attach_ms(500, swapState, &LED_PIN_1);
 
-  // every 26 ms, call setPin(1)
-  tickerSetHigh.attach_ms(26, setPin, 1);
+  // Blink LED every 1000 ms on LED_PIN_2
+  tickerSetHigh.attach_ms(1000, swapState, &LED_PIN_2);
 }
 
 void loop() {

libraries/WiFiClientSecure/src/WiFiClientSecure.cpp

@@ -124,12 +124,21 @@ int WiFiClientSecure::connect(const char *host, uint16_t port, int32_t timeout){
 
 int WiFiClientSecure::connect(IPAddress ip, uint16_t port, const char *CA_cert, const char *cert, const char *private_key)
 {
-    return connect(ip.toString().c_str(), port, CA_cert, cert, private_key);
+    return connect(ip, port, NULL, CA_cert, cert, private_key);
 }
 
 int WiFiClientSecure::connect(const char *host, uint16_t port, const char *CA_cert, const char *cert, const char *private_key)
 {
-    int ret = start_ssl_client(sslclient, host, port, _timeout, CA_cert, _use_ca_bundle, cert, private_key, NULL, NULL, _use_insecure, _alpn_protos);
+    IPAddress address;
+    if (!WiFi.hostByName(host, address))
+        return 0;
+
+    return connect(address, port, host, CA_cert, cert, private_key);
+}
+
+int WiFiClientSecure::connect(IPAddress ip, uint16_t port, const char *host, const char *CA_cert, const char *cert, const char *private_key)
+{
+    int ret = start_ssl_client(sslclient, ip, port, host, _timeout, CA_cert, _use_ca_bundle, cert, private_key, NULL, NULL, _use_insecure, _alpn_protos);
     _lastError = ret;
     if (ret < 0) {
         log_e("start_ssl_client: %d", ret);
@@ -146,7 +155,12 @@ int WiFiClientSecure::connect(IPAddress ip, uint16_t port, const char *pskIdent,
 
 int WiFiClientSecure::connect(const char *host, uint16_t port, const char *pskIdent, const char *psKey) {
     log_v("start_ssl_client with PSK");
-    int ret = start_ssl_client(sslclient, host, port, _timeout, NULL, false, NULL, NULL, pskIdent, psKey, _use_insecure, _alpn_protos);
+
+    IPAddress address;
+    if (!WiFi.hostByName(host, address))
+        return 0;
+
+    int ret = start_ssl_client(sslclient, address, port, host, _timeout, NULL, false, NULL, NULL, pskIdent, psKey, _use_insecure, _alpn_protos);
     _lastError = ret;
     if (ret < 0) {
         log_e("start_ssl_client: %d", ret);

libraries/WiFiClientSecure/src/WiFiClientSecure.h

@@ -55,6 +55,7 @@ class WiFiClientSecure : public WiFiClient
     int connect(const char *host, uint16_t port, const char *rootCABuff, const char *cli_cert, const char *cli_key);
     int connect(IPAddress ip, uint16_t port, const char *pskIdent, const char *psKey);
     int connect(const char *host, uint16_t port, const char *pskIdent, const char *psKey);
+    int connect(IPAddress ip, uint16_t port, const char *host, const char *CA_cert, const char *cert, const char *private_key);
     int peek();
     size_t write(uint8_t data);
     size_t write(const uint8_t *buf, size_t size);

libraries/WiFiClientSecure/src/ssl_client.cpp

@@ -54,7 +54,7 @@ void ssl_init(sslclient_context *ssl_client)
 }
 
 
-int start_ssl_client(sslclient_context *ssl_client, const char *host, uint32_t port, int timeout, const char *rootCABuff, bool useRootCABundle, const char *cli_cert, const char *cli_key, const char *pskIdent, const char *psKey, bool insecure, const char **alpn_protos)
+int start_ssl_client(sslclient_context *ssl_client, const IPAddress& ip, uint32_t port, const char* hostname, int timeout, const char *rootCABuff, bool useRootCABundle, const char *cli_cert, const char *cli_key, const char *pskIdent, const char *psKey, bool insecure, const char **alpn_protos)
 {
     char buf[512];
     int ret, flags;
@@ -74,16 +74,11 @@ int start_ssl_client(sslclient_context *ssl_client, const char *host, uint32_t p
         return ssl_client->socket;
     }
 
-    IPAddress srv((uint32_t)0);
-    if(!WiFiGenericClass::hostByName(host, srv)){
-        return -1;
-    }
-
     fcntl( ssl_client->socket, F_SETFL, fcntl( ssl_client->socket, F_GETFL, 0 ) | O_NONBLOCK );
     struct sockaddr_in serv_addr;
     memset(&serv_addr, 0, sizeof(serv_addr));
     serv_addr.sin_family = AF_INET;
-    serv_addr.sin_addr.s_addr = srv;
+    serv_addr.sin_addr.s_addr = ip;
     serv_addr.sin_port = htons(port);
 
     if(timeout <= 0){
@@ -259,7 +254,7 @@ int start_ssl_client(sslclient_context *ssl_client, const char *host, uint32_t p
     log_v("Setting hostname for TLS session...");
 
     // Hostname set here should match CN in server certificate
-    if((ret = mbedtls_ssl_set_hostname(&ssl_client->ssl_ctx, host)) != 0){
+    if((ret = mbedtls_ssl_set_hostname(&ssl_client->ssl_ctx, hostname != NULL ? hostname : ip.toString().c_str())) != 0){
         return handle_error(ret);
     }
 

libraries/WiFiClientSecure/src/ssl_client.h

@@ -30,7 +30,7 @@ typedef struct sslclient_context {
 
 
 void ssl_init(sslclient_context *ssl_client);
-int start_ssl_client(sslclient_context *ssl_client, const char *host, uint32_t port, int timeout, const char *rootCABuff, bool useRootCABundle, const char *cli_cert, const char *cli_key, const char *pskIdent, const char *psKey, bool insecure, const char **alpn_protos);
+int start_ssl_client(sslclient_context *ssl_client, const IPAddress& ip, uint32_t port, const char* hostname, int timeout, const char *rootCABuff, bool useRootCABundle, const char *cli_cert, const char *cli_key, const char *pskIdent, const char *psKey, bool insecure, const char **alpn_protos);
 void stop_ssl_socket(sslclient_context *ssl_client, const char *rootCABuff, const char *cli_cert, const char *cli_key);
 int data_to_read(sslclient_context *ssl_client);
 int send_ssl_data(sslclient_context *ssl_client, const uint8_t *data, size_t len);

tools/platformio-build.py

@@ -50,19 +50,19 @@ def get_partition_table_csv(variants_dir):
 
     if partitions_name:
         # A custom partitions file is selected
-        if isfile(join(variant_partitions_dir, partitions_name)):
+        if isfile(env.subst(join(variant_partitions_dir, partitions_name))):
             return join(variant_partitions_dir, partitions_name)
 
         return abspath(
             join(fwpartitions_dir, partitions_name)
-            if isfile(join(fwpartitions_dir, partitions_name))
+            if isfile(env.subst(join(fwpartitions_dir, partitions_name)))
             else partitions_name
         )
 
     variant_partitions = join(variant_partitions_dir, "partitions.csv")
     return (
         variant_partitions
-        if isfile(variant_partitions)
+        if isfile(env.subst(variant_partitions))
         else join(fwpartitions_dir, "default.csv")
     )
 
@@ -80,7 +80,7 @@ def get_bootloader_image(variants_dir):
 
     return (
         variant_bootloader
-        if isfile(variant_bootloader)
+        if isfile(env.subst(variant_bootloader))
         else generate_bootloader_image(
             join(
                 FRAMEWORK_DIR,
@@ -125,8 +125,8 @@ def add_tinyuf2_extra_image():
     )
 
     # Add the UF2 image only if it exists and it's not already added
-    if not isfile(tinuf2_image):
-        print("Warning! The `%s` UF2 bootloader image doesn't exist" % tinuf2_image)
+    if not isfile(env.subst(tinuf2_image)):
+        print("Warning! The `%s` UF2 bootloader image doesn't exist" % env.subst(tinuf2_image))
         return
 
     if any(

variants/AirM2M_CORE_ESP32C3/pins_arduino.h

@@ -11,6 +11,10 @@
 #define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):-1)
 #define digitalPinHasPWM(p)         (p < EXTERNAL_NUM_INTERRUPTS)
 
+static const uint8_t LED_BUILTIN     = 12;
+#define BUILTIN_LED  LED_BUILTIN
+static const uint8_t LED_BUILTIN_AUX = 13;
+
 static const uint8_t TX = 21;
 static const uint8_t RX = 20;
 

variants/AirM2M_CORE_ESP32C3/variant.cpp

@@ -0,0 +1,7 @@
+#include "Arduino.h"
+
+extern "C" void initVariant(void){
+	// Stop LEDs floating
+	pinMode(LED_BUILTIN, OUTPUT); digitalWrite(LED_BUILTIN, LOW);
+	pinMode(LED_BUILTIN_AUX, OUTPUT); digitalWrite(LED_BUILTIN_AUX, LOW);
+}