I change again my mind for telemetry: now Range and Offset. Audio sounds now have a name. Haptic sounds skipped when HAPTIC=NO

This commit is contained in:
bsongis
2012-02-04 17:34:25 +00:00
parent 064d0eeb20
commit 1d8fb1f6ee
7 changed files with 25 additions and 14 deletions
+5 -4
View File
@@ -35,15 +35,16 @@ extern const pm_char STR_OPEN9X[];
#define OFS_VMIXTRIMS (OFS_VMLTPX2 + PSIZE(TR_VMLTPX2))
#define OFS_VCSWFUNC (OFS_VMIXTRIMS + PSIZE(TR_VMIXTRIMS))
#define OFS_VFSWFUNC (OFS_VCSWFUNC + PSIZE(TR_VCSWFUNC))
#define OFS_FUNCSOUNDS (OFS_VFSWFUNC + PSIZE(TR_VFSWFUNC))
#ifdef FRSKY
#define OFS_VTELEMUNIT (OFS_VFSWFUNC + PSIZE(TR_VFSWFUNC))
#define OFS_VTELEMUNIT (OFS_FUNCSOUNDS + PSIZE(TR_FUNCSOUNDS))
#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_TELEMCHNS (OFS_VTELPROTO + PSIZE(TR_VTELPROTO))
#define OFS_ENDTELEM (OFS_TELEMCHNS + PSIZE(TR_TELEMCHNS))
#else
#define OFS_ENDTELEM (OFS_VFSWFUNC + PSIZE(TR_VFSWFUNC))
#define OFS_ENDTELEM (OFS_FUNCSOUNDS + PSIZE(TR_FUNCSOUNDS))
#endif
#ifdef TEMPLATES
#define OFS_VTEMPLATES (OFS_ENDTELEM)
@@ -95,6 +96,7 @@ extern const pm_char STR_OPEN9X[];
#define STR_VMIXTRIMS (STR_OPEN9X + OFS_VMIXTRIMS)
#define STR_VCSWFUNC (STR_OPEN9X + OFS_VCSWFUNC)
#define STR_VFSWFUNC (STR_OPEN9X + OFS_VFSWFUNC)
#define STR_FUNCSOUNDS (STR_OPEN9X + OFS_FUNCSOUNDS)
#ifdef FRSKY
#define STR_VTELEMUNIT (STR_OPEN9X + OFS_VTELEMUNIT)
@@ -183,8 +185,7 @@ 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_MIN[];
extern const pm_char STR_RANGE[];
extern const pm_char STR_BAR[];
extern const pm_char STR_ALARM[];
extern const pm_char STR_USRPROTO[];