diff --git a/MCUME_pico2/CMakeLists.txt b/MCUME_pico2/CMakeLists.txt index fb2e66dd..fd4e6ab3 100644 --- a/MCUME_pico2/CMakeLists.txt +++ b/MCUME_pico2/CMakeLists.txt @@ -436,7 +436,7 @@ pico_generate_pio_header(${TARGET} ${CMAKE_CURRENT_LIST_DIR}/psram/psram_spi.pio add_subdirectory(pico-extras/src/rp2_common/pico_audio_i2s) add_subdirectory(pico-extras/src/common/pico_audio) add_subdirectory(pico-extras/src/common/pico_util_buffer) -add_compile_definitions(PICO_AUDIO_I2S_PIO=1 PICO_AUDIO_I2S_DMA_IRQ=1 PICO_AUDIO_I2S_DATA_PIN=24 PICO_AUDIO_I2S_CLOCK_PIN_BASE=25 PICO_AUDIO_I2S_MONO_INPUT=1 PICO_AUDIO_I2S_SWAP_CLOCK=1) +add_compile_definitions(PICO_AUDIO_I2S_PIO=1 PICO_AUDIO_I2S_DMA_IRQ=1 PICO_AUDIO_I2S_DATA_PIN=24 PICO_AUDIO_I2S_CLOCK_PIN_BASE=26 PICO_AUDIO_I2S_MONO_INPUT=1) add_compile_definitions(PICO_DEFAULT_UART=0 PICO_DEFAULT_UART_TX_PIN=44 PICO_DEFAULT_UART_RX_PIN=45) set(EXTRA_AUDIO_LIB pico_util_buffer pico_audio pico_audio_i2s hardware_i2c) @@ -460,7 +460,7 @@ target_compile_definitions(${TARGET} PRIVATE target_compile_definitions(${TARGET} PRIVATE PICO_CLOCK_AJDUST_PERI_CLOCK_WITH_SYS_CLOCK=1) #target_compile_definitions(${TARGET} PRIVATE CFG_TUSB_DEBUG=2) -#target_compile_options(${TARGET} PUBLIC -O3) +target_compile_options(${TARGET} PUBLIC -O3) #target_compile_options(${TARGET} PUBLIC -Wall -Wextra -Wno-unused-function -Wno-unused-parameter) IF (NOT DEFINED N_SD_CARDS) SET(N_SD_CARDS 1) diff --git a/MCUME_pico2/display/pico_dsp.cpp b/MCUME_pico2/display/pico_dsp.cpp index 9eace7a7..284fb746 100755 --- a/MCUME_pico2/display/pico_dsp.cpp +++ b/MCUME_pico2/display/pico_dsp.cpp @@ -1305,7 +1305,6 @@ const struct audio_i2s_config config = .clock_pin_base = PICO_AUDIO_I2S_CLOCK_PIN_BASE, .dma_channel = AUD_DMA_CHANNEL, .pio_sm = 0, - .clock_pins_swapped = true, }; static struct audio_buffer_format producer_format = {