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

Bug in MixWarning when Switches are sources. Negative differential now allowed

Browse Source
This commit is contained in:
bsongis
2012-03-25 10:37:02 +00:00
parent 39f14cdaae
commit 0a292381e1
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/model_menus.cpp
+2 -2
View File
@@ -1220,8 +1220,8 @@ void menuProcMixOne(uint8_t event)
case 2:
// TODO INFLIGHT
lcd_puts(2*FW, y, STR_DIFFERENTIAL);
lcd_outdezAtt(FW*10, y, md2->differential, attr|LEFT);
if (attr) CHECK_INCDEC_MODELVAR(event, md2->differential, 0, 100);
lcd_outdezAtt(FW*10, y, md2->differential*2, attr|LEFT);
if (attr) CHECK_INCDEC_MODELVAR(event, md2->differential, -50, 50);
break;
case 3:
lcd_puts(2*FW, y, STR_OFFSET);
src/myeeprom.h
+1 -1
View File
@@ -204,7 +204,7 @@ PACK(typedef struct t_MixData {
uint8_t speedUp:4; // Servogeschwindigkeit aus Tabelle (10ms Cycle)
uint8_t speedDown:4; // 0 nichts
uint16_t srcRaw:7; //
uint16_t differential:7;
int16_t differential:7;
uint16_t carryTrim:2;
int8_t sOffset;
}) MixData;
src/open9x.cpp
+6 -4
View File
@@ -1386,7 +1386,7 @@ void perOut(uint8_t phase)
v = chans[k-MIXSRC_CH1+1] / 100;
else if (k>=MIXSRC_THR-1 && k<=MIXSRC_SWC-1) {
v = getSwitch(k-MIXSRC_THR+1+1, 0) ? +1024 : -1024;
if (v<0 && !md->swtch && (md->delayDown || md->delayUp))
if (v<0 && !md->swtch)
sw = false;
}
else
@@ -1487,9 +1487,11 @@ void perOut(uint8_t phase)
//========== MULTIPLEX ===============
int32_t dv = (int32_t)v*md->weight;
uint8_t differential = md->differential;
if (differential && dv<0)
dv = (dv * (100-differential)) / 100;
int8_t differential = md->differential;
if (differential>0 && dv<0)
dv = (dv * (50-differential)) / 50;
else if (differential<0 && dv>0)
dv = (dv * (50+differential)) / 50;
int32_t *ptr = &chans[md->destCh]; // Save calculating address several times
switch(md->mltpx){