Merge branch 'espressif:master' into main

Author: Jason2866

.github/workflows/boards.yml

@@ -45,6 +45,16 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v3
 
+      - name: Check if build.board is uppercase
+        run: |
+          board_name=$(echo ${{ matrix.fqbn }} | awk -F':' '{print $NF}')
+          if grep -q "^$board_name.build.board=[A-Z0-9_]*$" boards.txt; then
+            echo "$board_name.build.board is valid.";
+          else
+            echo "Error: $board_name.build.board is not uppercase!";
+            exit 1;
+          fi
+
       - name: Compile sketch
         uses: P-R-O-C-H-Y/compile-sketches@main
         with:

CMakeLists.txt

@@ -97,6 +97,7 @@ set(LIBRARY_SRCS
   libraries/Update/src/Updater.cpp
   libraries/Update/src/HttpsOTAUpdate.cpp
   libraries/USB/src/USBHID.cpp
+  libraries/USB/src/USBMIDI.cpp
   libraries/USB/src/USBHIDMouse.cpp
   libraries/USB/src/USBHIDKeyboard.cpp
   libraries/USB/src/USBHIDGamepad.cpp

boards.txt

@@ -430,6 +430,8 @@ esp32c6.menu.PartitionScheme.custom.upload.maximum_size=16777216
 
 esp32c6.menu.CPUFreq.160=160MHz (WiFi)
 esp32c6.menu.CPUFreq.160.build.f_cpu=160000000L
+esp32c6.menu.CPUFreq.120=120MHz (WiFi)
+esp32c6.menu.CPUFreq.120.build.f_cpu=120000000L
 esp32c6.menu.CPUFreq.80=80MHz (WiFi)
 esp32c6.menu.CPUFreq.80.build.f_cpu=80000000L
 esp32c6.menu.CPUFreq.40=40MHz
@@ -17110,7 +17112,7 @@ heltec_wifi_kit_32.build.target=esp32
 heltec_wifi_kit_32.build.mcu=esp32
 heltec_wifi_kit_32.build.core=esp32
 heltec_wifi_kit_32.build.variant=heltec_wifi_kit_32
-heltec_wifi_kit_32.build.board=heltec_wifi_kit_32
+heltec_wifi_kit_32.build.board=HELTEC_WIFI_KIT_32
 
 heltec_wifi_kit_32.build.f_cpu=240000000L
 heltec_wifi_kit_32.build.flash_size=4MB
@@ -17199,7 +17201,7 @@ heltec_wifi_kit_32_V3.build.target=esp32s3
 heltec_wifi_kit_32_V3.build.mcu=esp32s3
 heltec_wifi_kit_32_V3.build.core=esp32
 heltec_wifi_kit_32_V3.build.variant=heltec_wifi_kit_32_V3
-heltec_wifi_kit_32_V3.build.board=heltec_wifi_kit_32_V3
+heltec_wifi_kit_32_V3.build.board=HELTEC_WIFI_KIT_32_V3
 
 heltec_wifi_kit_32_V3.build.usb_mode=1
 heltec_wifi_kit_32_V3.build.cdc_on_boot=0
@@ -17298,7 +17300,7 @@ heltec_wifi_lora_32.build.target=esp32
 heltec_wifi_lora_32.build.mcu=esp32
 heltec_wifi_lora_32.build.core=esp32
 heltec_wifi_lora_32.build.variant=heltec_wifi_lora_32
-heltec_wifi_lora_32.build.board=heltec_wifi_lora_32
+heltec_wifi_lora_32.build.board=HELTEC_WIFI_LORA_32
 
 heltec_wifi_lora_32.build.f_cpu=240000000L
 heltec_wifi_lora_32.build.flash_size=4MB
@@ -17435,7 +17437,7 @@ heltec_wifi_lora_32_V2.build.target=esp32
 heltec_wifi_lora_32_V2.build.mcu=esp32
 heltec_wifi_lora_32_V2.build.core=esp32
 heltec_wifi_lora_32_V2.build.variant=heltec_wifi_lora_32_V2
-heltec_wifi_lora_32_V2.build.board=heltec_wifi_lora_32_V2
+heltec_wifi_lora_32_V2.build.board=HELTEC_WIFI_LORA_32_V2
 
 heltec_wifi_lora_32_V2.build.f_cpu=240000000L
 heltec_wifi_lora_32_V2.build.flash_size=8MB
@@ -17551,7 +17553,7 @@ heltec_wifi_lora_32_V3.build.target=esp32s3
 heltec_wifi_lora_32_V3.build.mcu=esp32s3
 heltec_wifi_lora_32_V3.build.core=esp32
 heltec_wifi_lora_32_V3.build.variant=heltec_wifi_lora_32_V3
-heltec_wifi_lora_32_V3.build.board=heltec_wifi_32_lora_V3
+heltec_wifi_lora_32_V3.build.board=HELTEC_WIFI_LORA_32_V3
 
 heltec_wifi_lora_32_V3.build.usb_mode=1
 heltec_wifi_lora_32_V3.build.cdc_on_boot=0
@@ -17693,7 +17695,7 @@ heltec_wireless_stick.build.target=esp32
 heltec_wireless_stick.build.mcu=esp32
 heltec_wireless_stick.build.core=esp32
 heltec_wireless_stick.build.variant=heltec_wireless_stick
-heltec_wireless_stick.build.board=heltec_wireless_stick
+heltec_wireless_stick.build.board=HELTEC_WIRELESS_STICK
 
 heltec_wireless_stick.build.f_cpu=240000000L
 heltec_wireless_stick.build.flash_size=8MB
@@ -17806,7 +17808,7 @@ heltec_wireless_stick_lite.build.target=esp32
 heltec_wireless_stick_lite.build.mcu=esp32
 heltec_wireless_stick_lite.build.core=esp32
 heltec_wireless_stick_lite.build.variant=heltec_wireless_stick_lite
-heltec_wireless_stick_lite.build.board=heltec_wireless_stick_LITE
+heltec_wireless_stick_lite.build.board=HELTEC_WIRELESS_STICK_LITE
 
 heltec_wireless_stick_lite.build.f_cpu=240000000L
 heltec_wireless_stick_lite.build.flash_size=4MB

cores/esp32/esp32-hal-cpu.c

@@ -188,11 +188,11 @@ bool setCpuFrequencyMhz(uint32_t cpu_freq_mhz){
     }
 #endif
 #ifndef CONFIG_IDF_TARGET_ESP32H2
-    if(cpu_freq_mhz > xtal && cpu_freq_mhz != 240 && cpu_freq_mhz != 160 && cpu_freq_mhz != 80){
+    if(cpu_freq_mhz > xtal && cpu_freq_mhz != 240 && cpu_freq_mhz != 160 && cpu_freq_mhz != 120 && cpu_freq_mhz != 80){
         if(xtal >= RTC_XTAL_FREQ_40M){
-            log_e("Bad frequency: %u MHz! Options are: 240, 160, 80, %u, %u and %u MHz", cpu_freq_mhz, xtal, xtal/2, xtal/4);
+            log_e("Bad frequency: %u MHz! Options are: 240, 160, 120, 80, %u, %u and %u MHz", cpu_freq_mhz, xtal, xtal/2, xtal/4);
         } else {
-            log_e("Bad frequency: %u MHz! Options are: 240, 160, 80, %u and %u MHz", cpu_freq_mhz, xtal, xtal/2);
+            log_e("Bad frequency: %u MHz! Options are: 240, 160, 120, 80, %u and %u MHz", cpu_freq_mhz, xtal, xtal/2);
         }
         return false;
     }

libraries/USB/examples/MIDI/MidiController/.skip.esp32

@@ -0,0 +1,118 @@
+/*
+This is an example of a Simple MIDI Controller using an ESP32 with a native USB support stack (S2, S3,
+etc.).
+
+For a hookup guide and more information on reading the ADC, please see:
+https://randomnerdtutorials.com/esp32-adc-analog-read-arduino-ide/ (Note: This sketch uses GPIO05)
+
+For best results, it is recommended to add an extra offset resistor between VCC and the potentiometer.
+(For a standard 10kOhm potentiometer, 3kOhm - 4kOhm will do.)
+
+View this sketch in action on YouTube: https://youtu.be/Y9TLXs_3w1M
+*/
+#if ARDUINO_USB_MODE
+#warning This sketch should be used when USB is in OTG mode
+void setup() {}
+void loop() {}
+#else
+
+#include <math.h>
+
+#include "USB.h"
+#include "USBMIDI.h"
+USBMIDI MIDI;
+
+#define MIDI_NOTE_C4 64
+
+#define MIDI_CC_CUTOFF 74
+
+///// ADC & Controller Input Handling /////
+
+#define CONTROLLER_PIN 5
+
+// ESP32 ADC needs a ton of smoothing
+#define SMOOTHING_VALUE 1000
+static double controllerInputValue = 0;
+
+void updateControllerInputValue() {
+    controllerInputValue =
+        (controllerInputValue * (SMOOTHING_VALUE - 1) + analogRead(CONTROLLER_PIN)) / SMOOTHING_VALUE;
+}
+
+void primeControllerInputValue() {
+    for (int i = 0; i < SMOOTHING_VALUE; i++) {
+        updateControllerInputValue();
+    }
+}
+
+uint16_t readControllerValue() {
+    // Lower ADC input amplitude to get a stable value
+    return round(controllerInputValue / 12);
+}
+
+///// Button Handling /////
+
+#define BUTTON_PIN 0
+
+// Simple button state transition function with debounce
+// (See also: https://tinyurl.com/simple-debounce)
+#define PRESSED 0xff00
+#define RELEASED 0xfe1f
+uint16_t getButtonEvent() {
+    static uint16_t state = 0;
+    state = (state << 1) | digitalRead(BUTTON_PIN) | 0xfe00;
+    return state;
+}
+
+///// Arduino Hooks /////
+
+void setup() {
+    Serial.begin(115200);
+    MIDI.begin();
+    USB.begin();
+
+    primeControllerInputValue();
+}
+
+void loop() {
+    uint16_t newControllerValue = readControllerValue();
+    static uint16_t lastControllerValue = 0;
+
+    // Auto-calibrate the controller range
+    static uint16_t maxControllerValue = 0;
+    static uint16_t minControllerValue = 0xFFFF;
+
+    if (newControllerValue < minControllerValue) {
+        minControllerValue = newControllerValue;
+    }
+    if (newControllerValue > maxControllerValue) {
+        maxControllerValue = newControllerValue;
+    }
+
+    // Send update if the controller value has changed
+    if (lastControllerValue != newControllerValue) {
+        lastControllerValue = newControllerValue;
+
+        // Can't map if the range is zero
+        if (minControllerValue != maxControllerValue) {
+            MIDI.controlChange(MIDI_CC_CUTOFF,
+                               map(newControllerValue, minControllerValue, maxControllerValue, 0, 127));
+        }
+    }
+
+    updateControllerInputValue();
+
+    // Hook Button0 to a MIDI note so that we can observe
+    // the CC effect without the need for a MIDI keyboard.
+    switch (getButtonEvent()) {
+        case PRESSED:
+            MIDI.noteOn(MIDI_NOTE_C4, 64);
+            break;
+        case RELEASED:
+            MIDI.noteOff(MIDI_NOTE_C4, 0);
+            break;
+        default:
+            break;
+    }
+}
+#endif /* ARDUINO_USB_MODE */

libraries/USB/examples/MIDI/MidiController/.skip.esp32c3

@@ -0,0 +1,70 @@
+/*
+This is an example of using an ESP32 with a native USB support stack (S2, S3, etc.) as a Serial MIDI to
+USB MIDI bridge (AKA "A MIDI Interface").
+
+View this sketch in action on YouTube: https://youtu.be/BXG5i55I9s0
+
+Receiving and decoding USB MIDI 1.0 packets is a more advanced topic than sending MIDI over USB,
+please refer to the other examples in this library for a more basic example of sending MIDI over USB.
+
+This example should still be self explanatory, please refer to the USB MIDI 1.0 specification (the spec)
+for a more in-depth explanation of the packet format.
+
+For the spec please visit: https://www.midi.org/specifications-old/item/usb-midi-1-0-specification
+
+Note: Because ESP32 works at VCC=3.3v normal schematics for Serial MIDI connections will not suffice,
+      Please refer to the Updated MIDI 1.1 Electrical Specification [1] for information on how to hookup
+      Serial MIDI for 3.3v devices.
+
+[1] - https://www.midi.org/specifications/midi-transports-specifications/5-pin-din-electrical-specs
+*/
+#if ARDUINO_USB_MODE
+#warning This sketch should be used when USB is in OTG mode
+void setup() {}
+void loop() {}
+#else
+
+#include "USB.h"
+#include "USBMIDI.h"
+USBMIDI MIDI;
+
+#define MIDI_RX 39
+#define MIDI_TX 40
+
+void setup() {
+    // USBCDC Serial
+    Serial.begin(115200);
+
+    // HW UART Serial
+    Serial1.begin(31250, SERIAL_8N1, MIDI_RX, MIDI_TX);
+
+    MIDI.begin();
+    USB.begin();
+}
+
+void loop() {
+    // MIDI Serial 1.0 to USB MIDI 1.0
+    if (Serial1.available()) {
+        byte data = Serial1.read();
+        MIDI.write(data);
+    }
+
+    // USB MIDI 1.0 to MIDI Serial 1.0
+    midiEventPacket_t midi_packet_in = {0};
+    // See Chapter 4: USB-MIDI Event Packets (page 16) of the spec.
+    int8_t cin_to_midix_size[16] = {-1, -1, 2, 3, 3, 1, 2, 3, 3, 3, 3, 3, 2, 2, 3, 1};
+
+    if (MIDI.readPacket(&midi_packet_in)) {
+        midi_code_index_number_t code_index_num = MIDI_EP_HEADER_CIN_GET(midi_packet_in.header);
+        int8_t midix_size = cin_to_midix_size[code_index_num];
+
+        // We skip Misc and Cable Events for simplicity
+        if (code_index_num >= 0x2) {
+            for (int i = 0; i < midix_size; i++) {
+                Serial1.write(((uint8_t *)&midi_packet_in)[i + 1]);
+            }
+            Serial1.flush();
+        }
+    }
+}
+#endif /* ARDUINO_USB_MODE */

libraries/USB/examples/MIDI/MidiController/.skip.esp32c6

@@ -0,0 +1,59 @@
+/*
+This is an example of a MIDI Music Box using an ESP32 with a native USB support stack (S2, S3, etc.).
+
+Every time the button on the ESP32 board (attached to pin 0) is pressed the next note of a melody is
+played. It is up to the user to get the timing of the button presses right.
+
+One simple way of running this sketch is to download the Pianoteq evaluation version, because upon
+application start it automatically listens to the first MIDI Input on Channel 1, which is the case,
+if the ESP32 is the only MIDI device attached.
+
+View this sketch in action on YouTube: https://youtu.be/JFrc-wSmcus
+*/
+#if ARDUINO_USB_MODE
+#warning This sketch should be used when USB is in OTG mode
+void setup() {}
+void loop() {}
+#else
+
+#include "USB.h"
+#include "USBMIDI.h"
+USBMIDI MIDI;
+
+#define END_OF_SONG 255
+uint8_t notes[] = {END_OF_SONG, 71, 76, 79, 78, 76, 83, 81, 78, 76, 79, 78, 75, 77, 71};
+uint8_t noteIndex = 0; // From 0 to sizeof(notes)
+#define SONG_LENGTH (sizeof(notes) - 1) // END_OF_SONG does not attribute to the length.
+
+#define BUTTON_PIN 0
+
+// Simple button press check with debounce
+// (See also: https://tinyurl.com/simple-debounce)
+bool isButtonPressed() {
+    static uint16_t state = 0;
+    state = (state << 1) | digitalRead(BUTTON_PIN) | 0xfe00;
+    return (state == 0xff00);
+}
+
+void setup() {
+    Serial.begin(115200);
+    // Make the BUTTON_PIN an input:
+    pinMode(BUTTON_PIN, INPUT_PULLUP);
+
+    MIDI.begin();
+    USB.begin();
+}
+
+void loop() {
+    if (isButtonPressed()) {
+        // Stop current note
+        MIDI.noteOff(notes[noteIndex]);
+
+        // Play next note
+        noteIndex = noteIndex < SONG_LENGTH ? noteIndex + 1 : 0;
+        if (notes[noteIndex] != END_OF_SONG) {
+            MIDI.noteOn(notes[noteIndex], 64);
+        }
+    }
+}
+#endif /* ARDUINO_USB_MODE */