Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-24 00:35:18 +03:00
Code Issues Wiki Activity

Stick mode now in one global variable, it should work in Horus emerge… (#3455)

Browse source 
* Stick mode now in one global variable, it should work in Horus emergency mode

* Improvements (suggested by Bertrand)
This commit is contained in:
Damjan Adamic 2016-05-02 23:39:15 +02:00 • committed by Bertrand Songis
parent d2f654e32d
commit baacc0fe29
7 changed files with 88 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

14
radio/src/gui/9x/menu_general_setup.cpp
View file

@ -141,6 +141,10 @@ void menuGeneralSetup(uint8_t event)
MENU(STR_MENURADIOSETUP, menuTabGeneral, e_Setup, ITEM_SETUP_MAX+1, {0, CASE_RTCLOCK(2) CASE_RTCLOCK(2) CASE_BATTGRAPH(1) LABEL(SOUND), CASE_AUDIO(0) CASE_BUZZER(0) CASE_VOICE(0) CASE_CPUARM(0) CASE_CPUARM(0) CASE_CPUARM(0) 0, CASE_AUDIO(0) CASE_VARIO_CPUARM(LABEL(VARIO)) CASE_VARIO_CPUARM(0) CASE_VARIO_CPUARM(0) CASE_VARIO_CPUARM(0) CASE_VARIO_CPUARM(0) CASE_HAPTIC(LABEL(HAPTIC)) CASE_HAPTIC(0) CASE_HAPTIC(0) CASE_HAPTIC(0) 0, LABEL(ALARMS), 0, CASE_CAPACITY(0) CASE_PCBSKY9X(0) 0, 0, 0, IF_ROTARY_ENCODERS(0) LABEL(BACKLIGHT), 0, 0, CASE_CPUARM(0) CASE_PWM_BACKLIGHT(0) CASE_PWM_BACKLIGHT(0) 0, CASE_SPLASH_PARAM(0) CASE_GPS(0) CASE_GPS(0) CASE_PXX(0) CASE_CPUARM(0) CASE_CPUARM(0) IF_FAI_CHOICE(0) CASE_MAVLINK(0) CASE_CPUARM(0) 0, COL_TX_MODE, 1/*to force edit mode*/});
if (event == EVT_ENTRY) {
reusableBuffer.generalSettings.stickMode = g_eeGeneral.stickMode;
}
uint8_t sub = menuVerticalPosition - 1;
for (uint8_t i=0; i<LCD_LINES-1; i++) {
@ -557,16 +561,16 @@ void menuGeneralSetup(uint8_t event)
break;
case ITEM_SETUP_STICK_MODE:
lcdDrawChar(2*FW, y, '1'+g_eeGeneral.stickMode, attr);
lcdDrawChar(2*FW, y, '1'+reusableBuffer.generalSettings.stickMode, attr);
for (uint8_t i=0; i<4; i++) {
putsMixerSource((6+4*i)*FW, y, MIXSRC_Rud + pgm_read_byte(modn12x3 + 4*g_eeGeneral.stickMode + i), 0);
putsMixerSource((6+4*i)*FW, y, MIXSRC_Rud + pgm_read_byte(modn12x3 + 4*reusableBuffer.generalSettings.stickMode + i), 0);
}
if (attr && s_editMode>0) {
CHECK_INCDEC_GENVAR(event, g_eeGeneral.stickMode, 0, 3);
CHECK_INCDEC_GENVAR(event, reusableBuffer.generalSettings.stickMode, 0, 3);
}
else if (stickMode != g_eeGeneral.stickMode) {
else if (reusableBuffer.generalSettings.stickMode != g_eeGeneral.stickMode) {
pausePulses();
stickMode = g_eeGeneral.stickMode;
g_eeGeneral.stickMode = reusableBuffer.generalSettings.stickMode;
checkTHR();
resumePulses();
clearKeyEvents();

14
radio/src/gui/horus/menu_general_setup.cpp
View file

@ -117,6 +117,10 @@ bool menuGeneralSetup(evt_t event)
LABEL(BACKLIGHT), 0, 0, 0, 0, 0,
CASE_GPS(LABEL(GPS)) CASE_GPS(0) CASE_GPS(0) CASE_PXX(0) 0, 0, 0, 0, 0, 0, 1/*to force edit mode*/ });
if (event == EVT_ENTRY) {
reusableBuffer.generalSettings.stickMode = g_eeGeneral.stickMode;
}
int sub = menuVerticalPosition;
for (int i=0; i<NUM_BODY_LINES; i++) {
@ -496,17 +500,17 @@ bool menuGeneralSetup(evt_t event)
{
lcdDrawText(MENUS_MARGIN_LEFT, y, NO_INDENT(STR_MODE));
char s[2] = " ";
s[0] = '1'+g_eeGeneral.stickMode;
s[0] = '1'+reusableBuffer.generalSettings.stickMode;
lcdDrawText(RADIO_SETUP_2ND_COLUMN, y, s, attr);
for (uint8_t i=0; i<4; i++) {
putsMixerSource(RADIO_SETUP_2ND_COLUMN + 40 + 50*i, y, MIXSRC_Rud + pgm_read_byte(modn12x3 + 4*g_eeGeneral.stickMode + i));
putsMixerSource(RADIO_SETUP_2ND_COLUMN + 40 + 50*i, y, MIXSRC_Rud + pgm_read_byte(modn12x3 + 4*reusableBuffer.generalSettings.stickMode + i));
}
if (attr && s_editMode>0) {
CHECK_INCDEC_GENVAR(event, g_eeGeneral.stickMode, 0, 3);
CHECK_INCDEC_GENVAR(event, reusableBuffer.generalSettings.stickMode, 0, 3);
}
else if (stickMode != g_eeGeneral.stickMode) {
else if (reusableBuffer.generalSettings.stickMode != g_eeGeneral.stickMode) {
pausePulses();
stickMode = g_eeGeneral.stickMode;
g_eeGeneral.stickMode = reusableBuffer.generalSettings.stickMode;
checkTHR();
resumePulses();
clearKeyEvents();

14
radio/src/gui/taranis/menu_general_setup.cpp
View file

@ -116,6 +116,10 @@ void menuGeneralSetup(uint8_t event)
MENU(STR_MENURADIOSETUP, menuTabGeneral, e_Setup, ITEM_SETUP_MAX, { 2, 2, 1, LABEL(SOUND), 0, 0, 0, 0, 0, 0, 0, CASE_VARIO(LABEL(VARIO)) CASE_VARIO(0) CASE_VARIO(0) CASE_VARIO(0) CASE_VARIO(0) CASE_HAPTIC(LABEL(HAPTIC)) CASE_HAPTIC(0) CASE_HAPTIC(0) CASE_HAPTIC(0) 0, LABEL(ALARMS), 0, 0, 0, 0, IF_ROTARY_ENCODERS(0) LABEL(BACKLIGHT), 0, 0, 0, CASE_REVPLUS(0) CASE_PWM_BACKLIGHT(0) CASE_PWM_BACKLIGHT(0) 0, CASE_SPLASH_PARAM(0) CASE_GPS(LABEL(GPS)) CASE_GPS(0) CASE_GPS(0) CASE_GPS(0) CASE_PXX(0) 0, 0, IF_FAI_CHOICE(0) CASE_MAVLINK(0) 0, 0, LABEL(TX_MODE), 0, 1/*to force edit mode*/ });
if (event == EVT_ENTRY) {
reusableBuffer.generalSettings.stickMode = g_eeGeneral.stickMode;
}
int sub = menuVerticalPosition;
for (unsigned int i=0; i<NUM_BODY_LINES; i++) {
@ -466,16 +470,16 @@ void menuGeneralSetup(uint8_t event)
break;
case ITEM_SETUP_STICK_MODE:
lcdDrawChar(2*FW, y, '1'+g_eeGeneral.stickMode, attr);
lcdDrawChar(2*FW, y, '1'+reusableBuffer.generalSettings.stickMode, attr);
for (uint8_t i=0; i<4; i++) {
putsStickName((6+4*i)*FW, y, pgm_read_byte(modn12x3 + 4*g_eeGeneral.stickMode + i), 0);
putsStickName((6+4*i)*FW, y, pgm_read_byte(modn12x3 + 4*reusableBuffer.generalSettings.stickMode + i), 0);
}
if (attr && s_editMode>0) {
CHECK_INCDEC_GENVAR(event, g_eeGeneral.stickMode, 0, 3);
CHECK_INCDEC_GENVAR(event, reusableBuffer.generalSettings.stickMode, 0, 3);
}
else if (stickMode != g_eeGeneral.stickMode) {
else if (reusableBuffer.generalSettings.stickMode != g_eeGeneral.stickMode) {
pausePulses();
stickMode = g_eeGeneral.stickMode;
g_eeGeneral.stickMode = reusableBuffer.generalSettings.stickMode;
checkTHR();
resumePulses();
clearKeyEvents();

2
radio/src/opentx.cpp
View file

@ -67,8 +67,6 @@ audioQueue audio;
uint8_t heartbeat;
uint8_t stickMode;
#if defined(OVERRIDE_CHANNEL_FUNCTION)
safetych_t safetyCh[NUM_CHNOUT];
#endif

9
radio/src/opentx.h
View file

@ -539,15 +539,13 @@ typedef struct {
extern const pm_uint8_t bchout_ar[];
extern const pm_uint8_t modn12x3[];
extern uint8_t stickMode;
//convert from mode 1 to mode stickMode
//NOTICE! => 0..3 -> 0..3
#define RUD_STICK 0
#define ELE_STICK 1
#define THR_STICK 2
#define AIL_STICK 3
#define CONVERT_MODE(x) (((x)<=AIL_STICK) ? pgm_read_byte(modn12x3 + 4*stickMode + (x)) : (x) )
#define CONVERT_MODE(x) (((x)<=AIL_STICK) ? pgm_read_byte(modn12x3 + 4*g_eeGeneral.stickMode + (x)) : (x) )
extern uint8_t channel_order(uint8_t x);
@ -1499,7 +1497,6 @@ union ReusableBuffer
#else
char mainname[LEN_MODEL_NAME];
#endif
} modelsel;
// 103 bytes
@ -1537,6 +1534,10 @@ union ReusableBuffer
char id[27];
} version;
#endif
struct
{
uint8_t stickMode;
} generalSettings;
};
extern union ReusableBuffer reusableBuffer;

2
radio/src/storage/eeprom_common.cpp
View file

@ -97,8 +97,6 @@ void storageReadAll()
eeLoadModelHeaders();
}
stickMode = g_eeGeneral.stickMode;
#if defined(CPUARM)
for (uint8_t i=0; languagePacks[i]!=NULL; i++) {
if (!strncmp(g_eeGeneral.ttsLanguage, languagePacks[i]->id, 2)) {

2
radio/src/storage/sdcard_raw.cpp
View file

@ -177,8 +177,6 @@ void storageReadAll()
storageEraseAll(true);
}
stickMode = g_eeGeneral.stickMode;
#if defined(CPUARM)
for (uint8_t i=0; languagePacks[i]!=NULL; i++) {
if (!strncmp(g_eeGeneral.ttsLanguage, languagePacks[i]->id, 2)) {