Compare commits
No commits in common. "master" and "revb_usb" have entirely different histories.
9 changed files with 178 additions and 358 deletions
2
.github/workflows/build.yml
vendored
2
.github/workflows/build.yml
vendored
|
|
@ -34,7 +34,7 @@ jobs:
|
|||
run: (cd MCUME_pico2/pico-sdk/lib/tinyusb/hw/mcu/raspberry_pi/Pico-PIO-USB && git pull https://github.com/tannewt/Pico-PIO-USB/ better_timeouts)
|
||||
|
||||
- name: build targets
|
||||
run: for target in pico64 pico20 pico800 picospeccy picomsx pico8086 picocolem picogb picopce picosms picogen; do cmake -S MCUME_pico2 -B build -DPICO_SDK_PATH=MCUME_pico2/pico-sdk -DTARGET=$target && make -C build -j$(nproc); done
|
||||
run: for target in pico64 pico20 picospeccy picomsx pico8086 picocolem picogb picopce picosms picogen; do cmake -S MCUME_pico2 -B build -DPICO_SDK_PATH=MCUME_pico2/pico-sdk -DTARGET=$target && make -C build; done
|
||||
|
||||
- name: Upload artifact
|
||||
uses: actions/upload-artifact@v4
|
||||
|
|
|
|||
3
.gitmodules
vendored
3
.gitmodules
vendored
|
|
@ -1,6 +1,3 @@
|
|||
[submodule "MCUME_pico2/pico-sdk"]
|
||||
path = MCUME_pico2/pico-sdk
|
||||
url = https://github.com/raspberrypi/pico-sdk
|
||||
[submodule "MCUME_pico2/pico-extras"]
|
||||
path = MCUME_pico2/pico-extras
|
||||
url = https://github.com/adafruit/pico-extras.git
|
||||
|
|
|
|||
|
|
@ -433,13 +433,6 @@ add_executable(${TARGET}
|
|||
|
||||
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_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)
|
||||
|
||||
target_link_libraries(${TARGET} pico_multicore
|
||||
pico_stdlib
|
||||
hardware_dma
|
||||
|
|
@ -450,7 +443,6 @@ target_link_libraries(${TARGET} pico_multicore
|
|||
tinyusb_host
|
||||
tinyusb_board
|
||||
tinyusb_pico_pio_usb
|
||||
${EXTRA_AUDIO_LIB}
|
||||
)
|
||||
|
||||
target_compile_definitions(${TARGET} PRIVATE
|
||||
|
|
@ -459,6 +451,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 -Wall -Wextra -Wno-unused-function -Wno-unused-parameter)
|
||||
|
|
|
|||
|
|
@ -1712,9 +1712,6 @@ int keypressed = emu_ReadKeys();
|
|||
#endif
|
||||
}
|
||||
|
||||
void kbd_signal_raw_gamepad(uint16_t new_pad_state) {
|
||||
usbnavpad = new_pad_state;
|
||||
}
|
||||
|
||||
void emu_start(void)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1278,308 +1278,206 @@ void PICO_DSP::drawTextNoDma(int16_t x, int16_t y, const char * text, dsp_pixel
|
|||
#include "pico/float.h"
|
||||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
#include "pico/audio_i2s.h"
|
||||
#include "hardware/i2c.h"
|
||||
|
||||
|
||||
#ifdef AUDIO_1DMA
|
||||
#define SAMPLE_REPEAT_SHIFT 0 // not possible to repeat samples with single DMA!!
|
||||
#endif
|
||||
#ifdef AUDIO_3DMA
|
||||
#define SAMPLE_REPEAT_SHIFT 2 // shift 2 is REPETITION_RATE=4
|
||||
#endif
|
||||
#ifndef SAMPLE_REPEAT_SHIFT
|
||||
#define SAMPLE_REPEAT_SHIFT 0 // not possible to repeat samples CBACK!!
|
||||
#endif
|
||||
|
||||
#define REPETITION_RATE (1<<SAMPLE_REPEAT_SHIFT)
|
||||
|
||||
static void (*fillsamples)(audio_sample * stream, int len) = nullptr;
|
||||
static audio_sample * snd_buffer; // samples buffer (1 malloc for 2 buffers)
|
||||
static uint16_t snd_nb_samples; // total nb samples (mono) later divided by 2
|
||||
static uint16_t snd_sample_ptr = 0; // sample index
|
||||
static audio_sample * audio_buffers[2]; // pointers to 2 samples buffers
|
||||
static volatile int cur_audio_buffer;
|
||||
static volatile int last_audio_buffer;
|
||||
#ifdef AUDIO_3DMA
|
||||
static uint32_t single_sample = 0;
|
||||
static uint32_t *single_sample_ptr = &single_sample;
|
||||
static int pwm_dma_chan, trigger_dma_chan, sample_dma_chan;
|
||||
#endif
|
||||
#ifdef AUDIO_1DMA
|
||||
static int pwm_dma_chan;
|
||||
#endif
|
||||
|
||||
/********************************
|
||||
* Processing
|
||||
********************************/
|
||||
#ifdef AUDIO_1DMA
|
||||
static void __isr __time_critical_func(AUDIO_isr)()
|
||||
{
|
||||
cur_audio_buffer = 1 - cur_audio_buffer;
|
||||
dma_hw->ch[pwm_dma_chan].al3_read_addr_trig = (intptr_t)audio_buffers[cur_audio_buffer];
|
||||
dma_hw->ints1 = (1u << pwm_dma_chan);
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef AUDIO_3DMA
|
||||
static void __isr __time_critical_func(AUDIO_isr)()
|
||||
{
|
||||
cur_audio_buffer = 1 - cur_audio_buffer;
|
||||
dma_hw->ch[sample_dma_chan].al1_read_addr = (intptr_t)audio_buffers[cur_audio_buffer];
|
||||
dma_hw->ch[trigger_dma_chan].al3_read_addr_trig = (intptr_t)&single_sample_ptr;
|
||||
dma_hw->ints1 = (1u << trigger_dma_chan);
|
||||
}
|
||||
#endif
|
||||
|
||||
// fill half buffer depending on current position
|
||||
static void pwm_audio_handle_buffer(void)
|
||||
{
|
||||
if (last_audio_buffer == cur_audio_buffer) {
|
||||
return;
|
||||
}
|
||||
audio_sample *buf = audio_buffers[last_audio_buffer];
|
||||
last_audio_buffer = cur_audio_buffer;
|
||||
fillsamples(buf, snd_nb_samples);
|
||||
}
|
||||
|
||||
static void pwm_audio_reset(void)
|
||||
{
|
||||
memset((void*)snd_buffer,0, snd_nb_samples*sizeof(uint8_t));
|
||||
}
|
||||
|
||||
|
||||
/********************************
|
||||
* Initialization
|
||||
********************************/
|
||||
struct audio_buffer_pool *producer_pool;
|
||||
|
||||
#if AUDIO_8BIT
|
||||
_Static_assert(!AUDIO_8BIT, "only configured for 16 bit audio");
|
||||
#endif
|
||||
|
||||
static audio_format_t audio_format = {
|
||||
.sample_freq = SOUNDRATE,
|
||||
.format = AUDIO_BUFFER_FORMAT_PCM_S16,
|
||||
.channel_count = 1,
|
||||
};
|
||||
|
||||
const struct audio_i2s_config config =
|
||||
{
|
||||
.data_pin = PICO_AUDIO_I2S_DATA_PIN,
|
||||
.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 = {
|
||||
.format = &audio_format,
|
||||
.sample_stride = 2
|
||||
};
|
||||
|
||||
#define I2C_ADDR 0x18
|
||||
|
||||
#define DEBUG_I2C (0)
|
||||
static void writeRegister(uint8_t reg, uint8_t value) {
|
||||
uint8_t buf[2];
|
||||
buf[0] = reg;
|
||||
buf[1] = value;
|
||||
int res = i2c_write_timeout_us(i2c0, I2C_ADDR, buf, sizeof(buf), /* nostop */ false, 1000);
|
||||
if (res != 2) {
|
||||
panic("i2c_write_timeout failed: res=%d\n", res);
|
||||
}
|
||||
if(DEBUG_I2C)
|
||||
printf("Write Reg: %d = 0x%x\n", reg, value);
|
||||
}
|
||||
|
||||
static uint8_t readRegister(uint8_t reg) {
|
||||
uint8_t buf[1];
|
||||
buf[0] = reg;
|
||||
int res = i2c_write_timeout_us(i2c0, I2C_ADDR, buf, sizeof(buf), /* nostop */ true, 1000);
|
||||
if (res != 1) {
|
||||
if(DEBUG_I2C)
|
||||
printf("res=%d\n", res);
|
||||
panic("i2c_write_timeout failed: res=%d\n", res);
|
||||
}
|
||||
res = i2c_read_timeout_us(i2c0, I2C_ADDR, buf, sizeof(buf), /* nostop */ false, 1000);
|
||||
if (res != 1) {
|
||||
if(DEBUG_I2C)
|
||||
printf("res=%d\n", res);
|
||||
panic("i2c_read_timeout failed: res=%d\n", res);
|
||||
}
|
||||
uint8_t value = buf[0];
|
||||
if(DEBUG_I2C)
|
||||
printf("Read Reg: %d = 0x%x\n", reg, value);
|
||||
return value;
|
||||
}
|
||||
|
||||
static void modifyRegister(uint8_t reg, uint8_t mask, uint8_t value) {
|
||||
uint8_t current = readRegister(reg);
|
||||
if(DEBUG_I2C)
|
||||
printf("Modify Reg: %d = [Before: 0x%x] with mask 0x%x and value 0x%x\n", reg, current, mask, value);
|
||||
uint8_t new_value = (current & ~mask) | (value & mask);
|
||||
writeRegister(reg, new_value);
|
||||
}
|
||||
|
||||
static void setPage(uint8_t page) {
|
||||
printf("Set page %d\n", page);
|
||||
writeRegister(0x00, page);
|
||||
}
|
||||
|
||||
|
||||
static void Wire_begin() {
|
||||
i2c_init(i2c0, 100000);
|
||||
gpio_set_function(20, GPIO_FUNC_I2C);
|
||||
gpio_set_function(21, GPIO_FUNC_I2C);
|
||||
}
|
||||
|
||||
static void i2s_audio_init(void)
|
||||
static void pwm_audio_init(int buffersize, void (*callback)(audio_sample * stream, int len))
|
||||
{
|
||||
|
||||
gpio_init(22);
|
||||
gpio_set_dir(22, true);
|
||||
gpio_put(22, true); // allow i2s to come out of reset
|
||||
|
||||
Wire_begin();
|
||||
sleep_ms(1000);
|
||||
|
||||
if(DEBUG_I2C)
|
||||
printf("initialize codec\n");
|
||||
|
||||
// Reset codec
|
||||
writeRegister(0x01, 0x01);
|
||||
sleep_ms(10);
|
||||
|
||||
// Interface Control
|
||||
modifyRegister(0x1B, 0xC0, 0x00);
|
||||
modifyRegister(0x1B, 0x30, 0x00);
|
||||
|
||||
// Clock MUX and PLL settings
|
||||
modifyRegister(0x04, 0x03, 0x03);
|
||||
modifyRegister(0x04, 0x0C, 0x04);
|
||||
|
||||
writeRegister(0x06, 0x20); // PLL J
|
||||
writeRegister(0x08, 0x00); // PLL D LSB
|
||||
writeRegister(0x07, 0x00); // PLL D MSB
|
||||
|
||||
modifyRegister(0x05, 0x0F, 0x02); // PLL P/R
|
||||
modifyRegister(0x05, 0x70, 0x10);
|
||||
|
||||
// DAC/ADC Config
|
||||
modifyRegister(0x0B, 0x7F, 0x08); // NDAC
|
||||
modifyRegister(0x0B, 0x80, 0x80);
|
||||
|
||||
modifyRegister(0x0C, 0x7F, 0x02); // MDAC
|
||||
modifyRegister(0x0C, 0x80, 0x80);
|
||||
|
||||
modifyRegister(0x12, 0x7F, 0x08); // NADC
|
||||
modifyRegister(0x12, 0x80, 0x80);
|
||||
|
||||
modifyRegister(0x13, 0x7F, 0x02); // MADC
|
||||
modifyRegister(0x13, 0x80, 0x80);
|
||||
|
||||
// PLL Power Up
|
||||
modifyRegister(0x05, 0x80, 0x80);
|
||||
|
||||
// Headset and GPIO Config
|
||||
setPage(1);
|
||||
modifyRegister(0x2e, 0xFF, 0x0b);
|
||||
setPage(0);
|
||||
modifyRegister(0x43, 0x80, 0x80); // Headset Detect
|
||||
modifyRegister(0x30, 0x80, 0x80); // INT1 Control
|
||||
modifyRegister(0x33, 0x3C, 0x14); // GPIO1
|
||||
|
||||
|
||||
// DAC Setup
|
||||
modifyRegister(0x3F, 0xC0, 0xC0);
|
||||
|
||||
// DAC Routing
|
||||
setPage(1);
|
||||
modifyRegister(0x23, 0xC0, 0x40);
|
||||
modifyRegister(0x23, 0x0C, 0x04);
|
||||
|
||||
// DAC Volume Control
|
||||
setPage(0);
|
||||
modifyRegister(0x40, 0x0C, 0x00);
|
||||
writeRegister(0x41, 0x28); // Left DAC Vol
|
||||
writeRegister(0x42, 0x28); // Right DAC Vol
|
||||
|
||||
// ADC Setup
|
||||
modifyRegister(0x51, 0x80, 0x80);
|
||||
modifyRegister(0x52, 0x80, 0x00);
|
||||
writeRegister(0x53, 0x68); // ADC Volume
|
||||
|
||||
// Headphone and Speaker Setup
|
||||
setPage(1);
|
||||
modifyRegister(0x1F, 0xC0, 0xC0); // HP Driver
|
||||
modifyRegister(0x28, 0x04, 0x04); // HP Left Gain
|
||||
modifyRegister(0x29, 0x04, 0x04); // HP Right Gain
|
||||
writeRegister(0x24, 0x0A); // Left Analog HP
|
||||
writeRegister(0x25, 0x0A); // Right Analog HP
|
||||
|
||||
modifyRegister(0x28, 0x78, 0x40); // HP Left Gain
|
||||
modifyRegister(0x29, 0x78, 0x40); // HP Right Gain
|
||||
|
||||
// Speaker Amp
|
||||
modifyRegister(0x20, 0x80, 0x80);
|
||||
modifyRegister(0x2A, 0x04, 0x04);
|
||||
modifyRegister(0x2A, 0x18, 0x08);
|
||||
writeRegister(0x26, 0x0A);
|
||||
|
||||
// Return to page 0
|
||||
setPage(0);
|
||||
|
||||
if(DEBUG_I2C)
|
||||
printf("Initialization complete!\n");
|
||||
|
||||
|
||||
// Read all registers for verification
|
||||
if(DEBUG_I2C) {
|
||||
printf("Reading all registers for verification:\n");
|
||||
|
||||
setPage(0);
|
||||
readRegister(0x00); // AIC31XX_PAGECTL
|
||||
readRegister(0x01); // AIC31XX_RESET
|
||||
readRegister(0x03); // AIC31XX_OT_FLAG
|
||||
readRegister(0x04); // AIC31XX_CLKMUX
|
||||
readRegister(0x05); // AIC31XX_PLLPR
|
||||
readRegister(0x06); // AIC31XX_PLLJ
|
||||
readRegister(0x07); // AIC31XX_PLLDMSB
|
||||
readRegister(0x08); // AIC31XX_PLLDLSB
|
||||
readRegister(0x0B); // AIC31XX_NDAC
|
||||
readRegister(0x0C); // AIC31XX_MDAC
|
||||
readRegister(0x0D); // AIC31XX_DOSRMSB
|
||||
readRegister(0x0E); // AIC31XX_DOSRLSB
|
||||
readRegister(0x10); // AIC31XX_MINI_DSP_INPOL
|
||||
readRegister(0x12); // AIC31XX_NADC
|
||||
readRegister(0x13); // AIC31XX_MADC
|
||||
readRegister(0x14); // AIC31XX_AOSR
|
||||
readRegister(0x19); // AIC31XX_CLKOUTMUX
|
||||
readRegister(0x1A); // AIC31XX_CLKOUTMVAL
|
||||
readRegister(0x1B); // AIC31XX_IFACE1
|
||||
readRegister(0x1C); // AIC31XX_DATA_OFFSET
|
||||
readRegister(0x1D); // AIC31XX_IFACE2
|
||||
readRegister(0x1E); // AIC31XX_BCLKN
|
||||
readRegister(0x1F); // AIC31XX_IFACESEC1
|
||||
readRegister(0x20); // AIC31XX_IFACESEC2
|
||||
readRegister(0x21); // AIC31XX_IFACESEC3
|
||||
readRegister(0x22); // AIC31XX_I2C
|
||||
readRegister(0x24); // AIC31XX_ADCFLAG
|
||||
readRegister(0x25); // AIC31XX_DACFLAG1
|
||||
readRegister(0x26); // AIC31XX_DACFLAG2
|
||||
readRegister(0x27); // AIC31XX_OFFLAG
|
||||
readRegister(0x2C); // AIC31XX_INTRDACFLAG
|
||||
readRegister(0x2D); // AIC31XX_INTRADCFLAG
|
||||
readRegister(0x2E); // AIC31XX_INTRDACFLAG2
|
||||
readRegister(0x2F); // AIC31XX_INTRADCFLAG2
|
||||
readRegister(0x30); // AIC31XX_INT1CTRL
|
||||
readRegister(0x31); // AIC31XX_INT2CTRL
|
||||
readRegister(0x33); // AIC31XX_GPIO1
|
||||
readRegister(0x3C); // AIC31XX_DACPRB
|
||||
readRegister(0x3D); // AIC31XX_ADCPRB
|
||||
readRegister(0x3F); // AIC31XX_DACSETUP
|
||||
readRegister(0x40); // AIC31XX_DACMUTE
|
||||
readRegister(0x41); // AIC31XX_LDACVOL
|
||||
readRegister(0x42); // AIC31XX_RDACVOL
|
||||
readRegister(0x43); // AIC31XX_HSDETECT
|
||||
readRegister(0x51); // AIC31XX_ADCSETUP
|
||||
readRegister(0x52); // AIC31XX_ADCFGA
|
||||
readRegister(0x53); // AIC31XX_ADCVOL
|
||||
|
||||
setPage(1);
|
||||
readRegister(0x1F); // AIC31XX_HPDRIVER
|
||||
readRegister(0x20); // AIC31XX_SPKAMP
|
||||
readRegister(0x21); // AIC31XX_HPPOP
|
||||
readRegister(0x22); // AIC31XX_SPPGARAMP
|
||||
readRegister(0x23); // AIC31XX_DACMIXERROUTE
|
||||
readRegister(0x24); // AIC31XX_LANALOGHPL
|
||||
readRegister(0x25); // AIC31XX_RANALOGHPR
|
||||
readRegister(0x26); // AIC31XX_LANALOGSPL
|
||||
readRegister(0x27); // AIC31XX_RANALOGSPR
|
||||
readRegister(0x28); // AIC31XX_HPLGAIN
|
||||
readRegister(0x29); // AIC31XX_HPRGAIN
|
||||
readRegister(0x2A); // AIC31XX_SPLGAIN
|
||||
readRegister(0x2B); // AIC31XX_SPRGAIN
|
||||
readRegister(0x2C); // AIC31XX_HPCONTROL
|
||||
readRegister(0x2E); // AIC31XX_MICBIAS
|
||||
readRegister(0x2F); // AIC31XX_MICPGA
|
||||
readRegister(0x30); // AIC31XX_MICPGAPI
|
||||
readRegister(0x31); // AIC31XX_MICPGAMI
|
||||
readRegister(0x32); // AIC31XX_MICPGACM
|
||||
|
||||
setPage(3);
|
||||
readRegister(0x10); // AIC31XX_TIMERDIVIDER
|
||||
fillsamples = callback;
|
||||
snd_nb_samples = buffersize;
|
||||
snd_sample_ptr = 0;
|
||||
snd_buffer = (audio_sample*)malloc(snd_nb_samples*sizeof(audio_sample));
|
||||
if (snd_buffer == NULL) {
|
||||
printf("sound buffer could not be allocated!!!!!\n");
|
||||
return;
|
||||
}
|
||||
memset((void*)snd_buffer,128, snd_nb_samples*sizeof(audio_sample));
|
||||
|
||||
const struct audio_format *output_format = audio_i2s_setup(&audio_format, &config);
|
||||
assert(output_format);
|
||||
if (!output_format) {
|
||||
panic("PicoAudio: Unable to open audio device.\n");
|
||||
}
|
||||
assert(producer_pool);
|
||||
bool ok = audio_i2s_connect(producer_pool);
|
||||
assert(ok);
|
||||
audio_i2s_set_enabled(true);
|
||||
}
|
||||
gpio_set_function(AUDIO_PIN, GPIO_FUNC_PWM);
|
||||
|
||||
static void i2s_audio_handle_buffer(void) {
|
||||
audio_buffer *buffer = take_audio_buffer(producer_pool, true);
|
||||
fillsamples(reinterpret_cast<audio_sample*>(buffer->buffer->bytes), buffer->max_sample_count);
|
||||
buffer->sample_count = buffer->max_sample_count;
|
||||
give_audio_buffer(producer_pool, buffer);
|
||||
int audio_pin_slice = pwm_gpio_to_slice_num(AUDIO_PIN);
|
||||
pwm_set_gpio_level(AUDIO_PIN, 0);
|
||||
|
||||
// Setup PWM for audio output
|
||||
pwm_config config = pwm_get_default_config();
|
||||
pwm_config_set_clkdiv(&config, (((float)SOUNDRATE)/1000) / REPETITION_RATE);
|
||||
pwm_config_set_wrap(&config, 254);
|
||||
pwm_init(audio_pin_slice, &config, true);
|
||||
|
||||
snd_nb_samples = snd_nb_samples/2;
|
||||
audio_buffers[0] = &snd_buffer[0];
|
||||
audio_buffers[1] = &snd_buffer[snd_nb_samples];
|
||||
|
||||
#ifdef AUDIO_3DMA
|
||||
int audio_pin_chan = pwm_gpio_to_channel(AUDIO_PIN);
|
||||
// DMA chain of 3 DMA channels
|
||||
sample_dma_chan = AUD_DMA_CHANNEL;
|
||||
pwm_dma_chan = AUD_DMA_CHANNEL+1;
|
||||
trigger_dma_chan = AUD_DMA_CHANNEL+2;
|
||||
|
||||
// setup PWM DMA channel
|
||||
dma_channel_config pwm_dma_chan_config = dma_channel_get_default_config(pwm_dma_chan);
|
||||
channel_config_set_transfer_data_size(&pwm_dma_chan_config, DMA_SIZE_32); // transfer 32 bits at a time
|
||||
channel_config_set_read_increment(&pwm_dma_chan_config, false); // always read from the same address
|
||||
channel_config_set_write_increment(&pwm_dma_chan_config, false); // always write to the same address
|
||||
channel_config_set_chain_to(&pwm_dma_chan_config, sample_dma_chan); // trigger sample DMA channel when done
|
||||
channel_config_set_dreq(&pwm_dma_chan_config, DREQ_PWM_WRAP0 + audio_pin_slice); // transfer on PWM cycle end
|
||||
dma_channel_configure(pwm_dma_chan,
|
||||
&pwm_dma_chan_config,
|
||||
&pwm_hw->slice[audio_pin_slice].cc, // write to PWM slice CC register
|
||||
&single_sample, // read from single_sample
|
||||
REPETITION_RATE, // transfer once per desired sample repetition
|
||||
false // don't start yet
|
||||
);
|
||||
|
||||
|
||||
// setup trigger DMA channel
|
||||
dma_channel_config trigger_dma_chan_config = dma_channel_get_default_config(trigger_dma_chan);
|
||||
channel_config_set_transfer_data_size(&trigger_dma_chan_config, DMA_SIZE_32); // transfer 32-bits at a time
|
||||
channel_config_set_read_increment(&trigger_dma_chan_config, false); // always read from the same address
|
||||
channel_config_set_write_increment(&trigger_dma_chan_config, false); // always write to the same address
|
||||
channel_config_set_dreq(&trigger_dma_chan_config, DREQ_PWM_WRAP0 + audio_pin_slice); // transfer on PWM cycle end
|
||||
dma_channel_configure(trigger_dma_chan,
|
||||
&trigger_dma_chan_config,
|
||||
&dma_hw->ch[pwm_dma_chan].al3_read_addr_trig, // write to PWM DMA channel read address trigger
|
||||
&single_sample_ptr, // read from location containing the address of single_sample
|
||||
REPETITION_RATE * snd_nb_samples, // trigger once per audio sample per repetition rate
|
||||
false // don't start yet
|
||||
);
|
||||
dma_channel_set_irq1_enabled(trigger_dma_chan, true); // fire interrupt when trigger DMA channel is done
|
||||
irq_set_exclusive_handler(DMA_IRQ_1, AUDIO_isr);
|
||||
irq_set_priority (DMA_IRQ_1, PICO_DEFAULT_IRQ_PRIORITY-8);
|
||||
irq_set_enabled(DMA_IRQ_1, true);
|
||||
|
||||
// setup sample DMA channel
|
||||
dma_channel_config sample_dma_chan_config = dma_channel_get_default_config(sample_dma_chan);
|
||||
channel_config_set_transfer_data_size(&sample_dma_chan_config, DMA_SIZE_8); // transfer 8-bits at a time
|
||||
channel_config_set_read_increment(&sample_dma_chan_config, true); // increment read address to go through audio buffer
|
||||
channel_config_set_write_increment(&sample_dma_chan_config, false); // always write to the same address
|
||||
dma_channel_configure(sample_dma_chan,
|
||||
&sample_dma_chan_config,
|
||||
(char*)&single_sample + 2*audio_pin_chan, // write to single_sample
|
||||
snd_buffer, // read from audio buffer
|
||||
1, // only do one transfer (once per PWM DMA completion due to chaining)
|
||||
false // don't start yet
|
||||
);
|
||||
|
||||
// Kick things off with the trigger DMA channel
|
||||
dma_channel_start(trigger_dma_chan);
|
||||
#endif
|
||||
#ifdef AUDIO_1DMA
|
||||
// Each sample played from a single DMA channel
|
||||
// Setup DMA channel to drive the PWM
|
||||
pwm_dma_chan = AUD_DMA_CHANNEL;
|
||||
dma_channel_config pwm_dma_chan_config = dma_channel_get_default_config(pwm_dma_chan);
|
||||
// Transfer 16 bits at once, increment read address to go through sample
|
||||
// buffer, always write to the same address (PWM slice CC register).
|
||||
channel_config_set_transfer_data_size(&pwm_dma_chan_config, DMA_SIZE_16);
|
||||
channel_config_set_read_increment(&pwm_dma_chan_config, true);
|
||||
channel_config_set_write_increment(&pwm_dma_chan_config, false);
|
||||
// Transfer on PWM cycle end
|
||||
channel_config_set_dreq(&pwm_dma_chan_config, DREQ_PWM_WRAP0 + audio_pin_slice);
|
||||
|
||||
// Setup the channel and set it going
|
||||
dma_channel_configure(
|
||||
pwm_dma_chan,
|
||||
&pwm_dma_chan_config,
|
||||
&pwm_hw->slice[audio_pin_slice].cc, // Write to PWM counter compare
|
||||
snd_buffer, // Read values from audio buffer
|
||||
snd_nb_samples,
|
||||
false // Start immediately if true.
|
||||
);
|
||||
|
||||
// Setup interrupt handler to fire when PWM DMA channel has gone through the
|
||||
// whole audio buffer
|
||||
dma_channel_set_irq1_enabled(pwm_dma_chan, true);
|
||||
irq_set_exclusive_handler(DMA_IRQ_1, AUDIO_isr);
|
||||
//irq_set_priority (DMA_IRQ_1, PICO_DEFAULT_IRQ_PRIORITY-8);
|
||||
irq_set_enabled(DMA_IRQ_1, true);
|
||||
dma_channel_start(pwm_dma_chan);
|
||||
#endif
|
||||
}
|
||||
|
||||
static void core1_func_tft() {
|
||||
i2s_audio_init();
|
||||
while (true) {
|
||||
if (producer_pool && fillsamples) i2s_audio_handle_buffer();
|
||||
if (fillsamples != NULL) pwm_audio_handle_buffer();
|
||||
__dmb();
|
||||
}
|
||||
}
|
||||
|
||||
void PICO_DSP::begin_audio(int samplesize, void (*callback)(short * stream, int len))
|
||||
{
|
||||
if (!callback) return;
|
||||
|
||||
producer_pool = audio_new_producer_pool(&producer_format, 3, samplesize);
|
||||
fillsamples = callback;
|
||||
multicore_launch_core1(core1_func_tft);
|
||||
pwm_audio_init(samplesize, callback);
|
||||
}
|
||||
|
||||
void PICO_DSP::end_audio()
|
||||
|
|
@ -1588,7 +1486,8 @@ void PICO_DSP::end_audio()
|
|||
|
||||
void * PICO_DSP::get_buffer_audio(void)
|
||||
{
|
||||
return NULL; // not implemented
|
||||
void *buf = audio_buffers[cur_audio_buffer==0?1:0];
|
||||
return buf;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit 53a61412565177133c810441f675a5d4a0bf24fa
|
||||
|
|
@ -175,7 +175,7 @@ void emu_sndInit() {
|
|||
|
||||
void * emu_sndGetBuffer(void)
|
||||
{
|
||||
panic("not implemented");
|
||||
return tft.get_buffer_audio();
|
||||
}
|
||||
|
||||
void emu_sndPlaySound(int chan, int volume, int freq)
|
||||
|
|
|
|||
|
|
@ -27,7 +27,6 @@
|
|||
#include "tusb.h"
|
||||
#include "kbd.h"
|
||||
#include "platform_config.h"
|
||||
#include "display/emuapi.h"
|
||||
|
||||
/* ================== Keycode translation table. ==================== */
|
||||
|
||||
|
|
@ -374,51 +373,6 @@ static void process_kbd_report (hid_keyboard_report_t const *report)
|
|||
prev_report = *report;
|
||||
}
|
||||
|
||||
static void process_gamepad_report(const uint8_t *report) {
|
||||
uint16_t decoded_report = 0;
|
||||
|
||||
// Directional Controls
|
||||
// Left is when byte 2 is close to 0x00
|
||||
if (report[0] < 0x40) {
|
||||
decoded_report |= MASK_JOY2_RIGHT; // Note: swapped due to gameboy mapping
|
||||
}
|
||||
// Right is when byte 2 is close to 0xFF
|
||||
if (report[0] > 0xB0) {
|
||||
decoded_report |= MASK_JOY2_LEFT; // Note: swapped due to gameboy mapping
|
||||
}
|
||||
// Up is when byte 1 is close to 0x00
|
||||
if (report[1] < 0x40) {
|
||||
decoded_report |= MASK_JOY2_UP;
|
||||
}
|
||||
// Down is when byte 1 is close to 0xFF
|
||||
if (report[1] > 0xB0) {
|
||||
decoded_report |= MASK_JOY2_DOWN;
|
||||
}
|
||||
|
||||
// A Button (check for 0x2F or 0x1F in byte 6)
|
||||
if ((report[5] & 0x20) || (report[5] & 0x10)) {
|
||||
decoded_report |= MASK_KEY_USER3;
|
||||
}
|
||||
|
||||
// B Button (check for 0x4F or 0x8F in byte 6)
|
||||
if ((report[5] & 0x40) || (report[5] & 0x80)) {
|
||||
decoded_report |= MASK_JOY2_BTN;
|
||||
}
|
||||
|
||||
// Select Button (byte 7, bit 0x10)
|
||||
if (report[6] & 0x10) {
|
||||
decoded_report |= MASK_KEY_USER1;
|
||||
}
|
||||
|
||||
// Start Button (byte 7, bit 0x20)
|
||||
if (report[6] & 0x20) {
|
||||
decoded_report |= MASK_KEY_USER2;
|
||||
}
|
||||
|
||||
// Send the decoded gamepad state
|
||||
kbd_signal_raw_gamepad(decoded_report);
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------+
|
||||
// MACRO TYPEDEF CONSTANT ENUM DECLARATION
|
||||
//--------------------------------------------------------------------+
|
||||
|
|
@ -453,10 +407,8 @@ void tuh_hid_mount_cb(uint8_t dev_addr, uint8_t instance, uint8_t const* desc_re
|
|||
{
|
||||
printf("Keyboard found\n");
|
||||
tuh_hid_receive_report (dev_addr, instance);
|
||||
} else {
|
||||
printf("not a keyboard found (but asking for reports anyway!)\n");
|
||||
tuh_hid_receive_report (dev_addr, instance);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// Invoked when device with hid interface is un-mounted
|
||||
|
|
@ -474,25 +426,11 @@ void tuh_hid_report_received_cb(uint8_t dev_addr, uint8_t instance, uint8_t cons
|
|||
// In principle we don't need to test that this USB report came from
|
||||
// a keyboard, since we are only asking for reports from keyboards.
|
||||
// But, for future expansion, we should be systematic
|
||||
int proto = tuh_hid_interface_protocol (dev_addr, instance);
|
||||
switch (proto)
|
||||
switch (tuh_hid_interface_protocol (dev_addr, instance))
|
||||
{
|
||||
case HID_ITF_PROTOCOL_KEYBOARD:
|
||||
process_kbd_report ((hid_keyboard_report_t const*) report);
|
||||
break;
|
||||
case HID_ITF_PROTOCOL_NONE:
|
||||
if (len >= 8) {
|
||||
process_gamepad_report(report);
|
||||
}
|
||||
break;
|
||||
#if 0 // you get to implement it, hoss!
|
||||
case HID_ITF_PROTOCOL_MOUSE:
|
||||
printf("MOUSE len=%d\n", len);
|
||||
if (len >= 6) {
|
||||
process_mouse_report (len, report);
|
||||
}
|
||||
break;
|
||||
#endif
|
||||
}
|
||||
|
||||
// Ask the device for the next report -- asking for a report is a
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
#include <stdint.h>
|
||||
|
||||
#define KBD_FLAG_LSHIFT 0x01
|
||||
#define KBD_FLAG_LCONTROL 0x02
|
||||
#define KBD_FLAG_LALT 0x04
|
||||
|
|
@ -50,7 +48,6 @@ extern "C" {
|
|||
* or released. */
|
||||
extern void kbd_signal_raw_key(int keycode, int code, int codeshifted, int flags, int pressed);
|
||||
extern void kbd_set_locale(KLAYOUT layout);
|
||||
extern void kbd_signal_raw_gamepad(uint16_t new_pad_state);
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
Loading…
Reference in a new issue