fleg
/
OpenRTX
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Using Kconfig-style #defines for GPS, RTC and knob type description

This commit is contained in:
Silvano Seva 2023-12-26 10:50:01 +01:00
parent cc27cc28a4
commit 8bc867beae
20 changed files with 79 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meson.build
View File

@ -291,9 +291,9 @@ linux_def += openrtx_def
# #
linux_default_src = linux_src + ui_src_default linux_default_src = linux_src + ui_src_default
linux_default_def = linux_def + {'CONFIG_SCREEN_WIDTH': '160', 'CONFIG_SCREEN_HEIGHT': '128', 'CONFIG_PIX_FMT_RGB565': '', linux_default_def = linux_def + {'CONFIG_SCREEN_WIDTH': '160', 'CONFIG_SCREEN_HEIGHT': '128', 'CONFIG_PIX_FMT_RGB565': '',
'GPS_PRESENT': '', 'RTC_PRESENT': ''} 'CONFIG_GPS': '', 'CONFIG_RTC': ''}
linux_small_def = linux_def + {'CONFIG_SCREEN_WIDTH': '128', 'CONFIG_SCREEN_HEIGHT': '64', 'CONFIG_PIX_FMT_BW': '', linux_small_def = linux_def + {'CONFIG_SCREEN_WIDTH': '128', 'CONFIG_SCREEN_HEIGHT': '64', 'CONFIG_PIX_FMT_BW': '',
'GPS_PRESENT': '', 'RTC_PRESENT': ''} 'CONFIG_GPS': '', 'CONFIG_RTC': ''}
# #
# Module17 UI # Module17 UI

4
openrtx/include/core/voicePromptUtils.h
View File

