piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

[all] THR and TH% are zeroed on flight reset

Browse Source
This commit is contained in:
bsongis@gmail.com
2013-06-08 11:14:15 +00:00
parent 86a7429f51
commit f4bdc3888e
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/opentx.cpp
+8 -14
View File
@@ -2090,18 +2090,18 @@ void resetAll()
for (uint8_t i=0; i<NUM_CSW; i++)
csLastValue[i] = CS_LAST_VALUE_INIT;
#if defined(THRTRACE)
s_traceCnt = 0;
s_traceWr = 0;
#endif
RESET_THR_TRACE();
}
TimerState timersStates[MAX_TIMERS] = { { 0 }, { 0 } };
#if defined(THRTRACE)
uint8_t s_traceBuf[MAXTRACE];
uint8_t s_traceWr;
int s_traceCnt;
uint8_t s_traceBuf[MAXTRACE];
uint8_t s_traceWr;
int s_traceCnt;
uint8_t s_cnt_10s;
uint16_t s_cnt_samples_thr_10s;
uint16_t s_sum_samples_thr_10s;
#endif
#if defined(HELI) || defined(FRSKY_HUB)
@@ -3338,11 +3338,6 @@ void doMixerCalculations()
static uint8_t s_cnt_1s;
static uint8_t s_cnt_samples_thr_1s;
static uint16_t s_sum_samples_thr_1s;
#if defined(THRTRACE)
static uint8_t s_cnt_10s;
static uint16_t s_cnt_samples_thr_10s;
static uint16_t s_sum_samples_thr_10s;
#endif
s_cnt_samples_thr_1s++;
s_sum_samples_thr_1s+=val;
@@ -3399,11 +3394,10 @@ void doMixerCalculations()
// throttle trace is done every 10 seconds; Tracebuffer is adjusted to screen size.
// in case buffer runs out, it wraps around
// resolution for y axis is only 32, therefore no higher value makes sense
s_cnt_10s += 1;
s_cnt_samples_thr_10s += s_cnt_samples_thr_1s;
s_sum_samples_thr_10s += s_sum_samples_thr_1s;
if (s_cnt_10s >= 10) { // 10s
if (++s_cnt_10s >= 10) { // 10s
s_cnt_10s -= 10;
val = s_sum_samples_thr_10s / s_cnt_samples_thr_10s;
s_sum_samples_thr_10s = 0;
src/opentx.h
+9 -3
View File
@@ -912,9 +912,15 @@ extern uint16_t lastMixerDuration;
#if defined(THRTRACE)
#define MAXTRACE (LCD_W - 8)
extern uint8_t s_traceBuf[MAXTRACE];
extern uint8_t s_traceWr;
extern int s_traceCnt;
extern uint8_t s_traceBuf[MAXTRACE];
extern uint8_t s_traceWr;
extern int s_traceCnt;
extern uint8_t s_cnt_10s;
extern uint16_t s_cnt_samples_thr_10s;
extern uint16_t s_sum_samples_thr_10s;
#define RESET_THR_TRACE() s_traceCnt = s_traceWr = s_cnt_10s = s_cnt_samples_thr_10s = s_sum_samples_thr_10s = s_timeCum16ThrP = s_timeCumThr = 0
#else
#define RESET_THR_TRACE() s_timeCum16ThrP = s_timeCumThr = 0
#endif
#if defined(PCBTARANIS)