Merge branch 'master' into feature/ipv6_support

Author: me-no-dev

.github/workflows/build_py_tools.yml

@@ -22,7 +22,7 @@ jobs:
           fetch-depth: 2
           ref: ${{ github.event.pull_request.head.ref }}
       - name: Verify Python Tools Changed
-        uses: tj-actions/changed-files@v36
+        uses: tj-actions/changed-files@v41
         id: verify-changed-files
         with:
           fetch_depth: '2'

boards.txt

@@ -29364,7 +29364,7 @@ esp32s3_powerfeather.build.variant=esp32s3_powerfeather
 esp32s3_powerfeather.build.board=ESP32S3_POWERFEATHER
 
 esp32s3_powerfeather.build.usb_mode=1
-esp32s3_powerfeather.build.cdc_on_boot=0
+esp32s3_powerfeather.build.cdc_on_boot=1
 esp32s3_powerfeather.build.msc_on_boot=0
 esp32s3_powerfeather.build.dfu_on_boot=0
 esp32s3_powerfeather.build.f_cpu=240000000L
@@ -29377,8 +29377,9 @@ esp32s3_powerfeather.build.partitions=default_8MB
 esp32s3_powerfeather.build.defines=
 esp32s3_powerfeather.build.loop_core=
 esp32s3_powerfeather.build.event_core=
+esp32s3_powerfeather.build.flash_type=qio
 esp32s3_powerfeather.build.psram_type=qspi
-esp32s3_powerfeather.build.memory_type={build.boot}_{build.psram_type}
+esp32s3_powerfeather.build.memory_type={build.flash_type}_{build.psram_type}
 
 esp32s3_powerfeather.menu.PSRAM.disabled=Disabled
 esp32s3_powerfeather.menu.PSRAM.disabled.build.defines=
@@ -29418,10 +29419,10 @@ esp32s3_powerfeather.menu.USBMode.hwcdc.build.usb_mode=1
 esp32s3_powerfeather.menu.USBMode.default=USB-OTG (TinyUSB)
 esp32s3_powerfeather.menu.USBMode.default.build.usb_mode=0
 
-esp32s3_powerfeather.menu.CDCOnBoot.default=Disabled
-esp32s3_powerfeather.menu.CDCOnBoot.default.build.cdc_on_boot=0
 esp32s3_powerfeather.menu.CDCOnBoot.cdc=Enabled
 esp32s3_powerfeather.menu.CDCOnBoot.cdc.build.cdc_on_boot=1
+esp32s3_powerfeather.menu.CDCOnBoot.default=Disabled
+esp32s3_powerfeather.menu.CDCOnBoot.default.build.cdc_on_boot=0
 
 esp32s3_powerfeather.menu.MSCOnBoot.default=Disabled
 esp32s3_powerfeather.menu.MSCOnBoot.default.build.msc_on_boot=0
@@ -29440,39 +29441,21 @@ esp32s3_powerfeather.menu.UploadMode.cdc=USB-OTG CDC (TinyUSB)
 esp32s3_powerfeather.menu.UploadMode.cdc.upload.use_1200bps_touch=true
 esp32s3_powerfeather.menu.UploadMode.cdc.upload.wait_for_upload_port=true
 
-esp32s3_powerfeather.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
-esp32s3_powerfeather.menu.PartitionScheme.default.build.partitions=default
-esp32s3_powerfeather.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
-esp32s3_powerfeather.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
 esp32s3_powerfeather.menu.PartitionScheme.default_8MB=8M with spiffs (3MB APP/1.5MB SPIFFS)
 esp32s3_powerfeather.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
 esp32s3_powerfeather.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
