Skip to content

Commit b33e017

Browse files
build(esp-idf): 7 recipes pull midi2 via Component Manager
Drop the dist/midi2.c entry that every recipe re-listed in SRCS under ${MIDI2_CPP_ROOT}. Each recipe now declares midi2 as a managed dependency and lists midi2 in REQUIRES so <midi2.h> resolves through the imported component: # idf/main/idf_component.yml dependencies: idf: ">=5.4" midi2: git: https://github.com/sauloverissimo/midi2.git version: ">=0.3.3" The Component Manager clones midi2 into managed_components/midi2; ESP-IDF processes it as a regular component because midi2's top-level CMakeLists detects ESP_PLATFORM and routes to idf_component_register (see midi2 v0.3.3). Recipes touched: - arduino-nano-esp32-midi2 - esp32-s3-devkitc-usb-midi2 - esp32-p4-devkit-usb-midi2 - esp32-p4-devkit-host-midi2 - esp32-p4-devkit-bridge-midi2 - esp32-p4-devkit-bridge2-midi2 - t-display-s3-midi2 The other midi2_cpp source files (midi2_device.cpp, midi2_ci.cpp, midi2_host.cpp, midi2_bridge.cpp) keep being compiled inline from the parent tree until the host helper library shape is finalised.
1 parent 4d01c0a commit b33e017

14 files changed

Lines changed: 28 additions & 7 deletions

File tree

examples/arduino-nano-esp32-midi2/idf/main/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ idf_component_register(
1111
SRCS
1212
"main.cpp"
1313
"arduino_nano_esp32_midi2.cpp"
14-
"${MIDI2_CPP_ROOT}/midi2.c"
1514
"${MIDI2_CPP_ROOT}/midi2_device.cpp"
1615
"${MIDI2_CPP_ROOT}/midi2_ci.cpp"
1716
INCLUDE_DIRS
1817
"."
1918
"${MIDI2_CPP_ROOT}"
2019
REQUIRES
20+
midi2
2121
tinyusb
2222
driver
2323
esp_timer

examples/arduino-nano-esp32-midi2/idf/main/idf_component.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,6 @@
55
## ./scripts/fetch_tinyusb.sh once to clone the fork at the pinned SHA.
66
dependencies:
77
idf: ">=5.4"
8+
midi2:
9+
git: https://github.com/sauloverissimo/midi2.git
10+
version: ">=0.3.3"

examples/esp32-p4-devkit-bridge-midi2/idf/main/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ idf_component_register(
1414
SRCS
1515
"main.cpp"
1616
"esp32_p4_devkit_bridge.cpp"
17-
"${MIDI2_CPP_ROOT}/midi2.c"
1817
"${MIDI2_CPP_ROOT}/midi2_device.cpp"
1918
"${MIDI2_CPP_ROOT}/midi2_ci.cpp"
2019
"${MIDI2_CPP_ROOT}/midi2_host.cpp"
2120
INCLUDE_DIRS
2221
"."
2322
"${MIDI2_CPP_ROOT}"
2423
REQUIRES
24+
midi2
2525
tinyusb
2626
driver
2727
esp_timer

examples/esp32-p4-devkit-bridge-midi2/idf/main/idf_component.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,6 @@
55
## ./scripts/fetch_tinyusb.sh once to clone the fork at the pinned SHA.
66
dependencies:
77
idf: ">=5.4"
8+
midi2:
9+
git: https://github.com/sauloverissimo/midi2.git
10+
version: ">=0.3.3"

examples/esp32-p4-devkit-bridge2-midi2/idf/main/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ idf_component_register(
1616
SRCS
1717
"main.cpp"
1818
"esp32_p4_devkit_bridge2.cpp"
19-
"${MIDI2_CPP_ROOT}/midi2.c"
2019
"${MIDI2_CPP_ROOT}/midi2_device.cpp"
2120
"${MIDI2_CPP_ROOT}/midi2_ci.cpp"
2221
"${MIDI2_CPP_ROOT}/midi2_host.cpp"
@@ -25,6 +24,7 @@ idf_component_register(
2524
"."
2625
"${MIDI2_CPP_ROOT}"
2726
REQUIRES
27+
midi2
2828
tinyusb
2929
driver
3030
esp_timer

examples/esp32-p4-devkit-bridge2-midi2/idf/main/idf_component.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,6 @@
55
## ./scripts/fetch_tinyusb.sh once to clone the fork at the pinned SHA.
66
dependencies:
77
idf: ">=5.4"
8+
midi2:
9+
git: https://github.com/sauloverissimo/midi2.git
10+
version: ">=0.3.3"

examples/esp32-p4-devkit-host-midi2/idf/main/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ idf_component_register(
1111
SRCS
1212
"main.cpp"
1313
"esp32_p4_devkit_host.cpp"
14-
"${MIDI2_CPP_ROOT}/midi2.c"
1514
"${MIDI2_CPP_ROOT}/midi2_host.cpp"
1615
INCLUDE_DIRS
1716
"."
1817
"${MIDI2_CPP_ROOT}"
1918
REQUIRES
19+
midi2
2020
tinyusb
2121
driver
2222
esp_timer

examples/esp32-p4-devkit-host-midi2/idf/main/idf_component.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,6 @@
55
## ./scripts/fetch_tinyusb.sh once to clone the fork at the pinned SHA.
66
dependencies:
77
idf: ">=5.4"
8+
midi2:
9+
git: https://github.com/sauloverissimo/midi2.git
10+
version: ">=0.3.3"

examples/esp32-p4-devkit-usb-midi2/idf/main/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ idf_component_register(
1111
SRCS
1212
"main.cpp"
1313
"esp32_p4_devkit_midi2.cpp"
14-
"${MIDI2_CPP_ROOT}/midi2.c"
1514
"${MIDI2_CPP_ROOT}/midi2_device.cpp"
1615
"${MIDI2_CPP_ROOT}/midi2_ci.cpp"
1716
INCLUDE_DIRS
1817
"."
1918
"${MIDI2_CPP_ROOT}"
2019
REQUIRES
20+
midi2
2121
tinyusb
2222
driver
2323
esp_timer

examples/esp32-p4-devkit-usb-midi2/idf/main/idf_component.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,6 @@
99
## indicator is a no-op (see esp32_p4_devkit_midi2.cpp).
1010
dependencies:
1111
idf: ">=5.4"
12+
midi2:
13+
git: https://github.com/sauloverissimo/midi2.git
14+
version: ">=0.3.3"

0 commit comments

Comments
 (0)