Merge branch 'espressif:master' into patch-2

Author: Jason2866

Diff for: CMakeLists.txt

@@ -83,6 +83,7 @@ set(ARDUINO_ALL_LIBRARIES
   DNSServer
   EEPROM
   ESP_I2S
+  ESP_NOW
   ESP_SR
   ESPmDNS
   Ethernet
@@ -127,6 +128,10 @@ set(ARDUINO_LIBRARY_DNSServer_SRCS libraries/DNSServer/src/DNSServer.cpp)
 set(ARDUINO_LIBRARY_EEPROM_SRCS libraries/EEPROM/src/EEPROM.cpp)
 
 set(ARDUINO_LIBRARY_ESP_I2S_SRCS libraries/ESP_I2S/src/ESP_I2S.cpp)
+
+set(ARDUINO_LIBRARY_ESP_NOW_SRCS 
+  libraries/ESP_NOW/src/ESP32_NOW.cpp
+  libraries/ESP_NOW/src/ESP32_NOW_Serial.cpp)
 
 set(ARDUINO_LIBRARY_ESP_SR_SRCS 
   libraries/ESP_SR/src/ESP_SR.cpp

Diff for: boards.txt

@@ -7705,6 +7705,120 @@ lolin_c3_mini.menu.EraseFlash.all.upload.erase_cmd=-e
 
 ##############################################################
 
+lolin_c3_pico.name=LOLIN C3 Pico
+lolin_c3_pico.vid.0=0x303a
+lolin_c3_pico.pid.0=0x1001
+
+lolin_c3_pico.bootloader.tool=esptool_py
+lolin_c3_pico.bootloader.tool.default=esptool_py
+
+lolin_c3_pico.upload.tool=esptool_py
+lolin_c3_pico.upload.tool.default=esptool_py
+lolin_c3_pico.upload.tool.network=esp_ota
+
+lolin_c3_pico.upload.maximum_size=1310720
+lolin_c3_pico.upload.maximum_data_size=327680
+lolin_c3_pico.upload.flags=
+lolin_c3_pico.upload.extra_flags=
+lolin_c3_pico.upload.use_1200bps_touch=false
+lolin_c3_pico.upload.wait_for_upload_port=false
+
+lolin_c3_pico.serial.disableDTR=true
+lolin_c3_pico.serial.disableRTS=true
+
+lolin_c3_pico.build.tarch=riscv32
+lolin_c3_pico.build.target=esp
+lolin_c3_pico.build.mcu=esp32c3
+lolin_c3_pico.build.core=esp32
+lolin_c3_pico.build.variant=lolin_c3_pico
+lolin_c3_pico.build.board=LOLIN_C3_PICO
+lolin_c3_pico.build.bootloader_addr=0x0
+
+lolin_c3_pico.build.cdc_on_boot=1
+lolin_c3_pico.build.f_cpu=160000000L
+lolin_c3_pico.build.flash_size=4MB
+lolin_c3_pico.build.flash_freq=80m
+lolin_c3_pico.build.flash_mode=dio
+lolin_c3_pico.build.boot=qio
+lolin_c3_pico.build.partitions=default
+lolin_c3_pico.build.defines=
+
+lolin_c3_pico.menu.CDCOnBoot.default=Enabled
+lolin_c3_pico.menu.CDCOnBoot.default.build.cdc_on_boot=1
+lolin_c3_pico.menu.CDCOnBoot.dis_cdc=Disabled
+lolin_c3_pico.menu.CDCOnBoot.dis_cdc.build.cdc_on_boot=0
+
+lolin_c3_pico.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
+lolin_c3_pico.menu.PartitionScheme.default.build.partitions=default
+lolin_c3_pico.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
+lolin_c3_pico.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
+lolin_c3_pico.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
+lolin_c3_pico.menu.PartitionScheme.no_ota.build.partitions=no_ota
+lolin_c3_pico.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
+lolin_c3_pico.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
+lolin_c3_pico.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
+lolin_c3_pico.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
+lolin_c3_pico.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
+lolin_c3_pico.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
+lolin_c3_pico.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
+lolin_c3_pico.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
+lolin_c3_pico.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
+lolin_c3_pico.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
+lolin_c3_pico.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
+lolin_c3_pico.menu.PartitionScheme.huge_app.build.partitions=huge_app
+lolin_c3_pico.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
+
+lolin_c3_pico.menu.CPUFreq.160=160MHz (WiFi)
+lolin_c3_pico.menu.CPUFreq.160.build.f_cpu=160000000L
+lolin_c3_pico.menu.CPUFreq.80=80MHz (WiFi)
+lolin_c3_pico.menu.CPUFreq.80.build.f_cpu=80000000L
+lolin_c3_pico.menu.CPUFreq.40=40MHz
+lolin_c3_pico.menu.CPUFreq.40.build.f_cpu=40000000L
+lolin_c3_pico.menu.CPUFreq.20=20MHz
+lolin_c3_pico.menu.CPUFreq.20.build.f_cpu=20000000L
+lolin_c3_pico.menu.CPUFreq.10=10MHz
+lolin_c3_pico.menu.CPUFreq.10.build.f_cpu=10000000L
+
+lolin_c3_pico.menu.FlashFreq.80=80MHz
+lolin_c3_pico.menu.FlashFreq.80.build.flash_freq=80m
+lolin_c3_pico.menu.FlashFreq.40=40MHz
+lolin_c3_pico.menu.FlashFreq.40.build.flash_freq=40m
+
+lolin_c3_pico.menu.UploadSpeed.921600=921600
+lolin_c3_pico.menu.UploadSpeed.921600.upload.speed=921600
+lolin_c3_pico.menu.UploadSpeed.115200=115200
+lolin_c3_pico.menu.UploadSpeed.115200.upload.speed=115200
+lolin_c3_pico.menu.UploadSpeed.256000.windows=256000
+lolin_c3_pico.menu.UploadSpeed.256000.upload.speed=256000
+lolin_c3_pico.menu.UploadSpeed.230400.windows.upload.speed=256000
+lolin_c3_pico.menu.UploadSpeed.230400=230400
+lolin_c3_pico.menu.UploadSpeed.230400.upload.speed=230400
+lolin_c3_pico.menu.UploadSpeed.460800.linux=460800
+lolin_c3_pico.menu.UploadSpeed.460800.macosx=460800
+lolin_c3_pico.menu.UploadSpeed.460800.upload.speed=460800
+lolin_c3_pico.menu.UploadSpeed.512000.windows=512000
+lolin_c3_pico.menu.UploadSpeed.512000.upload.speed=512000
+
+lolin_c3_pico.menu.DebugLevel.none=None
+lolin_c3_pico.menu.DebugLevel.none.build.code_debug=0
+lolin_c3_pico.menu.DebugLevel.error=Error
+lolin_c3_pico.menu.DebugLevel.error.build.code_debug=1
+lolin_c3_pico.menu.DebugLevel.warn=Warn
+lolin_c3_pico.menu.DebugLevel.warn.build.code_debug=2
+lolin_c3_pico.menu.DebugLevel.info=Info
+lolin_c3_pico.menu.DebugLevel.info.build.code_debug=3
+lolin_c3_pico.menu.DebugLevel.debug=Debug
+lolin_c3_pico.menu.DebugLevel.debug.build.code_debug=4
+lolin_c3_pico.menu.DebugLevel.verbose=Verbose
+lolin_c3_pico.menu.DebugLevel.verbose.build.code_debug=5
+
+lolin_c3_pico.menu.EraseFlash.none=Disabled
+lolin_c3_pico.menu.EraseFlash.none.upload.erase_cmd=
+lolin_c3_pico.menu.EraseFlash.all=Enabled
+lolin_c3_pico.menu.EraseFlash.all.upload.erase_cmd=-e
+
+##############################################################
+
 lolin_s2_mini.name=LOLIN S2 Mini
 lolin_s2_mini.vid.0=0x303a
 lolin_s2_mini.pid.0=0x80C2
@@ -15506,6 +15620,13 @@ esp32-devkitlipo.build.boot=dio
 esp32-devkitlipo.build.partitions=default
 esp32-devkitlipo.build.defines=
 
+esp32-devkitlipo.menu.PSRAM.disabled=Disabled (WROOM)
+esp32-devkitlipo.menu.PSRAM.disabled.build.defines=
+esp32-devkitlipo.menu.PSRAM.disabled.build.extra_libs=
+esp32-devkitlipo.menu.PSRAM.enabled=Enabled (WROVER)
+esp32-devkitlipo.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue -mfix-esp32-psram-cache-strategy=memw
+esp32-devkitlipo.menu.PSRAM.enabled.build.extra_libs=
+
 esp32-devkitlipo.menu.PartitionScheme.default=Default
 esp32-devkitlipo.menu.PartitionScheme.default.build.partitions=default
 esp32-devkitlipo.menu.PartitionScheme.minimal=Minimal (2MB FLASH)

Diff for: cores/esp32/HWCDC.cpp

@@ -367,15 +367,14 @@ size_t HWCDC::write(const uint8_t *buffer, size_t size)
     if(xSemaphoreTake(tx_lock, tx_timeout_ms / portTICK_PERIOD_MS) != pdPASS){
         return 0;
     }
-    size_t max_size = xRingbufferGetMaxItemSize(tx_ring_buf);
     size_t space = xRingbufferGetCurFreeSize(tx_ring_buf);
     size_t to_send = size, so_far = 0;
 
     if(space > size){
         space = size;
     }
     // Non-Blocking method, Sending data to ringbuffer, and handle the data in ISR.
-    if(xRingbufferSend(tx_ring_buf, (void*) (buffer), space, 0) != pdTRUE){
+    if(space > 0 && xRingbufferSend(tx_ring_buf, (void*) (buffer), space, 0) != pdTRUE){
         size = 0;
     } else {
         to_send -= space;
@@ -385,16 +384,17 @@ size_t HWCDC::write(const uint8_t *buffer, size_t size)
         if(connected) usb_serial_jtag_ll_ena_intr_mask(USB_SERIAL_JTAG_INTR_SERIAL_IN_EMPTY);
 
         while(to_send){
-            if(max_size > to_send){
-                max_size = to_send;
+            space = xRingbufferGetCurFreeSize(tx_ring_buf);
+            if(space > to_send){
+                space = to_send;
             }
             // Blocking method, Sending data to ringbuffer, and handle the data in ISR.
-            if(xRingbufferSend(tx_ring_buf, (void*) (buffer+so_far), max_size, tx_timeout_ms / portTICK_PERIOD_MS) != pdTRUE){
+            if(xRingbufferSend(tx_ring_buf, (void*) (buffer+so_far), space, tx_timeout_ms / portTICK_PERIOD_MS) != pdTRUE){
                 size = so_far;
                 break;
             }
-            so_far += max_size;
-            to_send -= max_size;
+            so_far += space;
+            to_send -= space;
             // Now trigger the ISR to read data from the ring buffer.
             usb_serial_jtag_ll_txfifo_flush();
             if(connected) usb_serial_jtag_ll_ena_intr_mask(USB_SERIAL_JTAG_INTR_SERIAL_IN_EMPTY);

Diff for: cores/esp32/Server.h

@@ -25,7 +25,7 @@
 class Server: public Print
 {
 public:
-    virtual void begin(uint16_t port=0) =0;
+    virtual void begin() =0;
 };
 
 #endif