summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjacqueline <me@jacqueline.id.au>2023-01-31 14:39:52 +1100
committerjacqueline <me@jacqueline.id.au>2023-01-31 14:39:52 +1100
commitaae18719991c29a286d69661264d261004ee7aeb (patch)
tree71142524e06edc60c1d5d07b60426c38dd72f25a
parentef8d404b15e6d32506617a95aa3161fbe59ecdaf (diff)
downloadtangara-fw-aae18719991c29a286d69661264d261004ee7aeb.tar.gz
remove unused ISR allocation
this was blocking the i2s driver somehow!(?)
-rw-r--r--src/audio/i2s_audio_output.cpp4
-rw-r--r--src/drivers/display.cpp2
-rw-r--r--src/main/main.cpp1
3 files changed, 2 insertions, 5 deletions
diff --git a/src/audio/i2s_audio_output.cpp b/src/audio/i2s_audio_output.cpp
index bfc88588..ca943904 100644
--- a/src/audio/i2s_audio_output.cpp
+++ b/src/audio/i2s_audio_output.cpp
@@ -92,12 +92,10 @@ auto I2SAudioOutput::ProcessStreamInfo(const StreamInfo& info)
auto I2SAudioOutput::ProcessChunk(const cpp::span<std::byte>& chunk)
-> cpp::result<std::size_t, AudioProcessingError> {
- ESP_LOGI(kTag, "playing samples");
SetSoftMute(false);
// TODO(jacqueline): write smaller parts with a small delay so that we can
// be responsive to pause and seek commands.
- std::size_t bytes_written = dac_->WriteData(chunk, portMAX_DELAY);
- ESP_LOGI(kTag, "played %u bytes", bytes_written);
+ dac_->WriteData(chunk, portMAX_DELAY);
return 0;
}
diff --git a/src/drivers/display.cpp b/src/drivers/display.cpp
index 83710f45..2ada4a3e 100644
--- a/src/drivers/display.cpp
+++ b/src/drivers/display.cpp
@@ -241,7 +241,7 @@ void Display::Flush(lv_disp_drv_t* disp_drv,
// lv_disp_flush_ready(&driver_);
}
-void IRAM_ATTR Display::PostTransaction(const spi_transaction_t& transaction) {
+void Display::PostTransaction(const spi_transaction_t& transaction) {
if (reinterpret_cast<uintptr_t>(transaction.user) & LVGL_FLUSH) {
lv_disp_flush_ready(&driver_);
}
diff --git a/src/main/main.cpp b/src/main/main.cpp
index 06908ef3..fde416ce 100644
--- a/src/main/main.cpp
+++ b/src/main/main.cpp
@@ -89,7 +89,6 @@ void lvgl_main(void* voidArgs) {
extern "C" void app_main(void) {
ESP_LOGI(TAG, "Initialising peripherals");
- ESP_ERROR_CHECK(gpio_install_isr_service(ESP_INTR_FLAG_LOWMED));
ESP_ERROR_CHECK(drivers::init_i2c());
ESP_ERROR_CHECK(drivers::init_spi());