-esp32s3_powerfeather.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
-esp32s3_powerfeather.menu.PartitionScheme.minimal.build.partitions=minimal
-esp32s3_powerfeather.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
-esp32s3_powerfeather.menu.PartitionScheme.no_ota.build.partitions=no_ota
-esp32s3_powerfeather.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
-esp32s3_powerfeather.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
-esp32s3_powerfeather.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
-esp32s3_powerfeather.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
-esp32s3_powerfeather.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
-esp32s3_powerfeather.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
-esp32s3_powerfeather.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
-esp32s3_powerfeather.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
-esp32s3_powerfeather.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
-esp32s3_powerfeather.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
-esp32s3_powerfeather.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
-esp32s3_powerfeather.menu.PartitionScheme.huge_app.build.partitions=huge_app
-esp32s3_powerfeather.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
-esp32s3_powerfeather.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
-esp32s3_powerfeather.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
-esp32s3_powerfeather.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
+esp32s3_powerfeather.menu.PartitionScheme.default_ffat_8MB=8M with ffat (3MB APP/1.5MB FATFS)
+esp32s3_powerfeather.menu.PartitionScheme.default_ffat_8MB.build.partitions=default_ffat_8MB
+esp32s3_powerfeather.menu.PartitionScheme.default_ffat_8MB.upload.maximum_size=3342336
+esp32s3_powerfeather.menu.PartitionScheme.large_spiffs_8MB=Large SPIFFS (1.2MB APP/5.3MB SPIFFS)
+esp32s3_powerfeather.menu.PartitionScheme.large_spiffs_8MB.build.partitions=large_spiffs_8MB
+esp32s3_powerfeather.menu.PartitionScheme.large_spiffs_8MB.upload.maximum_size=1310720
+esp32s3_powerfeather.menu.PartitionScheme.large_ffat_8MB=Large FFAT (1.2MB APP/5.3MB FATFS)
+esp32s3_powerfeather.menu.PartitionScheme.large_ffat_8MB.build.partitions=large_ffat_8MB
+esp32s3_powerfeather.menu.PartitionScheme.large_ffat_8MB.upload.maximum_size=1310720
 esp32s3_powerfeather.menu.PartitionScheme.max_app_8MB=Maximum APP (7.9MB APP No OTA/No FS)
 esp32s3_powerfeather.menu.PartitionScheme.max_app_8MB.build.partitions=max_app_8MB
 esp32s3_powerfeather.menu.PartitionScheme.max_app_8MB.upload.maximum_size=8257536
-esp32s3_powerfeather.menu.PartitionScheme.rainmaker=RainMaker
-esp32s3_powerfeather.menu.PartitionScheme.rainmaker.build.partitions=rainmaker
-esp32s3_powerfeather.menu.PartitionScheme.rainmaker.upload.maximum_size=3145728
 
 esp32s3_powerfeather.menu.CPUFreq.240=240MHz (WiFi)
 esp32s3_powerfeather.menu.CPUFreq.240.build.f_cpu=240000000L

cores/esp32/Esp.cpp

@@ -131,7 +131,7 @@ unsigned long long operator"" _GB(unsigned long long x)
 
 EspClass ESP;
 
-void EspClass::deepSleep(uint32_t time_us)
+void EspClass::deepSleep(uint64_t time_us)
 {
     esp_deep_sleep(time_us);
 }

cores/esp32/Esp.h

@@ -86,7 +86,7 @@ class EspClass
     const char * getSdkVersion(); //version of ESP-IDF
     const char * getCoreVersion();//version of this core
 
-    void deepSleep(uint32_t time_us);
+    void deepSleep(uint64_t time_us);
 
     uint32_t getFlashChipSize();
     uint32_t getFlashChipSpeed();

cores/esp32/Tone.cpp

@@ -95,6 +95,7 @@ void noTone(uint8_t pin){
         .frequency = 0, // Ignored
         .duration = 0, // Ignored
       };
+      xQueueReset(_tone_queue); // clear queue
       xQueueSend(_tone_queue, &tone_msg, portMAX_DELAY);
     }
   }

cores/esp32/USBCDC.cpp

