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

Now options are stored in EEPROM

Browse source
This commit is contained in:
bsongis 2012-05-06 14:47:18 +00:00
parent 2c8c1f856b
commit 801c0c2a52
5 changed files with 71 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/myeeprom.h
View file

@ -100,6 +100,35 @@ enum BeeperMode {
#define EXTRA_ARM_FIELDS #define EXTRA_ARM_FIELDS
#endif #endif
#if defined(FRSKY)
#define FRSKY_OPTION 0x01
#else
#define FRSKY_OPTION 0x00
#endif
#if defined(HAPTIC)
#define HAPTIC_OPTION 0x02
#else
#define HAPTIC_OPTION 0x00
#endif
#if defined(DEBUG)
#define DEBUG_OPTION 0x04
#else
#define DEBUG_OPTION 0x00
#endif
#if defined(PXX)
#define PXX_OPTION 0x10
#else
#define PXX_OPTION 0x00
#endif
#if defined(DSM2)
#define DSM2_OPTION 0x20
#else
#define DSM2_OPTION 0x00
#endif
#define FW_OPTIONS (FRSKY_OPTION|HAPTIC_OPTION|DEBUG_OPTION|PXX_OPTION|DSM2_OPTION)
#define ALTERNATE_VIEW 0x10 #define ALTERNATE_VIEW 0x10
PACK(typedef struct t_EEGeneral { PACK(typedef struct t_EEGeneral {
uint8_t myVers; uint8_t myVers;
@ -145,6 +174,8 @@ PACK(typedef struct t_EEGeneral {
EXTRA_ARM_FIELDS EXTRA_ARM_FIELDS
uint8_t fwOptions;
}) EEGeneral; }) EEGeneral;
// eeprom modelspec // eeprom modelspec
@ -511,8 +542,12 @@ enum Protocols {
PROTO_PPM, PROTO_PPM,
PROTO_PPM16, PROTO_PPM16,
PROTO_PPMSIM, PROTO_PPMSIM,
#if defined(PXX)
PROTO_PXX, PROTO_PXX,
#endif
#if defined(DSM2)
PROTO_DSM2, PROTO_DSM2,
#endif
PROTO_MAX PROTO_MAX
}; };

3
src/open9x.cpp
View file

@ -135,6 +135,7 @@ void generalDefault()
memset(&g_eeGeneral, 0, sizeof(g_eeGeneral)); memset(&g_eeGeneral, 0, sizeof(g_eeGeneral));
g_eeGeneral.lightSw = SWITCH_ON; g_eeGeneral.lightSw = SWITCH_ON;
g_eeGeneral.myVers = EEPROM_VER; g_eeGeneral.myVers = EEPROM_VER;
g_eeGeneral.fwOptions = FW_OPTIONS;
g_eeGeneral.contrast = 25; g_eeGeneral.contrast = 25;
g_eeGeneral.vBatWarn = 90; g_eeGeneral.vBatWarn = 90;
for (int i = 0; i < 7; ++i) { for (int i = 0; i < 7; ++i) {
@ -2570,8 +2571,10 @@ int main(void)
#endif #endif
{ {
#ifdef SPLASH #ifdef SPLASH
#ifdef DSM2
// TODO rather use another Model Parameter // TODO rather use another Model Parameter
if (g_model.protocol != PROTO_DSM2) if (g_model.protocol != PROTO_DSM2)
#endif
doSplash(); doSplash();
#endif #endif

12
src/translations/en.h
View file

@ -47,7 +47,17 @@
#endif #endif
#define LEN_VPROTOS "\006" #define LEN_VPROTOS "\006"
#define TR_VPROTOS "PPM\0 ""PPM16\0""PPMsim""PXX\0 ""DSM2\0 " #ifdef PXX
#define TR_PXX "PXX\0 "
#else
#define TR_PXX
#endif
#ifdef DSM2
#define TR_DSM2 "DSM2\0 "
#else
#define TR_DSM2
#endif
#define TR_VPROTOS "PPM\0 ""PPM16\0""PPMsim" TR_PXX TR_DSM2
#define LEN_POSNEG "\003" #define LEN_POSNEG "\003"
#define TR_POSNEG "POS""NEG" #define TR_POSNEG "POS""NEG"

12
src/translations/fr.h
View file

@ -47,7 +47,17 @@
#endif #endif
#define LEN_VPROTOS "\006" #define LEN_VPROTOS "\006"
#define TR_VPROTOS "PPM\0 ""PPM16\0""PPMsim""PXX\0 ""DSM2\0 " #ifdef PXX
#define TR_PXX "PXX\0 "
#else
#define TR_PXX
#endif
#ifdef DSM2
#define TR_DSM2 "DSM2\0 "
#else
#define TR_DSM2
#endif
#define TR_VPROTOS "PPM\0 ""PPM16\0""PPMsim" TR_PXX TR_DSM2
#define LEN_POSNEG "\003" #define LEN_POSNEG "\003"
#define TR_POSNEG "POS""NEG" #define TR_POSNEG "POS""NEG"

12
src/translations/se.h
View file

@ -47,7 +47,17 @@
#endif #endif
#define LEN_VPROTOS "\006" #define LEN_VPROTOS "\006"
#define TR_VPROTOS "PPM\0 ""PPM16\0""PPMsim""PXX\0 ""DSM2\0 " #ifdef PXX
#define TR_PXX "PXX\0 "
#else
#define TR_PXX
#endif
#ifdef DSM2
#define TR_DSM2 "DSM2\0 "
#else
#define TR_DSM2
#endif
#define TR_VPROTOS "PPM\0 ""PPM16\0""PPMsim" TR_PXX TR_DSM2
#define LEN_POSNEG "\003" #define LEN_POSNEG "\003"
#define TR_POSNEG "POS""NEG" #define TR_POSNEG "POS""NEG"