piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases 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
radio/src/strhelpers.cpp
+28 -21
View File
@@ -241,6 +241,33 @@ char * getGVarString(char * dest, int idx)
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)
{
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)
if (idx <= SWSRC_LAST_SWITCH) {
div_t swinfo = switchInfo(idx);
if (ZEXIST(g_eeGeneral.switchNames[swinfo.quot])) {
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 = getSwitchName(s, idx);
*s++ = "\300-\301"[swinfo.rem];
*s = '\0';
}