[all] Nasty copy/paste bug on Radio Timer (inactivity alarm raises far too quickly!)
[Taranis] Bad display of selected lines over bitmaps in MODELSEL screen
This commit is contained in:
@@ -315,6 +315,12 @@ void onModelSelectMenu(const char *result)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if defined(PCBTARANIS)
|
||||||
|
#define MODELSEL_W 133
|
||||||
|
#else
|
||||||
|
#define MODELSEL_W LCD_W
|
||||||
|
#endif
|
||||||
|
|
||||||
void menuModelSelect(uint8_t event)
|
void menuModelSelect(uint8_t event)
|
||||||
{
|
{
|
||||||
if (s_warning_result) {
|
if (s_warning_result) {
|
||||||
@@ -589,7 +595,7 @@ void menuModelSelect(uint8_t event)
|
|||||||
if (k == sub) {
|
if (k == sub) {
|
||||||
if (s_copyMode == COPY_MODE) {
|
if (s_copyMode == COPY_MODE) {
|
||||||
k = s_copySrcRow;
|
k = s_copySrcRow;
|
||||||
lcd_putc(LCD_W-FW, y, '+');
|
lcd_putc(MODELSEL_W-FW, y, '+');
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
k = sub + s_copyTgtOfs;
|
k = sub + s_copyTgtOfs;
|
||||||
@@ -619,8 +625,8 @@ void menuModelSelect(uint8_t event)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (s_copyMode && (vertpos_t)sub==i+s_pgOfs) {
|
if (s_copyMode && (vertpos_t)sub==i+s_pgOfs) {
|
||||||
lcd_filled_rect(9, y, LCD_W-1-9, 7);
|
lcd_filled_rect(9, y, MODELSEL_W-1-9, 7);
|
||||||
lcd_rect(8, y-1, LCD_W-1-7, 9, s_copyMode == COPY_MODE ? SOLID : DOTTED);
|
lcd_rect(8, y-1, MODELSEL_W-1-7, 9, s_copyMode == COPY_MODE ? SOLID : DOTTED);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+7
-7
@@ -2101,7 +2101,7 @@ TimerState timersStates[MAX_TIMERS] = { { 0 }, { 0 } };
|
|||||||
#if defined(THRTRACE)
|
#if defined(THRTRACE)
|
||||||
uint8_t s_traceBuf[MAXTRACE];
|
uint8_t s_traceBuf[MAXTRACE];
|
||||||
uint8_t s_traceWr;
|
uint8_t s_traceWr;
|
||||||
int8_t s_traceCnt;
|
int s_traceCnt;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(HELI) || defined(FRSKY_HUB)
|
#if defined(HELI) || defined(FRSKY_HUB)
|
||||||
@@ -3334,9 +3334,9 @@ void doMixerCalculations()
|
|||||||
}
|
}
|
||||||
} //endfor timer loop (only two)
|
} //endfor timer loop (only two)
|
||||||
|
|
||||||
static tmr10ms_t s_cnt_100ms;
|
static uint8_t s_cnt_100ms;
|
||||||
static uint8_t s_cnt_1s;
|
static uint8_t s_cnt_1s;
|
||||||
static uint8_t s_cnt_samples_thr_1s;
|
static uint8_t s_cnt_samples_thr_1s;
|
||||||
static uint16_t s_sum_samples_thr_1s;
|
static uint16_t s_sum_samples_thr_1s;
|
||||||
#if defined(THRTRACE)
|
#if defined(THRTRACE)
|
||||||
static uint8_t s_cnt_10s;
|
static uint8_t s_cnt_10s;
|
||||||
@@ -3347,8 +3347,8 @@ void doMixerCalculations()
|
|||||||
s_cnt_samples_thr_1s++;
|
s_cnt_samples_thr_1s++;
|
||||||
s_sum_samples_thr_1s+=val;
|
s_sum_samples_thr_1s+=val;
|
||||||
|
|
||||||
if ((tmr10ms_t)(tmr10ms - s_cnt_100ms) >= 10) { // 0.1sec
|
if ((s_cnt_100ms += tick10ms) >= 10) { // 0.1sec
|
||||||
s_cnt_100ms += 10;
|
s_cnt_100ms -= 10;
|
||||||
s_cnt_1s += 1;
|
s_cnt_1s += 1;
|
||||||
|
|
||||||
for (uint8_t i=0; i<NUM_CSW; i++) {
|
for (uint8_t i=0; i<NUM_CSW; i++) {
|
||||||
@@ -3404,7 +3404,7 @@ void doMixerCalculations()
|
|||||||
s_sum_samples_thr_10s += s_sum_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_1s -= 10;
|
s_cnt_10s -= 10;
|
||||||
val = s_sum_samples_thr_10s / s_cnt_samples_thr_10s;
|
val = s_sum_samples_thr_10s / s_cnt_samples_thr_10s;
|
||||||
s_sum_samples_thr_10s = 0;
|
s_sum_samples_thr_10s = 0;
|
||||||
s_cnt_samples_thr_10s = 0;
|
s_cnt_samples_thr_10s = 0;
|
||||||
|
|||||||
Reference in New Issue
Block a user