From 6586819171b635e3b17effb3bfab096da695a0e9 Mon Sep 17 00:00:00 2001 From: ailurux Date: Fri, 1 Mar 2024 19:08:54 +1100 Subject: WIP Commit- Lua setters for volume, bluetooth todo --- src/audio/bt_audio_output.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'src/audio/bt_audio_output.cpp') diff --git a/src/audio/bt_audio_output.cpp b/src/audio/bt_audio_output.cpp index 41c89069..6deb1f71 100644 --- a/src/audio/bt_audio_output.cpp +++ b/src/audio/bt_audio_output.cpp @@ -57,10 +57,22 @@ auto BluetoothAudioOutput::GetVolumePct() -> uint_fast8_t { return static_cast(static_cast(volume_) * 100 / 0x7f); } +auto BluetoothAudioOutput::SetVolumePct(uint_fast8_t val) -> bool { + // TODO + ESP_LOGE(kTag, "Not implemented"); + return false; +} + auto BluetoothAudioOutput::GetVolumeDb() -> int_fast16_t { return 0; } +auto BluetoothAudioOutput::SetVolumeDb(int_fast16_t) -> bool { + // TODO + ESP_LOGE(kTag, "Not implemented"); + return false; +} + auto BluetoothAudioOutput::AdjustVolumeUp() -> bool { if (volume_ == 0x7f) { return false; -- cgit v1.2.3 From a750af35aa6afda40aadca8f7cf8db75f41a43b2 Mon Sep 17 00:00:00 2001 From: ailurux Date: Tue, 2 Apr 2024 11:11:44 +1100 Subject: Added bluetooth db impl --- src/audio/bt_audio_output.cpp | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'src/audio/bt_audio_output.cpp') diff --git a/src/audio/bt_audio_output.cpp b/src/audio/bt_audio_output.cpp index 6deb1f71..f431a49b 100644 --- a/src/audio/bt_audio_output.cpp +++ b/src/audio/bt_audio_output.cpp @@ -9,6 +9,7 @@ #include #include #include +#include #include #include @@ -58,19 +59,22 @@ auto BluetoothAudioOutput::GetVolumePct() -> uint_fast8_t { } auto BluetoothAudioOutput::SetVolumePct(uint_fast8_t val) -> bool { - // TODO - ESP_LOGE(kTag, "Not implemented"); - return false; + if (val < 100) { + return false; + } + SetVolume(val / 100 * 0x7f); + return true; } auto BluetoothAudioOutput::GetVolumeDb() -> int_fast16_t { - return 0; + return log(GetVolumePct()/100) * 20; } -auto BluetoothAudioOutput::SetVolumeDb(int_fast16_t) -> bool { - // TODO - ESP_LOGE(kTag, "Not implemented"); - return false; +auto BluetoothAudioOutput::SetVolumeDb(int_fast16_t val) -> bool { + auto pct = pow(2, val / 20.0) * 100; + ESP_LOGI("Audio", "Bluetooth audio pct: %d", (int)pct); + SetVolumePct(pct); + return true; } auto BluetoothAudioOutput::AdjustVolumeUp() -> bool { -- cgit v1.2.3 From 25dca40e5dab82c5a814233813c24180fcf975eb Mon Sep 17 00:00:00 2001 From: ailurux Date: Tue, 2 Apr 2024 15:03:49 +1100 Subject: Fix volume getters/setters for bluetooth --- src/audio/bt_audio_output.cpp | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'src/audio/bt_audio_output.cpp') diff --git a/src/audio/bt_audio_output.cpp b/src/audio/bt_audio_output.cpp index 20ed7bb3..7d6bade2 100644 --- a/src/audio/bt_audio_output.cpp +++ b/src/audio/bt_audio_output.cpp @@ -55,26 +55,30 @@ auto BluetoothAudioOutput::GetVolume() -> uint16_t { } auto BluetoothAudioOutput::GetVolumePct() -> uint_fast8_t { - return static_cast(static_cast(volume_) * 100 / 0x7f); + return static_cast(round(static_cast(volume_) * 100.0 / 0x7f)); } auto BluetoothAudioOutput::SetVolumePct(uint_fast8_t val) -> bool { - if (val < 100) { + if (val > 100) { return false; } - SetVolume(val / 100 * 0x7f); + uint16_t vol = (val * (0x7f))/100; + SetVolume(vol); return true; } auto BluetoothAudioOutput::GetVolumeDb() -> int_fast16_t { - return log(GetVolumePct()/100) * 20; + double pct = GetVolumePct()/100.0; + if (pct <= 0) { + pct = 0.01; + } + int_fast16_t db = log(pct) * 20; + return db; } auto BluetoothAudioOutput::SetVolumeDb(int_fast16_t val) -> bool { - auto pct = pow(2, val / 20.0) * 100; - ESP_LOGI("Audio", "Bluetooth audio pct: %d", (int)pct); - SetVolumePct(pct); - return true; + double pct = exp(val / 20.0) * 100; + return SetVolumePct(pct); } auto BluetoothAudioOutput::AdjustVolumeUp() -> bool { -- cgit v1.2.3