mirrors
/
pimoroni-pico
mirror of https://github.com/pimoroni/pimoroni-pico.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #370 from Daft-Freak/patch-2 

Small pico unicorn cleanups
This commit is contained in:
Philip Howard 2022-05-23 14:53:45 +01:00 committed by GitHub
parent d6571210a8 8be98da0e5
commit 8d490a6e7c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libraries/pico_unicorn/pico_unicorn.cpp
View File

@ -51,13 +51,13 @@ constexpr uint32_t BCD_FRAMES = 15; // includes fet discharge frame
constexpr uint32_t BITSTREAM_LENGTH = (ROW_COUNT * ROW_BYTES * BCD_FRAMES); constexpr uint32_t BITSTREAM_LENGTH = (ROW_COUNT * ROW_BYTES * BCD_FRAMES);
// must be aligned for 32bit dma transfer // must be aligned for 32bit dma transfer
alignas(4) uint8_t bitstream[BITSTREAM_LENGTH] = {0}; alignas(4) static uint8_t bitstream[BITSTREAM_LENGTH] = {0};
uint16_t r_gamma_lut[256] = {0}; static uint16_t r_gamma_lut[256] = {0};
uint16_t g_gamma_lut[256] = {0}; static uint16_t g_gamma_lut[256] = {0};
uint16_t b_gamma_lut[256] = {0}; static uint16_t b_gamma_lut[256] = {0};
uint32_t dma_channel; static uint32_t dma_channel;
static inline void unicorn_jetpack_program_init(PIO pio, uint sm, uint offset) { static inline void unicorn_jetpack_program_init(PIO pio, uint sm, uint offset) {
pio_gpio_init(pio, pin::LED_DATA); pio_gpio_init(pio, pin::LED_DATA);
@ -144,13 +144,13 @@ namespace pimoroni {
// gamma correct the provided 0-255 brightness value onto a // gamma correct the provided 0-255 brightness value onto a
// 0-65535 range for the pwm counter // 0-65535 range for the pwm counter
float r_gamma = 2.8f; float r_gamma = 2.8f;
r_gamma_lut[v] = (uint16_t)(pow((float)(v) / 255.0f, r_gamma) * 16383.0f + 0.5f); r_gamma_lut[v] = (uint16_t)(powf((float)(v) / 255.0f, r_gamma) * 16383.0f + 0.5f);
float g_gamma = 2.8f; float g_gamma = 2.8f;
g_gamma_lut[v] = (uint16_t)(pow((float)(v) / 255.0f, g_gamma) * 16383.0f + 0.5f); g_gamma_lut[v] = (uint16_t)(powf((float)(v) / 255.0f, g_gamma) * 16383.0f + 0.5f);
float b_gamma = 2.8f; float b_gamma = 2.8f;
b_gamma_lut[v] = (uint16_t)(pow((float)(v) / 255.0f, b_gamma) * 16383.0f + 0.5f); b_gamma_lut[v] = (uint16_t)(powf((float)(v) / 255.0f, b_gamma) * 16383.0f + 0.5f);
} }
// initialise the bcd timing values and row selects in the bitstream // initialise the bcd timing values and row selects in the bitstream
@ -177,7 +177,7 @@ namespace pimoroni {
uint8_t row_select_mask = ~(1 << (7 - row)); uint8_t row_select_mask = ~(1 << (7 - row));
bitstream[row_select_offset] = row_select_mask; bitstream[row_select_offset] = row_select_mask;
uint16_t bcd_ticks = pow(2, frame); uint16_t bcd_ticks = 1 << frame;
bitstream[bcd_offset + 1] = (bcd_ticks & 0xff00) >> 8; bitstream[bcd_offset + 1] = (bcd_ticks & 0xff00) >> 8;
bitstream[bcd_offset] = (bcd_ticks & 0xff); bitstream[bcd_offset] = (bcd_ticks & 0xff);
} }