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

Issue 53 fixed

Browse Source 
Issue 75 fixed
This commit is contained in:
bsongis
2012-08-11 20:08:58 +00:00
parent 5697f4aa72
commit 0eee68144d
3 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/open9x.cpp
+19 -10
View File
@@ -635,6 +635,9 @@ bool __getSwitch(int8_t swtch)
#if defined(FRSKY)
// Telemetry
if (cs->v1 > CSW_CHOUT_BASE+NUM_CHNOUT) {
if (frskyStreaming <= 0 && cs->v1 > CSW_CHOUT_BASE+NUM_CHNOUT+MAX_TIMERS)
return swtch > 0 ? false : true;
y = convertTelemValue(cs->v1-(CSW_CHOUT_BASE+NUM_CHNOUT), 128+cs->v2);
uint8_t idx = cs->v1-CSW_CHOUT_BASE-NUM_CHNOUT-TELEM_ALT;
if (idx < THLD_MAX) {
@@ -1726,13 +1729,14 @@ void playValue(uint8_t idx)
default:
{
uint8_t unit;
uint8_t unit = 1;
if (idx < NUM_XCHNRAW+TELEM_TM1-1)
val = (val * 25) / 256;
if (idx >= NUM_XCHNRAW+TELEM_ALT-1 && idx <= NUM_XCHNRAW+TELEM_GPSALT-1)
unit = idx - (NUM_XCHNRAW+TELEM_ALT-1);
else if (idx >= NUM_XCHNRAW+TELEM_MAX_T1-1 && idx <= NUM_XCHNRAW+TELEM_MAX_DIST-1)
unit = 3 + idx - (NUM_XCHNRAW+TELEM_MAX_T1-1);
else
unit = 1;
unit = pgm_read_byte(bchunit_ar+unit);
#if !defined(IMPERIAL_UNITS)
if (unit == UNIT_KTS) {
@@ -1785,20 +1789,25 @@ void evalFunctions()
swtch += MAX_SWITCH+1;
}
if (getSwitch(swtch, 0)) {
if (sd->func < FUNC_TRAINER && sd->delay) {
safetyCh[sd->func] = FSW_PARAM(sd);
}
if (sd->delay) {
if (sd->func < FUNC_TRAINER) {
safetyCh[sd->func] = FSW_PARAM(sd);
}
if (~activeFunctions & function_mask) {
if (sd->func == FUNC_INSTANT_TRIM) {
if (g_menuStack[0] == menuMainView
if (~activeFunctions & function_mask) {
if (sd->func == FUNC_INSTANT_TRIM) {
if (g_menuStack[0] == menuMainView
#if defined(FRSKY)
|| g_menuStack[0] == menuProcFrsky
#endif
)
instantTrim();
instantTrim();
}
}
}
else if (sd->func <= FUNC_INSTANT_TRIM) {
function_mask = 0;
}
#if defined(SDCARD)
if (sd->func == FUNC_LOGS) {