Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2025-08-13 17:05:37 -04:00
Code Issues Projects Releases Packages Wiki Activity

Moved AK Speaker Disable back to a title bar, and modified Mute Icon to differentiate (#1192)

Browse source 
* Added fn to indicate support for disabling speaker
* Support both mute & speaker disable icons
* Byte grouping for ui_config2_t bitmap
* Fix disabling AK speaker to take effect immediately
This commit is contained in:
Mark Thompson 2023-06-26 01:08:09 -05:00 • committed by GitHub
parent b5ea81cf96
commit 3f8a4957af
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 153 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

30
firmware/application/ui_navigation.cpp
View file

@ -183,6 +183,10 @@ SystemStatusView::SystemStatusView(
this->on_speaker();
};
button_mute.on_select = [this](ImageButton&) {
this->on_mute();
};
button_stealth.on_select = [this](ImageButton&) {
this->on_stealth();
};
@ -218,13 +222,18 @@ void SystemStatusView::refresh() {
if (!pmem::ui_hide_converter()) status_icons.add(&button_converter);
if (!pmem::ui_hide_bias_tee()) status_icons.add(&button_bias_tee);
if (!pmem::ui_hide_clock()) status_icons.add(&button_clock_status);
if (!pmem::ui_hide_speaker()) status_icons.add(&button_speaker);
if (!pmem::ui_hide_mute()) status_icons.add(&button_mute);
// Display "Disable speaker" icon only if AK4951 Codec which has separate speaker/headphone control
if (audio::speaker_disable_supported() && !pmem::ui_hide_speaker())
status_icons.add(&button_speaker);
if (!pmem::ui_hide_sd_card()) status_icons.add(&sd_card_status_view);
status_icons.update_layout();
// Update icon display (try to keep all in on place).
// Speaker
if (pmem::config_audio_mute()) {
// Speaker Enable/Disable (AK4951 boards only)
if (pmem::config_speaker_disable()) {
button_speaker.set_foreground(Color::light_grey());
button_speaker.set_bitmap(&bitmap_icon_speaker_mute);
} else {
@ -232,6 +241,15 @@ void SystemStatusView::refresh() {
button_speaker.set_bitmap(&bitmap_icon_speaker);
}
// Audio Mute (both headphones & speaker)
if (pmem::config_audio_mute()) {
button_mute.set_foreground(Color::light_grey());
button_mute.set_bitmap(&bitmap_icon_speaker_and_headphones_mute);
} else {
button_mute.set_foreground(Color::green());
button_mute.set_bitmap(&bitmap_icon_speaker_and_headphones);
}
// Clock status
bool external_clk = portapack::clock_manager.get_reference().source == ClockManager::ReferenceSource::External;
button_clock_status.set_bitmap(external_clk ? &bitmap_icon_clk_ext : &bitmap_icon_clk_int);
@ -295,6 +313,12 @@ void SystemStatusView::on_converter() {
}
void SystemStatusView::on_speaker() {
pmem::set_config_speaker_disable(!pmem::config_speaker_disable());
audio::output::update_audio_mute();
refresh();
}
void SystemStatusView::on_mute() {
pmem::set_config_audio_mute(!pmem::config_audio_mute());
audio::output::update_audio_mute();
refresh();