mirror
/
OpenRTX
kopia lustrzana https://github.com/OpenRTX/OpenRTX
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Platform: Add frequency limit check

replace/0db23a58de0607abe6e18f6621af289d2a7e8c0f
Federico Amedeo Izzo 2020-12-31 14:51:19 +01:00
rodzic c2f331467c
commit 7a9135d746
7 zmienionych plików z 107 dodań i 14 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

61
openrtx/src/ui.c
Wyświetl plik

@ -552,6 +552,20 @@ freq_t _ui_freq_add_digit(freq_t freq, uint8_t pos, uint8_t number)
return freq += number * coefficient;
}
bool _ui_freq_check_limits(freq_t freq)
{
bool valid = false;
#ifdef BAND_VHF
if(freq >= FREQ_LIMIT_VHF_LO && freq <= FREQ_LIMIT_VHF_HI)
valid = true;
#endif
#ifdef BAND_UHF
if(freq >= FREQ_LIMIT_UHF_LO && freq <= FREQ_LIMIT_UHF_HI)
valid = true;
#endif
return valid;
}
void ui_updateFSM(event_t event, bool *sync_rtx)
{
// Check if battery has enough charge to operate
@ -577,17 +591,25 @@ void ui_updateFSM(event_t event, bool *sync_rtx)
case VFO_MAIN:
if(msg.keys & KEY_UP)
{
// Advance TX and RX frequency of 12.5KHz
state.channel.rx_frequency += 12500;
state.channel.tx_frequency += 12500;
*sync_rtx = true;
// Increment TX and RX frequency of 12.5KHz
if(_ui_freq_check_limits(state.channel.rx_frequency + 12500) &&
_ui_freq_check_limits(state.channel.tx_frequency + 12500))
{
state.channel.rx_frequency += 12500;
state.channel.tx_frequency += 12500;
*sync_rtx = true;
}
}
else if(msg.keys & KEY_DOWN)
{
// Advance TX and RX frequency of 12.5KHz
state.channel.rx_frequency -= 12500;
state.channel.tx_frequency -= 12500;
*sync_rtx = true;
// Decrement TX and RX frequency of 12.5KHz
if(_ui_freq_check_limits(state.channel.rx_frequency - 12500) &&
_ui_freq_check_limits(state.channel.tx_frequency - 12500))
{
state.channel.rx_frequency -= 12500;
state.channel.tx_frequency -= 12500;
*sync_rtx = true;
}
}
else if(msg.keys & KEY_ENTER)
// Open Menu
@ -623,14 +645,21 @@ void ui_updateFSM(event_t event, bool *sync_rtx)
// If TX frequency was not set, TX = RX
if(new_tx_frequency == 0)
{
state.channel.rx_frequency = new_rx_frequency;
state.channel.tx_frequency = new_rx_frequency;
if(_ui_freq_check_limits(new_rx_frequency))
{
state.channel.rx_frequency = new_rx_frequency;
state.channel.tx_frequency = new_rx_frequency;
}
}
// Otherwise set both frequencies
else
{
state.channel.rx_frequency = new_rx_frequency;
state.channel.tx_frequency = new_tx_frequency;
if(_ui_freq_check_limits(new_rx_frequency) &&
_ui_freq_check_limits(new_tx_frequency))
{
state.channel.rx_frequency = new_rx_frequency;
state.channel.tx_frequency = new_tx_frequency;
}
}
state.ui_screen = VFO_MAIN;
}
@ -679,8 +708,12 @@ void ui_updateFSM(event_t event, bool *sync_rtx)
if(input_position >= (FREQ_DIGITS))
{
// Save both inserted frequencies
state.channel.rx_frequency = new_rx_frequency;
state.channel.tx_frequency = new_tx_frequency;
if(_ui_freq_check_limits(new_rx_frequency) &&
_ui_freq_check_limits(new_tx_frequency))
{
state.channel.rx_frequency = new_rx_frequency;
state.channel.tx_frequency = new_tx_frequency;
}
state.ui_screen = VFO_MAIN;
}
}

10
platform/targets/DM-1801/hwconfig.h
Wyświetl plik

@ -23,6 +23,16 @@
#include "MK22F51212.h"
/* Supported radio bands */
#define BAND_VHF
#define BAND_UHF
/* Band limits in Hz */
#define FREQ_LIMIT_VHF_LO 136000000
#define FREQ_LIMIT_VHF_HI 136000000
#define FREQ_LIMIT_UHF_LO 400000000
#define FREQ_LIMIT_UHF_HI 470000000
/* Screen dimensions */
#define SCREEN_WIDTH 128
#define SCREEN_HEIGHT 64

10
platform/targets/GD77/hwconfig.h
Wyświetl plik

@ -23,6 +23,16 @@
#include "MK22F51212.h"
/* Supported radio bands */
#define BAND_VHF
#define BAND_UHF
/* Band limits in Hz */
#define FREQ_LIMIT_VHF_LO 136000000
#define FREQ_LIMIT_VHF_HI 136000000
#define FREQ_LIMIT_UHF_LO 400000000
#define FREQ_LIMIT_UHF_HI 470000000
/* Screen dimensions */
#define SCREEN_WIDTH 128
#define SCREEN_HEIGHT 64

10
platform/targets/MD-380/hwconfig.h
Wyświetl plik

@ -22,6 +22,16 @@
#include <stm32f4xx.h>
/* Supported radio bands */
#define BAND_VHF
#define BAND_UHF
/* Band limits in Hz */
#define FREQ_LIMIT_VHF_LO 136000000
#define FREQ_LIMIT_VHF_HI 136000000
#define FREQ_LIMIT_UHF_LO 400000000
#define FREQ_LIMIT_UHF_HI 480000000
/* Screen dimensions */
#define SCREEN_WIDTH 160
#define SCREEN_HEIGHT 128

10
platform/targets/MD-390/hwconfig.h
Wyświetl plik

@ -22,6 +22,16 @@
#include <stm32f4xx.h>
/* Supported radio bands */
#define BAND_VHF
#define BAND_UHF
/* Band limits in Hz */
#define FREQ_LIMIT_VHF_LO 136000000
#define FREQ_LIMIT_VHF_HI 136000000
#define FREQ_LIMIT_UHF_LO 400000000
#define FREQ_LIMIT_UHF_HI 480000000
/* Screen dimensions */
#define SCREEN_WIDTH 160
#define SCREEN_HEIGHT 128

10
platform/targets/MD-UV380/hwconfig.h
Wyświetl plik

@ -22,6 +22,16 @@
#include <stm32f4xx.h>
/* Supported radio bands */
#define BAND_VHF
#define BAND_UHF
/* Band limits in Hz */
#define FREQ_LIMIT_VHF_LO 136000000
#define FREQ_LIMIT_VHF_HI 136000000
#define FREQ_LIMIT_UHF_LO 400000000
#define FREQ_LIMIT_UHF_HI 480000000
/* Screen dimensions */
#define SCREEN_WIDTH 160
#define SCREEN_HEIGHT 128

10
platform/targets/linux/hwconfig.h
Wyświetl plik

@ -18,6 +18,16 @@
#define PLATFORM_LINUX
/* Supported radio bands */
#define BAND_VHF
#define BAND_UHF
/* Band limits in Hz */
#define FREQ_LIMIT_VHF_LO 136000000
#define FREQ_LIMIT_VHF_HI 136000000
#define FREQ_LIMIT_UHF_LO 400000000
#define FREQ_LIMIT_UHF_HI 480000000
/* Battery type */
#define BAT_LIPO_2S