Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-21 15:25:17 +03:00
Code Issues Wiki Activity

Fixes #2022

Browse source
This commit is contained in:
Bertrand Songis 2016-01-30 11:23:34 +01:00
parent fe865dfdae
commit 2a4bc2cf6a
2 changed files with 37 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

23
radio/src/logs.cpp
View file

@ -167,7 +167,7 @@ void writeHeader()
#endif #endif
#endif #endif
#if defined(PCBTARANIS) #if defined(PCBTARANIS) || defined(PCBHORUS)
for (uint8_t i=1; i<NUM_STICKS+NUM_POTS+1; i++) { for (uint8_t i=1; i<NUM_STICKS+NUM_POTS+1; i++) {
const char * p = STR_VSRCRAW + i * STR_VSRCRAW[0] + 2; const char * p = STR_VSRCRAW + i * STR_VSRCRAW[0] + 2;
for (uint8_t j=0; j<STR_VSRCRAW[0]-1; ++j) { for (uint8_t j=0; j<STR_VSRCRAW[0]-1; ++j) {
@ -177,12 +177,22 @@ void writeHeader()
} }
f_putc(',', &g_oLogFile); f_putc(',', &g_oLogFile);
} }
f_puts("SA,SB,SC,SD,SE,SF,SG,SH\n", &g_oLogFile); #define STR_SWITCHES_LOG_HEADER "SA,SB,SC,SD,SE,SF,SG,SH"
f_puts(STR_SWITCHES_LOG_HEADER ",LS" "\n", &g_oLogFile);
#else #else
f_puts("Rud,Ele,Thr,Ail,P1,P2,P3,THR,RUD,ELE,3POS,AIL,GEA,TRN\n", &g_oLogFile); f_puts("Rud,Ele,Thr,Ail,P1,P2,P3,THR,RUD,ELE,3POS,AIL,GEA,TRN\n", &g_oLogFile);
#endif #endif
} }
uint32_t getLogicalSwitchesStates(uint8_t first)
{
uint32_t result = 0;
for (uint8_t i=0; i<32; i++) {
result |= (getSwitch(SWSRC_FIRST_LOGICAL_SWITCH+first+i) << i);
}
return result;
}
void writeLogs() void writeLogs()
{ {
static const pm_char * error_displayed = NULL; static const pm_char * error_displayed = NULL;
@ -207,8 +217,7 @@ void writeLogs()
{ {
static struct gtm utm; static struct gtm utm;
static gtime_t lastRtcTime = 0; static gtime_t lastRtcTime = 0;
if ( g_rtcTime != lastRtcTime ) if (g_rtcTime != lastRtcTime) {
{
lastRtcTime = g_rtcTime; lastRtcTime = g_rtcTime;
gettime(&utm); gettime(&utm);
} }
@ -318,7 +327,7 @@ void writeLogs()
get2PosState(SE), get2PosState(SE),
get3PosState(SF)); get3PosState(SF));
#elif defined(PCBTARANIS) || defined(PCBHORUS) #elif defined(PCBTARANIS) || defined(PCBHORUS)
int result = f_printf(&g_oLogFile, "%d,%d,%d,%d,%d,%d,%d,%d\n", int result = f_printf(&g_oLogFile, "%d,%d,%d,%d,%d,%d,%d,%d,%lu%lu\n",
get3PosState(SA), get3PosState(SA),
get3PosState(SB), get3PosState(SB),
get3PosState(SC), get3PosState(SC),
@ -326,7 +335,9 @@ void writeLogs()
get3PosState(SE), get3PosState(SE),
get2PosState(SF), get2PosState(SF),
get3PosState(SG), get3PosState(SG),
get2PosState(SH)); get2PosState(SH),
getLogicalSwitchesStates(32),
getLogicalSwitchesStates(0));
#else #else
int result = f_printf(&g_oLogFile, "%d,%d,%d,%d,%d,%d,%d\n", int result = f_printf(&g_oLogFile, "%d,%d,%d,%d,%d,%d,%d\n",
get2PosState(THR), get2PosState(THR),

1
radio/src/mixer.cpp
View file

@ -260,7 +260,6 @@ getvalue_t getValue(mixsrc_t i)
else if (i>=MIXSRC_FIRST_STICK && i<=MIXSRC_LAST_POT) { else if (i>=MIXSRC_FIRST_STICK && i<=MIXSRC_LAST_POT) {
return calibratedStick[i-MIXSRC_Rud]; return calibratedStick[i-MIXSRC_Rud];
} }
}
#endif #endif
#if defined(PCBGRUVIN9X) || defined(PCBMEGA2560) || defined(ROTARY_ENCODERS) #if defined(PCBGRUVIN9X) || defined(PCBMEGA2560) || defined(ROTARY_ENCODERS)