Refactor audio board firmware

.gitignore

@@ -1,4 +1,3 @@
 *.bak
 *.mp4
-*.ts
 xml

.gitmodules

@@ -16,9 +16,6 @@
 [submodule "hardware/firmware/audio_board/vendor/SPI"]
 	path = hardware/firmware/audio_board/vendor/SPI
 	url = https://github.com/PaulStoffregen/SPI.git
-[submodule "hardware/firmware/audio_board/vendor/OSC"]
-	path = hardware/firmware/audio_board/vendor/OSC
-	url = https://github.com/CNMAT/OSC
 [submodule "hardware/firmware/audio_board/vendor/ST7735_t3"]
 	path = hardware/firmware/audio_board/vendor/ST7735_t3
 	url = https://github.com/PaulStoffregen/ST7735_t3

hardware/firmware/audio_board/.clang-format

@@ -1,8 +1,34 @@
 ---
 BasedOnStyle: LLVM
 IndentWidth: 4
-ColumnLimit: 80
----
-Language: Cpp
+TabWidth: 4
+UseTab: AlignWithSpaces
+BreakBeforeBraces: Attach
+
+InsertBraces: true
+
+SpacesInParentheses: false
+
+AlignConsecutiveMacros: AcrossEmptyLinesAndComments
+AlignConsecutiveAssignments:
+  Enabled: true
+  AcrossEmptyLines: false
+  AcrossComments: false
+  AlignCompound: false
+  PadOperators: false
+AlignConsecutiveDeclarations: Consecutive
+AlignTrailingComments: true
+AlignAfterOpenBracket: BlockIndent
+IndentAccessModifiers: true
+
 DerivePointerAlignment: false
-PointerAlignment: Right
+PointerAlignment: Left
+
+PackConstructorInitializers: BinPack
+BreakConstructorInitializers: AfterColon
+
+ColumnLimit: 0
+
+SortIncludes: false
+
+LineEnding: LF

hardware/firmware/audio_board/CMakeLists.txt

@@ -33,7 +33,7 @@ set(TEENSY_DEFINITIONS USB_MIDI_AUDIO_SERIAL
         LAYOUT_US_ENGLISH
         F_CPU=${CPU_CORE_SPEED}
         ${CPU_DEFINE}
-        ARDUINO_TEENSY40)
+        ARDUINO_TEENSY41)
 set(MCPU cortex-m7)
 add_compile_options(-mcpu=${MCPU} -mthumb -mthumb-interwork -mfloat-abi=hard -mfpu=fpv5-d16 -D${CPU_DEFINE} -DTEENSYDUINO=159 -DARDUINO=10607 -nostdlib)
 set(c_flags -MMD -fno-exceptions)
@@ -91,7 +91,6 @@ set_property(SOURCE ${VENDOR_ROOT}/Audio/memcpy_audio.S PROPERTY LANGUAGE C)
 #import_arduino_library(${VENDOR_ROOT} Adafruit_BusIO)
 #import_arduino_library(${VENDOR_ROOT} Adafruit_SSD1306)
 import_arduino_library(${VENDOR_ROOT} ST7735_t3/src)
-import_arduino_library(${VENDOR_ROOT} OSC)
 import_arduino_library(${VENDOR_ROOT} SD/src)
 import_arduino_library(${VENDOR_ROOT} SdFat/src)
 import_arduino_library(${VENDOR_ROOT} SdFat/src/ExFatLib)
@@ -107,13 +106,18 @@ set(FEATURES
 	USE_DISPLAY
 )
 
-set(SOURCES 
+set(SOURCES
 	teensy4_usb_descriptor.c
 	src/main.cpp
 	src/storage.cpp
 	src/display.cpp
-	src/helpers.cpp
+	src/db_conversion.cpp
 	src/teensyaudio.cpp
+    src/taa3040.cpp
+    src/cli/cli.cpp
+    src/cli/commands.cpp
+    src/debug.cpp
+    src/channels.cpp
 )
 
 # Build this project

hardware/firmware/audio_board/format.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+set -euo pipefail
+
+cdir="$(dirname "$(readlink -f "${0}")")"
+
+if [[ $# -eq 1 ]]; then
+    dirs=( "$(readlink -f "${1}")" )
+elif [[ $# -eq 0 ]]; then
+    dirs=( "${cdir}"/src )
+else
+    echo 'what?' >&2
+    exit 1
+fi
+
+cd "${cdir}"
+
+for dir in "${dirs[@]}"; do
+    echo "formatting in ${dir}" >&2
+    find "${dir}" -type f -regextype egrep -iregex '.*\.[ch]|.*\.cpp' \
+        -not -path '*/sys/*' \
+        -not -path '*/build/*' \
+        -not -path '*/vendor/*' \
+        -exec clang-format -i -style=file '{}' \+
+done

hardware/firmware/audio_board/src/channels.cpp

@@ -0,0 +1,21 @@
+#include "channels.h"
+
+static constexpr ChanInfo the_channel_info[] = {
+	{CHAN_WHITE, "1", "IN1", 0},
+	{CHAN_WHITE, "2", "IN2", 0},
+	{CHAN_WHITE, "3", "IN3", 0},
+	{CHAN_YELLOW, "P", "PC", 0},
+	{CHAN_MAGENTA, "USB", "USB1", 1},
+	{CHAN_MAGENTA, "USB", "USB2", 2},
+
+	{CHAN_WHITE, "1", "OUT1", 0},
+	{CHAN_WHITE, "2", "OUT2", 0},
+	{CHAN_GREEN, "AFL", "HP1", 1},
+	{CHAN_GREEN, "AFL", "HP2", 2},
+	{CHAN_MAGENTA, "USB", "USB1", 1},
+	{CHAN_MAGENTA, "USB", "USB2", 2},
+};
+
+const ChanInfo& channel_info(uint8_t chan_id) {
+	return the_channel_info[chan_id];
+}

hardware/firmware/audio_board/src/channels.h

@@ -1,20 +1,22 @@
-#ifndef _CHANNELS_H_
-#define _CHANNELS_H_
+#pragma once
 
 #include <stdint.h>
 
+#define CHANNELS 6
+#define BUSES    6
+
 typedef struct ChanInfo {
-    uint16_t color;
-    char label[4];
-    char desc[16];
-    uint8_t link;
+		uint16_t color;
+		char     label[4];
+		char     desc[16];
+		uint8_t  link;
 } ChanInfo;
 
+const ChanInfo& channel_info(uint8_t chan_id);
+
 #define RGB(r, g, b) (((r & 0xF8) << 8) | ((g & 0xFC) << 3) | (b >> 3))
 
-#define CHAN_WHITE RGB(255, 255, 255)
-#define CHAN_YELLOW RGB(255, 255, 80)
+#define CHAN_WHITE   RGB(255, 255, 255)
+#define CHAN_YELLOW  RGB(255, 255, 80)
 #define CHAN_MAGENTA RGB(255, 140, 255)
-#define CHAN_GREEN RGB(100, 255, 100)
-
-#endif
+#define CHAN_GREEN   RGB(100, 255, 100)