SUKU midi translator and midi uart moved to proper components

intechstudio · Dec 11, 2023 · d34b9e0 · d34b9e0
1 parent 5d41e83
commit d34b9e0
Show file tree

Hide file tree

Showing 18 changed files with 1,392 additions and 9 deletions.
diff --git a/firmware/.vscode/settings.json b/firmware/.vscode/settings.json
@@ -61,7 +61,7 @@
             "name": "Unit Test",
             "color": "white",
             "singleInstance": true,
-            "command": "cd ./main/host_test && ./test.sh",
+            "command": "cd ./components/knot_midi_translator/host_test && ./test.sh",
         }
     ]
 },

diff --git a/firmware/components/knot_midi_translator/CMakeLists.txt b/firmware/components/knot_midi_translator/CMakeLists.txt
@@ -0,0 +1,7 @@
+idf_component_register(
+    SRCS 
+        "knot_midi_translator.c"
+    INCLUDE_DIRS 
+        "."
+    REQUIRES
+)
diff --git a/firmware/components/knot_midi_translator/LICENSE b/firmware/components/knot_midi_translator/LICENSE
diff --git a/firmware/main/host_test/.gitignore → ...knot_midi_translator/host_test/.gitignore b/firmware/main/host_test/.gitignore → ...knot_midi_translator/host_test/.gitignore
diff --git a/firmware/main/host_test/CMakeLists.txt → ..._midi_translator/host_test/CMakeLists.txt b/firmware/main/host_test/CMakeLists.txt → ..._midi_translator/host_test/CMakeLists.txt
@@ -4,4 +4,4 @@ cmake_minimum_required(VERSION 3.10)
 project(UnitTest VERSION 1.0)
 
 # add the executable
-add_executable(${PROJECT_NAME} main.c unity.c ../midi_translator.c)
+add_executable(${PROJECT_NAME} main.c unity.c ../knot_midi_translator.c)
diff --git a/firmware/main/host_test/main.c → ...nts/knot_midi_translator/host_test/main.c b/firmware/main/host_test/main.c → ...nts/knot_midi_translator/host_test/main.c
@@ -1,5 +1,5 @@
 #include "unity.h"
-#include "../midi_translator.h"
+#include "../knot_midi_translator.h"
 
 #include <stdio.h>
 #include <memory.h>

diff --git a/firmware/main/host_test/test.sh → ...ts/knot_midi_translator/host_test/test.sh b/firmware/main/host_test/test.sh → ...ts/knot_midi_translator/host_test/test.sh
diff --git a/firmware/main/host_test/unity.c → ...ts/knot_midi_translator/host_test/unity.c b/firmware/main/host_test/unity.c → ...ts/knot_midi_translator/host_test/unity.c
diff --git a/firmware/main/host_test/unity.h → ...ts/knot_midi_translator/host_test/unity.h b/firmware/main/host_test/unity.h → ...ts/knot_midi_translator/host_test/unity.h
diff --git a/firmware/main/host_test/unity_internals.h → ...di_translator/host_test/unity_internals.h b/firmware/main/host_test/unity_internals.h → ...di_translator/host_test/unity_internals.h
diff --git a/firmware/main/midi_translator.c → ...ot_midi_translator/knot_midi_translator.c b/firmware/main/midi_translator.c → ...ot_midi_translator/knot_midi_translator.c
@@ -1,5 +1,5 @@
 #include <stdint.h>
-#include "midi_translator.h"
+#include "knot_midi_translator.h"
 
 
 struct uart_midi_event_packet usb_midi_to_uart(struct usb_midi_event_packet usb_packet){

diff --git a/firmware/main/midi_translator.h → ...ot_midi_translator/knot_midi_translator.h b/firmware/main/midi_translator.h → ...ot_midi_translator/knot_midi_translator.h
diff --git a/firmware/components/knot_midi_uart/CMakeLists.txt b/firmware/components/knot_midi_uart/CMakeLists.txt
@@ -0,0 +1,11 @@
+idf_component_register(
+    SRCS 
+        "knot_midi_uart.c"
+    INCLUDE_DIRS 
+        "."
+    REQUIRES
+        "knot_midi_translator"
+        "driver"
+        "grid_common"
+        "grid_esp32_led"
+)
diff --git a/firmware/components/knot_midi_uart/LICENSE b/firmware/components/knot_midi_uart/LICENSE
diff --git a/firmware/main/uart_driver.c → ...omponents/knot_midi_uart/knot_midi_uart.c b/firmware/main/uart_driver.c → ...omponents/knot_midi_uart/knot_midi_uart.c
@@ -4,6 +4,9 @@
  * SPDX-License-Identifier: Unlicense OR CC0-1.0
  */
 
+
+#include "knot_midi_uart.h"
+
 #include <stdlib.h>
 #include <string.h>
 #include "freertos/FreeRTOS.h"
@@ -18,7 +21,7 @@
 
 #include "freertos/queue.h"
 #include "driver/uart.h"
-#include "midi_translator.h"
+#include "knot_midi_translator.h"
 
 
 #define EX_UART_NUM UART_NUM_1
@@ -35,7 +38,6 @@ uint8_t midi_through = false;
 #include "driver/gpio.h"
 
 #include "grid_led.h"
-#include "../managed_components/sukuwc__grid_common/grid_led.h"
 
 #define TRS_TX_AB_SELECT 15
 #define TRS_RX_AB_SELECT 16

diff --git a/firmware/components/knot_midi_uart/knot_midi_uart.h b/firmware/components/knot_midi_uart/knot_midi_uart.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#include "driver/uart.h"
+#include "knot_midi_translator.h"
+
+
+
+#include "freertos/FreeRTOS.h"
+#include "freertos/semphr.h"
+#include "freertos/ringbuf.h"
+#include "freertos/queue.h"
+
+
+void uart_init(void);
+int uart_send_data(struct uart_midi_event_packet ev);
+void uart_housekeeping_task(void *arg);
+void uart_rx_task(void *arg);
diff --git a/firmware/main/CMakeLists.txt b/firmware/main/CMakeLists.txt
@@ -2,8 +2,6 @@ idf_component_register(
     SRCS 
         "midi_host_fw.c" 
         "class_driver.c" 
-        "midi_translator.c" 
-        "uart_driver.c" 
 
     INCLUDE_DIRS 
         "." 

diff --git a/firmware/main/class_driver.c b/firmware/main/class_driver.c
@@ -13,7 +13,7 @@
 #include "grid_led.h"
 #include "../managed_components/sukuwc__grid_common/grid_led.h"
 
-#include "midi_translator.h"
+#include "knot_midi_translator.h"
 
 #include "rom/ets_sys.h" // For ets_printf