Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-25 17:25:13 +03:00
Code Issues Wiki Activity

Compilation problem on Sky9x without FrSky module / telemetry

Browse source
This commit is contained in:
bsongis 2014-04-07 11:58:38 +02:00
parent d1d499a299
commit 03ab5adfc1
3 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
radio/src/gui/menu_general.cpp
View file

@ -158,11 +158,11 @@ enum menuGeneralSetupItems {
IF_CPUARM(ITEM_SETUP_BACKGROUND_VOLUME) IF_CPUARM(ITEM_SETUP_BACKGROUND_VOLUME)
ITEM_SETUP_BEEP_LENGTH, ITEM_SETUP_BEEP_LENGTH,
IF_AUDIO(ITEM_SETUP_SPEAKER_PITCH) IF_AUDIO(ITEM_SETUP_SPEAKER_PITCH)
IF_CPUARM(ITEM_SETUP_VARIO_LABEL) IF_VARIO_CPUARM(ITEM_SETUP_VARIO_LABEL)
IF_CPUARM(ITEM_SETUP_VARIO_VOLUME) IF_VARIO_CPUARM(ITEM_SETUP_VARIO_VOLUME)
IF_CPUARM(ITEM_SETUP_VARIO_PITCH) IF_VARIO_CPUARM(ITEM_SETUP_VARIO_PITCH)
IF_CPUARM(ITEM_SETUP_VARIO_RANGE) IF_VARIO_CPUARM(ITEM_SETUP_VARIO_RANGE)
IF_CPUARM(ITEM_SETUP_VARIO_REPEAT) IF_VARIO_CPUARM(ITEM_SETUP_VARIO_REPEAT)
IF_HAPTIC(ITEM_SETUP_HAPTIC_LABEL) IF_HAPTIC(ITEM_SETUP_HAPTIC_LABEL)
IF_HAPTIC(ITEM_SETUP_HAPTIC_MODE) IF_HAPTIC(ITEM_SETUP_HAPTIC_MODE)
IF_HAPTIC(ITEM_SETUP_HAPTIC_LENGTH) IF_HAPTIC(ITEM_SETUP_HAPTIC_LENGTH)
@ -219,7 +219,7 @@ void menuGeneralSetup(uint8_t event)
} }
#endif #endif
MENU(STR_MENURADIOSETUP, menuTabDiag, e_Setup, ITEM_SETUP_MAX+1, {0, IF_RTCLOCK(2) IF_RTCLOCK(2) IF_BATTGRAPH(1) LABEL(SOUND), IF_AUDIO(0) IF_BUZZER(0) IF_VOICE(0) IF_CPUARM(0) IF_CPUARM(0) IF_CPUARM(0) 0, IF_AUDIO(0) IF_CPUARM(LABEL(VARIO)) IF_CPUARM(0) IF_CPUARM(0) IF_CPUARM(0) IF_CPUARM(0) IF_HAPTIC(LABEL(HAPTIC)) IF_HAPTIC(0) IF_HAPTIC(0) IF_HAPTIC(0) 0, LABEL(ALARMS), 0, CASE_PCBSKY9X(0) CASE_PCBSKY9X(0) 0, 0, 0, IF_ROTARY_ENCODERS(0) LABEL(BACKLIGHT), 0, 0, IF_CPUARM(0) CASE_PWM_BACKLIGHT(0) CASE_PWM_BACKLIGHT(0) 0, IF_SPLASH_PARAM(0) IF_GPS(0) IF_GPS(0) IF_PXX(0) IF_CPUARM(0) IF_CPUARM(0) IF_FAI_CHOICE(0) 0, LABEL(TX_MODE), CASE_PCBTARANIS(0) 1/*to force edit mode*/}); MENU(STR_MENURADIOSETUP, menuTabDiag, e_Setup, ITEM_SETUP_MAX+1, {0, IF_RTCLOCK(2) IF_RTCLOCK(2) IF_BATTGRAPH(1) LABEL(SOUND), IF_AUDIO(0) IF_BUZZER(0) IF_VOICE(0) IF_CPUARM(0) IF_CPUARM(0) IF_CPUARM(0) 0, IF_AUDIO(0) IF_VARIO_CPUARM(LABEL(VARIO)) IF_VARIO_CPUARM(0) IF_VARIO_CPUARM(0) IF_VARIO_CPUARM(0) IF_VARIO_CPUARM(0) IF_HAPTIC(LABEL(HAPTIC)) IF_HAPTIC(0) IF_HAPTIC(0) IF_HAPTIC(0) 0, LABEL(ALARMS), 0, CASE_PCBSKY9X(0) CASE_PCBSKY9X(0) 0, 0, 0, IF_ROTARY_ENCODERS(0) LABEL(BACKLIGHT), 0, 0, IF_CPUARM(0) CASE_PWM_BACKLIGHT(0) CASE_PWM_BACKLIGHT(0) 0, IF_SPLASH_PARAM(0) IF_GPS(0) IF_GPS(0) IF_PXX(0) IF_CPUARM(0) IF_CPUARM(0) IF_FAI_CHOICE(0) 0, LABEL(TX_MODE), CASE_PCBTARANIS(0) 1/*to force edit mode*/});
uint8_t sub = m_posVert - 1; uint8_t sub = m_posVert - 1;
@ -384,7 +384,7 @@ void menuGeneralSetup(uint8_t event)
break; break;
#endif #endif
#if defined(CPUARM) #if defined(CPUARM) && defined(VARIO)
case ITEM_SETUP_VARIO_LABEL: case ITEM_SETUP_VARIO_LABEL:
lcd_putsLeft(y, STR_VARIO); lcd_putsLeft(y, STR_VARIO);
break; break;

2
radio/src/maths.cpp
View file

@ -137,7 +137,7 @@ void getGpsDistance()
} }
#endif #endif
#if defined(CPUARM) #if defined(CPUARM) && defined(VARIO)
void varioWakeup() void varioWakeup()
{ {

6
radio/src/opentx.h
View file

@ -72,6 +72,12 @@
#define IF_CPUARM(x) #define IF_CPUARM(x)
#endif #endif
#if defined(VARIO) && defined(CPUARM)
#define IF_VARIO_CPUARM(x) x,
#else
#define IF_VARIO_CPUARM(x)
#endif
#if defined(LUA) #if defined(LUA)
#define IF_LUA(x) x, #define IF_LUA(x) x,
#else #else