Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2024-10-01 01:26:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Eliminate unnecessary NumberField to save code space (#1964)

Browse Source 
* Eliminate extra NumberField to save code space

* Clang
This commit is contained in:
Mark Thompson 2024-03-09 17:36:48 -06:00 committed by GitHub
parent 9d8132978f
commit e496f8ecc2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 17 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
firmware/application/apps/analog_audio_app.cpp
View File

@ -119,7 +119,7 @@ SPECOptionsView::SPECOptionsView(
&text_speed, &text_speed,
&field_speed, &field_speed,
&text_rx_cal, &text_rx_cal,
hackrf_r9 ? &field_rx_iq_phase_cal_2839 : &field_rx_iq_phase_cal_2837 // max2839 has 6 bits [0..63], max2837 has 5 bits [0..31] &field_rx_iq_phase_cal,
}); });
options_config.set_selected_index(view->get_spec_bw_index()); options_config.set_selected_index(view->get_spec_bw_index());
@ -132,17 +132,11 @@ SPECOptionsView::SPECOptionsView(
view->set_spec_trigger(v); view->set_spec_trigger(v);
}; };
if (hackrf_r9) { // MAX2839 has 6 bits RX IQ CAL phasse adjustment. field_rx_iq_phase_cal.set_range(0, hackrf_r9 ? 63 : 31); // max2839 has 6 bits [0..63], max2837 has 5 bits [0..31]
field_rx_iq_phase_cal_2839.set_value(view->get_spec_iq_phase_calibration_value()); // using accessor function of AnalogAudioView to read iq_phase_calibration_value from rx_audio.ini field_rx_iq_phase_cal.set_value(view->get_spec_iq_phase_calibration_value()); // using accessor function of AnalogAudioView to read iq_phase_calibration_value from rx_audio.ini
field_rx_iq_phase_cal_2839.on_change = [this, view](int32_t v) { field_rx_iq_phase_cal.on_change = [this, view](int32_t v) {
view->set_spec_iq_phase_calibration_value(v); // using accessor function of AnalogAudioView to write inside SPEC submenu, register value to max283x and save it to rx_audio.ini view->set_spec_iq_phase_calibration_value(v); // using accessor function of AnalogAudioView to write inside SPEC submenu, register value to max283x and save it to rx_audio.ini
}; };
} else { // MAX2837 has 5 bits RX IQ CAL phase adjustment.
field_rx_iq_phase_cal_2837.set_value(view->get_spec_iq_phase_calibration_value()); // using accessor function of AnalogAudioView to read iq_phase_calibration_value from rx_audio.ini
field_rx_iq_phase_cal_2837.on_change = [this, view](int32_t v) {
view->set_spec_iq_phase_calibration_value(v); // using accessor function of AnalogAudioView to write inside SPEC submenu, register value to max283x and save it to rx_audio.ini
};
}
} }
/* AnalogAudioView *******************************************************/ /* AnalogAudioView *******************************************************/

11
firmware/application/apps/analog_audio_app.hpp
View File

@ -136,17 +136,10 @@ class SPECOptionsView : public View {
Text text_rx_cal{ Text text_rx_cal{
{19 * 8, 0 * 16, 11 * 8, 1 * 16}, // 18 (x col.) x char_size, 12 (length) x 8 blanking space to delete previous chars. {19 * 8, 0 * 16, 11 * 8, 1 * 16}, // 18 (x col.) x char_size, 12 (length) x 8 blanking space to delete previous chars.
"Rx_IQ_CAL "}; "Rx_IQ_CAL "};
NumberField field_rx_iq_phase_cal_2837{ NumberField field_rx_iq_phase_cal{
{28 * 8, 0 * 16}, {28 * 8, 0 * 16},
2, 2,
{0, 31}, // 5 bits IQ CAL phase adjustment. {0, 63}, // 5 or 6 bits IQ CAL phase adjustment (range updated later)
1,
' ',
};
NumberField field_rx_iq_phase_cal_2839{
{28 * 8, 0 * 16},
2,
{0, 63}, // 6 bits IQ CAL phase adjustment.
1, 1,
' ', ' ',
}; };

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

@ -338,7 +338,7 @@ MicTXView::MicTXView(
&field_rxlna, &field_rxlna,
&field_rxvga, &field_rxvga,
&field_rxamp, &field_rxamp,
hackrf_r9 ? &field_tx_iq_phase_cal_2839 : &field_tx_iq_phase_cal_2837, &field_tx_iq_phase_cal,
&tx_button, &tx_button,
&tx_icon}); &tx_icon});
@ -372,19 +372,12 @@ MicTXView::MicTXView(
}; };
radio::set_tx_max283x_iq_phase_calibration(iq_phase_calibration_value); radio::set_tx_max283x_iq_phase_calibration(iq_phase_calibration_value);
if (hackrf_r9) { // MAX2839 has 6 bits IQ CAL phasse adjustment. field_tx_iq_phase_cal.set_range(0, hackrf_r9 ? 63 : 31); // max2839 has 6 bits [0..63], max2837 has 5 bits [0..31]
field_tx_iq_phase_cal_2839.set_value(iq_phase_calibration_value); field_tx_iq_phase_cal.set_value(iq_phase_calibration_value);
field_tx_iq_phase_cal_2839.on_change = [this](int32_t v) { field_tx_iq_phase_cal.on_change = [this](int32_t v) {
iq_phase_calibration_value = v; iq_phase_calibration_value = v;
radio::set_tx_max283x_iq_phase_calibration(iq_phase_calibration_value); radio::set_tx_max283x_iq_phase_calibration(iq_phase_calibration_value);
}; };
} else { // MAX2837 has 5 bits IQ CAL phase adjustment.
field_tx_iq_phase_cal_2837.set_value(iq_phase_calibration_value);
field_tx_iq_phase_cal_2837.on_change = [this](int32_t v) {
iq_phase_calibration_value = v;
radio::set_tx_max283x_iq_phase_calibration(iq_phase_calibration_value);
};
}
options_gain.on_change = [this](size_t, int32_t v) { options_gain.on_change = [this](size_t, int32_t v) {
mic_gain_x10 = v; mic_gain_x10 = v;

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

@ -342,18 +342,10 @@ class MicTXView : public View {
' ', ' ',
}; };
NumberField field_tx_iq_phase_cal_2837{ NumberField field_tx_iq_phase_cal{
{24 * 8, (33 * 8)}, {24 * 8, (33 * 8)},
2, 2,
{0, 31}, // 5 bits IQ CAL phase adjustment. {0, 63}, // 5 or 6 bits IQ CAL phase adjustment (range updated later)
1,
' ',
};
NumberField field_tx_iq_phase_cal_2839{
{24 * 8, (33 * 8)},
2,
{0, 63}, // 6 bits IQ CAL phasse adjustment.
1, 1,
' ', ' ',
}; };