summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/drivers/bluetooth.cpp2
-rw-r--r--src/drivers/i2s_dac.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/drivers/bluetooth.cpp b/src/drivers/bluetooth.cpp
index a0a318e9..8ec30395 100644
--- a/src/drivers/bluetooth.cpp
+++ b/src/drivers/bluetooth.cpp
@@ -528,7 +528,7 @@ void Disabled::react(const events::Enable&) {
// Set a reasonable name for the device.
std::pmr::string name = DeviceName();
- esp_bt_dev_set_device_name(name.c_str());
+ esp_bt_gap_set_device_name(name.c_str());
// Initialise GAP. This controls advertising our device, and scanning for
// other devices.
diff --git a/src/drivers/i2s_dac.cpp b/src/drivers/i2s_dac.cpp
index b1044896..9c9bb793 100644
--- a/src/drivers/i2s_dac.cpp
+++ b/src/drivers/i2s_dac.cpp
@@ -46,12 +46,12 @@ extern "C" IRAM_ATTR auto callback(i2s_chan_handle_t handle,
if (event == nullptr || user_ctx == nullptr) {
return false;
}
- if (event->data == nullptr || event->size == 0) {
+ if (event->dma_buf == nullptr || event->size == 0) {
return false;
}
assert(event->size % 4 == 0);
- uint8_t* buf = *reinterpret_cast<uint8_t**>(event->data);
+ uint8_t* buf = reinterpret_cast<uint8_t*>(event->dma_buf);
auto* src = reinterpret_cast<PcmBuffer*>(user_ctx);
BaseType_t ret =