diff options
| author | jacqueline <me@jacqueline.id.au> | 2023-01-21 15:09:05 +1100 |
|---|---|---|
| committer | jacqueline <me@jacqueline.id.au> | 2023-01-21 15:09:05 +1100 |
| commit | c7901ae4297d42d55bb3a06010198ecf14b3a7ba (patch) | |
| tree | 3a6f781b22509e72ea1f9906527086f0088c6cdc /src/drivers/dac.cpp | |
| parent | 8cb9e9361cbb9ab0427a48df923d0017935608be (diff) | |
| download | tangara-fw-c7901ae4297d42d55bb3a06010198ecf14b3a7ba.tar.gz | |
build fixes for new compiler version and standard
Diffstat (limited to 'src/drivers/dac.cpp')
| -rw-r--r-- | src/drivers/dac.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/drivers/dac.cpp b/src/drivers/dac.cpp index 23c67e88..78bf94c4 100644 --- a/src/drivers/dac.cpp +++ b/src/drivers/dac.cpp @@ -5,6 +5,8 @@ #include "assert.h" #include "driver/i2c.h" #include "driver/i2s.h" +#include "driver/i2s_types.h" +#include "driver/i2s_types_legacy.h" #include "esp_err.h" #include "esp_log.h" #include "hal/i2c_types.h" @@ -17,7 +19,7 @@ namespace drivers { static const char* kTag = "AUDIODAC"; static const uint8_t kPcm5122Address = 0x4C; -static const uint8_t kPcm5122Timeout = 100 / portTICK_RATE_MS; +static const uint8_t kPcm5122Timeout = pdMS_TO_TICKS(100); static const i2s_port_t kI2SPort = I2S_NUM_0; static const AudioDac::SampleRate kDefaultSampleRate = @@ -46,7 +48,7 @@ auto AudioDac::create(GpioExpander* expander) .use_apll = false, .tx_desc_auto_clear = false, .fixed_mclk = 0, - .mclk_multiple = I2S_MCLK_MULTIPLE_DEFAULT, + .mclk_multiple = I2S_MCLK_MULTIPLE_512, // TODO: double check .bits_per_chan = I2S_BITS_PER_CHAN_DEFAULT, }; |