@ -156,7 +156,7 @@ void vp_announceM17Info(const channel_t* channel, bool isEditing,
/** /**
* *
*/ */
#ifdef GPS_PRESENT #ifdef CONFIG_GPS
void vp_announceGPSInfo(vpGPSInfoFlags_t gpsInfoFlags); void vp_announceGPSInfo(vpGPSInfoFlags_t gpsInfoFlags);
#endif #endif
@ -178,7 +178,7 @@ void vp_announceRestoreScreen();
/** /**
* *
*/ */
#ifdef RTC_PRESENT #ifdef CONFIG_RTC
void vp_announceSettingsTimeDate(); void vp_announceSettingsTimeDate();
#endif #endif

2
openrtx/include/interfaces/platform.h
View File

@ -144,7 +144,7 @@ void platform_beepStart(uint16_t freq);
*/ */
void platform_beepStop(); void platform_beepStop();
#ifdef RTC_PRESENT #ifdef CONFIG_RTC
/** /**
* Get current UTC date and time. * Get current UTC date and time.
* @return structure of type datetime_t with current clock and calendar values. * @return structure of type datetime_t with current clock and calendar values.

10
openrtx/include/ui/ui_default.h
View File

@ -80,7 +80,7 @@ enum menuItems
M_BANK = 0, M_BANK = 0,
M_CHANNEL, M_CHANNEL,
M_CONTACTS, M_CONTACTS,
#ifdef GPS_PRESENT #ifdef CONFIG_GPS
M_GPS, M_GPS,
#endif #endif
M_SETTINGS, M_SETTINGS,
@ -91,10 +91,10 @@ enum menuItems
enum settingsItems enum settingsItems
{ {
S_DISPLAY = 0, S_DISPLAY = 0,
#ifdef RTC_PRESENT #ifdef CONFIG_RTC
S_TIMEDATE, S_TIMEDATE,
#endif #endif
#ifdef GPS_PRESENT #ifdef CONFIG_GPS
S_GPS, S_GPS,
#endif #endif
S_RADIO, S_RADIO,
@ -120,7 +120,7 @@ enum displayItems
D_TIMER, D_TIMER,
}; };
#ifdef GPS_PRESENT #ifdef CONFIG_GPS
enum settingsGPSItems enum settingsGPSItems
{ {
G_ENABLED = 0, G_ENABLED = 0,
@ -217,7 +217,7 @@ typedef struct ui_state_t
freq_t new_tx_frequency; freq_t new_tx_frequency;
char new_rx_freq_buf[14]; char new_rx_freq_buf[14];
char new_tx_freq_buf[14]; char new_tx_freq_buf[14];
#ifdef RTC_PRESENT #ifdef CONFIG_RTC
// Variables used for Time & Date input // Variables used for Time & Date input
datetime_t new_timedate; datetime_t new_timedate;
char new_date_buf[9]; char new_date_buf[9];

10
openrtx/include/ui/ui_mod17.h
View File

@ -78,7 +78,7 @@ enum SetRxTx
enum menuItems enum menuItems
{ {
M_SETTINGS = 0, M_SETTINGS = 0,
#ifdef GPS_PRESENT #ifdef CONFIG_GPS
M_GPS, M_GPS,
#endif #endif
M_INFO, M_INFO,
@ -89,10 +89,10 @@ enum menuItems
enum settingsItems enum settingsItems
{ {
S_DISPLAY = 0 S_DISPLAY = 0
#ifdef RTC_PRESENT #ifdef CONFIG_RTC
,S_TIMEDATE ,S_TIMEDATE
#endif #endif
#ifdef GPS_PRESENT #ifdef CONFIG_GPS
,S_GPS ,S_GPS
#endif #endif
,S_M17 ,S_M17
@ -117,7 +117,7 @@ enum displayItems
#endif #endif
}; };
#ifdef GPS_PRESENT #ifdef CONFIG_GPS
enum settingsGPSItems enum settingsGPSItems
{ {
G_ENABLED = 0, G_ENABLED = 0,
@ -209,7 +209,7 @@ typedef struct ui_state_t
freq_t new_tx_frequency; freq_t new_tx_frequency;
char new_rx_freq_buf[14]; char new_rx_freq_buf[14];
char new_tx_freq_buf[14]; char new_tx_freq_buf[14];
#ifdef RTC_PRESENT #ifdef CONFIG_RTC
// Variables used for Time & Date input // Variables used for Time & Date input
datetime_t new_timedate; datetime_t new_timedate;
char new_date_buf[9]; char new_date_buf[9];

4
openrtx/src/core/gps.c
View File

@ -31,7 +31,7 @@
static char sentence[2*MINMEA_MAX_LENGTH]; static char sentence[2*MINMEA_MAX_LENGTH];
static bool gpsEnabled = false; static bool gpsEnabled = false;
static bool readNewSentence = true; static bool readNewSentence = true;
#ifdef RTC_PRESENT #ifdef CONFIG_RTC
static bool isRtcSyncronised = false; static bool isRtcSyncronised = false;
#endif #endif
@ -191,7 +191,7 @@ void gps_task()
pthread_mutex_unlock(&state_mutex); pthread_mutex_unlock(&state_mutex);
// Synchronize RTC with GPS UTC clock, only when fix is done // Synchronize RTC with GPS UTC clock, only when fix is done
#ifdef RTC_PRESENT #ifdef CONFIG_RTC
if(state.gps_set_time) if(state.gps_set_time)
{ {
if((sId == MINMEA_SENTENCE_RMC) && if((sId == MINMEA_SENTENCE_RMC) &&

2
openrtx/src/core/openrtx.c
View File

@ -74,7 +74,7 @@ void openrtx_init()
sleepFor(0u, 30u); sleepFor(0u, 30u);
display_setBacklightLevel(state.settings.brightness); display_setBacklightLevel(state.settings.brightness);
#if defined(GPS_PRESENT) #if defined(CONFIG_GPS)
// Detect and initialise GPS // Detect and initialise GPS
state.gpsDetected = gps_detect(1000); state.gpsDetected = gps_detect(1000);
if(state.gpsDetected) gps_init(9600); if(state.gpsDetected) gps_init(9600);

4
openrtx/src/core/state.c
View File

@ -64,7 +64,7 @@ void state_init()
/* /*
* Initialise remaining fields * Initialise remaining fields
*/ */
#ifdef RTC_PRESENT #ifdef CONFIG_RTC
state.time = platform_getCurrentTime(); state.time = platform_getCurrentTime();
#endif #endif
state.v_bat = platform_getVbat(); state.v_bat = platform_getVbat();
@ -127,7 +127,7 @@ void state_task()
state.charge = battery_getCharge(state.v_bat); state.charge = battery_getCharge(state.v_bat);
state.rssi = rtx_getRssi(); state.rssi = rtx_getRssi();
#ifdef RTC_PRESENT #ifdef CONFIG_RTC
state.time = platform_getCurrentTime(); state.time = platform_getCurrentTime();
#endif #endif

6
openrtx/src/core/threads.c
View File

@ -33,7 +33,7 @@
#include <utils.h> #include <utils.h>
#include <input.h> #include <input.h>
#include <backup.h> #include <backup.h>
#ifdef GPS_PRESENT #ifdef CONFIG_GPS
#include <peripherals/gps.h> #include <peripherals/gps.h>
#include <gps.h> #include <gps.h>
#endif #endif
@ -156,7 +156,7 @@ void *main_thread(void *arg)
pthread_mutex_unlock(&state_mutex); pthread_mutex_unlock(&state_mutex);
// Run GPS task // Run GPS task
#if defined(GPS_PRESENT) && !defined(MD3x0_ENABLE_DBG) #if defined(CONFIG_GPS) && !defined(MD3x0_ENABLE_DBG)
gps_task(); gps_task();
#endif #endif
@ -168,7 +168,7 @@ void *main_thread(void *arg)
sleepUntil(time); sleepUntil(time);
} }
#if defined(GPS_PRESENT) #if defined(CONFIG_GPS)
gps_terminate(); gps_terminate();
#endif #endif

