diff --git a/src/logs.cpp b/src/logs.cpp index 58c47eacc..0c2ae7865 100644 --- a/src/logs.cpp +++ b/src/logs.cpp @@ -149,7 +149,7 @@ const pm_char * openLogs() #if defined(PCBTARANIS) f_puts("Rud,Ele,Thr,Ail,S1,S2,LS,RS,SA,SB,SC,SD,SE,SF,SG,SH\n", &g_oLogFile); #else - f_puts("Rud,Ele,Thr,Ail,P1,P2,P3,THR,RUD,ELE,ID0,ID1,ID2,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 } else { diff --git a/src/telemetry/frsky.h b/src/telemetry/frsky.h index a18b60318..5446787f4 100644 --- a/src/telemetry/frsky.h +++ b/src/telemetry/frsky.h @@ -225,8 +225,8 @@ void resetTelemetry(); #define TELEMETRY_GPS_ALT_BP frskyData.hub.gpsAltitude_bp #define TELEMETRY_ALT frskyData.hub.baroAltitude_bp, frskyData.hub.baroAltitude_ap #define TELEMETRY_ALT_FORMAT "%d.%02d," -#define TELEMETRY_CELLS frskyData.hub.cellsSum / 10, frskyData.hub.cellsSum % 10 -#define TELEMETRY_CELLS_FORMAT "%d.%d," +#define TELEMETRY_CELLS frskyData.hub.cellsSum / 10, frskyData.hub.cellsSum % 10, frskyData.hub.cellVolts[0]*2/100, frskyData.hub.cellVolts[0]*2%100, frskyData.hub.cellVolts[1]*2/100, frskyData.hub.cellVolts[1]*2%100, frskyData.hub.cellVolts[2]*2/100, frskyData.hub.cellVolts[2]*2%100, frskyData.hub.cellVolts[3]*2/100, frskyData.hub.cellVolts[3]*2%100, frskyData.hub.cellVolts[4]*2/100, frskyData.hub.cellVolts[4]*2%100, frskyData.hub.cellVolts[5]*2/100, frskyData.hub.cellVolts[5]*2%100 +#define TELEMETRY_CELLS_FORMAT "%d.%d,%d.%02d,%d.%02d,%d.%02d,%d.%02d,%d.%02d,%d.%02d," #define TELEMETRY_CURRENT frskyData.hub.current / 100, frskyData.hub.current % 100 #define TELEMETRY_CURRENT_FORMAT "%d.%02d," #define TELEMETRY_VFAS frskyData.hub.vfas / 10, frskyData.hub.vfas % 10