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

Huge ram saving (320bytes) + expos order change

Browse Source
This commit is contained in:
bsongis
2011-10-10 19:58:02 +00:00
parent f65942d83b
commit f131b0a016
6 changed files with 42 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gruvin9x.cpp
+24 -4
View File
@@ -63,6 +63,22 @@ const prog_char APM modi12x3[]=
const prog_char APM s_charTab[] = "_-.,";
//R=1
//E=2
//T=3
//A=4
const prog_uint8_t APM chout_ar[24][4] = { //First number is 0..23 -> template setup, Second is relevant channel out
{1,2,3,4},{1,2,4,3},{1,3,2,4},{1,3,4,2},{1,4,2,3},{1,4,3,2},
{2,1,3,4},{2,1,4,3},{2,3,1,4},{2,3,4,1},{2,4,1,3},{2,4,3,1},
{3,1,2,4},{3,1,4,2},{3,2,1,4},{3,2,4,1},{3,4,1,2},{3,4,2,1},
{4,1,2,3},{4,1,3,2},{4,2,1,3},{4,2,3,1},{4,3,1,2},{4,3,2,1} };
const prog_uint8_t APM modn12x3[4][4]= {
{1, 2, 3, 4},
{1, 3, 2, 4},
{4, 2, 3, 1},
{4, 3, 2, 1} };
#ifdef TRANSLATIONS
int8_t char2idx(char c)
{
@@ -245,9 +261,12 @@ void applyExpos(int16_t *anas)
uint8_t phase = getFlightPhase();
int8_t cur_chn = -1;
for (uint8_t i=0; i<DIM(g_model.expoData); i++) {
ExpoData &ed = g_model.expoData[i];
if (ed.mode==0) break; // end of list
if (ed.chn == cur_chn)
continue;
if (ed.phase != 0) {
if (ed.negPhase) {
if (phase+1 == -ed.phase)
@@ -259,17 +278,18 @@ void applyExpos(int16_t *anas)
}
}
if (getSwitch(ed.swtch, 1)) {
int16_t v = anas2[ed.chn];
cur_chn = ed.chn;
int16_t v = anas2[cur_chn];
if((v<0 && ed.mode&1) || (v>=0 && ed.mode&2)) {
int16_t k = ed.expo;
if (IS_THROTTLE(ed.chn) && g_model.thrExpo)
if (IS_THROTTLE(cur_chn) && g_model.thrExpo)
v = 2*expo((v+RESX)/2, k);
else
v = expo(v, k);
if (ed.curve) v = applyCurve(v, ed.curve, 0);
v = ((int32_t)v * ed.weight) / 100;
if (IS_THROTTLE(ed.chn) && g_model.thrExpo) v -= RESX;
anas[ed.chn] = v;
if (IS_THROTTLE(cur_chn) && g_model.thrExpo) v -= RESX;
anas[cur_chn] = v;
}
}
}