Desktop port refactor

.gitmodules

@@ -28,3 +28,6 @@
 [submodule "thirdparty/esp-idf-components/embedded_cli/EmbeddedCLI"]
 	path = thirdparty/esp-idf-components/embedded_cli/EmbeddedCLI
 	url = https://github.com/AndreRenaud/EmbeddedCLI.git
+[submodule "thirdparty/uWebSockets/uWebSockets"]
+	path = thirdparty/uWebSockets/uWebSockets
+	url = https://github.com/uNetworking/uWebSockets.git

effects/CMakeLists.txt

@@ -0,0 +1,5 @@
+add_subdirectory(abstract_dsp)
+add_subdirectory(chorus)
+add_subdirectory(gate)
+add_subdirectory(valvestate)
+add_subdirectory(wah)

firmware/CMakeLists.txt

@@ -1,58 +1,35 @@
-if(ESP_PLATFORM)
-    cmake_minimum_required(VERSION 3.13)
+cmake_minimum_required(VERSION 3.13)
 
-    set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD 20)
 
-    option(SHRAPNEL_RESET_WIFI_CREDENTIALS
-           "Remove the provisioned Wi-Fi credentials at power up"
-           OFF
-    )
+option(SHRAPNEL_RESET_WIFI_CREDENTIALS
+       "Remove the provisioned Wi-Fi credentials at power up"
+       OFF
+)
 
-    if(SHRAPNEL_RESET_WIFI_CREDENTIALS)
-        add_compile_definitions(SHRAPNEL_RESET_WIFI_CREDENTIALS=1)
-    endif()
-
-    list(APPEND EXTRA_COMPONENT_DIRS ../thirdparty/esp-idf-components/esp-dsp)
-
-    include($ENV{IDF_PATH}/tools/cmake/project.cmake)
-    project(esp32-dsp)
-
-    add_subdirectory(../effects/abstract_dsp abstract_dsp)
-    add_subdirectory(../effects/chorus chorus)
-    add_subdirectory(../effects/gate gate)
-    add_subdirectory(../effects/valvestate valvestate)
-    add_subdirectory(../effects/wah wah)
-    add_subdirectory(../thirdparty/esp-idf-components/cppcodec cppcodec)
-    add_subdirectory(../thirdparty/esp-idf-components/embedded_cli embedded_cli)
-    add_subdirectory(../thirdparty/esp-idf-components/esp32-fft esp32-fft)
-    add_subdirectory(../thirdparty/esp-idf-components/etl etl)
-    add_subdirectory(../thirdparty/esp-idf-components/nanopb nanopb)
-    add_subdirectory(components/api)
-    add_subdirectory(components/audio)
-    add_subdirectory(components/audio_events)
-    add_subdirectory(components/audio_param)
-    add_subdirectory(components/cmd_handling)
-    add_subdirectory(components/compiler_warning_flags)
-    add_subdirectory(components/esp_persistence)
-    add_subdirectory(components/float_convert)
-    add_subdirectory(components/hardware)
-    add_subdirectory(components/heap_tracing)
-    add_subdirectory(components/i2c)
-    add_subdirectory(components/i2s)
-    add_subdirectory(components/messages)
-    add_subdirectory(components/midi_handling)
-    add_subdirectory(components/midi_mapping)
-    add_subdirectory(components/midi_protocol)
-    add_subdirectory(components/os)
-    add_subdirectory(components/pcm3060)
-    add_subdirectory(components/persistence)
-    add_subdirectory(components/presets)
-    add_subdirectory(components/server)
-    add_subdirectory(components/shrapnel_console)
-    add_subdirectory(components/wifi)
-
-    return()
+if(SHRAPNEL_RESET_WIFI_CREDENTIALS)
+    add_compile_definitions(SHRAPNEL_RESET_WIFI_CREDENTIALS=1)
 endif()
 
-add_subdirectory(main)
-add_subdirectory(components)
+list(APPEND EXTRA_COMPONENT_DIRS ../thirdparty/esp-idf-components/esp-dsp)
+
+include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+project(esp32-dsp)
+
+add_subdirectory(../effects effects)
+add_subdirectory(../shrapnel shrapnel)
+add_subdirectory(../thirdparty/esp-idf-components/cppcodec cppcodec)
+add_subdirectory(../thirdparty/esp-idf-components/embedded_cli embedded_cli)
+add_subdirectory(../thirdparty/esp-idf-components/esp32-fft esp32-fft)
+add_subdirectory(../thirdparty/esp-idf-components/etl etl)
+add_subdirectory(../thirdparty/esp-idf-components/nanopb nanopb)
+add_subdirectory(components/esp_midi_uart)
+add_subdirectory(components/esp_persistence)
+add_subdirectory(components/hardware)
+add_subdirectory(components/heap_tracing)
+add_subdirectory(components/i2c)
+add_subdirectory(components/i2s)
+add_subdirectory(components/pcm3060)
+add_subdirectory(components/server)
+add_subdirectory(components/shrapnel_console)
+add_subdirectory(components/wifi)

firmware/components/CMakeLists.txt

@@ -1,18 +0,0 @@
-if(ESP_PLATFORM)
-    return()
-endif()
-add_subdirectory(api)
-add_subdirectory(audio_events)
-add_subdirectory(audio_param)
-add_subdirectory(cmd_handling)
-add_subdirectory(compiler_warning_flags)
-add_subdirectory(float_convert)
-add_subdirectory(hardware)
-add_subdirectory(heap_tracing)
-add_subdirectory(messages)
-add_subdirectory(midi_handling)
-add_subdirectory(midi_mapping)
-add_subdirectory(midi_protocol)
-add_subdirectory(os)
-add_subdirectory(persistence)
-add_subdirectory(presets)

firmware/components/esp_midi_uart/CMakeLists.txt

@@ -0,0 +1,12 @@
+add_library(shrapnel_esp_midi_uart STATIC)
+add_library(shrapnel::esp_midi_uart ALIAS shrapnel_esp_midi_uart)
+
+target_sources(shrapnel_esp_midi_uart PRIVATE src/esp_midi_uart.cpp)
+
+target_include_directories(shrapnel_esp_midi_uart PUBLIC include)
+
+target_link_libraries(shrapnel_esp_midi_uart PUBLIC
+                      shrapnel::midi_protocol
+                      idf::freertos
+                      idf::driver
+)

firmware/components/midi_protocol/include/midi_uart.h → firmware/components/esp_midi_uart/include/esp_midi_uart.h

@@ -20,22 +20,13 @@
 #pragma once
 
 #include "freertos/FreeRTOS.h"
-#include <cstdint>
+#include "midi_uart.h"
 #include <driver/gpio.h>
 #include <driver/uart.h>
-#include <memory>
-#include <optional>
 
-namespace shrapnel {
-namespace midi {
+namespace shrapnel::midi {
 
-class MidiUartBase
-{
-public:
-    virtual std::optional<uint8_t> get_byte(TickType_t timeout) = 0;
-};
-
-class EspMidiUart final : public MidiUartBase
+class EspMidiUart final : public MidiUartBase<TickType_t>
 {
 public:
     EspMidiUart(uart_port_t uart, gpio_num_t rx_io);
@@ -46,5 +37,4 @@ class EspMidiUart final : public MidiUartBase
     uart_port_t uart;
 };
 
-} // namespace midi
-} // namespace shrapnel
+} // namespace shrapnel::midi