Skip to content

Commit 6bc04b3

Browse files
committed
Merge branch 'build-fixes', incorporating 44.1khz firmware
2 parents 091c389 + 121fe20 commit 6bc04b3

File tree

92 files changed

+2368
-9581
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+2368
-9581
lines changed

.circleci/config.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ executors:
66
- image: cimg/go:1.23
77
debian:
88
docker:
9-
- image: debian:bookworm
9+
- image: archlinux:latest
1010
ruby:
1111
docker:
1212
- image: cimg/ruby:3.4
@@ -18,14 +18,13 @@ jobs:
1818
build_firmware:
1919
executor: debian
2020
steps:
21-
- run: apt-get update
2221
- run: >
23-
apt-get install -y \
22+
pacman -Syu --noconfirm \
2423
git \
25-
build-essential cmake \
26-
gcc-arm-none-eabi binutils-arm-none-eabi libstdc++-arm-none-eabi-newlib \
27-
libusb-1.0.0-dev libfreetype-dev \
28-
python3
24+
base-devel cmake \
25+
arm-none-eabi-binutils arm-none-eabi-gcc arm-none-eabi-newlib \
26+
libusb freetype2 \
27+
python openssh
2928
3029
# I have no idea why git fails locally otherwise, but...
3130
- run: git config --global --add safe.directory /tmp/_circleci_local_build_repo

.gitmodules

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,12 @@
3131
[submodule "hardware/firmware/box_rp2040/vendor/rp2040_tca9534"]
3232
path = hardware/firmware/box_rp2040/vendor/rp2040_tca9534
3333
url = [email protected]:dexterlb/rp2040_tca9534.git
34+
[submodule "hardware/firmware/audio_board/vendor/SD"]
35+
path = hardware/firmware/audio_board/vendor/SD
36+
url = https://github.com/PaulStoffregen/SD
37+
[submodule "hardware/firmware/audio_board/vendor/SdFat"]
38+
path = hardware/firmware/audio_board/vendor/SdFat
39+
url = https://github.com/PaulStoffregen/SdFat
40+
[submodule "hardware/firmware/audio_board/vendor/SerialFlash"]
41+
path = hardware/firmware/audio_board/vendor/SerialFlash
42+
url = https://github.com/PaulStoffregen/SerialFlash

hardware/firmware/audio_board/CMakeLists.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,15 @@ set_property(SOURCE ${VENDOR_ROOT}/Audio/memcpy_audio.S PROPERTY LANGUAGE C)
9292
#import_arduino_library(${VENDOR_ROOT} Adafruit_SSD1306)
9393
import_arduino_library(${VENDOR_ROOT} ST7735_t3/src)
9494
import_arduino_library(${VENDOR_ROOT} OSC)
95+
import_arduino_library(${VENDOR_ROOT} SD/src)
96+
import_arduino_library(${VENDOR_ROOT} SdFat/src)
97+
import_arduino_library(${VENDOR_ROOT} SdFat/src/ExFatLib)
98+
import_arduino_library(${VENDOR_ROOT} SdFat/src/FatLib)
99+
import_arduino_library(${VENDOR_ROOT} SdFat/src/common)
100+
import_arduino_library(${VENDOR_ROOT} SdFat/src/SdCard)
101+
import_arduino_library(${VENDOR_ROOT} SdFat/src/SpiDriver)
102+
import_arduino_library(${VENDOR_ROOT} SdFat/src/FsLib)
103+
import_arduino_library(${VENDOR_ROOT} SerialFlash)
95104

96105
set(FEATURES
97106
USE_EEPROM

hardware/firmware/audio_board/vendor/Audio/210.patch

Lines changed: 0 additions & 27 deletions
This file was deleted.

hardware/firmware/audio_board/vendor/Audio/439.patch

Lines changed: 0 additions & 228 deletions
This file was deleted.

0 commit comments

Comments
 (0)