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

[all] MODS strings removed (unused)

Browse Source 
[all] EEPROM variants
This commit is contained in:
bsongis
2012-10-18 17:45:34 +00:00
parent f497c4f9d2
commit 99283c6ed6
15 changed files with 85 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Makefile
-13
View File
@@ -385,19 +385,16 @@ endif
# If JETI-Support is enabled
ifeq ($(EXT), JETI)
MODS:=${MODS}J
CPPDEFS += -DJETI
endif
ifeq ($(EXT), MAVLINK)
MODS:=${MODS}M
CPPDEFS += -DMAVLINK
CPPSRC += mavlink.cpp rotarysw.cpp serial.cpp
endif
# If FRSKY-Support is enabled
ifeq ($(EXT), FRSKY)
MODS:=${MODS}F
CPPDEFS += -DFRSKY
CPPSRC += frsky.cpp
# If FRSKY-Hub is enabled
@@ -406,7 +403,6 @@ ifeq ($(EXT), FRSKY)
endif
# If WS HowHigh is enabled
ifeq ($(WS_HOW_HIGH), YES)
MODS:=${MODS}W
CPPDEFS += -DWS_HOW_HIGH
endif
# If Vario is enabled
@@ -424,7 +420,6 @@ ifeq ($(EEPROM_PROGRESS_BAR), YES)
endif
ifeq ($(SDCARD), YES)
MODS:=${MODS}S
CPPDEFS += -DSDCARD
CPPSRC += logs.cpp
endif
@@ -455,7 +450,6 @@ ifeq ($(PCB), X9D)
endif
ifeq ($(BLUETOOTH), YES)
MODS:=${MODS}S
CPPDEFS += -DBLUETOOTH
CPPSRC += sky9x/bluetooth.cpp
endif
@@ -491,7 +485,6 @@ ifeq ($(PCB), SKY9X)
endif
ifeq ($(BLUETOOTH), YES)
MODS:=${MODS}S
CPPDEFS += -DBLUETOOTH
CPPSRC += sky9x/bluetooth.cpp
endif
@@ -525,7 +518,6 @@ ifeq ($(PCB), GRUVIN9X)
ifeq ($(EXTRA_ROTARY_ENCODERS), YES)
CPPDEFS += -DEXTRA_ROTARY_ENCODERS
MODS:=${MODS}X
endif
endif
@@ -611,7 +603,6 @@ ifeq ($(DECIMALS), YES)
endif
ifeq ($(HELI), YES)
MODS:=${MODS}H
CPPDEFS += -DHELI
endif
@@ -738,28 +729,24 @@ stamp_header:
@echo "//Automatically generated file (Makefile) - do not edit" > stamp-open9x.h
@echo "#define DATE_STR \"`date +%Y-%m-%d`\"" >> stamp-open9x.h
@echo "#define TIME_STR \"`date +%H:%M:%S`\"" >> stamp-open9x.h
@echo "#define VERS_STR \"$(MAJ_VER).$(MIN_VER)-$(MODS)\"" >> stamp-open9x.h
@echo "#define SVN_STR \"open9x-r$(SVNREV)\"" >> stamp-open9x.h
@cat stamp-open9x.h
stock-stamp:
@echo "#define DATE_STR \"`date +%Y-%m-%d`\"" > stamp-open9x-stock.txt
@echo "#define TIME_STR \"`date +%H:%M:%S`\"" >> stamp-open9x-stock.txt
@echo "#define VERS_STR \"$(MAJ_VER).$(MIN_VER)\"" >> stamp-open9x-stock.txt
@echo "#define SVN_VERS \"open9x-r$(SVNREV)\"" >> stamp-open9x-stock.txt
@cat stamp-open9x-stock.txt
v4-stamp:
@echo "#define DATE_STR \"`date +%Y-%m-%d`\"" > stamp-open9x-v4.txt
@echo "#define TIME_STR \"`date +%H:%M:%S`\"" >> stamp-open9x-v4.txt
@echo "#define VERS_STR \"$(MAJ_VER).$(MIN_VER)\"" >> stamp-open9x-v4.txt
@echo "#define SVN_VERS \"open9x-r$(SVNREV)\"" >> stamp-open9x-v4.txt
@cat stamp-open9x-v4.txt
arm-stamp:
@echo "#define DATE_STR \"`date +%Y-%m-%d`\"" > stamp-open9x-arm.txt
@echo "#define TIME_STR \"`date +%H:%M:%S`\"" >> stamp-open9x-arm.txt
@echo "#define VERS_STR \"$(MAJ_VER).$(MIN_VER)\"" >> stamp-open9x-arm.txt
@echo "#define SVN_VERS \"open9x-r$(SVNREV)\"" >> stamp-open9x-arm.txt
@cat stamp-open9x-arm.txt
src/eeprom_arm.cpp
+7 -8
View File
@@ -444,17 +444,16 @@ bool ee32LoadGeneral()
read32_eeprom_data( ( File_system[0].block_no << 12) + sizeof( struct t_eeprom_header), ( uint8_t *)&g_eeGeneral, size) ;
}
if (g_eeGeneral.myVers == EEPROM_VER && g_eeGeneral.variants == EEPROM_VARIANTS) {
if (g_eeGeneral.version == EEPROM_VER && g_eeGeneral.variant == EEPROM_VARIANT) {
uint16_t sum = evalChkSum();
if (g_eeGeneral.chkSum == sum) {
return true;
}
}
#ifdef SIMU
else {
printf("EEPROM version %d (%d) instead of %d (%d)\n", g_eeGeneral.myVers, g_eeGeneral.variants, EEPROM_VER, EEPROM_VARIANTS);
fflush(stdout);
}
printf("EEPROM version %d (%d) instead of %d (%d)\n", g_eeGeneral.version, g_eeGeneral.variant, EEPROM_VER, EEPROM_VARIANT);
fflush(stdout);
#endif
return false;
@@ -513,8 +512,8 @@ void eeLoadModel(uint8_t id)
resetProto();
for (uint8_t i=0; i<MAX_TIMERS; i++) {
if (g_model.timersXtra[i].remanent) {
s_timerVal[i] = g_model.timersXtra[i].value;
if (g_model.timers[i].remanent) {
s_timerVal[i] = g_model.timers[i].value;
}
}
@@ -985,7 +984,7 @@ const pm_char * eeBackupModel(uint8_t i_fileSrc)
uint16_t size = File_system[i_fileSrc+1].size;
*(uint32_t*)&buf[0] = O9X_FOURCC;
buf[4] = g_eeGeneral.myVers;
buf[4] = g_eeGeneral.version;
buf[5] = 'M';
*(uint16_t*)&buf[6] = size;
src/eeprom_avr.cpp
+11 -5
View File
@@ -578,7 +578,7 @@ const pm_char * eeBackupModel(uint8_t i_fileSrc)
theFile2.openRd(FILE_MODEL(i_fileSrc));
*(uint32_t*)&buf[0] = O9X_FOURCC;
buf[4] = g_eeGeneral.myVers;
buf[4] = g_eeGeneral.version;
buf[5] = 'M';
*(uint16_t*)&buf[6] = theFile2.size();
@@ -813,14 +813,20 @@ void RlcFile::DisplayProgressBar(uint8_t x)
bool eeLoadGeneral()
{
theFile.openRlc(FILE_GENERAL);
if (theFile.readRlc((uint8_t*)&g_eeGeneral, 1) == 1 && g_eeGeneral.myVers == EEPROM_VER) {
if (theFile.readRlc((uint8_t*)&g_eeGeneral, 1) == 1 && g_eeGeneral.version == EEPROM_VER) {
theFile.openRlc(FILE_GENERAL);
if (theFile.readRlc((uint8_t*)&g_eeGeneral, sizeof(g_eeGeneral)) <= sizeof(EEGeneral)) {
if (g_eeGeneral.variants == EEPROM_VARIANTS && g_eeGeneral.chkSum == evalChkSum()) {
if (g_eeGeneral.variant == EEPROM_VARIANT && g_eeGeneral.chkSum == evalChkSum()) {
return true;
}
}
}
#ifdef SIMU
printf("EEPROM version %d (%d) instead of %d (%d)\n", g_eeGeneral.version, g_eeGeneral.variant, EEPROM_VER, EEPROM_VARIANT);
fflush(stdout);
#endif
return false;
}
@@ -883,8 +889,8 @@ void eeLoadModel(uint8_t id)
#if defined(PCBGRUVIN9X)
for (uint8_t i=0; i<MAX_TIMERS; i++) {
if (g_model.timersXtra[i].remanent) {
s_timerVal[i] = g_model.timersXtra[i].value;
if (g_model.timers[i].remanent) {
s_timerVal[i] = g_model.timers[i].value;
}
}
#endif
src/general_menus.cpp
+5 -5
View File
@@ -757,18 +757,18 @@ void menuGeneralVersion(uint8_t event)
lcd_putsLeft(2*FH, stamp1);
lcd_putsLeft(3*FH, stamp2);
lcd_putsLeft(4*FH, stamp3);
lcd_putsLeft(5*FH, stamp4);
#if defined(PCBSKY9X)
if (Coproc_valid == 1) {
lcd_putsLeft(6*FH, PSTR("CoPr:"));
lcd_outdez8(10*FW, 6*FH, Coproc_read);
lcd_putsLeft(5*FH, PSTR("CoPr:"));
lcd_outdez8(10*FW, 5*FH, Coproc_read);
}
else {
lcd_putsLeft(6*FH, PSTR("CoPr: ---"));
lcd_putsLeft(5*FH, PSTR("CoPr: ---"));
}
#endif
lcd_putsLeft(7*FH, STR_EEPROMV);
lcd_outdezAtt(8*FW, 7*FH, g_eeGeneral.myVers, LEFT);
lcd_outdezAtt(6*FW+1, 7*FH, g_eeGeneral.version, LEFT);
lcd_outhex4(10*FW+1, 7*FH, g_eeGeneral.variant);
}
void displayKeyState(uint8_t x, uint8_t y, EnumKeys key)
src/model_menus.cpp
+7 -7
View File
@@ -638,30 +638,30 @@ void menuModelSetup(uint8_t event)
TimerData *timer = &g_model.timers[k-ITEM_MODEL_TIMER1];
putsStrIdx(0*FW, y, STR_TIMER, k-ITEM_MODEL_TIMER1+1);
putsTmrMode(MODEL_SETUP_2ND_COLUMN, y, timer->mode, (attr && m_posHorz==0) ? blink : 0);
putsTime(MODEL_SETUP_2ND_COLUMN+5*FW-2, y, timer->val,
putsTime(MODEL_SETUP_2ND_COLUMN+5*FW-2, y, timer->start,
(attr && m_posHorz==1 ? blink:0),
(attr && m_posHorz==2 ? blink:0) );
#if defined(PCBSKY9X) || defined(PCBGRUVIN9X)
lcd_putcAtt(MODEL_SETUP_2ND_COLUMN+10*FW-1, y, g_model.timersXtra[k-ITEM_MODEL_TIMER1].remanent ? 'R' : '-', (attr && m_posHorz==3) ? blink : 0);
lcd_putcAtt(MODEL_SETUP_2ND_COLUMN+10*FW-1, y, g_model.timers[k-ITEM_MODEL_TIMER1].remanent ? 'R' : '-', (attr && m_posHorz==3) ? blink : 0);
#endif
if (attr && (editMode>0 || p1valdiff)) {
div_t qr = div(timer->val, 60);
div_t qr = div(timer->start, 60);
switch (m_posHorz) {
case 0:
CHECK_INCDEC_MODELVAR(event, timer->mode, -2*(MAX_PSWITCH+NUM_CSW), TMR_VAROFS-1+2*(MAX_PSWITCH+NUM_CSW));
break;
case 1:
CHECK_INCDEC_MODELVAR(event, qr.quot, 0, 59);
timer->val = qr.rem + qr.quot*60;
timer->start = qr.rem + qr.quot*60;
break;
case 2:
qr.rem -= checkIncDecModel(event, qr.rem+2, 1, 62)-2;
timer->val -= qr.rem ;
if ((int16_t)timer->val < 0) timer->val=0;
timer->start -= qr.rem ;
if ((int16_t)timer->start < 0) timer->start=0;
break;
#if defined(PCBSKY9X) || defined(PCBGRUVIN9X)
case 3:
CHECK_INCDEC_MODELVAR(event, g_model.timersXtra[k-ITEM_MODEL_TIMER1].remanent, 0, 1);
CHECK_INCDEC_MODELVAR(event, g_model.timers[k-ITEM_MODEL_TIMER1].remanent, 0, 1);
break;
#endif
}
src/myeeprom.h
+17 -19
View File
@@ -124,7 +124,8 @@ enum BacklightMode {
#define ALTERNATE_VIEW 0x10
PACK(typedef struct t_EEGeneral {
uint8_t myVers;
uint8_t version;
uint16_t variant;
int16_t calibMid[7];
int16_t calibSpanNeg[7];
int16_t calibSpanPos[7];
@@ -166,8 +167,6 @@ PACK(typedef struct t_EEGeneral {
EXTRA_SKY9X_FIELDS;
uint8_t variants;
EXTRA_GENERAL_FIELDS;
}) EEGeneral;
@@ -678,10 +677,20 @@ PACK(typedef struct t_PhaseData {
#define TMRMODE_THR 2
#define TMRMODE_THR_REL 3
#define TMRMODE_THR_TRG 4
#if defined(PCBGRUVIN9X) || defined(PCBSKY9X)
PACK(typedef struct t_TimerData {
int8_t mode; // timer trigger source -> off, abs, stk, stk%, sw/!sw, !m_sw/!m_sw
uint16_t val;
uint16_t start;
uint16_t remanent:1;
uint16_t value:15;
}) TimerData;
#else
PACK(typedef struct t_TimerData {
int8_t mode; // timer trigger source -> off, abs, stk, stk%, sw/!sw, !m_sw/!m_sw
uint16_t start;
}) TimerData;
#endif
enum Protocols {
PROTO_PPM,
@@ -721,16 +730,6 @@ enum Dsm2Variants {
#define BeepANACenter uint8_t
#endif
#if defined(PCBGRUVIN9X) || defined(PCBSKY9X)
PACK(typedef struct t_TimerDataExtra {
uint16_t remanent:1;
uint16_t value:15;
}) TimerDataExtra;
#define EXTRA_MODEL_FIELDS TimerDataExtra timersXtra[MAX_TIMERS]
#else
#define EXTRA_MODEL_FIELDS
#endif
#if defined(PCBSKY9X)
PACK(typedef struct {
int8_t value;
@@ -744,10 +743,10 @@ typedef int8_t model_gvar_t;
#if defined(GVARS)
#define MAX_GVARS 5
#define EXTRA_GVARS model_gvar_t gvars[MAX_GVARS]
#define GVARS_DATA model_gvar_t gvars[MAX_GVARS]
#else
#define MAX_GVARS 0
#define EXTRA_GVARS
#define GVARS_DATA
#endif
PACK(typedef struct t_ModelData {
@@ -782,13 +781,12 @@ PACK(typedef struct t_ModelData {
uint8_t switchWarningStates;
GVARS_DATA;
TELEMETRY_DATA;
ROTARY_ENCODER_ARRAY_EXTRA;
EXTRA_MODEL_FIELDS;
EXTRA_GVARS;
}) ModelData;
extern EEGeneral g_eeGeneral;
src/open9x.cpp
+9 -9
View File
@@ -215,8 +215,8 @@ void memclear(void *ptr, uint8_t size)
void generalDefault()
{
memclear(&g_eeGeneral, sizeof(g_eeGeneral));
g_eeGeneral.myVers = EEPROM_VER;
g_eeGeneral.variants = EEPROM_VARIANTS;
g_eeGeneral.version = EEPROM_VER;
g_eeGeneral.variant = EEPROM_VARIANT;
g_eeGeneral.contrast = 25;
g_eeGeneral.vBatWarn = 90;
for (int i = 0; i < 7; ++i) {
@@ -1609,7 +1609,7 @@ uint8_t trimsCheckTimer = 0;
void resetTimer(uint8_t idx)
{
s_timerState[idx] = TMR_OFF; // is changed to RUNNING dep from mode
s_timerVal[idx] = g_model.timers[idx].val;
s_timerVal[idx] = g_model.timers[idx].start;
s_timerVal_10ms[idx] = 0 ;
}
@@ -2629,7 +2629,7 @@ inline void doMixerCalculations(tmr10ms_t tmr10ms, uint8_t tick10ms)
// Timers start
for (uint8_t i=0; i<2; i++) {
int8_t tm = g_model.timers[i].mode;
uint16_t tv = g_model.timers[i].val;
uint16_t tv = g_model.timers[i].start;
if (tm) {
if (s_timerState[i] == TMR_OFF) {
@@ -2707,14 +2707,14 @@ inline void doMixerCalculations(tmr10ms_t tmr10ms, uint8_t tick10ms)
static int16_t last_tmr;
if (last_tmr != s_timerVal[0]) { // beep only if seconds advance
if (s_timerState[0] == TMR_RUNNING) {
if (g_eeGeneral.preBeep && g_model.timers[0].val) { // beep when 30, 15, 10, 5,4,3,2,1 seconds remaining
if (g_eeGeneral.preBeep && g_model.timers[0].start) { // beep when 30, 15, 10, 5,4,3,2,1 seconds remaining
if(s_timerVal[0]==30) AUDIO_TIMER_30(); //beep three times
if(s_timerVal[0]==20) AUDIO_TIMER_20(); //beep two times
if(s_timerVal[0]==10) AUDIO_TIMER_10();
if(s_timerVal[0]<= 3) AUDIO_TIMER_LT3(s_timerVal[0]);
}
if (g_eeGeneral.minuteBeep && (((g_model.timers[0].val ? g_model.timers[0].val-s_timerVal[0] : s_timerVal[0])%60)==0)) { // short beep every minute
if (g_eeGeneral.minuteBeep && (((g_model.timers[0].start ? g_model.timers[0].start-s_timerVal[0] : s_timerVal[0])%60)==0)) { // short beep every minute
AUDIO_MINUTE_BEEP();
}
}
@@ -3270,9 +3270,9 @@ void moveTrimsToOffsets() // copy state of 3 primary to subtrim
void saveTimers()
{
for (uint8_t i=0; i<MAX_TIMERS; i++) {
if (g_model.timersXtra[i].remanent) {
if (g_model.timersXtra[i].value != s_timerVal[i]) {
g_model.timersXtra[i].value = s_timerVal[i];
if (g_model.timers[i].remanent) {
if (g_model.timers[i].value != s_timerVal[i]) {
g_model.timers[i].value = s_timerVal[i];
eeDirty(EE_MODEL);
}
}
src/open9x.h
+20 -2
View File
@@ -36,7 +36,6 @@
#define MAJ_VERS 2
#define MIN_VERS 00
#define EEPROM_VARIANTS (0x00)
#include <inttypes.h>
#include <string.h>
@@ -86,8 +85,10 @@
#endif
#if defined(FRSKY)
#define FRSKY_VARIANT 0x0002
#define IF_FRSKY(x) x,
#else
#define FRSKY_VARIANT 0x0000
#define IF_FRSKY(x)
#endif
@@ -133,12 +134,30 @@
#define IF_CURVES(x)
#endif
#if defined(GVARS)
#define GVARS_VARIANT 0x0001
#define IF_GVARS(x) x,
#else
#define GVARS_VARIANT 0x0000
#define IF_GVARS(x)
#endif
#if defined(PCBSTD)
#define WDT_RESET_STOCK() wdt_reset()
#else
#define WDT_RESET_STOCK()
#endif
/* #define HELI_VARIANT 0x0004
#define VOICE_VARIANT 0x0008
#define PHASES_VARIANT 0x0010
#define PXX_VARIANT 0x0020
#define DSM2_VARIANT 0x0040
#define VARIO_VARIANT 0x0080
#define HAPTIC_VARIANT 0x0100 */
#define EEPROM_VARIANT (GVARS_VARIANT + FRSKY_VARIANT)
#if defined(PCBSKY9X)
#include "board_sky9x.h"
#elif defined(PCBGRUVIN9X)
@@ -963,7 +982,6 @@ extern inline uint16_t get_tmr10ms()
extern const char stamp1[];
extern const char stamp2[];
extern const char stamp3[];
extern const char stamp4[];
extern uint8_t g_vbat100mV;
extern volatile uint8_t g_blinkTmr10ms;
src/stamp.cpp
+3 -4
View File
@@ -37,8 +37,7 @@
#define STR2(s) #s
#define DEFNUMSTR(s) STR2(s)
const pm_char stamp1[] PROGMEM = "VERS: V" VERS_STR;
const pm_char stamp2[] PROGMEM = " SVN: " SVN_STR;
const pm_char stamp3[] PROGMEM = "DATE: " DATE_STR;
const pm_char stamp4[] PROGMEM = "TIME: " TIME_STR;
const pm_char stamp1[] PROGMEM = " SVN: " SVN_STR;
const pm_char stamp2[] PROGMEM = "DATE: " DATE_STR;
const pm_char stamp3[] PROGMEM = "TIME: " TIME_STR;
src/translations/cz.h
+1 -1
View File
@@ -325,7 +325,7 @@
#define TR_MODESRC " M\205d\003% Zdroj"
#define TR_MULTIPLIER "N\200sobi\201"
#define TR_CAL "Kal."
#define TR_EEPROMV "EEPROM v"
#define TR_EEPROMV "EEpr:\004-"
#define TR_VTRIM "Trim- +"
#define TR_BG "BG:"
#define TR_MENUTOSTART " [MENU] = START"
src/translations/de.h
+1 -1
View File
@@ -325,7 +325,7 @@
#define TR_MODESRC "MODE\003% QUELLE"
#define TR_MULTIPLIER "Multiplikator"
#define TR_CAL "Kal."
#define TR_EEPROMV "EEPROM v"
#define TR_EEPROMV "EEpr:\004-"
#define TR_VTRIM "Trim- +"
#define TR_BG "BG:"
#define TR_MENUTOSTART "[MENU] > Starten"
src/translations/en.h
+1 -1
View File
@@ -326,7 +326,7 @@
#define TR_MODESRC "mode\003% src"
#define TR_MULTIPLIER "Multiplier"
#define TR_CAL "Cal"
#define TR_EEPROMV "EEPROM v"
#define TR_EEPROMV "EEpr:\004-"
#define TR_VTRIM "Trim- +"
#define TR_BG "BG:"
#define TR_MENUTOSTART "[MENU] TO START"
src/translations/fr.h
+1 -1
View File
@@ -323,7 +323,7 @@
#define TR_MODESRC "Mode\003% Source"
#define TR_MULTIPLIER "Multiplieur"
#define TR_CAL "Cal"
#define TR_EEPROMV "EEPROM v"
#define TR_EEPROMV "EEpr:\004-"
#define TR_VTRIM "Trim- +"
#define TR_BG "BG:"
#define TR_MENUTOSTART "[MENU]POUR DEBUT"
src/translations/it.h
+1 -1
View File
@@ -325,7 +325,7 @@
#define TR_MODESRC "mode\003% src"
#define TR_MULTIPLIER "Moltiplica"
#define TR_CAL "Cal"
#define TR_EEPROMV "EEPROM v"
#define TR_EEPROMV "EEpr:\004-"
#define TR_VTRIM "Trim- +"
#define TR_BG "BG:"
#define TR_MENUTOSTART "[Men\200] per Cal."
src/translations/se.h
+1 -1
View File
@@ -322,7 +322,7 @@
#define TR_MODESRC " l\201ge % k\201lla"
#define TR_MULTIPLIER "Styrka"
#define TR_CAL "Kalib."
#define TR_EEPROMV "EEPROM v"
#define TR_EEPROMV "EEpr:\004-"
#define TR_VTRIM "Trim- +"
#define TR_BG "BG:"
#define TR_MENUTOSTART "[MENU] STARTAR"