diff --git a/firmware/application/apps/ais_app.hpp b/firmware/application/apps/ais_app.hpp index 17aa700d5..8146dd4a0 100644 --- a/firmware/application/apps/ais_app.hpp +++ b/firmware/application/apps/ais_app.hpp @@ -210,7 +210,7 @@ class AISAppView : public View { }; AudioVolumeField field_volume{ - {28 * 8, 0 * 16}}; + {screen_width - 2 * 8, 0 * 16}}; Channel channel{ {21 * 8, 5, 6 * 8, 4}, diff --git a/firmware/application/apps/analog_audio_app.hpp b/firmware/application/apps/analog_audio_app.hpp index 3f84d5b97..f858cb2a7 100644 --- a/firmware/application/apps/analog_audio_app.hpp +++ b/firmware/application/apps/analog_audio_app.hpp @@ -185,7 +185,7 @@ class SPECOptionsView : public View { {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 "}; NumberField field_rx_iq_phase_cal{ - {28 * 8, 0 * 16}, + {screen_width - 2 * 8, 0 * 16}, 2, {0, 63}, // 5 or 6 bits IQ CAL phase adjustment (range updated later) 1, @@ -283,7 +283,7 @@ class AnalogAudioView : public View { }}; AudioVolumeField field_volume{ - {28 * 8, 0 * 16}}; + {screen_width - 2 * 8, 0 * 16}}; Text text_ctcss{ {16 * 8, 1 * 16, 14 * 8, 1 * 16}, diff --git a/firmware/application/apps/ble_tx_app.hpp b/firmware/application/apps/ble_tx_app.hpp index e42b64578..678450155 100644 --- a/firmware/application/apps/ble_tx_app.hpp +++ b/firmware/application/apps/ble_tx_app.hpp @@ -216,7 +216,7 @@ class BLETxView : public View { true}; ImageButton button_play{ - {28 * 8, 2 * 16, 2 * 8, 1 * 16}, + {screen_width - 2 * 8, 2 * 16, 2 * 8, 1 * 16}, &bitmap_play, Theme::getInstance()->fg_green->foreground, Theme::getInstance()->fg_green->background}; diff --git a/firmware/application/apps/ert_app.hpp b/firmware/application/apps/ert_app.hpp index 9172ca8ed..9e12fe917 100644 --- a/firmware/application/apps/ert_app.hpp +++ b/firmware/application/apps/ert_app.hpp @@ -166,7 +166,7 @@ class ERTAppView : public View { }; AudioVolumeField field_volume{ - {28 * 8, 0 * 16}}; + {screen_width - 2 * 8, 0 * 16}}; MessageHandlerRegistration message_handler_packet{ Message::ID::ERTPacket, diff --git a/firmware/application/apps/pocsag_app.hpp b/firmware/application/apps/pocsag_app.hpp index fb7a5cd37..45a01f3aa 100644 --- a/firmware/application/apps/pocsag_app.hpp +++ b/firmware/application/apps/pocsag_app.hpp @@ -259,7 +259,7 @@ class POCSAGAppView : public View { ' ', true /*wrap*/}; AudioVolumeField field_volume{ - {28 * 8, 0 * 16}}; + {screen_width - 2 * 8, 0 * 16}}; Image image_status{ {0 * 8 + 4, 1 * 16 + 2, 16, 16}, diff --git a/firmware/application/apps/soundboard_app.hpp b/firmware/application/apps/soundboard_app.hpp index 7842a4c28..72b9fd063 100644 --- a/firmware/application/apps/soundboard_app.hpp +++ b/firmware/application/apps/soundboard_app.hpp @@ -131,9 +131,9 @@ class SoundBoardView : public View { {}}; AudioVolumeField field_volume{ - {28 * 8, 180}}; + {screen_width - 2 * 8, 180}}; Text text_volume_disabled{ - {28 * 8, 180, 3 * 8, 16}, + {screen_width - 2 * 8, 180, 3 * 8, 16}, "--"}; Checkbox check_loop{ diff --git a/firmware/application/apps/ui_adsb_rx.hpp b/firmware/application/apps/ui_adsb_rx.hpp index adbe12874..039135f5d 100644 --- a/firmware/application/apps/ui_adsb_rx.hpp +++ b/firmware/application/apps/ui_adsb_rx.hpp @@ -442,7 +442,7 @@ class ADSBRxView : public View { }; AudioVolumeField field_volume{ - {28 * 8, 0 * 16}}; + {screen_width - 2 * 8, 0 * 16}}; MessageHandlerRegistration message_handler_frame{ Message::ID::ADSBFrame, diff --git a/firmware/application/apps/ui_aprs_rx.hpp b/firmware/application/apps/ui_aprs_rx.hpp index 4aa860320..41a55f2cf 100644 --- a/firmware/application/apps/ui_aprs_rx.hpp +++ b/firmware/application/apps/ui_aprs_rx.hpp @@ -220,7 +220,7 @@ class APRSRxView : public View { {21 * 8, 5, 6 * 8, 4}}; AudioVolumeField field_volume{ - {28 * 8, 0 * 16}}; + {screen_width - 2 * 8, 0 * 16}}; OptionsField options_region{ {0 * 8, 0 * 8}, diff --git a/firmware/application/apps/ui_playlist.hpp b/firmware/application/apps/ui_playlist.hpp index 4b4f5fd56..cf98e6c24 100644 --- a/firmware/application/apps/ui_playlist.hpp +++ b/firmware/application/apps/ui_playlist.hpp @@ -139,7 +139,7 @@ class PlaylistView : public View { true}; ImageButton button_play{ - {28 * 8, 2 * 16, 2 * 8, 1 * 16}, + {screen_width - 2 * 8, 2 * 16, 2 * 8, 1 * 16}, &bitmap_play, Theme::getInstance()->fg_green->foreground, Theme::getInstance()->fg_green->background}; diff --git a/firmware/application/apps/ui_sonde.hpp b/firmware/application/apps/ui_sonde.hpp index 886ee44e4..2f1a4c0aa 100644 --- a/firmware/application/apps/ui_sonde.hpp +++ b/firmware/application/apps/ui_sonde.hpp @@ -120,7 +120,7 @@ class SondeView : public View { {21 * 8, 0, 6 * 8, 4}}; AudioVolumeField field_volume{ - {28 * 8, 0 * 16}}; + {screen_width - 2 * 8, 0 * 16}}; Checkbox check_log{ {22 * 8, 8 * 16}, diff --git a/firmware/application/apps/ui_weatherstation.hpp b/firmware/application/apps/ui_weatherstation.hpp index 6c265e517..5123b1186 100644 --- a/firmware/application/apps/ui_weatherstation.hpp +++ b/firmware/application/apps/ui_weatherstation.hpp @@ -149,7 +149,7 @@ class WeatherView : public View { {21 * 8, 0, 6 * 8, 4}}; AudioVolumeField field_volume{ - {28 * 8, 0 * 16}}; + {screen_width - 2 * 8, 0 * 16}}; RxFrequencyField field_frequency{ {0 * 8, 0 * 16}, diff --git a/firmware/application/external/acars_rx/acars_app.hpp b/firmware/application/external/acars_rx/acars_app.hpp index 5e1ef99df..abefedce0 100644 --- a/firmware/application/external/acars_rx/acars_app.hpp +++ b/firmware/application/external/acars_rx/acars_app.hpp @@ -90,7 +90,7 @@ class ACARSAppView : public View { {0, 3 * 16, screen_width, 256}}; AudioVolumeField field_volume{ - {28 * 8, 1 * 16}}; + {screen_width - 2 * 8, 1 * 16}}; std::unique_ptr logger{}; diff --git a/firmware/application/external/afsk_rx/ui_afsk_rx.hpp b/firmware/application/external/afsk_rx/ui_afsk_rx.hpp index 75618e6c1..388a966c7 100644 --- a/firmware/application/external/afsk_rx/ui_afsk_rx.hpp +++ b/firmware/application/external/afsk_rx/ui_afsk_rx.hpp @@ -84,7 +84,7 @@ class AFSKRxView : public View { {21 * 8, 5, 6 * 8, 4}}; AudioVolumeField field_volume{ - {28 * 8, 0 * 16}}; + {screen_width - 2 * 8, 0 * 16}}; RxFrequencyField field_frequency{ {0 * 8, 0 * 16}, diff --git a/firmware/application/external/fmradio/ui_fmradio.hpp b/firmware/application/external/fmradio/ui_fmradio.hpp index 377a613dd..7deab3bbd 100644 --- a/firmware/application/external/fmradio/ui_fmradio.hpp +++ b/firmware/application/external/fmradio/ui_fmradio.hpp @@ -89,7 +89,7 @@ class FmRadioView : public View { RSSI rssi{ {21 * 8, 0, 6 * 8, 4}}; AudioVolumeField field_volume{ - {28 * 8, 0 * 16}}; + {screen_width - 2 * 8, 0 * 16}}; RxFrequencyField field_frequency{ {0 * 8, 0 * 16}, diff --git a/firmware/application/external/foxhunt/ui_foxhunt_rx.hpp b/firmware/application/external/foxhunt/ui_foxhunt_rx.hpp index c90fab7ff..25d48c0c3 100644 --- a/firmware/application/external/foxhunt/ui_foxhunt_rx.hpp +++ b/firmware/application/external/foxhunt/ui_foxhunt_rx.hpp @@ -62,7 +62,7 @@ class FoxhuntRxView : public View { RSSI rssi{ {21 * 8, 0, 6 * 8, 4}}; AudioVolumeField field_volume{ - {28 * 8, 0 * 16}}; + {screen_width - 2 * 8, 0 * 16}}; RxFrequencyField field_frequency{ {0 * 8, 0 * 16}, diff --git a/firmware/application/external/gfxeq/ui_gfxeq.hpp b/firmware/application/external/gfxeq/ui_gfxeq.hpp index 7cd34f499..b935672cf 100644 --- a/firmware/application/external/gfxeq/ui_gfxeq.hpp +++ b/firmware/application/external/gfxeq/ui_gfxeq.hpp @@ -99,7 +99,7 @@ class gfxEQView : public View { LNAGainField field_lna{{15 * 8, 0 * 16}}; VGAGainField field_vga{{18 * 8, 0 * 16}}; Button button_mood{{21 * 8, 0, 6 * 8, 16}, "MOOD"}; - AudioVolumeField field_volume{{28 * 8, 0 * 16}}; + AudioVolumeField field_volume{{screen_width - 2 * 8, 0 * 16}}; rf::Frequency frequency_value{93100000}; diff --git a/firmware/application/external/gpssim/gps_sim_app.hpp b/firmware/application/external/gpssim/gps_sim_app.hpp index ba967177d..42b4906ea 100644 --- a/firmware/application/external/gpssim/gps_sim_app.hpp +++ b/firmware/application/external/gpssim/gps_sim_app.hpp @@ -112,7 +112,7 @@ class GpsSimAppView : public View { LanguageHelper::currentMessages[LANG_LOOP], true}; ImageButton button_play{ - {28 * 8, 2 * 16, 2 * 8, 1 * 16}, + {screen_width - 2 * 8, 2 * 16, 2 * 8, 1 * 16}, &bitmap_play, Theme::getInstance()->fg_green->foreground, Theme::getInstance()->fg_green->background}; diff --git a/firmware/application/external/noaaapt_rx/ui_noaaapt_rx.hpp b/firmware/application/external/noaaapt_rx/ui_noaaapt_rx.hpp index e90139d89..686ed20a0 100644 --- a/firmware/application/external/noaaapt_rx/ui_noaaapt_rx.hpp +++ b/firmware/application/external/noaaapt_rx/ui_noaaapt_rx.hpp @@ -89,7 +89,7 @@ class NoaaAptRxView : public View { RSSI rssi{ {21 * 8, 0, 6 * 8, 4}}; AudioVolumeField field_volume{ - {28 * 8, 0 * 16}}; + {screen_width - 2 * 8, 0 * 16}}; RxFrequencyField field_frequency{ {0 * 8, 0 * 16}, diff --git a/firmware/application/external/protoview/ui_protoview.hpp b/firmware/application/external/protoview/ui_protoview.hpp index 60300ff96..32d0efa51 100644 --- a/firmware/application/external/protoview/ui_protoview.hpp +++ b/firmware/application/external/protoview/ui_protoview.hpp @@ -69,7 +69,7 @@ class ProtoView : public View { {21 * 8, 0, 6 * 8, 4}}; AudioVolumeField field_volume{ - {28 * 8, 0 * 16}}; + {screen_width - 2 * 8, 0 * 16}}; RxFrequencyField field_frequency{ {0 * 8, 0 * 16}, diff --git a/firmware/application/external/scanner/ui_scanner.hpp b/firmware/application/external/scanner/ui_scanner.hpp index 71ff204ab..bb5821907 100644 --- a/firmware/application/external/scanner/ui_scanner.hpp +++ b/firmware/application/external/scanner/ui_scanner.hpp @@ -217,7 +217,7 @@ class ScannerView : public View { NumberField field_lock_wait{ // Signal-Lost wait timer - time to wait before moving on after losing signal lock - {28 * 8, 1 * 16}, + {screen_width - 2 * 8, 1 * 16}, 2, {0, 99}, 1, diff --git a/firmware/application/external/spainter/ui_spectrum_painter.hpp b/firmware/application/external/spainter/ui_spectrum_painter.hpp index 72ee260e4..4efde91ed 100644 --- a/firmware/application/external/spainter/ui_spectrum_painter.hpp +++ b/firmware/application/external/spainter/ui_spectrum_painter.hpp @@ -121,7 +121,7 @@ class SpectrumPainterView : public View { true}; ImageButton button_play{ - {28 * 8, footer_location + 1 * 16, 2 * 8, 1 * 16}, + {screen_width - 2 * 8, footer_location + 1 * 16, 2 * 8, 1 * 16}, &bitmap_play, Theme::getInstance()->fg_green->foreground, Theme::getInstance()->fg_green->background}; diff --git a/firmware/application/external/tpmsrx/tpms_app.hpp b/firmware/application/external/tpmsrx/tpms_app.hpp index 8746711fe..05766441b 100644 --- a/firmware/application/external/tpmsrx/tpms_app.hpp +++ b/firmware/application/external/tpmsrx/tpms_app.hpp @@ -138,7 +138,7 @@ class TPMSAppView : public View { }; AudioVolumeField field_volume{ - {28 * 8, 0 * 16}}; + {screen_width - 2 * 8, 0 * 16}}; Channel channel{ {21 * 8, 5, 6 * 8, 4}, diff --git a/firmware/application/external/wav_view/ui_view_wav.hpp b/firmware/application/external/wav_view/ui_view_wav.hpp index ecf62e447..a358c30db 100644 --- a/firmware/application/external/wav_view/ui_view_wav.hpp +++ b/firmware/application/external/wav_view/ui_view_wav.hpp @@ -118,7 +118,7 @@ class ViewWavView : public View { Theme::getInstance()->fg_green->foreground, Theme::getInstance()->fg_green->background}; AudioVolumeField field_volume{ - {28 * 8, 18 * 16}}; + {screen_width - 2 * 8, 18 * 16}}; Waveform waveform{ {0, 5 * 16, screen_width, 64}, diff --git a/firmware/application/external/wefax_rx/ui_wefax_rx.hpp b/firmware/application/external/wefax_rx/ui_wefax_rx.hpp index a3de3a004..36da65e2a 100644 --- a/firmware/application/external/wefax_rx/ui_wefax_rx.hpp +++ b/firmware/application/external/wefax_rx/ui_wefax_rx.hpp @@ -92,7 +92,7 @@ class WeFaxRxView : public View { RSSI rssi{ {21 * 8, 0, 6 * 8, 4}}; AudioVolumeField field_volume{ - {28 * 8, 0 * 16}}; + {screen_width - 2 * 8, 0 * 16}}; RxFrequencyField field_frequency{ {0 * 8, 0 * 16},