Flash saving (idea from er9x)

Trims2Offsets function removed as it was as full of bugs than other firmwares (total = ~1000bytes flash saved)
A "Safety CHxx" function is not applied when it is currently edited
The Stick Mode needs confirmation before being used (now edited with [MENU] edit [MENU]).
This commit is contained in:
bsongis
2012-02-27 18:52:29 +00:00
parent 0826ceada1
commit 6c1d0cab8a
16 changed files with 272 additions and 307 deletions
+39 -39
View File
@@ -33,54 +33,56 @@
#include "open9x.h"
#define ISTR(x) LEN_##x TR_##x
// The non-0-terminated-strings
const pm_char STR_OPEN9X[] PROGMEM =
TR_OFFON
TR_MMMINV
TR_NCHANNELS
TR_VBEEPMODE
TR_VBEEPLEN
TR_ADCFILTER
TR_WARNSW
TR_TRNMODE
TR_TRNCHN
TR_VTRIMINC
TR_RETA123
TR_VPROTOS
TR_POSNEG
TR_VCURVEFUNC
TR_CURVMODES
TR_EXPLABELS
TR_VMLTPX
TR_VMLTPX2
TR_VMIXTRIMS
TR_VCSWFUNC
TR_VFSWFUNC
TR_FUNCSOUNDS
ISTR(OFFON)
ISTR(MMMINV)
ISTR(NCHANNELS)
ISTR(VBEEPMODE)
ISTR(VBEEPLEN)
ISTR(ADCFILTER)
ISTR(WARNSW)
ISTR(TRNMODE)
ISTR(TRNCHN)
ISTR(VTRIMINC)
ISTR(RETA123)
ISTR(VPROTOS)
ISTR(POSNEG)
ISTR(VCURVEFUNC)
ISTR(CURVMODES)
ISTR(EXPLABELS)
ISTR(VMLTPX)
ISTR(VMLTPX2)
ISTR(VMIXTRIMS)
ISTR(VCSWFUNC)
ISTR(VFSWFUNC)
ISTR(FUNCSOUNDS)
#ifdef FRSKY
TR_VTELEMBARS
TR_VTELEMUNIT
TR_VALARM
TR_VALARMFN
TR_VTELPROTO
TR_TELEMCHNS
ISTR(VTELEMBARS)
ISTR(VTELEMUNIT)
ISTR(VALARM)
ISTR(VALARMFN)
ISTR(VTELPROTO)
ISTR(TELEMCHNS)
#endif
#ifdef TEMPLATES
TR_VTEMPLATES
ISTR(VTEMPLATES)
#endif
#ifdef HELI
TR_VSWASHTYPE
ISTR(VSWASHTYPE)
#endif
TR_VKEYS
TR_VSWITCHES
TR_VSRCRAW
TR_VTMRMODES
ISTR(VKEYS)
ISTR(VSWITCHES)
ISTR(VSRCRAW)
ISTR(VTMRMODES)
#if defined(DSM2)
TR_DSM2MODE
ISTR(DSM2MODE)
#endif
#if defined(PCBV4)
TR_RE1RE2
TR_DATETIME
ISTR(RE1RE2)
ISTR(DATETIME)
#endif
;
@@ -136,7 +138,6 @@ const pm_char STR_DELAYUP[] PROGMEM = TR_DELAYUP;
const pm_char STR_SLOWDOWN[] PROGMEM = TR_SLOWDOWN;
const pm_char STR_SLOWUP[] PROGMEM = TR_SLOWUP;
const pm_char STR_MIXER[] PROGMEM = TR_MIXER;
const pm_char STR_COPYTRIMMENU[] PROGMEM = TR_COPYTRIMMENU;
const pm_char STR_CV[] PROGMEM = TR_CV;
const pm_char STR_SW[] PROGMEM = TR_SW;
const pm_char STR_ACHANNEL[] PROGMEM = TR_ACHANNEL;
@@ -173,7 +174,6 @@ const pm_char STR_MEMORYWARNING[] PROGMEM = TR_MEMORYWARNING;
const pm_char STR_ALARMWARNING[] PROGMEM = TR_ALARMWARNING;
const pm_char STR_NODATAALARM[] PROGMEM = TR_NODATAALARM;
const pm_char STR_RXCHANNELORD[] PROGMEM = TR_RXCHANNELORD;
const pm_char STR_MODE2[] PROGMEM = TR_MODE2;
const pm_char STR_SLAVE[] PROGMEM = TR_SLAVE;
const pm_char STR_MODESRC[] PROGMEM = TR_MODESRC;
const pm_char STR_MULTIPLIER[] PROGMEM = TR_MULTIPLIER;