Merge pull request #190 from tasmota/espressif_master

Espressif master

Author: Jason2866

docs/source/api/sigmadelta.rst

@@ -28,7 +28,7 @@ This function is used to setup the SigmaDelta channel frequency and resolution.
 
 .. code-block:: arduino
 
-    double ledcSetup(uint8_t channel, double freq, uint8_t resolution_bits);
+    uint32_t sigmaDeltaSetup(uint8_t pin, uint8_t channel, uint32_t freq);
 
 * ``pin`` select GPIO pin.
 * ``channel`` select SigmaDelta channel.

libraries/Update/src/HttpsOTAUpdate.h

@@ -1,5 +1,5 @@
-#ifndef HTPSPOTUADATE_H
-#define HTPSPOTUADATE_H
+#ifndef HTTPSOTAUPDATE_H
+#define HTTPSOTAUPDATE_H
 #include "esp_http_client.h"
 #define HttpEvent_t esp_http_client_event_t
 

libraries/Update/src/Update.h

@@ -1,5 +1,5 @@
-#ifndef ESP8266UPDATER_H
-#define ESP8266UPDATER_H
+#ifndef ESP32UPDATER_H
+#define ESP32UPDATER_H
 
 #include <Arduino.h>
 #include <MD5Builder.h>

libraries/WiFi/src/WiFiClient.cpp

@@ -216,10 +216,10 @@ int WiFiClient::connect(IPAddress ip, uint16_t port)
     return connect(ip,port,_timeout);
 }
 
-int WiFiClient::connect(IPAddress ip, uint16_t port, int32_t timeout)
+int WiFiClient::connect(IPAddress ip, uint16_t port, int32_t timeout_ms)
 {
     struct sockaddr_storage serveraddr = {};
-    _timeout = timeout;
+    _timeout = timeout_ms;
     int sockfd = -1;
 
     if (ip.type() == IPv6) {
@@ -246,7 +246,7 @@ int WiFiClient::connect(IPAddress ip, uint16_t port, int32_t timeout)
     FD_ZERO(&fdset);
     FD_SET(sockfd, &fdset);
     tv.tv_sec = _timeout / 1000;
-    tv.tv_usec = 0;
+    tv.tv_usec = (_timeout  % 1000) * 1000;
 
 #ifdef ESP_IDF_VERSION_MAJOR
     int res = lwip_connect(sockfd, (struct sockaddr*)&serveraddr, sizeof(serveraddr));
@@ -307,7 +307,7 @@ int WiFiClient::connect(const char *host, uint16_t port)
     return connect(host,port,_timeout);
 }
 
-int WiFiClient::connect(const char *host, uint16_t port, int32_t timeout)
+int WiFiClient::connect(const char *host, uint16_t port, int32_t timeout_ms)
 {
     if (WiFiGenericClass::getStatusBits() & WIFI_WANT_IP6_BIT) {
         ip_addr_t srv6;
@@ -326,7 +326,7 @@ int WiFiClient::connect(const char *host, uint16_t port, int32_t timeout)
     if(!WiFiGenericClass::hostByName(host, srv)){
         return 0;
     }
-    return connect(srv, port, timeout);
+    return connect(srv, port, timeout_ms);
 }
 
 int WiFiClient::setSocketOption(int option, char* value, size_t len)

libraries/WiFi/src/WiFiClient.h

@@ -50,9 +50,9 @@ class WiFiClient : public ESPLwIPClient
     WiFiClient(int fd);
     ~WiFiClient();
     int connect(IPAddress ip, uint16_t port);
-    int connect(IPAddress ip, uint16_t port, int32_t timeout);
+    int connect(IPAddress ip, uint16_t port, int32_t timeout_ms);
     int connect(const char *host, uint16_t port);
-    int connect(const char *host, uint16_t port, int32_t timeout);
+    int connect(const char *host, uint16_t port, int32_t timeout_ms);
     size_t write(uint8_t data);
     size_t write(const uint8_t *buf, size_t size);
     size_t write_P(PGM_P buf, size_t size);