From 0a3f0e92166f4d0b290a47fefb4086c61e1a2241 Mon Sep 17 00:00:00 2001 From: radex Date: Mon, 3 Jun 2024 22:15:44 +0200 Subject: [PATCH] begin MainBoard bringup --- firmware/src/audio.h | 2 +- firmware/src/leds.h | 18 +++++++++--------- firmware/src/main.cpp | 4 ++-- firmware/src/sd.cpp | 10 +++++----- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/firmware/src/audio.h b/firmware/src/audio.h index ee4594d..3aa5638 100644 --- a/firmware/src/audio.h +++ b/firmware/src/audio.h @@ -3,7 +3,7 @@ #ifndef _audio_h #define _audio_h -#define AUDIO_PIN 2 +#define AUDIO_PIN 8 #define AUDIO_RATE 22000.0f #define BUFFER_LEN 512*4 diff --git a/firmware/src/leds.h b/firmware/src/leds.h index 80231f6..d9aacdb 100644 --- a/firmware/src/leds.h +++ b/firmware/src/leds.h @@ -4,18 +4,18 @@ #include -#define COL_SER 20 -#define COL_OE 21 -// #define COL_RCLK 22 -#define RCLK 22 -#define COL_SRCLK 26 -#define COL_SRCLR 27 +#define COL_SER 21 +#define COL_OE 22 +// #define COL_RCLK 23 +#define RCLK 23 +#define COL_SRCLK 24 +#define COL_SRCLR 25 #define ROW_SER 14 #define ROW_OE 13 -// #define ROW_RCLK 12 -#define ROW_SRCLK 11 -#define ROW_SRCLR 10 +// #define ROW_RCLK 20 +#define ROW_SRCLK 18 +#define ROW_SRCLR 15 #define ROW_MODULES 2 #define ROW_COUNT ROW_MODULES * 20 diff --git a/firmware/src/main.cpp b/firmware/src/main.cpp index 090ff63..f4dc8ae 100644 --- a/firmware/src/main.cpp +++ b/firmware/src/main.cpp @@ -11,7 +11,7 @@ void loadVideo(size_t index); void setup() { leds_init(); setupSDPins(); - pinMode(4, INPUT_PULLUP); + pinMode(9, INPUT_PULLUP); delay(2000); Serial.begin(115200); @@ -62,7 +62,7 @@ void nextSong() { } void loop() { - if (digitalRead(4) == LOW) { + if (digitalRead(9) == LOW) { delay(100); nextSong(); delay(50); diff --git a/firmware/src/sd.cpp b/firmware/src/sd.cpp index 766b90d..9ab3136 100644 --- a/firmware/src/sd.cpp +++ b/firmware/src/sd.cpp @@ -8,12 +8,12 @@ #include "ff.h" #include "f_util.h" -#define SD_DET_PIN 28 +#define SD_DET_PIN 4 -#define SD_PIN_SS 17 -#define SD_PIN_SCK 18 -#define SD_PIN_MOSI 19 -#define SD_PIN_MISO 16 +#define SD_PIN_SS 1 +#define SD_PIN_SCK 2 +#define SD_PIN_MOSI 3 +#define SD_PIN_MISO 0 static spi_t spi = { .hw_inst = spi0,