12
openrtx/src/core/voicePromptUtils.c
View File

@ -549,7 +549,7 @@ void vp_announceM17Info(const channel_t* channel, bool isEditing,
playIfNeeded(flags); playIfNeeded(flags);
} }
#ifdef GPS_PRESENT #ifdef CONFIG_GPS
// cardinal point plus or minus this value is still considered cardinal point. // cardinal point plus or minus this value is still considered cardinal point.
#define margin 3 #define margin 3
@ -725,7 +725,7 @@ void vp_announceGPSInfo(vpGPSInfoFlags_t gpsInfoFlags)
vp_play(); vp_play();
} }
#endif // GPS_PRESENT #endif // CONFIG_GPS
void vp_announceAboutScreen() void vp_announceAboutScreen()
{ {
@ -770,7 +770,7 @@ void vp_announceRestoreScreen()
vp_play(); vp_play();
} }
#ifdef RTC_PRESENT #ifdef CONFIG_RTC
void vp_announceSettingsTimeDate() void vp_announceSettingsTimeDate()
{ {
vp_flush(); vp_flush();
@ -796,7 +796,7 @@ void vp_announceSettingsTimeDate()
vp_play(); vp_play();
} }
#endif // RTC_PRESENT #endif // CONFIG_RTC
void vp_announceSettingsVoiceLevel(const vpQueueFlags_t flags) void vp_announceSettingsVoiceLevel(const vpQueueFlags_t flags)
{ {
@ -869,7 +869,7 @@ void vp_announceScreen(uint8_t ui_screen)
state.bank, infoFlags); state.bank, infoFlags);
break; break;
#ifdef GPS_PRESENT #ifdef CONFIG_GPS
case MENU_GPS: case MENU_GPS:
vp_announceGPSInfo(vpGPSAll); vp_announceGPSInfo(vpGPSAll);
break; break;
@ -887,7 +887,7 @@ void vp_announceScreen(uint8_t ui_screen)
vp_announceAboutScreen(); vp_announceAboutScreen();
break; break;
#ifdef RTC_PRESENT #ifdef CONFIG_RTC
case SETTINGS_TIMEDATE: case SETTINGS_TIMEDATE:
vp_announceSettingsTimeDate(); vp_announceSettingsTimeDate();
break; break;

48
openrtx/src/ui/default/ui.c
View File

