piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Battery / Capacity / Temperature calib moved to HARDWARE menu

Browse Source 
[PXX2] REGISTRATION ID moved to RADIO SETUP
This commit is contained in:
Bertrand Songis
2019-03-16 23:08:13 +01:00
parent ce0a58b790
commit 2bc7d7dd9b
17 changed files with 134 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/128x64/radio_setup.cpp
+43 -7
View File
@@ -26,9 +26,9 @@ const unsigned char sticks[] = {
#include "sticks.lbm"
};
#define RADIO_SETUP_2ND_COLUMN (LCD_W-6*FW-3)
#define RADIO_SETUP_2ND_COLUMN (LCD_W-7*FW-3)
#define RADIO_SETUP_DATE_COLUMN (FW*15+7)
#define RADIO_SETUP_TIME_COLUMN (FW*15+9)
#define RADIO_SETUP_TIME_COLUMN (RADIO_SETUP_2ND_COLUMN + 2 * FWNUM)
#define SLIDER_5POS(y, value, label, event, attr) { \
int8_t tmp = value; \
@@ -88,6 +88,9 @@ enum MenuRadioSetupItems {
CASE_PWM_BACKLIGHT(ITEM_SETUP_BACKLIGHT_BRIGHTNESS_ON)
ITEM_SETUP_FLASH_BEEP,
CASE_SPLASH_PARAM(ITEM_SETUP_DISABLE_SPLASH)
#if defined(PXX2)
ITEM_RADIO_OWNER_ID,
#endif
CASE_GPS(ITEM_SETUP_TIMEZONE)
ITEM_SETUP_ADJUST_RTC,
CASE_GPS(ITEM_SETUP_GPSFORMAT)
@@ -132,11 +135,38 @@ void menuRadioSetup(event_t event)
}
#endif
MENU(STR_MENURADIOSETUP, menuTabGeneral, MENU_RADIO_SETUP, HEADER_LINE+ITEM_SETUP_MAX, { HEADER_LINE_COLUMNS CASE_RTCLOCK(2) CASE_RTCLOCK(2) CASE_BATTGRAPH(1)
LABEL(SOUND), CASE_AUDIO(0) CASE_BUZZER(0) 0, 0, 0, 0, 0, CASE_AUDIO(0) CASE_VARIO(LABEL(VARIO)) CASE_VARIO(0) CASE_VARIO(0) CASE_VARIO(0) CASE_VARIO(0) CASE_HAPTIC(LABEL(HAPTIC)) CASE_HAPTIC(0) CASE_HAPTIC(0) CASE_HAPTIC(0) 0, LABEL(ALARMS), 0, CASE_CAPACITY(0) CASE_PCBSKY9X(0) 0, 0, 0, 0, IF_ROTARY_ENCODERS(0) LABEL(BACKLIGHT), 0, 0, 0, CASE_PWM_BACKLIGHT(0) CASE_PWM_BACKLIGHT(0) 0, CASE_SPLASH_PARAM(0) CASE_GPS(0) 0, CASE_GPS(0) CASE_PXX(0) 0, 0, IF_FAI_CHOICE(0) 0,
CASE_STM32(0) // USB mode
CASE_JACK_DETECT(0) // Jack mode
0, COL_TX_MODE, 0, 1/*to force edit mode*/});
MENU(STR_MENURADIOSETUP, menuTabGeneral, MENU_RADIO_SETUP, HEADER_LINE+ITEM_SETUP_MAX, {
HEADER_LINE_COLUMNS CASE_RTCLOCK(2) CASE_RTCLOCK(2) CASE_BATTGRAPH(1)
LABEL(SOUND), CASE_AUDIO(0)
CASE_BUZZER(0)
0, 0, 0, 0, 0, CASE_AUDIO(0)
CASE_VARIO(LABEL(VARIO))
CASE_VARIO(0)
CASE_VARIO(0)
CASE_VARIO(0)
CASE_VARIO(0)
CASE_HAPTIC(LABEL(HAPTIC))
CASE_HAPTIC(0)
CASE_HAPTIC(0)
CASE_HAPTIC(0)
0, LABEL(ALARMS), 0, CASE_CAPACITY(0)
CASE_PCBSKY9X(0)
0, 0, 0, 0, IF_ROTARY_ENCODERS(0)
LABEL(BACKLIGHT), 0, 0, 0, CASE_PWM_BACKLIGHT(0)
CASE_PWM_BACKLIGHT(0)
0,
CASE_SPLASH_PARAM(0)
#if defined(PXX2)
0 /* owner registration ID */,
#endif
CASE_GPS(0)
0, CASE_GPS(0)
CASE_PXX(0)
0, 0, IF_FAI_CHOICE(0)
0,
CASE_STM32(0) // USB mode
CASE_JACK_DETECT(0) // Jack mode
0, COL_TX_MODE, 0, 1/*to force edit mode*/});
if (event == EVT_ENTRY) {
reusableBuffer.generalSettings.stickMode = g_eeGeneral.stickMode;
@@ -472,6 +502,12 @@ void menuRadioSetup(event_t event)
}
#endif
#if defined(PXX2)
case ITEM_RADIO_OWNER_ID:
editSingleName(RADIO_SETUP_2ND_COLUMN, y, STR_OWNER_ID, g_eeGeneral.ownerRegistrationID, PXX2_LEN_REGISTRATION_ID, event, attr);
break;
#endif
#if defined(TELEMETRY_FRSKY) && defined(GPS)
case ITEM_SETUP_TIMEZONE:
lcdDrawTextAlignedLeft(y, STR_TIMEZONE);