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

Renamed 'HAS_GPS' and 'HAS_RTC' to, respectively, 'GPS_PRESENT' and 'RTC_PRESENT'

This commit is contained in:
Silvano Seva 2022-06-28 11:19:50 +02:00
parent 6d10f52b5b
commit 2fc89bf583
11 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,7 +75,7 @@ enum menuItems
M_BANK = 0, M_BANK = 0,
M_CHANNEL, M_CHANNEL,
M_CONTACTS, M_CONTACTS,
#ifdef HAS_GPS #ifdef GPS_PRESENT
M_GPS, M_GPS,
#endif #endif
M_SETTINGS, M_SETTINGS,
@ -87,10 +87,10 @@ enum menuItems
enum settingsItems enum settingsItems
{ {
S_DISPLAY = 0 S_DISPLAY = 0
#ifdef HAS_RTC #ifdef RTC_PRESENT
,S_TIMEDATE ,S_TIMEDATE
#endif #endif
#ifdef HAS_GPS #ifdef GPS_PRESENT
,S_GPS ,S_GPS
#endif #endif
,S_M17 ,S_M17
@ -112,7 +112,7 @@ enum displayItems
,D_TIMER ,D_TIMER
}; };
#ifdef HAS_GPS #ifdef GPS_PRESENT
enum settingsGPSItems enum settingsGPSItems
{ {
G_ENABLED = 0, G_ENABLED = 0,
@ -176,7 +176,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 HAS_RTC #ifdef RTC_PRESENT
// 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/state.c
View File

@ -74,7 +74,7 @@ void state_init()
/* /*
* Initialise remaining fields * Initialise remaining fields
*/ */
#ifdef HAS_RTC #ifdef RTC_PRESENT
state.time = rtc_getTime(); state.time = rtc_getTime();
#endif #endif
state.v_bat = platform_getVbat(); state.v_bat = platform_getVbat();
@ -118,7 +118,7 @@ void state_update()
state.charge = battery_getCharge(state.v_bat); state.charge = battery_getCharge(state.v_bat);
state.rssi = rtx_getRssi(); state.rssi = rtx_getRssi();
#ifdef HAS_RTC #ifdef RTC_PRESENT
state.time = rtc_getTime(); state.time = rtc_getTime();
#endif #endif
} }

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

@ -36,7 +36,7 @@
#include <string.h> #include <string.h>
#include <utils.h> #include <utils.h>
#include <input.h> #include <input.h>
#ifdef HAS_GPS #ifdef GPS_PRESENT
#include <interfaces/gps.h> #include <interfaces/gps.h>
#include <gps.h> #include <gps.h>
#endif #endif
@ -215,7 +215,7 @@ void *rtx_task(void *arg)
return NULL; return NULL;
} }
#if defined(HAS_GPS) && !defined(MD3x0_ENABLE_DBG) #if defined(GPS_PRESENT) && !defined(MD3x0_ENABLE_DBG)
/** /**
* \internal Task function for parsing GPS data and updating radio state. * \internal Task function for parsing GPS data and updating radio state.
*/ */
@ -283,7 +283,7 @@ void create_threads()
pthread_attr_setstacksize(&kbd_attr, KBD_TASK_STKSIZE); pthread_attr_setstacksize(&kbd_attr, KBD_TASK_STKSIZE);
pthread_create(&kbd_thread, &kbd_attr, kbd_task, NULL); pthread_create(&kbd_thread, &kbd_attr, kbd_task, NULL);
#if defined(HAS_GPS) && !defined(MD3x0_ENABLE_DBG) #if defined(GPS_PRESENT) && !defined(MD3x0_ENABLE_DBG)
// Create GPS thread // Create GPS thread
pthread_t gps_thread; pthread_t gps_thread;
pthread_attr_t gps_attr; pthread_attr_t gps_attr;

36
openrtx/src/ui/ui.c
View File