@@ -79,7 +79,7 @@ void tud_cdc_tx_complete_cb(uint8_t itf){
 
 static void ARDUINO_ISR_ATTR cdc0_write_char(char c){
     if(devices[0] != NULL){
-        devices[0]->write(c);
+        tud_cdc_n_write_char(0, c);
     }
 }
 

cores/esp32/WString.cpp

@@ -677,7 +677,10 @@ int String::lastIndexOf(char ch, unsigned int fromIndex) const {
     wbuffer()[fromIndex + 1] = tempchar;
     if(temp == NULL)
         return -1;
-    return temp - buffer();
+    const int rv = temp - buffer();
+    if(rv >= len())
+        return -1;
+    return rv;
 }
 
 int String::lastIndexOf(const String &s2) const {

cores/esp32/esp32-hal-gpio.c

@@ -104,14 +104,14 @@ extern void ARDUINO_ISR_ATTR __pinMode(uint8_t pin, uint8_t mode)
 #endif
 
     if (pin >= SOC_GPIO_PIN_COUNT) {
-        log_e("Invalid pin selected");
+        log_e("Invalid IO %i selected", pin);
         return;
     }
 
     if(perimanGetPinBus(pin, ESP32_BUS_TYPE_GPIO) == NULL){
         perimanSetBusDeinit(ESP32_BUS_TYPE_GPIO, gpioDetachBus);
         if(!perimanClearPinBus(pin)){
-            log_e("Deinit of previous bus failed");
+            log_e("Deinit of previous bus from IO %i failed", pin);
             return;
         }
     }
@@ -140,7 +140,7 @@ extern void ARDUINO_ISR_ATTR __pinMode(uint8_t pin, uint8_t mode)
     }
     if(gpio_config(&conf) != ESP_OK)
     {
-        log_e("GPIO config failed");
+        log_e("IO %i config failed", pin);
         return;
     }
     if(perimanGetPinBus(pin, ESP32_BUS_TYPE_GPIO) == NULL){
@@ -164,7 +164,7 @@ extern void ARDUINO_ISR_ATTR __digitalWrite(uint8_t pin, uint8_t val)
         if(perimanGetPinBus(pin, ESP32_BUS_TYPE_GPIO) != NULL){
             gpio_set_level((gpio_num_t)pin, val);
         } else {
-            log_e("Pin is not set as GPIO.");
+            log_e("IO %i is not set as GPIO.", pin);
         }
 }
 
@@ -174,7 +174,7 @@ extern int ARDUINO_ISR_ATTR __digitalRead(uint8_t pin)
         return gpio_get_level((gpio_num_t)pin);
     }
     else {
-        log_e("Pin is not set as GPIO.");
+        log_e("IO %i is not set as GPIO.", pin);
         return 0;
     }
 }
@@ -204,7 +204,7 @@ extern void __attachInterruptFunctionalArg(uint8_t pin, voidFuncPtrArg userFunc,
     	interrupt_initialized = (err == ESP_OK) || (err == ESP_ERR_INVALID_STATE);
     }
     if(!interrupt_initialized) {
-    	log_e("GPIO ISR Service Failed To Start");
+    	log_e("IO %i ISR Service Failed To Start", pin);
     	return;
     }
 
@@ -256,6 +256,14 @@ extern void __detachInterrupt(uint8_t pin)
     gpio_set_intr_type((gpio_num_t)pin, GPIO_INTR_DISABLE);
 }
 
+extern void enableInterrupt(uint8_t pin) {
+    gpio_intr_enable((gpio_num_t)pin);
+}
+
+extern void disableInterrupt(uint8_t pin) {
+    gpio_intr_disable((gpio_num_t)pin);
+}
+
 
 extern void pinMode(uint8_t pin, uint8_t mode) __attribute__ ((weak, alias("__pinMode")));
 extern void digitalWrite(uint8_t pin, uint8_t val) __attribute__ ((weak, alias("__digitalWrite")));

cores/esp32/esp32-hal-gpio.h

@@ -78,6 +78,8 @@ int digitalRead(uint8_t pin);
 void attachInterrupt(uint8_t pin, void (*)(void), int mode);
 void attachInterruptArg(uint8_t pin, void (*)(void*), void * arg, int mode);
 void detachInterrupt(uint8_t pin);
+void enableInterrupt(uint8_t pin);
+void disableInterrupt(uint8_t pin);
 
 int8_t digitalPinToTouchChannel(uint8_t pin);
 int8_t digitalPinToAnalogChannel(uint8_t pin);

cores/esp32/esp32-hal-ledc.c

@@ -56,12 +56,11 @@ static bool ledcDetachBus(void * bus){
     return true;
 }
 