@ -94,7 +94,7 @@ extern void _ui_drawMenuTop(ui_state_t* ui_state);
extern void _ui_drawMenuBank(ui_state_t* ui_state); extern void _ui_drawMenuBank(ui_state_t* ui_state);
extern void _ui_drawMenuChannel(ui_state_t* ui_state); extern void _ui_drawMenuChannel(ui_state_t* ui_state);
extern void _ui_drawMenuContacts(ui_state_t* ui_state); extern void _ui_drawMenuContacts(ui_state_t* ui_state);
#ifdef GPS_PRESENT #ifdef CONFIG_GPS
extern void _ui_drawMenuGPS(); extern void _ui_drawMenuGPS();
extern void _ui_drawSettingsGPS(ui_state_t* ui_state); extern void _ui_drawSettingsGPS(ui_state_t* ui_state);
#endif #endif
@ -105,7 +105,7 @@ extern void _ui_drawMenuBackup(ui_state_t* ui_state);
extern void _ui_drawMenuRestore(ui_state_t* ui_state); extern void _ui_drawMenuRestore(ui_state_t* ui_state);
extern void _ui_drawMenuInfo(ui_state_t* ui_state); extern void _ui_drawMenuInfo(ui_state_t* ui_state);
extern void _ui_drawMenuAbout(); extern void _ui_drawMenuAbout();
#ifdef RTC_PRESENT #ifdef CONFIG_RTC
extern void _ui_drawSettingsTimeDate(); extern void _ui_drawSettingsTimeDate();
extern void _ui_drawSettingsTimeDateSet(ui_state_t* ui_state); extern void _ui_drawSettingsTimeDateSet(ui_state_t* ui_state);
#endif #endif
@ -122,7 +122,7 @@ const char *menu_items[] =
"Banks", "Banks",
"Channels", "Channels",
"Contacts", "Contacts",
#ifdef GPS_PRESENT #ifdef CONFIG_GPS
"GPS", "GPS",
#endif #endif
"Settings", "Settings",
@ -133,10 +133,10 @@ const char *menu_items[] =
const char *settings_items[] = const char *settings_items[] =
{ {
"Display", "Display",
#ifdef RTC_PRESENT #ifdef CONFIG_RTC
"Time & Date", "Time & Date",
#endif #endif
#ifdef GPS_PRESENT #ifdef CONFIG_GPS
"GPS", "GPS",
#endif #endif
"Radio", "Radio",
@ -156,7 +156,7 @@ const char *display_items[] =
"Timer" "Timer"
}; };
#ifdef GPS_PRESENT #ifdef CONFIG_GPS
const char *settings_gps_items[] = const char *settings_gps_items[] =
{ {
"GPS Enabled", "GPS Enabled",
@ -253,7 +253,7 @@ static const char *symbols_ITU_T_E161_callsign[] =
const uint8_t menu_num = sizeof(menu_items)/sizeof(menu_items[0]); const uint8_t menu_num = sizeof(menu_items)/sizeof(menu_items[0]);
const uint8_t settings_num = sizeof(settings_items)/sizeof(settings_items[0]); const uint8_t settings_num = sizeof(settings_items)/sizeof(settings_items[0]);
const uint8_t display_num = sizeof(display_items)/sizeof(display_items[0]); const uint8_t display_num = sizeof(display_items)/sizeof(display_items[0]);
#ifdef GPS_PRESENT #ifdef CONFIG_GPS
const uint8_t settings_gps_num = sizeof(settings_gps_items)/sizeof(settings_gps_items[0]); const uint8_t settings_gps_num = sizeof(settings_gps_items)/sizeof(settings_gps_items[0]);
#endif #endif
const uint8_t settings_radio_num = sizeof(settings_radio_items)/sizeof(settings_radio_items[0]); const uint8_t settings_radio_num = sizeof(settings_radio_items)/sizeof(settings_radio_items[0]);
@ -506,7 +506,7 @@ static freq_t _ui_freq_add_digit(freq_t freq, uint8_t pos, uint8_t number)
return freq += number * coefficient; return freq += number * coefficient;
} }
#ifdef RTC_PRESENT #ifdef CONFIG_RTC
static void _ui_timedate_add_digit(datetime_t *timedate, uint8_t pos, static void _ui_timedate_add_digit(datetime_t *timedate, uint8_t pos,
uint8_t number) uint8_t number)
{ {
@ -1022,9 +1022,9 @@ static void _ui_fsm_menuMacro(kbd_msg_t msg, bool *sync_rtx)
if(msg.keys & KEY_LEFT || msg.keys & KEY_DOWN || msg.keys & KNOB_LEFT) if(msg.keys & KEY_LEFT || msg.keys & KEY_DOWN || msg.keys & KNOB_LEFT)
#endif // PLATFORM_TTWRPLUS #endif // PLATFORM_TTWRPLUS
{ {
#ifdef HAS_ABSOLUTE_KNOB // If the radio has an absolute position knob #ifdef CONFIG_KNOB_ABSOLUTE // If the radio has an absolute position knob
state.settings.sqlLevel = platform_getChSelector() - 1; state.settings.sqlLevel = platform_getChSelector() - 1;
#endif // HAS_ABSOLUTE_KNOB #endif // CONFIG_KNOB_ABSOLUTE
if(state.settings.sqlLevel > 0) if(state.settings.sqlLevel > 0)
{ {
state.settings.sqlLevel -= 1; state.settings.sqlLevel -= 1;
@ -1039,7 +1039,7 @@ static void _ui_fsm_menuMacro(kbd_msg_t msg, bool *sync_rtx)
else if(msg.keys & KEY_RIGHT || msg.keys & KEY_UP || msg.keys & KNOB_RIGHT) else if(msg.keys & KEY_RIGHT || msg.keys & KEY_UP || msg.keys & KNOB_RIGHT)
#endif // PLATFORM_TTWRPLUS #endif // PLATFORM_TTWRPLUS
{ {
#ifdef HAS_ABSOLUTE_KNOB #ifdef CONFIG_KNOB_ABSOLUTE
state.settings.sqlLevel = platform_getChSelector() - 1; state.settings.sqlLevel = platform_getChSelector() - 1;
#endif #endif
if(state.settings.sqlLevel < 15) if(state.settings.sqlLevel < 15)
@ -1274,7 +1274,7 @@ void ui_saveState()
last_state = state; last_state = state;
} }
#ifdef GPS_PRESENT #ifdef CONFIG_GPS
static float priorGPSSpeed = 0; static float priorGPSSpeed = 0;
static float priorGPSAltitude = 0; static float priorGPSAltitude = 0;
static float priorGPSDirection = 500; // impossible value init. static float priorGPSDirection = 500; // impossible value init.
@ -1338,7 +1338,7 @@ static vpGPSInfoFlags_t GetGPSDirectionOrSpeedChanged()
return whatChanged; return whatChanged;
} }
#endif // GPS_PRESENT #endif // CONFIG_GPS
void ui_updateFSM(bool *sync_rtx) void ui_updateFSM(bool *sync_rtx)
{ {
@ -1776,7 +1776,7 @@ void ui_updateFSM(bool *sync_rtx)
case M_CONTACTS: case M_CONTACTS:
state.ui_screen = MENU_CONTACTS; state.ui_screen = MENU_CONTACTS;
break; break;
#ifdef GPS_PRESENT #ifdef CONFIG_GPS
case M_GPS: case M_GPS:
state.ui_screen = MENU_GPS; state.ui_screen = MENU_GPS;
break; break;
@ -1869,7 +1869,7 @@ void ui_updateFSM(bool *sync_rtx)
else if(msg.keys & KEY_ESC) else if(msg.keys & KEY_ESC)
_ui_menuBack(MENU_TOP); _ui_menuBack(MENU_TOP);
break; break;
#ifdef GPS_PRESENT #ifdef CONFIG_GPS
// GPS menu screen // GPS menu screen
case MENU_GPS: case MENU_GPS:
if ((msg.keys & KEY_F1) && (state.settings.vpLevel > vpBeep)) if ((msg.keys & KEY_F1) && (state.settings.vpLevel > vpBeep))
@ -1898,12 +1898,12 @@ void ui_updateFSM(bool *sync_rtx)
case S_DISPLAY: case S_DISPLAY:
state.ui_screen = SETTINGS_DISPLAY; state.ui_screen = SETTINGS_DISPLAY;
break; break;
#ifdef RTC_PRESENT #ifdef CONFIG_RTC
case S_TIMEDATE: case S_TIMEDATE:
state.ui_screen = SETTINGS_TIMEDATE; state.ui_screen = SETTINGS_TIMEDATE;
break; break;
#endif #endif
#ifdef GPS_PRESENT #ifdef CONFIG_GPS
case S_GPS: case S_GPS:
state.ui_screen = SETTINGS_GPS; state.ui_screen = SETTINGS_GPS;
break; break;
@ -1974,7 +1974,7 @@ void ui_updateFSM(bool *sync_rtx)
if(msg.keys & KEY_ESC) if(msg.keys & KEY_ESC)
_ui_menuBack(MENU_TOP); _ui_menuBack(MENU_TOP);
break; break;
#ifdef RTC_PRESENT #ifdef CONFIG_RTC
// Time&Date settings screen // Time&Date settings screen
case SETTINGS_TIMEDATE: case SETTINGS_TIMEDATE:
if(msg.keys & KEY_ENTER) if(msg.keys & KEY_ENTER)
@ -2084,7 +2084,7 @@ void ui_updateFSM(bool *sync_rtx)
else if(msg.keys & KEY_ESC) else if(msg.keys & KEY_ESC)
_ui_menuBack(MENU_SETTINGS); _ui_menuBack(MENU_SETTINGS);
break; break;
#ifdef GPS_PRESENT #ifdef CONFIG_GPS
case SETTINGS_GPS: case SETTINGS_GPS:
if(msg.keys & KEY_LEFT || msg.keys & KEY_RIGHT || if(msg.keys & KEY_LEFT || msg.keys & KEY_RIGHT ||
(ui_state.edit_mode && (ui_state.edit_mode &&
@ -2428,7 +2428,7 @@ void ui_updateFSM(bool *sync_rtx)
} }
else if(event.type == EVENT_STATUS) else if(event.type == EVENT_STATUS)
{ {
#ifdef GPS_PRESENT #ifdef CONFIG_GPS
if ((state.ui_screen == MENU_GPS) && if ((state.ui_screen == MENU_GPS) &&
(!vp_isPlaying()) && (!vp_isPlaying()) &&
(state.settings.vpLevel > vpLow) && (state.settings.vpLevel > vpLow) &&
@ -2438,7 +2438,7 @@ void ui_updateFSM(bool *sync_rtx)
if (whatChanged != vpGPSNone) if (whatChanged != vpGPSNone)
vp_announceGPSInfo(whatChanged); vp_announceGPSInfo(whatChanged);
} }
#endif // GPS_PRESENT #endif // CONFIG_GPS
if (txOngoing || rtx_rxSquelchOpen()) if (txOngoing || rtx_rxSquelchOpen())
{ {
@ -2496,7 +2496,7 @@ bool ui_updateGUI()
case MENU_CONTACTS: case MENU_CONTACTS:
_ui_drawMenuContacts(&ui_state); _ui_drawMenuContacts(&ui_state);
break; break;
#ifdef GPS_PRESENT #ifdef CONFIG_GPS
// GPS menu screen // GPS menu screen
case MENU_GPS: case MENU_GPS:
_ui_drawMenuGPS(); _ui_drawMenuGPS();
@ -2526,7 +2526,7 @@ bool ui_updateGUI()
case MENU_ABOUT: case MENU_ABOUT:
_ui_drawMenuAbout(); _ui_drawMenuAbout();
break; break;
#ifdef RTC_PRESENT #ifdef CONFIG_RTC
// Time&Date settings screen // Time&Date settings screen
case SETTINGS_TIMEDATE: case SETTINGS_TIMEDATE:
_ui_drawSettingsTimeDate(); _ui_drawSettingsTimeDate();
@ -2540,7 +2540,7 @@ bool ui_updateGUI()
case SETTINGS_DISPLAY: case SETTINGS_DISPLAY:
_ui_drawSettingsDisplay(&ui_state); _ui_drawSettingsDisplay(&ui_state);
break; break;
#ifdef GPS_PRESENT #ifdef CONFIG_GPS
// GPS settings screen // GPS settings screen
case SETTINGS_GPS: case SETTINGS_GPS:
_ui_drawSettingsGPS(&ui_state); _ui_drawSettingsGPS(&ui_state);

2
openrtx/src/ui/default/ui_main.c
View File

@ -36,7 +36,7 @@ void _ui_drawMainBackground()
void _ui_drawMainTop(ui_state_t * ui_state) void _ui_drawMainTop(ui_state_t * ui_state)
{ {
#ifdef RTC_PRESENT #ifdef CONFIG_RTC
// Print clock on top bar // Print clock on top bar
datetime_t local_time = utcToLocalTime(last_state.time, datetime_t local_time = utcToLocalTime(last_state.time,
last_state.settings.utc_timezone); last_state.settings.utc_timezone);

8
openrtx/src/ui/default/ui_menu.c
View File

@ -289,7 +289,7 @@ int _ui_getDisplayValueName(char *buf, uint8_t max_len, uint8_t index)
return 0; return 0;
} }
#ifdef GPS_PRESENT #ifdef CONFIG_GPS
int _ui_getSettingsGPSEntryName(char *buf, uint8_t max_len, uint8_t index) int _ui_getSettingsGPSEntryName(char *buf, uint8_t max_len, uint8_t index)
{ {
if(index >= settings_gps_num) return -1; if(index >= settings_gps_num) return -1;
@ -594,7 +594,7 @@ void _ui_drawMenuContacts(ui_state_t* ui_state)
_ui_drawMenuList(ui_state->menu_selected, _ui_getContactName); _ui_drawMenuList(ui_state->menu_selected, _ui_getContactName);
} }
#ifdef GPS_PRESENT #ifdef CONFIG_GPS
void _ui_drawMenuGPS() void _ui_drawMenuGPS()
{ {
char *fix_buf, *type_buf; char *fix_buf, *type_buf;
@ -808,7 +808,7 @@ void _ui_drawSettingsDisplay(ui_state_t* ui_state)
_ui_getDisplayValueName); _ui_getDisplayValueName);
} }
#ifdef GPS_PRESENT #ifdef CONFIG_GPS
void _ui_drawSettingsGPS(ui_state_t* ui_state) void _ui_drawSettingsGPS(ui_state_t* ui_state)
{ {
gfx_clearScreen(); gfx_clearScreen();
@ -822,7 +822,7 @@ void _ui_drawSettingsGPS(ui_state_t* ui_state)
} }
#endif #endif
#ifdef RTC_PRESENT #ifdef CONFIG_RTC
void _ui_drawSettingsTimeDate() void _ui_drawSettingsTimeDate()
{ {
gfx_clearScreen(); gfx_clearScreen();

16
openrtx/src/ui/module17/ui.c
View File

@ -44,14 +44,14 @@ extern void _ui_drawMainVFOInput(ui_state_t* ui_state);
extern void _ui_drawMainMEM(ui_state_t* ui_state); extern void _ui_drawMainMEM(ui_state_t* ui_state);
/* UI menu functions, their implementation is in "ui_menu.c" */ /* UI menu functions, their implementation is in "ui_menu.c" */
extern void _ui_drawMenuTop(ui_state_t* ui_state); extern void _ui_drawMenuTop(ui_state_t* ui_state);
#ifdef GPS_PRESENT #ifdef CONFIG_GPS
extern void _ui_drawMenuGPS(); extern void _ui_drawMenuGPS();
extern void _ui_drawSettingsGPS(ui_state_t* ui_state); extern void _ui_drawSettingsGPS(ui_state_t* ui_state);
#endif #endif
extern void _ui_drawMenuSettings(ui_state_t* ui_state); extern void _ui_drawMenuSettings(ui_state_t* ui_state);
extern void _ui_drawMenuInfo(ui_state_t* ui_state); extern void _ui_drawMenuInfo(ui_state_t* ui_state);
extern void _ui_drawMenuAbout(); extern void _ui_drawMenuAbout();
#ifdef RTC_PRESENT #ifdef CONFIG_RTC
extern void _ui_drawSettingsTimeDate(); extern void _ui_drawSettingsTimeDate();
extern void _ui_drawSettingsTimeDateSet(ui_state_t* ui_state); extern void _ui_drawSettingsTimeDateSet(ui_state_t* ui_state);
#endif #endif
@ -64,7 +64,7 @@ extern bool _ui_drawMacroMenu(ui_state_t* ui_state);
const char *menu_items[] = const char *menu_items[] =
{ {
"Settings", "Settings",
#ifdef GPS_PRESENT #ifdef CONFIG_GPS
"GPS", "GPS",
#endif #endif
"Info", "Info",
@ -75,10 +75,10 @@ const char *menu_items[] =
const char *settings_items[] = const char *settings_items[] =
{ {
"Display", "Display",
#ifdef RTC_PRESENT #ifdef CONFIG_RTC
"Time & Date", "Time & Date",
#endif #endif
#ifdef GPS_PRESENT #ifdef CONFIG_GPS
"GPS", "GPS",
#endif #endif
"M17", "M17",
@ -110,7 +110,7 @@ const char *module17_items[] =
"Mic Gain" "Mic Gain"
}; };
#ifdef GPS_PRESENT #ifdef CONFIG_GPS
const char *settings_gps_items[] = const char *settings_gps_items[] =
{ {
"GPS Enabled", "GPS Enabled",
@ -172,7 +172,7 @@ static const char symbols_callsign[] = "_ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890/-.
const uint8_t menu_num = sizeof(menu_items)/sizeof(menu_items[0]); const uint8_t menu_num = sizeof(menu_items)/sizeof(menu_items[0]);
const uint8_t settings_num = sizeof(settings_items)/sizeof(settings_items[0]); const uint8_t settings_num = sizeof(settings_items)/sizeof(settings_items[0]);
const uint8_t display_num = sizeof(display_items)/sizeof(display_items[0]); const uint8_t display_num = sizeof(display_items)/sizeof(display_items[0]);
#ifdef GPS_PRESENT #ifdef CONFIG_GPS
const uint8_t settings_gps_num = sizeof(settings_gps_items)/sizeof(settings_gps_items[0]); const uint8_t settings_gps_num = sizeof(settings_gps_items)/sizeof(settings_gps_items[0]);
#endif #endif
const uint8_t m17_num = sizeof(m17_items)/sizeof(m17_items[0]); const uint8_t m17_num = sizeof(m17_items)/sizeof(m17_items[0]);
@ -332,7 +332,7 @@ freq_t _ui_freq_add_digit(freq_t freq, uint8_t pos, uint8_t number)
return freq += number * coefficient; return freq += number * coefficient;
} }
#ifdef RTC_PRESENT #ifdef CONFIG_RTC
void _ui_timedate_add_digit(datetime_t *timedate, uint8_t pos, uint8_t number) void _ui_timedate_add_digit(datetime_t *timedate, uint8_t pos, uint8_t number)
{ {
switch(pos) switch(pos)

2
openrtx/src/ui/module17/ui_main.c
View File

@ -35,7 +35,7 @@ void _ui_drawMainBackground()
void _ui_drawMainTop() void _ui_drawMainTop()
{ {
#ifdef RTC_PRESENT #ifdef CONFIG_RTC
// Print clock on top bar // Print clock on top bar
datetime_t local_time = utcToLocalTime(last_state.time, datetime_t local_time = utcToLocalTime(last_state.time,
last_state.settings.utc_timezone); last_state.settings.utc_timezone);

8
openrtx/src/ui/module17/ui_menu.c
View File

@ -251,7 +251,7 @@ int _ui_getModule17ValueName(char *buf, uint8_t max_len, uint8_t index)
return 0; return 0;
} }
#ifdef GPS_PRESENT #ifdef CONFIG_GPS
int _ui_getSettingsGPSEntryName(char *buf, uint8_t max_len, uint8_t index) int _ui_getSettingsGPSEntryName(char *buf, uint8_t max_len, uint8_t index)
{ {
if(index >= settings_gps_num) return -1; if(index >= settings_gps_num) return -1;
@ -318,7 +318,7 @@ void _ui_drawMenuTop(ui_state_t* ui_state)
_ui_drawMenuList(ui_state->menu_selected, _ui_getMenuTopEntryName); _ui_drawMenuList(ui_state->menu_selected, _ui_getMenuTopEntryName);
} }
#ifdef GPS_PRESENT #ifdef CONFIG_GPS
void _ui_drawMenuGPS() void _ui_drawMenuGPS()
{ {
char *fix_buf, *type_buf; char *fix_buf, *type_buf;
@ -458,7 +458,7 @@ void _ui_drawSettingsDisplay(ui_state_t* ui_state)
_ui_getDisplayValueName); _ui_getDisplayValueName);
} }
#ifdef GPS_PRESENT #ifdef CONFIG_GPS
void _ui_drawSettingsGPS(ui_state_t* ui_state) void _ui_drawSettingsGPS(ui_state_t* ui_state)
{ {
gfx_clearScreen(); gfx_clearScreen();
@ -472,7 +472,7 @@ void _ui_drawSettingsGPS(ui_state_t* ui_state)
} }
#endif #endif
#ifdef RTC_PRESENT #ifdef CONFIG_RTC
void _ui_drawSettingsTimeDate() void _ui_drawSettingsTimeDate()
{ {
gfx_clearScreen(); gfx_clearScreen();

6
platform/targets/MD-3x0/hwconfig.h
View File

@ -28,13 +28,13 @@ extern "C" {
#endif #endif
/* Device has a working real time clock */ /* Device has a working real time clock */
#define RTC_PRESENT #define CONFIG_RTC
/* Device supports an optional GPS chip */ /* Device supports an optional GPS chip */
#define GPS_PRESENT #define CONFIG_GPS
/* Device has a channel selection knob */ /* Device has a channel selection knob */
#define HAS_ABSOLUTE_KNOB #define CONFIG_KNOB_ABSOLUTE
/* Screen dimensions */ /* Screen dimensions */
#define CONFIG_SCREEN_WIDTH 160 #define CONFIG_SCREEN_WIDTH 160

4
platform/targets/MD-9600/hwconfig.h
View File

@ -29,10 +29,10 @@ extern "C" {
#endif #endif
/* Device has a working real time clock */ /* Device has a working real time clock */
#define RTC_PRESENT #define CONFIG_RTC
/* Device supports an optional GPS chip */ /* Device supports an optional GPS chip */
#define GPS_PRESENT #define CONFIG_GPS
/* Screen dimensions */ /* Screen dimensions */
#define CONFIG_SCREEN_WIDTH 128 #define CONFIG_SCREEN_WIDTH 128

4
platform/targets/MD-UV3x0/hwconfig.h
View File

@ -28,10 +28,10 @@ extern "C" {
#endif #endif
/* Device has a working real time clock */ /* Device has a working real time clock */
#define RTC_PRESENT #define CONFIG_RTC
/* Device supports an optional GPS chip */ /* Device supports an optional GPS chip */
#define GPS_PRESENT #define CONFIG_GPS
/* Screen dimensions */ /* Screen dimensions */
#define CONFIG_SCREEN_WIDTH 160 #define CONFIG_SCREEN_WIDTH 160

2
platform/targets/ttwrplus/hwconfig.h
View File

@ -29,7 +29,7 @@
#define CONFIG_SCREEN_WIDTH DT_PROP(DISPLAY, width) #define CONFIG_SCREEN_WIDTH DT_PROP(DISPLAY, width)
#define CONFIG_SCREEN_HEIGHT DT_PROP(DISPLAY, height) #define CONFIG_SCREEN_HEIGHT DT_PROP(DISPLAY, height)
#define CONFIG_PIX_FMT_BW #define CONFIG_PIX_FMT_BW
#define GPS_PRESENT #define CONFIG_GPS
#define CONFIG_BAT_LIPO_1S #define CONFIG_BAT_LIPO_1S