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

Open9x strings bugs solved

Browse Source
This commit is contained in:
bsongis
2012-01-18 23:06:48 +00:00
parent c651917da8
commit ebff7a9d09
2 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/o9xstrings.cpp
+9 -1
View File
@@ -28,17 +28,23 @@ const prog_char APM STR_OPEN9X[] =
TR_VMLTPX2
TR_VCSWFUNC
TR_VFSWFUNC
#ifdef FRSKY
TR_VTELEMUNIT
TR_VALARM
TR_VALARMFN
TR_VTELPROTO
TR_TELEMCHNS
#endif
#ifdef TEMPLATES
TR_VTEMPLATES
#endif
#ifdef HELI
TR_VSWASHTYPE
#endif
TR_VKEYS
TR_VSWITCHES
TR_VSRCRAW
TR_VTMRMODES
TR_TELEMCHNS
#if defined(PCBV3)
TR_RE1RE2
TR_DATETIME
@@ -70,12 +76,14 @@ const prog_char APM STR_FADEIN[] = TR_FADEIN;
const prog_char APM STR_FADEOUT[] = TR_FADEOUT;
const prog_char APM STR_DEFAULT[] = TR_DEFAULT;
const prog_char APM STR_CHECKTRIMS[] = TR_CHECKTRIMS;
#ifdef HELI
const prog_char APM STR_SWASHTYPE[] = TR_SWASHTYPE;
const prog_char APM STR_COLLECTIVE[] = TR_COLLECTIVE;
const prog_char APM STR_SWASHRING[] = TR_SWASHRING;
const prog_char APM STR_ELEDIRECTION[] = TR_ELEDIRECTION;
const prog_char APM STR_AILDIRECTION[] = TR_AILDIRECTION;
const prog_char APM STR_COLDIRECTION[] = TR_COLDIRECTION;
#endif
const prog_char APM STR_MODE[] = TR_MODE;
const prog_char APM STR_NOFREEEXPO[] = TR_NOFREEEXPO;
const prog_char APM STR_NOFREEMIXER[] = TR_NOFREEMIXER;
src/o9xstrings.h
+27 -7
View File
@@ -33,20 +33,34 @@ extern const PROGMEM char STR_OPEN9X[];
#define OFS_VMLTPX2 (OFS_VMLTPX + PSIZE(TR_VMLTPX))
#define OFS_VCSWFUNC (OFS_VMLTPX2 + PSIZE(TR_VMLTPX2))
#define OFS_VFSWFUNC (OFS_VCSWFUNC + PSIZE(TR_VCSWFUNC))
#ifdef FRSKY
#define OFS_VTELEMUNIT (OFS_VFSWFUNC + PSIZE(TR_VFSWFUNC))
#define OFS_VALARM (OFS_VTELEMUNIT + PSIZE(TR_VTELEMUNIT))
#define OFS_VALARMFN (OFS_VALARM + PSIZE(TR_VALARM))
#define OFS_VTELPROTO (OFS_VALARMFN + PSIZE(TR_VALARMFN))
#define OFS_VTEMPLATES (OFS_VTELPROTO + PSIZE(TR_VTELPROTO))
#define OFS_VSWASHTYPE (OFS_VTEMPLATES + PSIZE(TR_VTEMPLATES))
#define OFS_VKEYS (OFS_VSWASHTYPE + PSIZE(TR_VSWASHTYPE))
#define OFS_TELEMCHNS (OFS_VTELPROTO + PSIZE(TR_VTELPROTO))
#define OFS_ENDTELEM (OFS_TELEMCHNS + PSIZE(TR_TELEMCHNS))
#else
#define OFS_ENDTELEM (OFS_VFSWFUNC + PSIZE(TR_VFSWFUNC))
#endif
#ifdef TEMPLATES
#define OFS_VTEMPLATES (OFS_ENDTELEM)
#define OFS_ENDTPLS (OFS_VTEMPLATES + PSIZE(TR_VTEMPLATES))
#else
#define OFS_ENDTPLS (OFS_ENDTELEM)
#endif
#ifdef HELI
#define OFS_VSWASHTYPE (OFS_ENDTPLS)
#define OFS_ENDHELI (OFS_VSWASHTYPE + PSIZE(TR_VTEMPLATES))
#else
#define OFS_ENDHELI (OFS_ENDTPLS)
#endif
#define OFS_VKEYS (OFS_ENDHELI)
#define OFS_VSWITCHES (OFS_VKEYS + PSIZE(TR_VKEYS))
#define OFS_VSRCRAW (OFS_VSWITCHES + PSIZE(TR_VSWITCHES))
#define OFS_VTMRMODES (OFS_VSRCRAW + PSIZE(TR_VSRCRAW))
#define OFS_TELEMCHNS (OFS_VTMRMODES + PSIZE(TR_VTMRMODES))
#if defined(PCBV3)
#define OFS_RE1RE2 (OFS_TELEMCHNS + PSIZE(TR_TELEMCHNS))
#define OFS_RE1RE2 (OFS_VTMRMODES + PSIZE(TR_VTMRMODES))
#define OFS_DATETIME (OFS_RE1RE2 + PSIZE(TR_RE1RE2))
#endif
@@ -72,17 +86,23 @@ extern const PROGMEM char STR_OPEN9X[];
#define STR_VMLTPX2 (STR_OPEN9X + OFS_VMLTPX2)
#define STR_VCSWFUNC (STR_OPEN9X + OFS_VCSWFUNC)
#define STR_VFSWFUNC (STR_OPEN9X + OFS_VFSWFUNC)
#ifdef FRSKY
#define STR_VTELEMUNIT (STR_OPEN9X + OFS_VTELEMUNIT)
#define STR_VALARM (STR_OPEN9X + OFS_VALARM)
#define STR_VALARMFN (STR_OPEN9X + OFS_VALARMFN)
#define STR_VTELPROTO (STR_OPEN9X + OFS_VTELPROTO)
#define STR_TELEMCHNS (STR_OPEN9X + OFS_TELEMCHNS)
#endif
#ifdef TEMPLATES
#define STR_VTEMPLATES (STR_OPEN9X + OFS_VTEMPLATES)
#endif
#ifdef HELI
#define STR_VSWASHTYPE (STR_OPEN9X + OFS_VSWASHTYPE)
#endif
#define STR_VKEYS (STR_OPEN9X + OFS_VKEYS)
#define STR_VSWITCHES (STR_OPEN9X + OFS_VSWITCHES)
#define STR_VSRCRAW (STR_OPEN9X + OFS_VSRCRAW)
#define STR_VTMRMODES (STR_OPEN9X + OFS_VTMRMODES)
#define STR_TELEMCHNS (STR_OPEN9X + OFS_TELEMCHNS)
#if defined(PCBV3)
#define STR_RE1RE2 (STR_OPEN9X + OFS_RE1RE2)