make code compatible with up-to-date build environment
These changes make it possible to compile open9x with old (avr-gcc 4.3.3, avr-libc 1.6.7) and up-to-date (avr-gcc 4.6.2, avr-libc 1.8.0) build environments. See Issue 1 for more details.
This commit is contained in:
+163
-163
@@ -13,7 +13,7 @@
|
||||
|
||||
// The non-0-terminated-strings
|
||||
|
||||
extern const PROGMEM char STR_OPEN9X[];
|
||||
extern const pm_char STR_OPEN9X[];
|
||||
|
||||
#define OFS_OFFON 0
|
||||
#define OFS_MMMINV (OFS_OFFON + PSIZE(TR_OFFON))
|
||||
@@ -128,169 +128,169 @@ extern const PROGMEM char STR_OPEN9X[];
|
||||
|
||||
// The 0-terminated-strings
|
||||
|
||||
extern const PROGMEM char STR_POPUPS[];
|
||||
extern const PROGMEM char STR_MENUWHENDONE[];
|
||||
extern const PROGMEM char STR_FREE[];
|
||||
extern const pm_char STR_POPUPS[];
|
||||
extern const pm_char STR_MENUWHENDONE[];
|
||||
extern const pm_char STR_FREE[];
|
||||
#define LEN_FREE PSIZE(TR_FREE)
|
||||
extern const PROGMEM char STR_DELETEMODEL[];
|
||||
extern const PROGMEM char STR_COPYINGMODEL[];
|
||||
extern const PROGMEM char STR_MOVINGMODEL[];
|
||||
extern const PROGMEM char STR_LOADINGMODEL[];
|
||||
extern const PROGMEM char STR_NAME[];
|
||||
extern const PROGMEM char STR_TIMER[];
|
||||
extern const PROGMEM char STR_ELIMITS[];
|
||||
extern const PROGMEM char STR_ETRIMS[];
|
||||
extern const PROGMEM char STR_TRIMINC[];
|
||||
extern const PROGMEM char STR_TTRACE[];
|
||||
extern const PROGMEM char STR_TTRIM[];
|
||||
extern const PROGMEM char STR_BEEPCTR[];
|
||||
extern const PROGMEM char STR_PROTO[];
|
||||
extern const PROGMEM char STR_PPMFRAME[];
|
||||
extern const PROGMEM char STR_MS[];
|
||||
extern const PROGMEM char STR_SWITCH[];
|
||||
extern const PROGMEM char STR_TRIMS[];
|
||||
extern const PROGMEM char STR_FADEIN[];
|
||||
extern const PROGMEM char STR_FADEOUT[];
|
||||
extern const PROGMEM char STR_DEFAULT[];
|
||||
extern const PROGMEM char STR_CHECKTRIMS[];
|
||||
extern const PROGMEM char STR_SWASHTYPE[];
|
||||
extern const PROGMEM char STR_COLLECTIVE[];
|
||||
extern const PROGMEM char STR_SWASHRING[];
|
||||
extern const PROGMEM char STR_ELEDIRECTION[];
|
||||
extern const PROGMEM char STR_AILDIRECTION[];
|
||||
extern const PROGMEM char STR_COLDIRECTION[];
|
||||
extern const PROGMEM char STR_MODE[];
|
||||
extern const PROGMEM char STR_NOFREEEXPO[];
|
||||
extern const PROGMEM char STR_NOFREEMIXER[];
|
||||
extern const PROGMEM char STR_INSERTMIX[];
|
||||
extern const PROGMEM char STR_EDITMIX[];
|
||||
extern const PROGMEM char STR_SOURCE[];
|
||||
extern const PROGMEM char STR_WEIGHT[];
|
||||
extern const PROGMEM char STR_OFFSET[];
|
||||
extern const PROGMEM char STR_TRIM[];
|
||||
extern const PROGMEM char STR_CURVES[];
|
||||
extern const PROGMEM char STR_FPHASE[];
|
||||
extern const PROGMEM char STR_WARNING[];
|
||||
extern const PROGMEM char STR_OFF[];
|
||||
extern const PROGMEM char STR_MULTPX[];
|
||||
extern const PROGMEM char STR_DELAYDOWN[];
|
||||
extern const PROGMEM char STR_DELAYUP[];
|
||||
extern const PROGMEM char STR_SLOWDOWN[];
|
||||
extern const PROGMEM char STR_SLOWUP[];
|
||||
extern const PROGMEM char STR_DREXPO[];
|
||||
extern const PROGMEM char STR_MIXER[];
|
||||
extern const PROGMEM char STR_COPYTRIMMENU[];
|
||||
extern const PROGMEM char STR_CV[];
|
||||
extern const PROGMEM char STR_SW[];
|
||||
extern const PROGMEM char STR_ACHANNEL[];
|
||||
extern const PROGMEM char STR_MAX[];
|
||||
extern const PROGMEM char STR_CALIB[];
|
||||
extern const PROGMEM char STR_BAR[];
|
||||
extern const PROGMEM char STR_ALARM[];
|
||||
extern const PROGMEM char STR_USRPROTO[];
|
||||
extern const PROGMEM char STR_CLEARMIXMENU[];
|
||||
extern const PROGMEM char STR_BEEPER[];
|
||||
extern const PROGMEM char STR_CONTRAST[];
|
||||
extern const PROGMEM char STR_BATTERYWARNING[];
|
||||
extern const PROGMEM char STR_INACTIVITYALARM[];
|
||||
extern const PROGMEM char STR_FILTERADC[];
|
||||
extern const PROGMEM char STR_THROTTLEREVERSE[];
|
||||
extern const PROGMEM char STR_MINUTEBEEP[];
|
||||
extern const PROGMEM char STR_BEEPCOUNTDOWN[];
|
||||
extern const PROGMEM char STR_FLASHONBEEP[];
|
||||
extern const PROGMEM char STR_LIGHTSWITCH[];
|
||||
extern const PROGMEM char STR_LIGHTOFFAFTER[];
|
||||
extern const PROGMEM char STR_SPLASHSCREEN[];
|
||||
extern const PROGMEM char STR_THROTTLEWARNING[];
|
||||
extern const PROGMEM char STR_SWITCHWARNING[];
|
||||
extern const PROGMEM char STR_MEMORYWARNING[];
|
||||
extern const PROGMEM char STR_ALARMWARNING[];
|
||||
extern const PROGMEM char STR_NODATAALARM[];
|
||||
extern const PROGMEM char STR_RXCHANNELORD[];
|
||||
extern const PROGMEM char STR_MODE2[];
|
||||
extern const PROGMEM char STR_SLAVE[];
|
||||
extern const PROGMEM char STR_MODESRC[];
|
||||
extern const PROGMEM char STR_MULTIPLIER[];
|
||||
extern const PROGMEM char STR_CAL[];
|
||||
extern const PROGMEM char STR_EEPROMV[];
|
||||
extern const PROGMEM char STR_VTRIM[];
|
||||
extern const PROGMEM char STR_BG[];
|
||||
extern const PROGMEM char STR_MENUTOSTART[];
|
||||
extern const PROGMEM char STR_SETMIDPOINT[];
|
||||
extern const PROGMEM char STR_MOVESTICKSPOTS[];
|
||||
extern const PROGMEM char STR_ALT[];
|
||||
extern const PROGMEM char STR_RXBATT[];
|
||||
extern const PROGMEM char STR_RX[];
|
||||
extern const PROGMEM char STR_TX[];
|
||||
extern const PROGMEM char STR_HDG[];
|
||||
extern const PROGMEM char STR_SPD[];
|
||||
extern const PROGMEM char STR_TEMP1[];
|
||||
extern const PROGMEM char STR_TEMP2[];
|
||||
extern const PROGMEM char STR_RPM[];
|
||||
extern const PROGMEM char STR_FUEL[];
|
||||
extern const PROGMEM char STR_VOLTS[];
|
||||
extern const PROGMEM char STR_ACCEL[];
|
||||
extern const PROGMEM char STR_TELE[];
|
||||
extern const PROGMEM char STR_RSSI[];
|
||||
extern const PROGMEM char STR_NODATA[];
|
||||
extern const PROGMEM char STR_TM1[];
|
||||
extern const PROGMEM char STR_TM2[];
|
||||
extern const PROGMEM char STR_THR[];
|
||||
extern const PROGMEM char STR_TH[];
|
||||
extern const PROGMEM char STR_TOT[];
|
||||
extern const PROGMEM char STR_TMR1LATMAXUS[];
|
||||
extern const PROGMEM char STR_TMR1LATMINUS[];
|
||||
extern const PROGMEM char STR_TMR1JITTERUS[];
|
||||
extern const PROGMEM char STR_TMAINMAXMS[];
|
||||
extern const PROGMEM char STR_T10MSUS[];
|
||||
extern const PROGMEM char STR_FREESTACKMINB[];
|
||||
extern const PROGMEM char STR_MENUTORESET[];
|
||||
extern const PROGMEM char STR_PPM[];
|
||||
extern const PROGMEM char STR_CH[];
|
||||
extern const PROGMEM char STR_TMR[];
|
||||
extern const PROGMEM char STR_MODEL[];
|
||||
extern const PROGMEM char STR_FP[];
|
||||
extern const PROGMEM char STR_EEPROMLOWMEM[];
|
||||
extern const PROGMEM char STR_ALERT[];
|
||||
extern const PROGMEM char STR_PRESSANYKEYTOSKIP[];
|
||||
extern const PROGMEM char STR_THROTTLENOTIDLE[];
|
||||
extern const PROGMEM char STR_RESETTHROTTLE[];
|
||||
extern const PROGMEM char STR_ALARMSDISABLED[];
|
||||
extern const PROGMEM char STR_SWITCHESNOTOFF[];
|
||||
extern const PROGMEM char STR_PLEASERESETTHEM[];
|
||||
extern const PROGMEM char STR_MESSAGE[];
|
||||
extern const PROGMEM char STR_PRESSANYKEY[];
|
||||
extern const pm_char STR_DELETEMODEL[];
|
||||
extern const pm_char STR_COPYINGMODEL[];
|
||||
extern const pm_char STR_MOVINGMODEL[];
|
||||
extern const pm_char STR_LOADINGMODEL[];
|
||||
extern const pm_char STR_NAME[];
|
||||
extern const pm_char STR_TIMER[];
|
||||
extern const pm_char STR_ELIMITS[];
|
||||
extern const pm_char STR_ETRIMS[];
|
||||
extern const pm_char STR_TRIMINC[];
|
||||
extern const pm_char STR_TTRACE[];
|
||||
extern const pm_char STR_TTRIM[];
|
||||
extern const pm_char STR_BEEPCTR[];
|
||||
extern const pm_char STR_PROTO[];
|
||||
extern const pm_char STR_PPMFRAME[];
|
||||
extern const pm_char STR_MS[];
|
||||
extern const pm_char STR_SWITCH[];
|
||||
extern const pm_char STR_TRIMS[];
|
||||
extern const pm_char STR_FADEIN[];
|
||||
extern const pm_char STR_FADEOUT[];
|
||||
extern const pm_char STR_DEFAULT[];
|
||||
extern const pm_char STR_CHECKTRIMS[];
|
||||
extern const pm_char STR_SWASHTYPE[];
|
||||
extern const pm_char STR_COLLECTIVE[];
|
||||
extern const pm_char STR_SWASHRING[];
|
||||
extern const pm_char STR_ELEDIRECTION[];
|
||||
extern const pm_char STR_AILDIRECTION[];
|
||||
extern const pm_char STR_COLDIRECTION[];
|
||||
extern const pm_char STR_MODE[];
|
||||
extern const pm_char STR_NOFREEEXPO[];
|
||||
extern const pm_char STR_NOFREEMIXER[];
|
||||
extern const pm_char STR_INSERTMIX[];
|
||||
extern const pm_char STR_EDITMIX[];
|
||||
extern const pm_char STR_SOURCE[];
|
||||
extern const pm_char STR_WEIGHT[];
|
||||
extern const pm_char STR_OFFSET[];
|
||||
extern const pm_char STR_TRIM[];
|
||||
extern const pm_char STR_CURVES[];
|
||||
extern const pm_char STR_FPHASE[];
|
||||
extern const pm_char STR_WARNING[];
|
||||
extern const pm_char STR_OFF[];
|
||||
extern const pm_char STR_MULTPX[];
|
||||
extern const pm_char STR_DELAYDOWN[];
|
||||
extern const pm_char STR_DELAYUP[];
|
||||
extern const pm_char STR_SLOWDOWN[];
|
||||
extern const pm_char STR_SLOWUP[];
|
||||
extern const pm_char STR_DREXPO[];
|
||||
extern const pm_char STR_MIXER[];
|
||||
extern const pm_char STR_COPYTRIMMENU[];
|
||||
extern const pm_char STR_CV[];
|
||||
extern const pm_char STR_SW[];
|
||||
extern const pm_char STR_ACHANNEL[];
|
||||
extern const pm_char STR_MAX[];
|
||||
extern const pm_char STR_CALIB[];
|
||||
extern const pm_char STR_BAR[];
|
||||
extern const pm_char STR_ALARM[];
|
||||
extern const pm_char STR_USRPROTO[];
|
||||
extern const pm_char STR_CLEARMIXMENU[];
|
||||
extern const pm_char STR_BEEPER[];
|
||||
extern const pm_char STR_CONTRAST[];
|
||||
extern const pm_char STR_BATTERYWARNING[];
|
||||
extern const pm_char STR_INACTIVITYALARM[];
|
||||
extern const pm_char STR_FILTERADC[];
|
||||
extern const pm_char STR_THROTTLEREVERSE[];
|
||||
extern const pm_char STR_MINUTEBEEP[];
|
||||
extern const pm_char STR_BEEPCOUNTDOWN[];
|
||||
extern const pm_char STR_FLASHONBEEP[];
|
||||
extern const pm_char STR_LIGHTSWITCH[];
|
||||
extern const pm_char STR_LIGHTOFFAFTER[];
|
||||
extern const pm_char STR_SPLASHSCREEN[];
|
||||
extern const pm_char STR_THROTTLEWARNING[];
|
||||
extern const pm_char STR_SWITCHWARNING[];
|
||||
extern const pm_char STR_MEMORYWARNING[];
|
||||
extern const pm_char STR_ALARMWARNING[];
|
||||
extern const pm_char STR_NODATAALARM[];
|
||||
extern const pm_char STR_RXCHANNELORD[];
|
||||
extern const pm_char STR_MODE2[];
|
||||
extern const pm_char STR_SLAVE[];
|
||||
extern const pm_char STR_MODESRC[];
|
||||
extern const pm_char STR_MULTIPLIER[];
|
||||
extern const pm_char STR_CAL[];
|
||||
extern const pm_char STR_EEPROMV[];
|
||||
extern const pm_char STR_VTRIM[];
|
||||
extern const pm_char STR_BG[];
|
||||
extern const pm_char STR_MENUTOSTART[];
|
||||
extern const pm_char STR_SETMIDPOINT[];
|
||||
extern const pm_char STR_MOVESTICKSPOTS[];
|
||||
extern const pm_char STR_ALT[];
|
||||
extern const pm_char STR_RXBATT[];
|
||||
extern const pm_char STR_RX[];
|
||||
extern const pm_char STR_TX[];
|
||||
extern const pm_char STR_HDG[];
|
||||
extern const pm_char STR_SPD[];
|
||||
extern const pm_char STR_TEMP1[];
|
||||
extern const pm_char STR_TEMP2[];
|
||||
extern const pm_char STR_RPM[];
|
||||
extern const pm_char STR_FUEL[];
|
||||
extern const pm_char STR_VOLTS[];
|
||||
extern const pm_char STR_ACCEL[];
|
||||
extern const pm_char STR_TELE[];
|
||||
extern const pm_char STR_RSSI[];
|
||||
extern const pm_char STR_NODATA[];
|
||||
extern const pm_char STR_TM1[];
|
||||
extern const pm_char STR_TM2[];
|
||||
extern const pm_char STR_THR[];
|
||||
extern const pm_char STR_TH[];
|
||||
extern const pm_char STR_TOT[];
|
||||
extern const pm_char STR_TMR1LATMAXUS[];
|
||||
extern const pm_char STR_TMR1LATMINUS[];
|
||||
extern const pm_char STR_TMR1JITTERUS[];
|
||||
extern const pm_char STR_TMAINMAXMS[];
|
||||
extern const pm_char STR_T10MSUS[];
|
||||
extern const pm_char STR_FREESTACKMINB[];
|
||||
extern const pm_char STR_MENUTORESET[];
|
||||
extern const pm_char STR_PPM[];
|
||||
extern const pm_char STR_CH[];
|
||||
extern const pm_char STR_TMR[];
|
||||
extern const pm_char STR_MODEL[];
|
||||
extern const pm_char STR_FP[];
|
||||
extern const pm_char STR_EEPROMLOWMEM[];
|
||||
extern const pm_char STR_ALERT[];
|
||||
extern const pm_char STR_PRESSANYKEYTOSKIP[];
|
||||
extern const pm_char STR_THROTTLENOTIDLE[];
|
||||
extern const pm_char STR_RESETTHROTTLE[];
|
||||
extern const pm_char STR_ALARMSDISABLED[];
|
||||
extern const pm_char STR_SWITCHESNOTOFF[];
|
||||
extern const pm_char STR_PLEASERESETTHEM[];
|
||||
extern const pm_char STR_MESSAGE[];
|
||||
extern const pm_char STR_PRESSANYKEY[];
|
||||
#define LEN_PRESSANYKEY PSIZE(TR_PRESSANYKEY)
|
||||
extern const PROGMEM char STR_BADEEPROMDATA[];
|
||||
extern const PROGMEM char STR_EEPROMFORMATTING[];
|
||||
extern const PROGMEM char STR_EEPROMOVERFLOW[];
|
||||
extern const PROGMEM char STR_MENUSERROR[];
|
||||
extern const PROGMEM char STR_MENURADIOSETUP[];
|
||||
extern const PROGMEM char STR_MENUDATEANDTIME[];
|
||||
extern const PROGMEM char STR_MENUTRAINER[];
|
||||
extern const PROGMEM char STR_MENUVERSION[];
|
||||
extern const PROGMEM char STR_MENUDIAG[];
|
||||
extern const PROGMEM char STR_MENUANA[];
|
||||
extern const PROGMEM char STR_MENUCALIBRATION[];
|
||||
extern const PROGMEM char STR_MENUMODELSEL[];
|
||||
extern const PROGMEM char STR_MENUSETUP[];
|
||||
extern const PROGMEM char STR_MENUFLIGHTPHASE[];
|
||||
extern const PROGMEM char STR_MENUFLIGHTPHASES[];
|
||||
extern const PROGMEM char STR_MENUHELISETUP[];
|
||||
extern const PROGMEM char STR_MENUDREXPO[];
|
||||
extern const PROGMEM char STR_MENULIMITS[];
|
||||
extern const PROGMEM char STR_MENUCURVES[];
|
||||
extern const PROGMEM char STR_MENUCURVE[];
|
||||
extern const PROGMEM char STR_MENUCUSTOMSWITCHES[];
|
||||
extern const PROGMEM char STR_MENUFUNCSWITCHES[];
|
||||
extern const PROGMEM char STR_MENUSAFETYSWITCHES[];
|
||||
extern const PROGMEM char STR_MENUTELEMETRY[];
|
||||
extern const PROGMEM char STR_MENUTEMPLATES[];
|
||||
extern const PROGMEM char STR_MENUSTAT[];
|
||||
extern const PROGMEM char STR_MENUDEBUG[];
|
||||
extern const PROGMEM char STR_RXNUM[];
|
||||
extern const PROGMEM char STR_SYNCMENU[];
|
||||
extern const PROGMEM char STR_HAPTICSTRENGTH[];
|
||||
extern const PROGMEM char STR_SPKRPITCH[];
|
||||
extern const pm_char STR_BADEEPROMDATA[];
|
||||
extern const pm_char STR_EEPROMFORMATTING[];
|
||||
extern const pm_char STR_EEPROMOVERFLOW[];
|
||||
extern const pm_char STR_MENUSERROR[];
|
||||
extern const pm_char STR_MENURADIOSETUP[];
|
||||
extern const pm_char STR_MENUDATEANDTIME[];
|
||||
extern const pm_char STR_MENUTRAINER[];
|
||||
extern const pm_char STR_MENUVERSION[];
|
||||
extern const pm_char STR_MENUDIAG[];
|
||||
extern const pm_char STR_MENUANA[];
|
||||
extern const pm_char STR_MENUCALIBRATION[];
|
||||
extern const pm_char STR_MENUMODELSEL[];
|
||||
extern const pm_char STR_MENUSETUP[];
|
||||
extern const pm_char STR_MENUFLIGHTPHASE[];
|
||||
extern const pm_char STR_MENUFLIGHTPHASES[];
|
||||
extern const pm_char STR_MENUHELISETUP[];
|
||||
extern const pm_char STR_MENUDREXPO[];
|
||||
extern const pm_char STR_MENULIMITS[];
|
||||
extern const pm_char STR_MENUCURVES[];
|
||||
extern const pm_char STR_MENUCURVE[];
|
||||
extern const pm_char STR_MENUCUSTOMSWITCHES[];
|
||||
extern const pm_char STR_MENUFUNCSWITCHES[];
|
||||
extern const pm_char STR_MENUSAFETYSWITCHES[];
|
||||
extern const pm_char STR_MENUTELEMETRY[];
|
||||
extern const pm_char STR_MENUTEMPLATES[];
|
||||
extern const pm_char STR_MENUSTAT[];
|
||||
extern const pm_char STR_MENUDEBUG[];
|
||||
extern const pm_char STR_RXNUM[];
|
||||
extern const pm_char STR_SYNCMENU[];
|
||||
extern const pm_char STR_HAPTICSTRENGTH[];
|
||||
extern const pm_char STR_SPKRPITCH[];
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user