TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2025-10-17 11:02:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged TxButton and Button & minor bug fix

Browse Source
This commit is contained in:
dqs105
2020-08-24 11:02:42 +08:00
parent d7568b820d
commit 911eb36210
4 changed files with 38 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
firmware/application/apps/ui_mictx.cpp
View File

@@ -362,42 +362,42 @@ MicTXView::MicTXView(
rx_lna = receiver_model.lna();
field_rxlna.on_change = [this](int32_t v) {
rx_lna = v;
receiver_model.set_lna(v);
if(rx_enabled)
receiver_model.set_lna(v);
};
field_rxlna.set_value(rx_lna);
rx_vga = receiver_model.vga();
field_rxvga.on_change = [this](int32_t v) {
rx_vga = v;
receiver_model.set_vga(v);
if(rx_enabled)
receiver_model.set_vga(v);
};
field_rxvga.set_value(rx_vga);
rx_amp = receiver_model.rf_amp();
field_rxamp.on_change = [this](int32_t v) {
rx_amp = v;
receiver_model.set_rf_amp(rx_amp);
if(rx_enabled)
receiver_model.set_rf_amp(rx_amp);
};
field_rxamp.set_value(rx_amp);
tx_button.on_select = [this](TxButton&) {
tx_button.on_select = [this](Button&) {
if(ptt_enabled && !transmitting) {
button_touch = true;
set_tx(true);
}
};
tx_button.on_release = [this](TxButton&) {
tx_button.on_touch_release = [this](Button&) {
if(button_touch) {
button_touch = false;
set_tx(false);
}
};
tx_button.on_buttonpress = [this](TxButton&) {
if(ptt_enabled && !transmitting) {
set_tx(true);
}
tx_button.on_touch_press = [this](Button&) {
button_touch = true;
};
transmitter_model.set_sampling_rate(sampling_rate);

7
firmware/application/apps/ui_mictx.hpp
View File

@@ -97,7 +97,7 @@ private:
rf::Frequency tx_frequency { 0 };
rf::Frequency rx_frequency { 0 };
int32_t focused_ui { 2 };
bool button_touch { true };
bool button_touch { false };
Labels labels {
@@ -267,9 +267,10 @@ private:
' ',
};
TxButton tx_button {
Button tx_button {
{ 10 * 8, 30 * 8, 10 * 8, 5 * 8 },
"TX"
"TX",
true
};