Merge remote-tracking branch 'upstream/master'

Author: acevest

CMakeLists.txt

@@ -42,7 +42,7 @@ set(LIBRARY_SRCS
   libraries/AsyncUDP/src/AsyncUDP.cpp
   libraries/BluetoothSerial/src/BluetoothSerial.cpp
   libraries/DNSServer/src/DNSServer.cpp
-  libraries/EEPROM/EEPROM.cpp
+  libraries/EEPROM/src/EEPROM.cpp
   libraries/ESPmDNS/src/ESPmDNS.cpp
   libraries/FFat/src/FFat.cpp
   libraries/FS/src/FS.cpp
@@ -181,6 +181,7 @@ set(COMPONENT_ADD_INCLUDEDIRS
   libraries/BLE/src
   libraries/BluetoothSerial/src
   libraries/DNSServer/src
+  libraries/EEPROM/src
   libraries/ESP32/src
   libraries/ESPmDNS/src
   libraries/FFat/src

boards.txt

@@ -6,6 +6,7 @@ menu.FlashSize=Flash Size
 menu.PartitionScheme=Partition Scheme
 menu.DebugLevel=Core Debug Level
 menu.PSRAM=PSRAM
+menu.Revision=Board Revision
 
 ##############################################################
 
@@ -1697,6 +1698,15 @@ esp32-evb.menu.FlashFreq.40.build.flash_freq=40m
 esp32-evb.menu.UploadSpeed.115200=115200
 esp32-evb.menu.UploadSpeed.115200.upload.speed=115200
 
+esp32-evb.menu.PartitionScheme.default=Default
+esp32-evb.menu.PartitionScheme.default.build.partitions=default
+esp32-evb.menu.PartitionScheme.no_ota=No OTA (Large APP)
+esp32-evb.menu.PartitionScheme.no_ota.build.partitions=no_ota
+esp32-evb.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
+esp32-evb.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (Large APPS with OTA)
+esp32-evb.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
+esp32-evb.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
+
 ##############################################################
 
 esp32-gateway.name=OLIMEX ESP32-GATEWAY
@@ -1712,7 +1722,13 @@ esp32-gateway.serial.disableRTS=true
 esp32-gateway.build.mcu=esp32
 esp32-gateway.build.core=esp32
 esp32-gateway.build.variant=esp32-gateway
-esp32-gateway.build.board=ESP32_GATEWAY
+#esp32-gateway.build.board=ESP32_GATEWAY
+esp32-gateway.menu.Revision.RevC=Revision C or older
+esp32-gateway.menu.Revision.RevC.build.board=ESP32_GATEWAY='C'
+esp32-gateway.menu.Revision.RevE=Revision E
+esp32-gateway.menu.Revision.RevE.build.board=ESP32_GATEWAY='E'
+esp32-gateway.menu.Revision.RevF=Revision F
+esp32-gateway.menu.Revision.RevF.build.board=ESP32_GATEWAY='F'
 
 esp32-gateway.build.f_cpu=240000000L
 esp32-gateway.build.flash_mode=dio
@@ -1730,6 +1746,15 @@ esp32-gateway.menu.FlashFreq.40.build.flash_freq=40m
 esp32-gateway.menu.UploadSpeed.115200=115200
 esp32-gateway.menu.UploadSpeed.115200.upload.speed=115200
 
+esp32-gateway.menu.PartitionScheme.default=Default
+esp32-gateway.menu.PartitionScheme.default.build.partitions=default
+esp32-gateway.menu.PartitionScheme.no_ota=No OTA (Large APP)
+esp32-gateway.menu.PartitionScheme.no_ota.build.partitions=no_ota
+esp32-gateway.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
+esp32-gateway.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (Large APPS with OTA)
+esp32-gateway.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
+esp32-gateway.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
+
 ##############################################################
 
 esp32-poe.name=OLIMEX ESP32-PoE
@@ -1763,6 +1788,15 @@ esp32-poe.menu.FlashFreq.40.build.flash_freq=40m
 esp32-poe.menu.UploadSpeed.115200=115200
 esp32-poe.menu.UploadSpeed.115200.upload.speed=115200
 
+esp32-poe.menu.PartitionScheme.default=Default
+esp32-poe.menu.PartitionScheme.default.build.partitions=default
+esp32-poe.menu.PartitionScheme.no_ota=No OTA (Large APP)
+esp32-poe.menu.PartitionScheme.no_ota.build.partitions=no_ota
+esp32-poe.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
+esp32-poe.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (Large APPS with OTA)
+esp32-poe.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
+esp32-poe.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
+
 ##############################################################
 
 espino32.name=ThaiEasyElec's ESPino32
@@ -2738,7 +2772,7 @@ lopy4.menu.DebugLevel.verbose.build.code_debug=5
 oroca_edubot.name=OROCA EduBot
 
 oroca_edubot.upload.tool=esptool_py
-oroca_edubot.upload.maximum_size=1310720
+oroca_edubot.upload.maximum_size=3145728
 oroca_edubot.upload.maximum_data_size=327680
 oroca_edubot.upload.wait_for_upload_port=true
 
@@ -2754,9 +2788,16 @@ oroca_edubot.build.f_cpu=240000000L
 oroca_edubot.build.flash_mode=dio
 oroca_edubot.build.flash_size=4MB
 oroca_edubot.build.boot=dio
-oroca_edubot.build.partitions=default
+oroca_edubot.build.partitions=huge_app
 oroca_edubot.build.defines=
 
+oroca_edubot.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA)
+oroca_edubot.menu.PartitionScheme.huge_app.build.partitions=huge_app
+oroca_edubot.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
+oroca_edubot.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (Large APPS with OTA)
+oroca_edubot.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
+oroca_edubot.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
+
 oroca_edubot.menu.FlashFreq.80=80MHz
 oroca_edubot.menu.FlashFreq.80.build.flash_freq=80m
 oroca_edubot.menu.FlashFreq.40=40MHz

cores/esp32/WMath.cpp

@@ -37,10 +37,23 @@ void randomSeed(unsigned long seed)
 
 long random(long howbig)
 {
-    if(howbig == 0) {
-        return 0;
+    uint32_t x = esp_random();
+    uint64_t m = uint64_t(x) * uint64_t(howbig);
+    uint32_t l = uint32_t(m);
+    if (l < howbig) {
+        uint32_t t = -howbig;
+        if (t >= howbig) {
+            t -= howbig;
+            if (t >= howbig) 
+                t %= howbig;
+        }
+        while (l < t) {
+            x = esp_random();
+            m = uint64_t(x) * uint64_t(howbig);
+            l = uint32_t(m);
+        }
     }
-    return esp_random() % howbig;
+    return m >> 32;
 }
 
 long random(long howsmall, long howbig)

cores/esp32/esp32-hal-i2c.c

@@ -451,7 +451,7 @@ static void IRAM_ATTR i2cTriggerDumps(i2c_t * i2c, uint8_t trigger, const char l
 static void i2cApbChangeCallback(void * arg, apb_change_ev_t ev_type, uint32_t old_apb, uint32_t new_apb){
     i2c_t* i2c = (i2c_t*) arg; // recover data
     if(i2c == NULL) {  // point to peripheral control block does not exits
-        return false;
+        return;
     }
     uint32_t oldFreq=0;
     switch(ev_type){

cores/esp32/esp32-hal-misc.c

@@ -21,6 +21,9 @@
 #include "esp_partition.h"
 #include "esp_log.h"
 #include "esp_timer.h"
+#ifdef CONFIG_APP_ROLLBACK_ENABLE
+#include "esp_ota_ops.h"
+#endif //CONFIG_APP_ROLLBACK_ENABLE
 #ifdef CONFIG_BT_ENABLED
 #include "esp_bt.h"
 #endif //CONFIG_BT_ENABLED
@@ -115,7 +118,7 @@ unsigned long IRAM_ATTR micros()
 
 unsigned long IRAM_ATTR millis()
 {
-    return (unsigned long) (esp_timer_get_time() / 1000);
+    return (unsigned long) (esp_timer_get_time() / 1000ULL);
 }
 
 void delay(uint32_t ms)
@@ -145,6 +148,9 @@ void initVariant() {}
 void init() __attribute__((weak));
 void init() {}
 
+bool verifyOta() __attribute__((weak));
+bool verifyOta() { return true; }
+
 #ifdef CONFIG_BT_ENABLED
 //overwritten in esp32-hal-bt.c
 bool btInUse() __attribute__((weak));
@@ -153,6 +159,20 @@ bool btInUse(){ return false; }
 
 void initArduino()
 {
+#ifdef CONFIG_APP_ROLLBACK_ENABLE
+    const esp_partition_t *running = esp_ota_get_running_partition();
+    esp_ota_img_states_t ota_state;
+    if (esp_ota_get_state_partition(running, &ota_state) == ESP_OK) {
+        if (ota_state == ESP_OTA_IMG_PENDING_VERIFY) {
+            if (verifyOta()) {
+                esp_ota_mark_app_valid_cancel_rollback();
+            } else {
+                log_e("OTA verification failed! Start rollback to the previous version ...");
+                esp_ota_mark_app_invalid_rollback_and_reboot();
+            }
+        }
+    }
+#endif
     //init proper ref tick value for PLL (uncomment if REF_TICK is different than 1MHz)
     //ESP_REG(APB_CTRL_PLL_TICK_CONF_REG) = APB_CLK_FREQ / REF_CLK_FREQ - 1;
 #ifdef F_CPU

cores/esp32/esp32-hal-psram.c

@@ -19,7 +19,7 @@ bool psramInit(){
     }
     uint32_t chip_ver = REG_GET_FIELD(EFUSE_BLK0_RDATA3_REG, EFUSE_RD_CHIP_VER_PKG);
     uint32_t pkg_ver = chip_ver & 0x7;
-    if (pkg_ver == EFUSE_RD_CHIP_VER_PKG_ESP32D2WDQ5 || pkg_ver == EFUSE_RD_CHIP_VER_PKG_ESP32PICOD2 || pkg_ver == EFUSE_RD_CHIP_VER_PKG_ESP32PICOD4) {
+    if (pkg_ver == EFUSE_RD_CHIP_VER_PKG_ESP32D2WDQ5 || pkg_ver == EFUSE_RD_CHIP_VER_PKG_ESP32PICOD2) {
         spiramFailed = true;
         log_w("PSRAM not supported!");
         return false;

cores/esp32/wiring_shift.c

@@ -25,11 +25,12 @@ uint8_t shiftIn(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder) {
     uint8_t i;
 
     for(i = 0; i < 8; ++i) {
-        digitalWrite(clockPin, HIGH);
+        //digitalWrite(clockPin, HIGH);
         if(bitOrder == LSBFIRST)
             value |= digitalRead(dataPin) << i;
         else
             value |= digitalRead(dataPin) << (7 - i);
+        digitalWrite(clockPin, HIGH);
         digitalWrite(clockPin, LOW);
     }
     return value;

libraries/EEPROM/EEPROM.cpp renamed to libraries/EEPROM/src/EEPROM.cpp

@@ -279,6 +279,7 @@ size_t EEPROMClass::readString (int address, char* value, size_t maxLen)
     return 0;
 
   memcpy((uint8_t*) value, _data + address, len);
+  value[len] = 0;
   return len;
 }
 

libraries/EEPROM/EEPROM.h renamed to libraries/EEPROM/src/EEPROM.h

@@ -28,7 +28,8 @@
 #include <ESPmDNS.h>
 
 #define FILESYSTEM SPIFFS
-#define FORMAT_FILESYSTEM true
+// You only need to format the filesystem once
+#define FORMAT_FILESYSTEM false
 #define DBG_OUTPUT_PORT Serial
 
 #if FILESYSTEM == FFat

libraries/WebServer/examples/FSBrowser/FSBrowser.ino

@@ -18,7 +18,7 @@ void setup()
 
     Serial.println();
     Serial.println();
-    Serial.print("Wait for WiFi... ");
+    Serial.print("Waiting for WiFi... ");
 
     while(WiFiMulti.run() != WL_CONNECTED) {
         Serial.print(".");
@@ -39,32 +39,30 @@ void loop()
     const uint16_t port = 80;
     const char * host = "192.168.1.1"; // ip or dns
 
-
-
-    Serial.print("connecting to ");
+    Serial.print("Connecting to ");
     Serial.println(host);
 
     // Use WiFiClient class to create TCP connections
     WiFiClient client;
 
     if (!client.connect(host, port)) {
-        Serial.println("connection failed");
-        Serial.println("wait 5 sec...");
+        Serial.println("Connection failed.");
+        Serial.println("Waiting 5 seconds before retrying...");
         delay(5000);
         return;
     }
 
-    // This will send the request to the server
-    client.print("Send this data to server");
+    // This will send a request to the server
+    client.print("Send this data to the server");
 
-    //read back one line from server
+    //read back one line from the server
     String line = client.readStringUntil('\r');
     client.println(line);
 
-    Serial.println("closing connection");
+    Serial.println("Closing connection.");
     client.stop();
 
-    Serial.println("wait 5 sec...");
+    Serial.println("Waiting 5 seconds before restarting...");
     delay(5000);
 }
 

libraries/WiFi/examples/WiFiClientBasic/WiFiClientBasic.ino

@@ -202,38 +202,56 @@ void WiFiClient::stop()
 }
 
 int WiFiClient::connect(IPAddress ip, uint16_t port)
+{
+    return connect(ip,port,-1);
+}
+int WiFiClient::connect(IPAddress ip, uint16_t port, int32_t timeout)
 {
     int sockfd = socket(AF_INET, SOCK_STREAM, 0);
     if (sockfd < 0) {
         log_e("socket: %d", errno);
         return 0;
     }
+    fcntl( sockfd, F_SETFL, fcntl( sockfd, F_GETFL, 0 ) | O_NONBLOCK );
 
     uint32_t ip_addr = ip;
     struct sockaddr_in serveraddr;
     bzero((char *) &serveraddr, sizeof(serveraddr));
     serveraddr.sin_family = AF_INET;
     bcopy((const void *)(&ip_addr), (void *)&serveraddr.sin_addr.s_addr, 4);
     serveraddr.sin_port = htons(port);
-    int res = lwip_connect_r(sockfd, (struct sockaddr*)&serveraddr, sizeof(serveraddr));
-    if (res < 0) {
-        log_e("lwip_connect_r: %d", errno);
+    fd_set fdset;
+    struct timeval tv;
+    FD_ZERO(&fdset);
+    FD_SET(sockfd, &fdset);
+    tv.tv_sec = 0;
+    tv.tv_usec = timeout * 1000;
+    lwip_connect_r(sockfd, (struct sockaddr*)&serveraddr, sizeof(serveraddr));
+    int res = select(sockfd + 1, nullptr, &fdset, nullptr, timeout<0 ? nullptr : &tv);
+    if (res != 1)
+    {
+        log_e("select: %d",errno);
         close(sockfd);
         return 0;
     }
+    fcntl( sockfd, F_SETFL, fcntl( sockfd, F_GETFL, 0 ) & (~O_NONBLOCK) );
     clientSocketHandle.reset(new WiFiClientSocketHandle(sockfd));
     _rxBuffer.reset(new WiFiClientRxBuffer(sockfd));
     _connected = true;
     return 1;
 }
 
 int WiFiClient::connect(const char *host, uint16_t port)
+{
+    return connect(host,port,-1);
+}
+int WiFiClient::connect(const char *host, uint16_t port, int32_t timeout)
 {
     IPAddress srv((uint32_t)0);
     if(!WiFiGenericClass::hostByName(host, srv)){
         return 0;
     }
-    return connect(srv, port);
+    return connect(srv, port, timeout);
 }
 
 int WiFiClient::setSocketOption(int option, char* value, size_t len)

libraries/WiFi/src/WiFiClient.cpp

@@ -41,7 +41,9 @@ class WiFiClient : public Client
     WiFiClient(int fd);
     ~WiFiClient();
     int connect(IPAddress ip, uint16_t port);
+    int connect(IPAddress ip, uint16_t port, int32_t timeout);
     int connect(const char *host, uint16_t port);
+    int connect(const char *host, uint16_t port, int32_t timeout);
     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);