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

Make switch logging using hardware config

Browse source
This commit is contained in:
3djc 2019-08-10 12:00:38 +02:00
parent f556b77894
commit 4fd5091657
3 changed files with 51 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

79
radio/src/logs.cpp
View file

@ -28,13 +28,11 @@ uint8_t logDelay;
void writeHeader(); void writeHeader();
#if defined(PCBTARANIS) || defined(PCBHORUS) #if defined(PCBTARANIS) || defined(PCBHORUS)
#define GET_2POS_STATE(sw) (switchState(SW_ ## sw ## 0) ? -1 : 1) #define GET_SWITCH_STATE(sw) (getValue(MIXSRC_FIRST_SWITCH+sw) < 0 ? -1 : getValue(MIXSRC_FIRST_SWITCH+sw) > 0 ? 1 : 0)
#else #else
#define GET_2POS_STATE(sw) (switchState(SW_ ## sw) ? -1 : 1) #define GET_2POS_STATE(sw) (switchState(SW_ ## sw) ? -1 : 1)
#endif
#define GET_3POS_STATE(sw) (switchState(SW_ ## sw ## 0) ? -1 : (switchState(SW_ ## sw ## 2) ? 1 : 0)) #define GET_3POS_STATE(sw) (switchState(SW_ ## sw ## 0) ? -1 : (switchState(SW_ ## sw ## 2) ? 1 : 0))
#endif
void logsInit() void logsInit()
{ {
@ -166,18 +164,18 @@ void writeHeader()
} }
f_putc(',', &g_oLogFile); f_putc(',', &g_oLogFile);
} }
#if defined(PCBX7)
#define STR_SWITCHES_LOG_HEADER "SA,SB,SC,SD,SF,SH" for(uint8_t i=0; i<NUM_SWITCHES; i++) {
#elif defined(PCBXLITE) if (SWITCH_EXISTS(i)) {
#define STR_SWITCHES_LOG_HEADER "SA,SB,SC,SD" char s[LEN_SWITCH_NAME + 2];
#elif defined(PCBXLITES) char * temp;
#define STR_SWITCHES_LOG_HEADER "SA,SB,SC,SD,SE,SF" temp = getSwitchName(s, SWSRC_FIRST_SWITCH + i * 3);
#elif defined(PCBX9LITE) *temp++ = ',';
#define STR_SWITCHES_LOG_HEADER "SA,SB,SC,SE,SF" *temp = '\0';
#else f_puts(s, &g_oLogFile);
#define STR_SWITCHES_LOG_HEADER "SA,SB,SC,SD,SE,SF,SG,SH" }
#endif }
f_puts(STR_SWITCHES_LOG_HEADER ",LSW,", &g_oLogFile); f_puts("LSW,", &g_oLogFile);
#else #else
f_puts("Rud,Ele,Thr,Ail,P1,P2,P3,THR,RUD,ELE,3POS,AIL,GEA,TRN,", &g_oLogFile); f_puts("Rud,Ele,Thr,Ail,P1,P2,P3,THR,RUD,ELE,3POS,AIL,GEA,TRN,", &g_oLogFile);
#endif #endif
@ -272,46 +270,13 @@ void logsWrite()
f_printf(&g_oLogFile, "%d,", calibratedAnalogs[i]); f_printf(&g_oLogFile, "%d,", calibratedAnalogs[i]);
} }
// TODO: use hardware config to populate #if defined(PCBTARANIS) || defined(PCBHORUS)
#if defined(PCBX9LITE) for(uint8_t i=0; i<NUM_SWITCHES; i++) {
f_printf(&g_oLogFile, "%d,%d,%d,%d,0x%08X%08X,", if (SWITCH_EXISTS(i)) {
GET_3POS_STATE(SA), f_printf(&g_oLogFile, "%d,", GET_SWITCH_STATE(i));
GET_3POS_STATE(SB), }
GET_3POS_STATE(SC), }
GET_2POS_STATE(SD), f_printf(&g_oLogFile, "0x%08X%08X,", getLogicalSwitchesStates(32), getLogicalSwitchesStates(0));
GET_2POS_STATE(SE),
getLogicalSwitchesStates(32),
getLogicalSwitchesStates(0));
#elif defined(PCBXLITE)
f_printf(&g_oLogFile, "%d,%d,%d,%d,0x%08X%08X,",
GET_3POS_STATE(SA),
GET_3POS_STATE(SB),
GET_3POS_STATE(SC),
GET_3POS_STATE(SD),
getLogicalSwitchesStates(32),
getLogicalSwitchesStates(0));
#elif defined(PCBX7)
f_printf(&g_oLogFile, "%d,%d,%d,%d,%d,%d,0x%08X%08X,",
GET_3POS_STATE(SA),
GET_3POS_STATE(SB),
GET_3POS_STATE(SC),
GET_3POS_STATE(SD),
GET_2POS_STATE(SF),
GET_2POS_STATE(SH),
getLogicalSwitchesStates(32),
getLogicalSwitchesStates(0));
#elif defined(PCBTARANIS) || defined(PCBHORUS)
f_printf(&g_oLogFile, "%d,%d,%d,%d,%d,%d,%d,%d,0x%08X%08X,",
GET_3POS_STATE(SA),
GET_3POS_STATE(SB),
GET_3POS_STATE(SC),
GET_3POS_STATE(SD),
GET_3POS_STATE(SE),
GET_2POS_STATE(SF),
GET_3POS_STATE(SG),
GET_2POS_STATE(SH),
getLogicalSwitchesStates(32),
getLogicalSwitchesStates(0));
#else #else
f_printf(&g_oLogFile, "%d,%d,%d,%d,%d,%d,%d,", f_printf(&g_oLogFile, "%d,%d,%d,%d,%d,%d,%d,",
GET_2POS_STATE(THR), GET_2POS_STATE(THR),

49
radio/src/strhelpers.cpp
View file

@ -241,6 +241,33 @@ char * getGVarString(char * dest, int idx)
return dest; return dest;
} }
char * getSwitchName(char * dest, swsrc_t idx)
{
div_t swinfo = switchInfo(idx);
if (ZEXIST(g_eeGeneral.switchNames[swinfo.quot])) {
dest += zchar2str(dest, g_eeGeneral.switchNames[swinfo.quot], LEN_SWITCH_NAME);
// TODO tous zchar2str
}
else {
*dest++ = 'S';
#if defined(PCBX7)
if (swinfo.quot >= 5)
*dest++ = 'H' + swinfo.quot - 5;
else if (swinfo.quot == 4)
#if defined(RADIO_T12)
*dest++ = 'G';
#else
*dest++ = 'F';
#endif
else
*dest++ = 'A'+swinfo.quot;
#else
*dest++ = 'A' + swinfo.quot;
#endif
}
return dest;
}
char * getSwitchString(char * dest, swsrc_t idx) char * getSwitchString(char * dest, swsrc_t idx)
{ {
if (idx == SWSRC_NONE) { if (idx == SWSRC_NONE) {
@ -267,27 +294,7 @@ char * getSwitchString(char * dest, swsrc_t idx)
#define IDX_ON_IN_STR_VSWITCHES (IDX_TRIMS_IN_STR_VSWITCHES+SWSRC_LAST_TRIM-SWSRC_FIRST_TRIM+1) #define IDX_ON_IN_STR_VSWITCHES (IDX_TRIMS_IN_STR_VSWITCHES+SWSRC_LAST_TRIM-SWSRC_FIRST_TRIM+1)
if (idx <= SWSRC_LAST_SWITCH) { if (idx <= SWSRC_LAST_SWITCH) {
div_t swinfo = switchInfo(idx); div_t swinfo = switchInfo(idx);
if (ZEXIST(g_eeGeneral.switchNames[swinfo.quot])) { s = getSwitchName(s, idx);
s += zchar2str(s, g_eeGeneral.switchNames[swinfo.quot], LEN_SWITCH_NAME);
// TODO tous zchar2str
}
else {
*s++ = 'S';
#if defined(PCBX7)
if (swinfo.quot >= 5)
*s++ = 'H' + swinfo.quot - 5;
else if (swinfo.quot == 4)
#if defined(RADIO_T12)
*s++ = 'G';
#else
*s++ = 'F';
#endif
else
*s++ = 'A'+swinfo.quot;
#else
*s++ = 'A' + swinfo.quot;
#endif
}
*s++ = "\300-\301"[swinfo.rem]; *s++ = "\300-\301"[swinfo.rem];
*s = '\0'; *s = '\0';
} }

1
radio/src/strhelpers.h
View file

@ -36,6 +36,7 @@ char * getTimerString(char * dest, int32_t tme, uint8_t hours=0);
char * getCurveString(char * dest, int idx); char * getCurveString(char * dest, int idx);
char * getGVarString(char * dest, int idx); char * getGVarString(char * dest, int idx);
char * getSwitchString(char * dest, swsrc_t idx); char * getSwitchString(char * dest, swsrc_t idx);
char * getSwitchName(char * dest, swsrc_t idx);
char * getSourceString(char * dest, mixsrc_t idx); char * getSourceString(char * dest, mixsrc_t idx);
#endif #endif