-bool ledcAttach(uint8_t pin, uint32_t freq, uint8_t resolution)
+bool ledcAttachChannel(uint8_t pin, uint32_t freq, uint8_t resolution, uint8_t channel)
 {
-    int free_channel = ~ledc_handle.used_channels & (ledc_handle.used_channels+1);
-    if (free_channel == 0 || resolution > LEDC_MAX_BIT_WIDTH)
+    if (channel >= LEDC_CHANNELS || resolution > LEDC_MAX_BIT_WIDTH)
     {
-        log_e("No more LEDC channels available! (maximum %u) or bit width too big (maximum %u)", LEDC_CHANNELS, LEDC_MAX_BIT_WIDTH);
+        log_e("Channel %u is not available! (maximum %u) or bit width too big (maximum %u)", channel, LEDC_CHANNELS, LEDC_MAX_BIT_WIDTH);
         return false;
     }
 
@@ -71,7 +70,6 @@ bool ledcAttach(uint8_t pin, uint32_t freq, uint8_t resolution)
         return false;
     }
 
-    int channel = log2(free_channel & -free_channel);
     uint8_t group=(channel/8), timer=((channel/2)%4);
 
     ledc_timer_config_t ledc_timer = {
@@ -115,8 +113,22 @@ bool ledcAttach(uint8_t pin, uint32_t freq, uint8_t resolution)
         return false;
     }
 
+    log_i("LEDC attached to pin %u (channel %u, resolution %u)", pin, channel, resolution);
     return true;
 }
