Merge branch 'master' into feature/zigbee-library

Author: P-R-O-C-H-Y

.github/scripts/sketch_utils.sh

@@ -416,10 +416,17 @@ function build_sketches(){ # build_sketches <ide_path> <user_path> <target> <pat
     echo "Start Sketch: $start_num"
     echo "End Sketch  : $end_index"
 
+    #if fqbn is not passed then set it to default for compilation log
+    if [ -z $fqbn ]; then
+        log_fqbn="espressif:esp32:$target"
+    else
+        log_fqbn=$fqbn
+    fi
+
     sizes_file="$GITHUB_WORKSPACE/cli_compile_$chunk_index.json"
     if [ $log_compilation ]; then
         #echo board,target and start of sketches to sizes_file json
-        echo "{ \"board\": \"$fqbn\",
+        echo "{ \"board\": \"$log_fqbn\",
                 \"target\": \"$target\",
                 \"sketches\": [" >> "$sizes_file"
     fi

boards.txt

@@ -3732,6 +3732,160 @@ um_nanos3.menu.EraseFlash.all.upload.erase_cmd=-e
 
 ##############################################################
 
+um_omgs3.name=UM OMGS3
+um_omgs3.vid.0=0x303a
+um_omgs3.pid.0=0x8224
+um_omgs3.upload_port.0.vid=0x303a
+um_omgs3.upload_port.0.pid=0x8224
+
+um_omgs3.bootloader.tool=esptool_py
+um_omgs3.bootloader.tool.default=esptool_py
+
+um_omgs3.upload.tool=esptool_py
+um_omgs3.upload.tool.default=esptool_py
+um_omgs3.upload.tool.network=esp_ota
+
+um_omgs3.upload.maximum_size=1310720
+um_omgs3.upload.maximum_data_size=327680
+um_omgs3.upload.flags=
+um_omgs3.upload.extra_flags=
+um_omgs3.upload.use_1200bps_touch=false
+um_omgs3.upload.wait_for_upload_port=false
+
+um_omgs3.serial.disableDTR=false
+um_omgs3.serial.disableRTS=false
+
+um_omgs3.build.tarch=xtensa
+um_omgs3.build.bootloader_addr=0x0
+um_omgs3.build.target=esp32s3
+um_omgs3.build.mcu=esp32s3
+um_omgs3.build.core=esp32
+um_omgs3.build.variant=um_omgs3
+um_omgs3.build.board=OMGS3
+
+um_omgs3.build.usb_mode=1
+um_omgs3.build.cdc_on_boot=1
+um_omgs3.build.msc_on_boot=0
+um_omgs3.build.dfu_on_boot=0
+um_omgs3.build.f_cpu=240000000L
+um_omgs3.build.flash_size=8MB
+um_omgs3.build.flash_freq=80m
+um_omgs3.build.flash_mode=dio
+um_omgs3.build.boot=qio
+um_omgs3.build.partitions=default
+um_omgs3.build.defines=
+um_omgs3.build.loop_core=
+um_omgs3.build.event_core=
+um_omgs3.build.flash_type=qio
+um_omgs3.build.psram_type=qspi
+um_omgs3.build.memory_type=qio_qspi
+
+um_omgs3.menu.LoopCore.1=Core 1
+um_omgs3.menu.LoopCore.1.build.loop_core=-DARDUINO_RUNNING_CORE=1
+um_omgs3.menu.LoopCore.0=Core 0
+um_omgs3.menu.LoopCore.0.build.loop_core=-DARDUINO_RUNNING_CORE=0
+
+um_omgs3.menu.EventsCore.1=Core 1
+um_omgs3.menu.EventsCore.1.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=1
+um_omgs3.menu.EventsCore.0=Core 0
+um_omgs3.menu.EventsCore.0.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=0
+
+um_omgs3.menu.USBMode.hwcdc=Hardware CDC and JTAG
+um_omgs3.menu.USBMode.hwcdc.build.usb_mode=1
+um_omgs3.menu.USBMode.default=USB-OTG (TinyUSB)
+um_omgs3.menu.USBMode.default.build.usb_mode=0
+
+um_omgs3.menu.CDCOnBoot.cdc=Enabled
+um_omgs3.menu.CDCOnBoot.cdc.build.cdc_on_boot=1
+um_omgs3.menu.CDCOnBoot.default=Disabled
+um_omgs3.menu.CDCOnBoot.default.build.cdc_on_boot=0
+
+um_omgs3.menu.MSCOnBoot.default=Disabled
+um_omgs3.menu.MSCOnBoot.default.build.msc_on_boot=0
+um_omgs3.menu.MSCOnBoot.msc=Enabled (Requires USB-OTG Mode)
+um_omgs3.menu.MSCOnBoot.msc.build.msc_on_boot=1
+
+um_omgs3.menu.DFUOnBoot.default=Disabled
+um_omgs3.menu.DFUOnBoot.default.build.dfu_on_boot=0
+um_omgs3.menu.DFUOnBoot.dfu=Enabled (Requires USB-OTG Mode)
+um_omgs3.menu.DFUOnBoot.dfu.build.dfu_on_boot=1
+
+um_omgs3.menu.UploadMode.cdc.upload.wait_for_upload_port=true
+um_omgs3.menu.UploadMode.default=UART0 / Hardware CDC
+um_omgs3.menu.UploadMode.cdc=USB-OTG CDC (TinyUSB)
+um_omgs3.menu.UploadMode.cdc.upload.use_1200bps_touch=true
+um_omgs3.menu.UploadMode.default.upload.use_1200bps_touch=false
+um_omgs3.menu.UploadMode.default.upload.wait_for_upload_port=false
+
+um_omgs3.menu.PSRAM.enabled=Enabled
+um_omgs3.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
+um_omgs3.menu.PSRAM.disabled=Disabled
+um_omgs3.menu.PSRAM.disabled.build.defines=
+
+um_omgs3.menu.PartitionScheme.default_8MB=Default (3MB APP/1.5MB SPIFFS)
+um_omgs3.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
+um_omgs3.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
+um_omgs3.menu.PartitionScheme.tinyuf2=TinyUF2 Compatibility (2MB APP/3.7MB FFAT)
+um_omgs3.menu.PartitionScheme.tinyuf2.build.custom_bootloader=bootloader_tinyuf2
+um_omgs3.menu.PartitionScheme.tinyuf2.build.custom_partitions=partitions_tinyuf2
+um_omgs3.menu.PartitionScheme.tinyuf2.upload.extra_flags=0x410000 "{runtime.platform.path}/variants/{build.variant}/tinyuf2.bin"
+um_omgs3.menu.PartitionScheme.tinyuf2.upload.maximum_size=2097152
+
+um_omgs3.menu.CPUFreq.240=240MHz (WiFi)
+um_omgs3.menu.CPUFreq.240.build.f_cpu=240000000L
+um_omgs3.menu.CPUFreq.160=160MHz (WiFi)
+um_omgs3.menu.CPUFreq.160.build.f_cpu=160000000L
+um_omgs3.menu.CPUFreq.80=80MHz (WiFi)
+um_omgs3.menu.CPUFreq.80.build.f_cpu=80000000L
+um_omgs3.menu.CPUFreq.40=40MHz
+um_omgs3.menu.CPUFreq.40.build.f_cpu=40000000L
+um_omgs3.menu.CPUFreq.20=20MHz
+um_omgs3.menu.CPUFreq.20.build.f_cpu=20000000L
+um_omgs3.menu.CPUFreq.10=10MHz
+um_omgs3.menu.CPUFreq.10.build.f_cpu=10000000L
+
+um_omgs3.menu.FlashMode.qio=QIO
+um_omgs3.menu.FlashMode.qio.build.flash_mode=dio
+um_omgs3.menu.FlashMode.qio.build.boot=qio
+um_omgs3.menu.FlashMode.dio=DIO
+um_omgs3.menu.FlashMode.dio.build.flash_mode=dio
+um_omgs3.menu.FlashMode.dio.build.boot=dio
+
+um_omgs3.menu.UploadSpeed.921600=921600
+um_omgs3.menu.UploadSpeed.921600.upload.speed=921600
+um_omgs3.menu.UploadSpeed.115200=115200
+um_omgs3.menu.UploadSpeed.115200.upload.speed=115200
+um_omgs3.menu.UploadSpeed.256000.windows=256000
+um_omgs3.menu.UploadSpeed.256000.upload.speed=256000
+um_omgs3.menu.UploadSpeed.230400.windows.upload.speed=256000
+um_omgs3.menu.UploadSpeed.230400=230400
+um_omgs3.menu.UploadSpeed.230400.upload.speed=230400
+um_omgs3.menu.UploadSpeed.460800.linux=460800
+um_omgs3.menu.UploadSpeed.460800.macosx=460800
+um_omgs3.menu.UploadSpeed.460800.upload.speed=460800
+um_omgs3.menu.UploadSpeed.512000.windows=512000
+um_omgs3.menu.UploadSpeed.512000.upload.speed=512000
+
+um_omgs3.menu.DebugLevel.none=None
+um_omgs3.menu.DebugLevel.none.build.code_debug=0
+um_omgs3.menu.DebugLevel.error=Error
+um_omgs3.menu.DebugLevel.error.build.code_debug=1
+um_omgs3.menu.DebugLevel.warn=Warn
+um_omgs3.menu.DebugLevel.warn.build.code_debug=2
+um_omgs3.menu.DebugLevel.info=Info
+um_omgs3.menu.DebugLevel.info.build.code_debug=3
+um_omgs3.menu.DebugLevel.debug=Debug
+um_omgs3.menu.DebugLevel.debug.build.code_debug=4
+um_omgs3.menu.DebugLevel.verbose=Verbose
+um_omgs3.menu.DebugLevel.verbose.build.code_debug=5
+
+um_omgs3.menu.EraseFlash.none=Disabled
+um_omgs3.menu.EraseFlash.none.upload.erase_cmd=
+um_omgs3.menu.EraseFlash.all=Enabled
+um_omgs3.menu.EraseFlash.all.upload.erase_cmd=-e
+
+##############################################################
+
 um_pros3.name=UM PROS3
 um_pros3.vid.0=0x303a
 um_pros3.pid.0=0x80D3
@@ -4507,8 +4661,6 @@ S_ODI_Ultra.menu.EraseFlash.all.upload.erase_cmd=-e
 ##############################################################
 
 lilygo_t_display.name=LilyGo T-Display
-lilygo_t_display.vid.0=0x1a86
-lilygo_t_display.pid.0=0x55d4
 
 lilygo_t_display.upload.tool=esptool_py
 lilygo_t_display.upload.tool.default=esptool_py
@@ -22051,7 +22203,7 @@ m5stack_stamp_s3.build.flash_freq=80m
 m5stack_stamp_s3.build.flash_mode=dio
 m5stack_stamp_s3.build.boot=qio
 m5stack_stamp_s3.build.boot_freq=80m
-m5stack_stamp_s3.build.partitions=default
+m5stack_stamp_s3.build.partitions=default_8MB
 m5stack_stamp_s3.build.defines=
 m5stack_stamp_s3.build.loop_core=
 m5stack_stamp_s3.build.event_core=
@@ -22771,7 +22923,7 @@ m5stack_dial.build.flash_freq=80m
 m5stack_dial.build.flash_mode=dio
 m5stack_dial.build.boot=qio
 m5stack_dial.build.boot_freq=80m
-m5stack_dial.build.partitions=default
+m5stack_dial.build.partitions=default_8MB
 m5stack_dial.build.defines=
 m5stack_dial.build.loop_core=
 m5stack_dial.build.event_core=
@@ -27574,8 +27726,6 @@ fm-devkit.menu.EraseFlash.all.upload.erase_cmd=-e
 ### Fri3d Badge 2024 (ESP32-S3-WROOM-1)
 
 fri3d_2024_esp32s3.name=Fri3d Badge 2024 (ESP32-S3-WROOM-1)
-fri3d_2024_esp32s3.vid.0=0x303a
-fri3d_2024_esp32s3.pid.0=0x1001
 
 fri3d_2024_esp32s3.bootloader.tool=esptool_py
 fri3d_2024_esp32s3.bootloader.tool.default=esptool_py
@@ -34347,9 +34497,9 @@ department_of_alchemy_minimain_esp32s2.menu.EraseFlash.all.upload.erase_cmd=-e
 
 Bee_Data_Logger.name=Bee Data Logger
 Bee_Data_Logger.vid.0=0x303a
-Bee_Data_Logger.pid.0=815C
+Bee_Data_Logger.pid.0=0x815C
 Bee_Data_Logger.upload_port.0.vid=0x303a
-Bee_Data_Logger.upload_port.0.pid=815C
+Bee_Data_Logger.upload_port.0.pid=0x815C
 
 Bee_Data_Logger.bootloader.tool=esptool_py
 Bee_Data_Logger.bootloader.tool.default=esptool_py
@@ -34571,7 +34721,7 @@ Bee_Motion.name=Bee Motion
 Bee_Motion.vid.0=0x303a
 Bee_Motion.pid.0=0x810D
 Bee_Motion.vid.upload_port.0.vid=0x303a
-Bee_Motion.pid.upload_port.0.vid=0x810D
+Bee_Motion.pid.upload_port.0.pid=0x810D
 
 Bee_Motion.bootloader.tool=esptool_py
 Bee_Motion.bootloader.tool.default=esptool_py
@@ -34790,7 +34940,7 @@ Bee_S3.name=Bee S3
 Bee_S3.vid.0=0x303a
 Bee_S3.pid.0=0x8110
 Bee_S3.vid.upload_port.0.vid=0x303a
-Bee_S3.pid.upload_port.0.vid=0x8110
+Bee_S3.pid.upload_port.0.pid=0x8110
 
 Bee_S3.bootloader.tool=esptool_py
 Bee_S3.bootloader.tool.default=esptool_py
@@ -39913,8 +40063,6 @@ waveshare_esp32_s3_lcd_169.menu.EraseFlash.all.upload.erase_cmd=-e
 ##############################################################
 
 waveshare_esp32s3_touch_lcd_128.name=Waveshare ESP32S3 Touch LCD 128
-waveshare_esp32s3_touch_lcd_128.vid.0=0x1a86
-waveshare_esp32s3_touch_lcd_128.pid.0=0x55d3
 
 waveshare_esp32s3_touch_lcd_128.upload.tool=esptool_py
 waveshare_esp32s3_touch_lcd_128.upload.tool.default=esptool_py
@@ -40584,8 +40732,6 @@ walter.menu.EraseFlash.all.upload.erase_cmd=-e
 ##############################################################
 
 elecrow_crowpanel_7.name=Elecrow CrowPanel 7.0P
-elecrow_crowpanel_7.vid.0=0x1a86
-elecrow_crowpanel_7.pid.0=0x7523
 
 elecrow_crowpanel_7.upload.tool=esptool_py
 elecrow_crowpanel_7.upload.tool.default=esptool_py

cores/esp32/Tone.cpp

@@ -4,9 +4,11 @@
 #include "freertos/queue.h"
 #include "freertos/semphr.h"
 
+#if SOC_LEDC_SUPPORTED
 static TaskHandle_t _tone_task = NULL;
 static QueueHandle_t _tone_queue = NULL;
 static int8_t _pin = -1;
+static uint8_t _channel = 255;
 
 typedef enum {
   TONE_START,
@@ -20,6 +22,12 @@ typedef struct {
   unsigned long duration;
 } tone_msg_t;
 
+#ifdef SOC_LEDC_SUPPORT_HS_MODE
+#define LEDC_CHANNELS (SOC_LEDC_CHANNEL_NUM << 1)
+#else
+#define LEDC_CHANNELS (SOC_LEDC_CHANNEL_NUM)
+#endif
+
 static void tone_task(void *) {
   tone_msg_t tone_msg;
   while (1) {
@@ -29,7 +37,13 @@ static void tone_task(void *) {
         log_d("Task received from queue TONE_START: pin=%d, frequency=%u Hz, duration=%lu ms", tone_msg.pin, tone_msg.frequency, tone_msg.duration);
 
         if (_pin == -1) {
-          if (ledcAttach(tone_msg.pin, tone_msg.frequency, 10) == 0) {
+          bool ret = true;
+          if (_channel == 255) {
+            ret = ledcAttach(tone_msg.pin, tone_msg.frequency, 10);
+          } else {
+            ret = ledcAttachChannel(tone_msg.pin, tone_msg.frequency, 10, _channel);
+          }
+          if (!ret) {
             log_e("Tone start failed");
             break;
           }
@@ -73,7 +87,7 @@ static int tone_init() {
       "toneTask",  // Name of the task
       3500,        // Stack size in words
       NULL,        // Task input parameter
-      1,           // Priority of the task
+      10,          // Priority of the task must be higher than Arduino task
       &_tone_task  // Task handle.
     );
     if (_tone_task == NULL) {
@@ -126,3 +140,13 @@ void tone(uint8_t pin, unsigned int frequency, unsigned long duration) {
     return;
   }
 }
+
+void setToneChannel(uint8_t channel) {
+  if (channel >= LEDC_CHANNELS) {
+    log_e("Channel %u is not available (maximum %u)!", channel, LEDC_CHANNELS);
+    return;
+  }
+  _channel = channel;
+}
+
+#endif /* SOC_LEDC_SUPPORTED */

cores/esp32/chip-debug-report.cpp

@@ -87,12 +87,7 @@ static void printChipInfo(void) {
     default:           chip_report_printf("Unknown %d\n", info.model); break;
   }
   printPkgVersion();
-  chip_report_printf("  Revision          : ");
-  if (info.revision > 0xFF) {
-    chip_report_printf("%d.%d\n", info.revision >> 8, info.revision & 0xFF);
-  } else {
-    chip_report_printf("%d\n", info.revision);
-  }
+  chip_report_printf("  Revision          : %.2f\n", (float)(info.revision) / 100.0);
   chip_report_printf("  Cores             : %d\n", info.cores);
   rtc_cpu_freq_config_t conf;
   rtc_clk_cpu_freq_get_config(&conf);

idf_component.yml

@@ -96,3 +96,4 @@ dependencies:
     require: public
 examples:
   - path: ./idf_component_examples/hello_world
+  - path: ./idf_component_examples/hw_cdc_hello_world

idf_component_examples/hw_cdc_hello_world/CMakeLists.txt

@@ -0,0 +1,12 @@
+# For more information about build system see
+# https://docs.espressif.com/projects/esp-idf/en/latest/api-guides/build-system.html
+# The following five lines of boilerplate have to be in your project's
+# CMakeLists in this exact order for cmake to work correctly
+cmake_minimum_required(VERSION 3.16)
+include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+
+# Adds necessary definitions for compiling it using Serial symbol attached to the HW USB CDC port
+list(APPEND compile_definitions "ARDUINO_USB_CDC_ON_BOOT=1")
+list(APPEND compile_definitions "ARDUINO_USB_MODE=1")
+
+project(hw_cdc_hello_world)