radex
/
radmatrix
mirror of https://github.com/radex/radmatrix.git
1
0
Fork 0
Code

more bits

sd2
radex 2024-05-24 21:27:43 +02:00
parent fe46fc625d
commit cffe7eefbf
Signed by: radex
SSH Key Fingerprint: SHA256:hvqRXAGG1h89yqnS+cyFTLKQbzjWD4uXIqw7Y+0ws30
5 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
firmware/src/leds.cpp
View File

@ -29,10 +29,10 @@ inline void outputEnable(uint8_t pin, bool enable) {
gpio_put(pin, !enable); gpio_put(pin, !enable);
} }
// we have 4-bit color depth, so 16 levels of brightness // we have COLOR_BITS-bit color depth, so 2^COLOR_BITS levels of brightness
// we go from phase 0 to phase 3 // we go from phase 0 to phase (COLOR_BITS-1)
uint8_t brightnessPhase = 0; uint8_t brightnessPhase = 0;
uint8_t brightnessPhaseDelays[] = {1, 10, 30, 100}; uint8_t brightnessPhaseDelays[COLOR_BITS] = {0, 1, 6, 20, 60};
// NOTE: Alignment required to allow 4-byte reads // NOTE: Alignment required to allow 4-byte reads
uint8_t framebuffer[ROW_COUNT * COL_COUNT] __attribute__((aligned(32))) = {0}; uint8_t framebuffer[ROW_COUNT * COL_COUNT] __attribute__((aligned(32))) = {0};
@ -185,7 +185,7 @@ void leds_render() {
} }
// next brightness phase // next brightness phase
brightnessPhase = (brightnessPhase + 1) % 4; brightnessPhase = (brightnessPhase + 1) % COLOR_BITS;
} }
void leds_initPusher() { void leds_initPusher() {

1
firmware/src/leds.h
View File

@ -20,6 +20,7 @@
#define COL_MODULES 2 #define COL_MODULES 2
#define COL_COUNT COL_MODULES * 20 #define COL_COUNT COL_MODULES * 20
#define COLOR_BITS 5
#define FPS 30 #define FPS 30
#define MS_PER_FRAME 1000 / FPS #define MS_PER_FRAME 1000 / FPS

5
firmware/src/leds.pio
View File

@ -2,7 +2,8 @@
.side_set 1 opt .side_set 1 opt
.wrap_target .wrap_target
public entry_point: public entry_point:
out null, 4 side 0 [0] ; ignore 4 least significant digits out null, 3 side 0 [0] ; ignore least significant digits
out pins, 1 ; set bit (shifted for brightness phase by C code) out pins, 1 ; set bit (shifted for brightness phase by C code)
out null, 3 side 1 [1] ; ignore remaining bits, latch data, allow time for latching out null, 4 side 1 [1] ; ignore remaining bits, latch data, allow time for latching
nop side 0 ; return to 0 (weird glitches happen otherwise)
.wrap .wrap

9
firmware/src/leds.pio.h
View File

@ -13,22 +13,23 @@
// -------------- // // -------------- //
#define leds_px_pusher_wrap_target 0 #define leds_px_pusher_wrap_target 0
#define leds_px_pusher_wrap 2 #define leds_px_pusher_wrap 3
#define leds_px_pusher_offset_entry_point 0u #define leds_px_pusher_offset_entry_point 0u
static const uint16_t leds_px_pusher_program_instructions[] = { static const uint16_t leds_px_pusher_program_instructions[] = {
// .wrap_target // .wrap_target
0x7064, // 0: out null, 4 side 0 0x7063, // 0: out null, 3 side 0
0x6001, // 1: out pins, 1 0x6001, // 1: out pins, 1
0x7963, // 2: out null, 3 side 1 [1] 0x7964, // 2: out null, 4 side 1 [1]
0xb042, // 3: nop side 0
// .wrap // .wrap
}; };
#if !PICO_NO_HARDWARE #if !PICO_NO_HARDWARE
static const struct pio_program leds_px_pusher_program = { static const struct pio_program leds_px_pusher_program = {
.instructions = leds_px_pusher_program_instructions, .instructions = leds_px_pusher_program_instructions,
.length = 3, .length = 4,
.origin = -1, .origin = -1,
}; };

24
firmware/src/main.cpp
View File

@ -44,18 +44,18 @@ void loop() {
sd_loadNextAudio(); sd_loadNextAudio();
} }
// if (Serial.available() > 0) { if (Serial.available() > 0) {
// char c = Serial.read(); char c = Serial.read();
// if (c == 'p') { if (c == 'p') {
// Serial.println("Paused. Press any key to continue."); Serial.println("Paused. Press any key to continue.");
// leds_disable(); leds_disable();
// while (Serial.available() == 0) { while (Serial.available() == 0) {
// Serial.read(); Serial.read();
// delay(50); delay(50);
// } }
// Serial.println("Continuing..."); Serial.println("Continuing...");
// } }
// } }
if (!gfx_decoder_handleLoop()) { if (!gfx_decoder_handleLoop()) {
Serial.println("Failed to load frame..."); Serial.println("Failed to load frame...");