+
+bool ledcAttach(uint8_t pin, uint32_t freq, uint8_t resolution)
+{
+    uint8_t free_channel = ~ledc_handle.used_channels & (ledc_handle.used_channels+1);
+    if (free_channel == 0 || resolution > LEDC_MAX_BIT_WIDTH){
+        log_e("No more LEDC channels available! (maximum %u) or bit width too big (maximum %u)", LEDC_CHANNELS, LEDC_MAX_BIT_WIDTH);
+        return false;
+    }
+    int channel = log2(free_channel & -free_channel);
+
+    return ledcAttachChannel(pin, freq, resolution, channel);
+}
+
 bool ledcWrite(uint8_t pin, uint32_t duty)
 {
     ledc_channel_handle_t *bus = (ledc_channel_handle_t*)perimanGetPinBus(pin, ESP32_BUS_TYPE_LEDC);

cores/esp32/esp32-hal-ledc.h

@@ -45,6 +45,7 @@ typedef struct {
 
 //channel 0-15 resolution 1-16bits freq limits depend on resolution
 bool        ledcAttach(uint8_t pin, uint32_t freq, uint8_t resolution);
+bool        ledcAttachChannel(uint8_t pin, uint32_t freq, uint8_t resolution, uint8_t channel);
 bool        ledcWrite(uint8_t pin, uint32_t duty);
 uint32_t    ledcWriteTone(uint8_t pin, uint32_t freq);
 uint32_t    ledcWriteNote(uint8_t pin, note_t note, uint8_t octave);

docs/source/api/ledc.rst

@@ -27,6 +27,7 @@ ledcAttach
 **********
 
 This function is used to setup LEDC pin with given frequency and resolution.
+LEDC channel will be selected automatically.
 
 .. code-block:: arduino
 
@@ -41,6 +42,25 @@ This function is used to setup LEDC pin with given frequency and resolution.
 This function will return ``true`` if configuration is successful.
 If ``false`` is returned, error occurs and LEDC channel was not configured.
 
+ledcAttachChannel
+*****************
+
+This function is used to setup LEDC pin with given frequency, resolution and channel.
+
+.. code-block:: arduino
+
+    bool ledcAttachChannel(uint8_t pin, uint32_t freq, uint8_t resolution, uint8_t channel);
+
+* ``pin`` select LEDC pin.
+* ``freq`` select frequency of pwm.
+* ``resolution`` select resolution for LEDC channel. 
+* ``channel`` select LEDC channel.
+ 
+  * range is 1-14 bits (1-20 bits for ESP32).
+  
+This function will return ``true`` if configuration is successful.
+If ``false`` is returned, error occurs and LEDC channel was not configured.
+
 ledcWrite
 *********
 

libraries/ESP32/examples/Serial/RS485_Echo_Demo/RS485_Echo_Demo.ino

@@ -0,0 +1,48 @@
+/*
+  This Sketch demonstrates how to use the Hardware Serial peripheral to communicate over an RS485 bus. 
+
+  Data received on the primary serial port is relayed to the bus acting as an RS485 interface and vice versa.
+
+  UART to RS485 translation hardware (e.g., MAX485, MAX33046E, ADM483) is assumed to be configured in half-duplex
+  mode with collision detection as described in
+  https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-reference/peripherals/uart.html#circuit-a-collision-detection-circuit
+
+  To use the script open the Arduino serial monitor (or alternative serial monitor on the Arduino port). Then,
+  using an RS485 tranciver, connect another serial monitor to the RS485 port. Entering data on one terminal
+  should be displayed on the other terminal.
+*/
+#include "hal/uart_types.h"
+
+#define RS485_RX_PIN 16
+#define RS485_TX_PIN 5
+#define RS485_RTS_PIN 4
+
+#define RS485 Serial1
+
+void setup() {
+  Serial.begin(115200);
+  while(!Serial) { delay(10); }
+
+  RS485.begin(9600, SERIAL_8N1, RS485_RX_PIN, RS485_TX_PIN);
+  while(!RS485) { delay(10); }
+  if(!RS485.setPins(-1, -1, -1, RS485_RTS_PIN)){
+    Serial.print("Failed to set RS485 pins");
+  }
+
+  // Certain versions of Arduino core don't define MODE_RS485_HALF_DUPLEX and so fail to compile.
+  // By using UART_MODE_RS485_HALF_DUPLEX defined in hal/uart_types.h we work around this problem.
+  // If using a newer IDF and Arduino core you can ommit including hal/uart_types.h and use MODE_RS485_HALF_DUPLEX
+  // defined in esp32-hal-uart.h (included during other build steps) instead.
+  if(!RS485.setMode(UART_MODE_RS485_HALF_DUPLEX)) {
+   Serial.print("Failed to set RS485 mode");
+  }
+}
+
+void loop() {
+  if (RS485.available()) {
+    Serial.write(RS485.read());
+  }
+  if (Serial.available()) {
+    RS485.write(Serial.read());
+  }
+}

libraries/LittleFS/src/LittleFS.cpp

@@ -81,7 +81,9 @@ bool LittleFSFS::begin(bool formatOnFail, const char * basePath, uint8_t maxOpen
     esp_vfs_littlefs_conf_t conf = {
       .base_path = basePath,
       .partition_label = partitionLabel_,
+      .partition = NULL,
       .format_if_mount_failed = false,
+      .read_only = false,
       .dont_mount = false,
       .grow_on_mount = true
     };

libraries/SD/src/sd_diskio.cpp

@@ -233,7 +233,7 @@ char sdWriteBytes(uint8_t pdrv, const char* buffer, char token)
     ardu_sdcard_t * card = s_cards[pdrv];
     unsigned short crc = (card->supports_crc)?CRC16(buffer, 512):0xFFFF;
     if (!sdWait(pdrv, 500)) {
-        return false;
+        return 0;
     }
 
     card->spi->write(token);
@@ -424,7 +424,7 @@ unsigned long sdGetSectorsCount(uint8_t pdrv)
 {
     for (int f = 0; f < 3; f++) {
         if(!sdSelectCard(pdrv)) {
-            return false;
+            return 0;
         }
 
         if (!sdCommand(pdrv, SEND_CSD, 0, NULL)) {
@@ -818,7 +818,7 @@ bool sdcard_mount(uint8_t pdrv, const char* path, uint8_t max_files, bool format
             }
             //FRESULT f_mkfs (const TCHAR* path, const MKFS_PARM* opt, void* work, UINT len);
             const MKFS_PARM opt = {(BYTE)FM_ANY, 0, 0, 0, 0};
-            res = f_mkfs(drv, &opt, work, sizeof(work));
+            res = f_mkfs(drv, &opt, work, sizeof(BYTE) * FF_MAX_SS);
             free(work);
             if (res != FR_OK) {
                 log_e("f_mkfs failed: %s", fferr2str[res]);

libraries/WiFi/src/WiFiSTA.cpp

@@ -373,7 +373,6 @@ bool WiFiSTAClass::disconnect(bool wifioff, bool eraseap)
     wifi_sta_config(&conf);
 
     if(WiFi.getMode() & WIFI_MODE_STA){
-        _useStaticIp = false;
         if(eraseap){
             if(esp_wifi_set_config((wifi_interface_t)ESP_IF_WIFI_STA, &conf)){
                 log_e("clear config failed!");