New UI merged

This commit is contained in:
Bertrand Songis
2019-08-28 20:50:14 +02:00
parent 1f41076b0e
commit f4f8893ae9
806 changed files with 30836 additions and 11704 deletions
+3 -3
View File
@@ -27,7 +27,7 @@ uint8_t logDelay;
void writeHeader();
#if defined(PCBTARANIS) || defined(PCBHORUS)
#if defined(PCBFRSKY) || defined(PCBNV14)
int getSwitchState(uint8_t swtch) {
int value = getValue(MIXSRC_FIRST_SWITCH + swtch);
return (value == 0) ? 0 : (value < 0) ? -1 : +1;
@@ -155,7 +155,7 @@ void writeHeader()
}
}
#if defined(PCBTARANIS) || defined(PCBHORUS)
#if defined(PCBFRSKY) || defined(PCBNV14)
for (uint8_t i=1; i<NUM_STICKS+NUM_POTS+NUM_SLIDERS+1; i++) {
const char * p = STR_VSRCRAW + i * STR_VSRCRAW[0] + 2;
for (uint8_t j=0; j<STR_VSRCRAW[0]-1; ++j) {
@@ -269,7 +269,7 @@ void logsWrite()
f_printf(&g_oLogFile, "%d,", calibratedAnalogs[i]);
}
#if defined(PCBTARANIS) || defined(PCBHORUS)
#if defined(PCBFRSKY) || defined(PCBFLYSKY)
for (uint8_t i=0; i<NUM_SWITCHES; i++) {
if (SWITCH_EXISTS(i)) {
f_printf(&g_oLogFile, "%d,", getSwitchState(i));