@ -68,7 +68,7 @@
#include <interfaces/platform.h> #include <interfaces/platform.h>
#include <interfaces/cps_io.h> #include <interfaces/cps_io.h>
#include <interfaces/nvmem.h> #include <interfaces/nvmem.h>
#ifdef HAS_GPS #ifdef GPS_PRESENT
#include <interfaces/gps.h> #include <interfaces/gps.h>
#endif #endif
#include <interfaces/delays.h> #include <interfaces/delays.h>
@ -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 HAS_GPS #ifdef GPS_PRESENT
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
@ -104,7 +104,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 HAS_RTC #ifdef RTC_PRESENT
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
@ -118,7 +118,7 @@ const char *menu_items[] =
"Banks", "Banks",
"Channels", "Channels",
"Contacts", "Contacts",
#ifdef HAS_GPS #ifdef GPS_PRESENT
"GPS", "GPS",
#endif #endif
"Settings", "Settings",
@ -130,10 +130,10 @@ const char *menu_items[] =
const char *settings_items[] = const char *settings_items[] =
{ {
"Display", "Display",
#ifdef HAS_RTC #ifdef RTC_PRESENT
"Time & Date", "Time & Date",
#endif #endif
#ifdef HAS_GPS #ifdef GPS_PRESENT
"GPS", "GPS",
#endif #endif
"M17", "M17",
@ -149,7 +149,7 @@ const char *display_items[] =
"Timer" "Timer"
}; };
#ifdef HAS_GPS #ifdef GPS_PRESENT
const char *settings_gps_items[] = const char *settings_gps_items[] =
{ {
"GPS Enabled", "GPS Enabled",
@ -222,7 +222,7 @@ 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 HAS_GPS #ifdef GPS_PRESENT
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 backup_restore_num = sizeof(backup_restore_items)/sizeof(backup_restore_items[0]); const uint8_t backup_restore_num = sizeof(backup_restore_items)/sizeof(backup_restore_items[0]);
@ -461,7 +461,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 HAS_RTC #ifdef RTC_PRESENT
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)
@ -1272,7 +1272,7 @@ void ui_updateFSM(event_t event, bool *sync_rtx)
case M_CONTACTS: case M_CONTACTS:
state.ui_screen = MENU_CONTACTS; state.ui_screen = MENU_CONTACTS;
break; break;
#ifdef HAS_GPS #ifdef GPS_PRESENT
case M_GPS: case M_GPS:
state.ui_screen = MENU_GPS; state.ui_screen = MENU_GPS;
break; break;
@ -1368,7 +1368,7 @@ void ui_updateFSM(event_t event, 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 HAS_GPS #ifdef GPS_PRESENT
// GPS menu screen // GPS menu screen
case MENU_GPS: case MENU_GPS:
if(msg.keys & KEY_ESC) if(msg.keys & KEY_ESC)
@ -1389,12 +1389,12 @@ void ui_updateFSM(event_t event, bool *sync_rtx)
case S_DISPLAY: case S_DISPLAY:
state.ui_screen = SETTINGS_DISPLAY; state.ui_screen = SETTINGS_DISPLAY;
break; break;
#ifdef HAS_RTC #ifdef RTC_PRESENT
case S_TIMEDATE: case S_TIMEDATE:
state.ui_screen = SETTINGS_TIMEDATE; state.ui_screen = SETTINGS_TIMEDATE;
break; break;
#endif #endif
#ifdef HAS_GPS #ifdef GPS_PRESENT
case S_GPS: case S_GPS:
state.ui_screen = SETTINGS_GPS; state.ui_screen = SETTINGS_GPS;
break; break;
@ -1454,7 +1454,7 @@ void ui_updateFSM(event_t event, bool *sync_rtx)
if(msg.keys & KEY_ESC) if(msg.keys & KEY_ESC)
_ui_menuBack(MENU_TOP); _ui_menuBack(MENU_TOP);
break; break;
#ifdef HAS_RTC #ifdef RTC_PRESENT
// Time&Date settings screen // Time&Date settings screen
case SETTINGS_TIMEDATE: case SETTINGS_TIMEDATE:
if(msg.keys & KEY_ENTER) if(msg.keys & KEY_ENTER)
@ -1547,7 +1547,7 @@ void ui_updateFSM(event_t event, 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 HAS_GPS #ifdef GPS_PRESENT
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 &&
@ -1710,7 +1710,7 @@ void ui_updateGUI()
case MENU_CONTACTS: case MENU_CONTACTS:
_ui_drawMenuContacts(&ui_state); _ui_drawMenuContacts(&ui_state);
break; break;
#ifdef HAS_GPS #ifdef GPS_PRESENT
// GPS menu screen // GPS menu screen
case MENU_GPS: case MENU_GPS:
_ui_drawMenuGPS(); _ui_drawMenuGPS();
@ -1740,7 +1740,7 @@ void ui_updateGUI()
case MENU_ABOUT: case MENU_ABOUT:
_ui_drawMenuAbout(); _ui_drawMenuAbout();
break; break;
#ifdef HAS_RTC #ifdef RTC_PRESENT
// Time&Date settings screen // Time&Date settings screen
case SETTINGS_TIMEDATE: case SETTINGS_TIMEDATE:
_ui_drawSettingsTimeDate(); _ui_drawSettingsTimeDate();
@ -1754,7 +1754,7 @@ void ui_updateGUI()
case SETTINGS_DISPLAY: case SETTINGS_DISPLAY:
_ui_drawSettingsDisplay(&ui_state); _ui_drawSettingsDisplay(&ui_state);
break; break;
#ifdef HAS_GPS #ifdef GPS_PRESENT
// GPS settings screen // GPS settings screen
case SETTINGS_GPS: case SETTINGS_GPS:
_ui_drawSettingsGPS(&ui_state); _ui_drawSettingsGPS(&ui_state);

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

@ -35,7 +35,7 @@ void _ui_drawMainBackground()
void _ui_drawMainTop() void _ui_drawMainTop()
{ {
#ifdef HAS_RTC #ifdef RTC_PRESENT
// 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/ui_menu.c
View File

@ -171,7 +171,7 @@ int _ui_getDisplayValueName(char *buf, uint8_t max_len, uint8_t index)
return 0; return 0;
} }
#ifdef HAS_GPS #ifdef GPS_PRESENT
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;
@ -338,7 +338,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 HAS_GPS #ifdef GPS_PRESENT
void _ui_drawMenuGPS() void _ui_drawMenuGPS()
{ {
char *fix_buf, *type_buf; char *fix_buf, *type_buf;
@ -555,7 +555,7 @@ void _ui_drawSettingsDisplay(ui_state_t* ui_state)
_ui_getDisplayValueName); _ui_getDisplayValueName);
} }
#ifdef HAS_GPS #ifdef GPS_PRESENT
void _ui_drawSettingsGPS(ui_state_t* ui_state) void _ui_drawSettingsGPS(ui_state_t* ui_state)
{ {
gfx_clearScreen(); gfx_clearScreen();
@ -569,7 +569,7 @@ void _ui_drawSettingsGPS(ui_state_t* ui_state)
} }
#endif #endif
#ifdef HAS_RTC #ifdef RTC_PRESENT
void _ui_drawSettingsTimeDate() void _ui_drawSettingsTimeDate()
{ {
gfx_clearScreen(); gfx_clearScreen();

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

@ -27,10 +27,10 @@ extern "C" {
#endif #endif
/* Device has a working real time clock */ /* Device has a working real time clock */
#define HAS_RTC #define RTC_PRESENT
/* Device supports an optional GPS chip */ /* Device supports an optional GPS chip */
#define HAS_GPS #define GPS_PRESENT
/* Device has a channel selection knob */ /* Device has a channel selection knob */
#define HAS_ABSOLUTE_KNOB #define HAS_ABSOLUTE_KNOB

4
platform/targets/MD-9600/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 HAS_RTC #define RTC_PRESENT
/* Device supports an optional GPS chip */ /* Device supports an optional GPS chip */
#define HAS_GPS #define GPS_PRESENT
/* Screen dimensions */ /* Screen dimensions */
#define SCREEN_WIDTH 128 #define SCREEN_WIDTH 128

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

@ -27,10 +27,10 @@ extern "C" {
#endif #endif
/* Device has a working real time clock */ /* Device has a working real time clock */
#define HAS_RTC #define RTC_PRESENT
/* Device supports an optional GPS chip */ /* Device supports an optional GPS chip */
#define HAS_GPS #define GPS_PRESENT
/* Screen dimensions */ /* Screen dimensions */
#define SCREEN_WIDTH 160 #define SCREEN_WIDTH 160

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

@ -25,7 +25,7 @@
#include <stm32f4xx.h> #include <stm32f4xx.h>
/* Device has a working real time clock */ /* Device has a working real time clock */
#define HAS_RTC #define RTC_PRESENT
/* Screen dimensions */ /* Screen dimensions */
#define SCREEN_WIDTH 128 #define SCREEN_WIDTH 128

4
platform/targets/linux/hwconfig.h
View File

@ -23,10 +23,10 @@ extern "C" {
#endif #endif
/* Device has a working real time clock */ /* Device has a working real time clock */
#define HAS_RTC #define RTC_PRESENT
/* Device supports an optional GPS chip */ /* Device supports an optional GPS chip */
#define HAS_GPS #define GPS_PRESENT
/* Battery type */ /* Battery type */
#define BAT_LIPO_2S #define BAT_LIPO_2S