From f2c3d15b8ebd65dcf895d853b04df7df58fa9bd2 Mon Sep 17 00:00:00 2001 From: jon Date: Tue, 26 Jul 2022 04:42:17 +0100 Subject: [PATCH] Galactic Unicorn: Playing basic audio samples now works, added rainbow example for photoshoot --- examples/galactic_unicorn/CMakeLists.txt | 10 +- examples/galactic_unicorn/demo2.cpp | 167 ------------------ .../galactic_unicorn/galactic_unicorn.cpp | 43 ++--- 3 files changed, 17 insertions(+), 203 deletions(-) delete mode 100644 examples/galactic_unicorn/demo2.cpp diff --git a/examples/galactic_unicorn/CMakeLists.txt b/examples/galactic_unicorn/CMakeLists.txt index 86b25380..7b145552 100644 --- a/examples/galactic_unicorn/CMakeLists.txt +++ b/examples/galactic_unicorn/CMakeLists.txt @@ -13,16 +13,16 @@ pico_add_extra_outputs(galactic_unicorn_demo) add_executable( - galactic_unicorn_demo2 - demo2.cpp + rainbow + rainbow.cpp ) # Pull in pico libraries that we need -target_link_libraries(galactic_unicorn_demo2 pico_stdlib hardware_pio hardware_adc hardware_dma pico_graphics galactic_unicorn) -pico_enable_stdio_usb(galactic_unicorn_demo2 1) +target_link_libraries(rainbow pico_stdlib hardware_pio hardware_adc hardware_dma pico_graphics galactic_unicorn) +pico_enable_stdio_usb(rainbow 1) # create map/bin/hex file etc. -pico_add_extra_outputs(galactic_unicorn_demo2) +pico_add_extra_outputs(rainbow) diff --git a/examples/galactic_unicorn/demo2.cpp b/examples/galactic_unicorn/demo2.cpp deleted file mode 100644 index ca2a79b7..00000000 --- a/examples/galactic_unicorn/demo2.cpp +++ /dev/null @@ -1,167 +0,0 @@ -#include -#include -#include -#include "pico/stdlib.h" - -#include "libraries/pico_graphics/pico_graphics.hpp" -#include "galactic_unicorn.hpp" -#include "okcolor.hpp" - -using namespace pimoroni; - -PicoGraphics_PenRGB565 graphics(53, 11, nullptr); -GalacticUnicorn galactic_unicorn; - -// HSV Conversion expects float inputs in the range of 0.00-1.00 for each channel -// Outputs are rgb in the range 0-255 for each channel -void from_hsv(float h, float s, float v, uint8_t &r, uint8_t &g, uint8_t &b) { - float i = floor(h * 6.0f); - float f = h * 6.0f - i; - v *= 255.0f; - uint8_t p = v * (1.0f - s); - uint8_t q = v * (1.0f - f * s); - uint8_t t = v * (1.0f - (1.0f - f) * s); - - switch (int(i) % 6) { - case 0: r = v; g = t; b = p; break; - case 1: r = q; g = v; b = p; break; - case 2: r = p; g = v; b = t; break; - case 3: r = p; g = q; b = v; break; - case 4: r = t; g = p; b = v; break; - case 5: r = v; g = p; b = q; break; - } -} - -void text(std::string t, Point p, float s = 1.0f, float a = 1.0f) { - int w = graphics.measure_text(t, s); - p.x += (53 / 2) - (w / 2); - p.y += (11 / 2); - graphics.text(t, Point(p.x, p.y), -1, s, a); - //graphics.text(t, Point(p.x + 1, p.y), -1, s, a); - //graphics.text(t, Point(p.x + 1, p.y + 1), -1, s, a); - //graphics.text(t, Point(p.x, p.y + 1), -1, s, a); -} - -struct star_t { - float dx, dy, x, y, a; - - uint8_t brightness() { - int b = a / 5; - return b > 15 ? 15 : b; - } -}; - -void init_star(star_t &s) { - s.x = ((rand() % 100) / 5.0f) - 10.0f; - s.y = ((rand() % 100) / 10.0f) - 5.0f; - - s.dx = s.x / 10.0f; - s.dy = s.y / 10.0f; - s.a = 0; -} - -void step_star(star_t &s) { - s.x += s.dx; - s.y += s.dy; - s.a++; - - if(s.a > 100) { - init_star(s); - } -} - - -int main() { - - stdio_init_all(); - - uint8_t hue_map[53][3]; - for(int i = 0; i < 53; i++) { - from_hsv(i / 53.0f, 1.0f, 1.0f, hue_map[i][0], hue_map[i][1], hue_map[i][2]); - } - - star_t stars[100]; - for(int i = 0; i < 100; i++) { - init_star(stars[i]); - stars[i].a = i; - } - -gpio_set_function(28, GPIO_FUNC_SIO); - gpio_set_dir(28, GPIO_OUT); - - for(int i = 0; i < 10; i++) { - gpio_put(28, !gpio_get(28)); - sleep_ms(100); - } - sleep_ms(1000); - - gpio_put(28,true); - - galactic_unicorn.init(); - -/* - bool a_pressed = false; - bool b_pressed = false; - bool x_pressed = false; - bool y_pressed = false; -*/ -graphics.set_font("bitmap8"); - - - - uint i = 0; - - float hue_offset = 0.0f; - - while(true) { - i++; - - if(galactic_unicorn.is_pressed(galactic_unicorn.SWITCH_VOLUME_UP)) { - hue_offset += 0.05; - if(hue_offset > 1.0f) hue_offset = 1.0f; - } - if(galactic_unicorn.is_pressed(galactic_unicorn.SWITCH_VOLUME_DOWN)) { - hue_offset -= 0.05; - if(hue_offset < 0.0f) hue_offset = 0.0f; - } - - if(galactic_unicorn.is_pressed(galactic_unicorn.SWITCH_BRIGHTNESS_UP)) { - galactic_unicorn.adjust_brightness(+0.01); - } - if(galactic_unicorn.is_pressed(galactic_unicorn.SWITCH_BRIGHTNESS_DOWN)) { - galactic_unicorn.adjust_brightness(-0.01); - } - - - -/* - graphics.set_pen(255, 255, 255); - float s = 0.65f;//0.65f + (sin(i / 25.0f) * 0.15f); - float a = 1.0f;// (sin(i / 25.0f) * 100.0f); - float x = (sin(i / 74.0f) * 80.0f) * s; - float y = (cos(i / 43.0f) * 6.0f) * s; - text("Chester smells!", Point(x, y - 3), s, a); -*/ - - for(int x = 0; x < 53; x++) { - for(int y = 0; y < 11; y++) { - int v = ((sin((x + y) / 3.0f + i / 15.0f) + 1.5f) / 2.5f) * 255.0f; - - graphics.set_pen(v, v, v); - graphics.pixel(Point(x, y)); - } - } - - galactic_unicorn.update(graphics); - - - printf("%d\n", galactic_unicorn.light()); - sleep_ms(20); - } - - - - printf("done\n"); - - return 0; -} diff --git a/libraries/galactic_unicorn/galactic_unicorn.cpp b/libraries/galactic_unicorn/galactic_unicorn.cpp index 9c98aa5f..ba0a456d 100644 --- a/libraries/galactic_unicorn/galactic_unicorn.cpp +++ b/libraries/galactic_unicorn/galactic_unicorn.cpp @@ -39,7 +39,7 @@ // .. and back to the start constexpr uint32_t ROW_COUNT = 11; -constexpr uint32_t BCD_FRAME_COUNT = 14; +constexpr uint32_t BCD_FRAME_COUNT = 12; constexpr uint32_t BCD_FRAME_BYTES = 60; constexpr uint32_t ROW_BYTES = BCD_FRAME_COUNT * BCD_FRAME_BYTES; constexpr uint32_t BITSTREAM_LENGTH = (ROW_COUNT * ROW_BYTES); @@ -274,48 +274,29 @@ namespace pimoroni { // setup audio pio program - /* audio_pio = pio0; audio_sm = pio_claim_unused_sm(audio_pio, true); audio_sm_offset = pio_add_program(audio_pio, &audio_i2s_program); - audio_i2s_program_init(audio_pio, audio_sm, audio_sm_offset, I2S_DATA, I2S_BCLK); - //pio_sm_set_enabled(audio_pio, audio_sm, true); + pio_gpio_init(audio_pio, I2S_DATA); + pio_gpio_init(audio_pio, I2S_BCLK); + pio_gpio_init(audio_pio, I2S_LRCLK); + + audio_i2s_program_init(audio_pio, audio_sm, audio_sm_offset, I2S_DATA, I2S_BCLK); uint32_t system_clock_frequency = clock_get_hz(clk_sys); uint32_t divider = system_clock_frequency * 4 / 22050; // avoid arithmetic overflow pio_sm_set_clkdiv_int_frac(audio_pio, audio_sm, divider >> 8u, divider & 0xffu); - + pio_sm_set_enabled(audio_pio, audio_sm, true); audio_dma_channel = dma_claim_unused_channel(true); dma_channel_config audio_config = dma_channel_get_default_config(audio_dma_channel); - channel_config_set_transfer_data_size(&audio_config, DMA_SIZE_32); - channel_config_set_bswap(&audio_config, false); // byte swap to reverse little endian + channel_config_set_transfer_data_size(&audio_config, DMA_SIZE_16); + //channel_config_set_bswap(&audio_config, false); // byte swap to reverse little endian channel_config_set_dreq(&audio_config, pio_get_dreq(audio_pio, audio_sm, true)); dma_channel_configure(audio_dma_channel, &audio_config, &audio_pio->txf[audio_sm], NULL, 0, false); - dma_channel_set_irq0_enabled(audio_dma_channel, true); - irq_set_enabled(pio_get_dreq(audio_pio, audio_sm, true), true);*/ - //irq_set_exclusive_handler(DMA_IRQ_0, dma_complete); - //irq_set_enabled(DMA_IRQ_0, true); - -/* dma_channel_set_trans_count(audio_dma_channel, BITSTREAM_LENGTH / 4, false); - dma_channel_set_read_addr(audio_dma_channel, bitstream, true);*/ - //pio_sm_config audio_i2s_config = audio_i2s_program_get_default_config(audio_sm_offset); - - // osr shifts right, autopull on, autopull threshold 8 - //sm_config_set_out_shift(&audio_i2s_config, true, true, 32); - - // // configure out, set, and sideset pins - // sm_config_set_out_pins(&audio_i2s_config, ROW_BIT_0, 4); - // sm_config_set_set_pins(&audio_i2s_config, COLUMN_DATA, 3); - // sm_config_set_sideset_pins(&audio_i2s_config, COLUMN_CLOCK); - - // // join fifos as only tx needed (gives 8 deep fifo instead of 4) - // sm_config_set_fifo_join(&audio_i2s_config, PIO_FIFO_JOIN_TX); - - - //pio_sm_init(audio_pio, audio_sm, audio_sm_offset, &audio_i2s_config); - //pio_sm_set_enabled(audio_pio, audio_sm, true); + //dma_channel_set_irq0_enabled(audio_dma_channel, true); + irq_set_enabled(pio_get_dreq(audio_pio, audio_sm, true), true); } @@ -328,7 +309,7 @@ namespace pimoroni { } void GalacticUnicorn::play_sample(uint8_t *data, uint32_t length) { - dma_channel_transfer_from_buffer_now(audio_dma_channel, data, length / 4); + dma_channel_transfer_from_buffer_now(audio_dma_channel, data, length / 2); } void GalacticUnicorn::set_pixel(int x, int y, uint8_t r, uint8_t g, uint8_t b) {