fixed pin defs and disabled OBSOLETEAPI

This commit is contained in:
Miller Puckette 2024-10-18 08:54:07 -05:00
parent 36537ac580
commit 62c421ad68
2 changed files with 12 additions and 19 deletions

View file

@ -177,24 +177,17 @@ static void initdacs( void)
get_i2s_pins(I2S_NUM_0, (board_i2s_pin_t *)(&i2s_pin_cfg)); get_i2s_pins(I2S_NUM_0, (board_i2s_pin_t *)(&i2s_pin_cfg));
#else /* PD_LYRAT */ #else /* PD_LYRAT */
i2s_pin_config_t i2s_pin_cfg = { i2s_pin_config_t i2s_pin_cfg = {
#if 0 /* generic board 1 - edit this as needed */ .bck_io_num = PIN_BIT_CLOCK, /* bit clock */
.bck_io_num = 13, /* bit clock */ .ws_io_num = PIN_WORD_SELECT, /* Word select, aka left right clock */
.ws_io_num = 33, /* Word select, aka left right clock */ .data_out_num = PIN_DATA_OUT, /* Data out ESP32 - to DIN on 38357A */
.data_out_num = 32, /* Data out from ESP32, to DIN on 38357A */ .data_in_num = PIN_DATA_IN /* data from ADC */
.data_in_num = 35 /* data from ADC */
#endif
#if 1 /* complex arts sensorboard */
.bck_io_num = 33, /* bit clock */
.ws_io_num = 25, /* Word select, aka left right clock */
.data_out_num = 32, /* Data out from ESP32, to DIN on 38357A */
.data_in_num = 26 /* ADC */
#endif
}; };
#endif /* PD_LYRAT */ #endif /* PD_LYRAT */
i2s_set_pin(I2S_NUM_0, &i2s_pin_cfg); i2s_set_pin(I2S_NUM_0, &i2s_pin_cfg);
} }
}
#else /* OBSOLETEAPI */ #else /* OBSOLETEAPI */
static void initdacs( void) static void initdacs( void)
{ {
@ -219,10 +212,10 @@ static void initdacs( void)
I2S_SLOT_MODE_STEREO), I2S_SLOT_MODE_STEREO),
.gpio_cfg = { .gpio_cfg = {
.mclk = I2S_GPIO_UNUSED, .mclk = I2S_GPIO_UNUSED,
.bclk = 13, .bclk = PIN_BIT_CLOCK,
.ws = 33, .ws = PIN_WORD_SELECT,
.dout = 32, .dout = PIN_DATA_OUT,
.din = 35, .din = PIN_DATA_IN,
.invert_flags = { .invert_flags = {
.mclk_inv = false, .mclk_inv = false,
.bclk_inv = false, .bclk_inv = false,

View file

@ -4,8 +4,9 @@
/* #define PD_INCLUDEPATCH */ /* load the patch defined in "testpatch.c" */ /* #define PD_INCLUDEPATCH */ /* load the patch defined in "testpatch.c" */
/* #define PD_LYRAT */ /* using LyraT or LyraT mini board */ /* #define PD_LYRAT */ /* using LyraT or LyraT mini board */
#define USEADC /* enable audio input (output always enabled) */ #define USEADC /* enable audio input (output always enabled) */
/* #define PD_USE_GYRO */ /* complex Arts board with BNO085 gyro */
#define IOCHANS 2 #define IOCHANS 2
#define OBSOLETEAPI 0 /* #define OBSOLETEAPI */ /* need this for LyraT boards */
/* task priorities */ /* task priorities */
#define PRIORITY_WIFI 2 #define PRIORITY_WIFI 2
@ -32,7 +33,6 @@ void bt_init( void);
void pd_bt_writeback(unsigned char *s, int length); void pd_bt_writeback(unsigned char *s, int length);
#endif #endif
#ifdef PD_USE_WIFI #ifdef PD_USE_WIFI
void wifi_init(void); /* wifi.c - manage 802.11 connection */ void wifi_init(void); /* wifi.c - manage 802.11 connection */
void net_init( void); /* init */ void net_init( void); /* init */