feat: Allow the timer count direction to be selected (#2038)

* timer direction: ellapsed or left

* Add AUDIO announcement support

* Storage for showElapsed

* Translations

* Fix storage

* BW implementation

* Different BW implementation

* Companion support

* Color LCD implementation and rebase to lvgl

* Fix problems found by raphaelcoeffic

* chore: Regenerate the YAML files properly

* fix: Remove unused `TR_SHOW` remnant

* chore: Formatting and cleanup

* fix: Timer dir choice was shown in wrong place
Wrong newline used in ce23b50

* Fix cpn ui triggers, remove unnecessary code and some formatting

* fix(colorlcd): Hide timer dir opt if zero value

Co-authored-by: Peter Feerick <peter.feerick@gmail.com>
Co-authored-by: elecpower <neilh713@tpg.com.au>
This commit is contained in:
eshifri
2022-08-03 09:22:42 +10:00
committed by GitHub
co-authored by Peter Feerick elecpower
parent 415b566a79
commit be7a6a51ab
50 changed files with 286 additions and 85 deletions
+10 -5
View File
@@ -925,18 +925,23 @@ void drawTimerWithMode(coord_t x, coord_t y, uint8_t index, LcdFlags att)
const TimerData &timer = g_model.timers[index];
if (timer.mode) {
const TimerData &timerData = g_model.timers[index];
const TimerState &timerState = timersStates[index];
const uint8_t negative = (timerState.val < 0 ? BLINK | INVERS : 0);
if (timerState.val < 60 * 60) { // display MM:SS
div_t qr = div((int) abs(timerState.val), 60);
int val = timerState.val;
if (timerData.start && timerData.showElapsed &&
timerData.start != timerState.val)
val = (int)timerData.start - (int)timerState.val;
if (val < 60 * 60) { // display MM:SS
div_t qr = div((int) abs(val), 60);
lcdDrawNumber(x - 5, y, qr.rem, att | LEADING0 | negative, 2);
lcdDrawText(lcdLastLeftPos, y, ":", att | BLINK | negative);
lcdDrawNumber(lcdLastLeftPos, y, qr.quot, att | negative);
if (negative)
lcdDrawText(lcdLastLeftPos, y, "-", att | negative);
}
else if (timerState.val < (99 * 60 * 60) + (59 * 60)) { // display HHhMM
div_t qr = div((int) (abs(timerState.val) / 60), 60);
else if (val < (99 * 60 * 60) + (59 * 60)) { // display HHhMM
div_t qr = div((int) (abs(val) / 60), 60);
lcdDrawNumber(x - 5, y, qr.rem, att | LEADING0, 2);
lcdDrawText(lcdLastLeftPos, y, "h", att);
lcdDrawNumber(lcdLastLeftPos, y, qr.quot, att);
@@ -945,7 +950,7 @@ void drawTimerWithMode(coord_t x, coord_t y, uint8_t index, LcdFlags att)
}
else { //display HHHH for crazy large persistent timers
lcdDrawText(x - 5, y, "h", att);
lcdDrawNumber(lcdLastLeftPos, y, timerState.val / 3600, att);
lcdDrawNumber(lcdLastLeftPos, y, val / 3600, att);
}
uint8_t xLabel = (negative ? x - 56 : x - 49);
uint8_t len = zlen(timer.name, LEN_TIMER_NAME);
+1 -1
View File
@@ -155,7 +155,7 @@ void menuModelLimitsOne(event_t event)
case ITEM_OUTPUTONE_DIR:
{
lcdDrawTextAlignedLeft(y, TR_LIMITS_HEADERS_DIRECTION);
lcdDrawTextAlignedLeft(y, STR_LIMITS_HEADERS_DIRECTION);
lcdDrawTextAtIndex(LIMITS_ONE_2ND_COLUMN, y, STR_MMMINV, ld->revert, attr);
if (active) {
CHECK_INCDEC_MODELVAR_ZERO(event, ld->revert, 1);
+17 -3
View File
@@ -188,7 +188,7 @@ enum MenuModelSetupItems {
ITEM_MODEL_SETUP_TRAINER_LABEL,
ITEM_MODEL_SETUP_TRAINER_MODE,
#if defined(BLUETOOTH)
ITEM_MODEL_SETUP_TRAINER_BLUETOOTH,
ITEM_MODEL_SETUP_TRAINER_BLUETOOTH,
#endif
ITEM_MODEL_SETUP_TRAINER_CHANNELS,
ITEM_MODEL_SETUP_TRAINER_PPM_PARAMS,
@@ -261,11 +261,13 @@ inline uint8_t MODULE_SUBTYPE_ROWS(int moduleIdx)
#define POT_WARN_ROWS ((g_model.potsWarnMode) ? (uint8_t)(NUM_POTS+NUM_SLIDERS) : (uint8_t)0)
#define TIMER_ROWS(x) \
1, 0, 1, 0, 0, \
1, 0, \
(uint8_t)((g_model.timers[x].start) ? 2 : 1), \
0, 0, \
g_model.timers[x].countdownBeep != COUNTDOWN_SILENT ? (uint8_t)1 \
: (uint8_t)0
#define EXTRA_MODULE_ROWS
#define EXTRA_MODULE_ROWS
#if defined(FUNCTION_SWITCHES)
#define FUNCTION_SWITCHES_ROWS READONLY_ROW, NAVIGATION_LINE_BY_LINE|3, NAVIGATION_LINE_BY_LINE|3, NAVIGATION_LINE_BY_LINE|3, NAVIGATION_LINE_BY_LINE|3, NAVIGATION_LINE_BY_LINE|3, NAVIGATION_LINE_BY_LINE|3, NAVIGATION_LINE_BY_LINE|(NUM_FUNCTIONS_SWITCHES-1),
@@ -571,6 +573,12 @@ void menuModelSetup(event_t event)
menuHorizontalPosition == 0 ? attr : 0,
menuHorizontalPosition == 1 ? attr : 0);
if (timer->start) {
lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN + 5 * FW, y, STR_TIMER_DIR,
timer->showElapsed,
menuHorizontalPosition == 2 ? attr : 0);
}
if (attr && s_editMode > 0) {
div_t qr = div(timer->start, 60);
switch (menuHorizontalPosition) {
@@ -586,6 +594,12 @@ void menuModelSetup(event_t event)
if ((int16_t) timer->start > 5999)
timer->start = 32399; // 8:59:59
break;
case 2:
if (timer->start) {
timer->showElapsed =
checkIncDecModel(event, timer->showElapsed, 0, 1);
}
break;
}
}
break;
+36 -12
View File
@@ -225,6 +225,12 @@ void editTimerStart(int timerIdx, coord_t y, LcdFlags attr, event_t event)
menuHorizontalPosition == 0 ? attr : 0,
menuHorizontalPosition == 1 ? attr : 0);
if (g_model.timers[timerIdx].start) {
lcdDrawTextAtIndex(MODEL_SETUP_3RD_COLUMN, y, STR_TIMER_DIR,
g_model.timers[timerIdx].showElapsed,
menuHorizontalPosition == 2 ? attr : 0);
}
if (attr && menuHorizontalPosition < 0) {
lcdDrawFilledRect(MODEL_SETUP_2ND_COLUMN - 1, y - 1, 4 * FW, FH + 1);
}
@@ -242,6 +248,12 @@ void editTimerStart(int timerIdx, coord_t y, LcdFlags attr, event_t event)
if ((int16_t)timer->start < 0) timer->start = 0;
if ((int16_t)timer->start > 5999) timer->start = 32399; // 8:59:59
break;
case 2:
if (g_model.timers[timerIdx].start) {
g_model.timers[timerIdx].showElapsed = checkIncDecModel(
event, g_model.timers[timerIdx].showElapsed, 0, 1);
}
break;
}
}
}
@@ -289,7 +301,10 @@ void editTimerCountdown(int timerIdx, coord_t y, LcdFlags attr, event_t event)
#endif
#define TIMER_ROWS(x) \
1 | NAVIGATION_LINE_BY_LINE, 0, 1 | NAVIGATION_LINE_BY_LINE, 0, 0, \
1 | NAVIGATION_LINE_BY_LINE, 0, \
(uint8_t)(((g_model.timers[x].start) ? 2 : 1) | \
NAVIGATION_LINE_BY_LINE), \
0, 0, \
g_model.timers[x].countdownBeep != COUNTDOWN_SILENT ? (uint8_t)1 \
: (uint8_t)0
@@ -520,17 +535,22 @@ void menuModelSetup(event_t event)
editTimerStart(0, y, attr, event);
break;
case ITEM_MODEL_SETUP_TIMER1_MINUTE_BEEP:
g_model.timers[0].minuteBeep = editCheckBox(g_model.timers[0].minuteBeep, MODEL_SETUP_2ND_COLUMN, y, INDENT TR_MINUTEBEEP, attr, event);
break;
case ITEM_MODEL_SETUP_TIMER1_MINUTE_BEEP:
g_model.timers[0].minuteBeep = editCheckBox(
g_model.timers[0].minuteBeep, MODEL_SETUP_2ND_COLUMN, y,
INDENT TR_MINUTEBEEP, attr, event);
break;
case ITEM_MODEL_SETUP_TIMER1_COUNTDOWN_BEEP:
editTimerCountdown(0, y, attr, event);
break;
case ITEM_MODEL_SETUP_TIMER1_COUNTDOWN_BEEP:
editTimerCountdown(0, y, attr, event);
break;
case ITEM_MODEL_SETUP_TIMER1_PERSISTENT:
g_model.timers[0].persistent = editChoice(
MODEL_SETUP_2ND_COLUMN, y, STR_PERSISTENT, STR_VPERSISTENT,
g_model.timers[0].persistent, 0, 2, attr, event);
break;
case ITEM_MODEL_SETUP_TIMER1_PERSISTENT:
g_model.timers[0].persistent = editChoice(MODEL_SETUP_2ND_COLUMN, y, STR_PERSISTENT, STR_VPERSISTENT, g_model.timers[0].persistent, 0, 2, attr, event);
break;
#if TIMERS > 1
case ITEM_MODEL_SETUP_TIMER2:
@@ -576,7 +596,9 @@ void menuModelSetup(event_t event)
break;
case ITEM_MODEL_SETUP_TIMER3_MINUTE_BEEP:
g_model.timers[2].minuteBeep = editCheckBox(g_model.timers[2].minuteBeep, MODEL_SETUP_2ND_COLUMN, y, INDENT TR_MINUTEBEEP, attr, event);
g_model.timers[2].minuteBeep =
editCheckBox(g_model.timers[2].minuteBeep, MODEL_SETUP_2ND_COLUMN,
y, INDENT TR_MINUTEBEEP, attr, event);
break;
case ITEM_MODEL_SETUP_TIMER3_COUNTDOWN_BEEP:
@@ -584,7 +606,9 @@ void menuModelSetup(event_t event)
break;
case ITEM_MODEL_SETUP_TIMER3_PERSISTENT:
g_model.timers[2].persistent = editChoice(MODEL_SETUP_2ND_COLUMN, y, STR_PERSISTENT, STR_VPERSISTENT, g_model.timers[2].persistent, 0, 2, attr, event);
g_model.timers[2].persistent = editChoice(
MODEL_SETUP_2ND_COLUMN, y, STR_PERSISTENT, STR_VPERSISTENT,
g_model.timers[2].persistent, 0, 2, attr, event);
break;
#endif
+5 -1
View File
@@ -318,7 +318,11 @@ void displayTimers()
else {
lcdDrawTextAtIndex(TIMERS_X, y-7, STR_VTMRMODES, timerData.mode, SMLSIZE);
}
drawTimer(TIMERS_X, y, timerState.val, TIMEHOUR|MIDSIZE|LEFT, TIMEHOUR|MIDSIZE|LEFT);
int val = timerState.val;
if (timerData.start && timerData.showElapsed &&
timerData.start != timerState.val)
val = (int)timerData.start - (int)timerState.val;
drawTimer(TIMERS_X, y, val, TIMEHOUR|MIDSIZE|LEFT, TIMEHOUR|MIDSIZE|LEFT);
if (timerData.persistent) {
lcdDrawChar(TIMERS_R, y+1, 'P', SMLSIZE);
}
+34 -3
View File
@@ -43,6 +43,21 @@ static std::function<void(uint32_t)> timerValueUpdater(uint8_t timer)
};
}
static void timer_start_changed(lv_event_t* e)
{
lv_obj_t* target = lv_event_get_target(e);
auto obj = (lv_obj_t*)lv_event_get_user_data(e);
auto val = (TimeEdit*)lv_obj_get_user_data(target);
if (!obj || !val) return;
if (val->getValue() > 0) {
lv_obj_clear_flag(obj, LV_OBJ_FLAG_HIDDEN);
} else {
lv_obj_add_flag(obj, LV_OBJ_FLAG_HIDDEN);
}
}
TimerWindow::TimerWindow(uint8_t timer) : Page(ICON_STATS_TIMERS)
{
std::string title = std::string(STR_TIMER) + std::to_string(timer + 1);
@@ -74,8 +89,21 @@ TimerWindow::TimerWindow(uint8_t timer) : Page(ICON_STATS_TIMERS)
// Timer start value
line = form->newLine(&grid);
new StaticText(line, rect_t{}, STR_START, 0, COLOR_THEME_PRIMARY1);
new TimeEdit(line, rect_t{}, 0, TIMER_MAX, GET_DEFAULT(p_timer->start),
timerValueUpdater(timer));
auto timerValue =
new TimeEdit(line, rect_t{}, 0, TIMER_MAX, GET_DEFAULT(p_timer->start),
timerValueUpdater(timer));
// Timer direction
auto timerDirLine = form->newLine(&grid);
new StaticText(timerDirLine, rect_t{}, STR_LIMITS_HEADERS_DIRECTION, 0,
COLOR_THEME_PRIMARY1);
new Choice(timerDirLine, rect_t{}, STR_TIMER_DIR, 0, 1,
GET_SET_DEFAULT(p_timer->showElapsed));
if (timerValue->getValue() == 0) {
auto obj = timerDirLine->getLvObj();
lv_obj_add_flag(obj, LV_OBJ_FLAG_HIDDEN);
}
// Timer minute beep
line = form->newLine(&grid);
@@ -88,7 +116,7 @@ TimerWindow::TimerWindow(uint8_t timer) : Page(ICON_STATS_TIMERS)
auto box = new FormGroup(line, rect_t{});
box->setFlexLayout(LV_FLEX_FLOW_ROW);
new Choice(box, rect_t{}, STR_VBEEPCOUNTDOWN, COUNTDOWN_SILENT,
COUNTDOWN_COUNT - 1, GET_SET_DEFAULT(p_timer->countdownBeep));
new Choice(box, rect_t{}, STR_COUNTDOWNVALUES, 0, 3,
@@ -100,4 +128,7 @@ TimerWindow::TimerWindow(uint8_t timer) : Page(ICON_STATS_TIMERS)
new Choice(line, rect_t{}, STR_VPERSISTENT, 0, 2,
GET_SET_DEFAULT(p_timer->persistent));
lv_obj_add_event_cb(timerValue->getLvObj(), timer_start_changed,
LV_EVENT_VALUE_CHANGED, timerDirLine->getLvObj());
}
+20 -9
View File
@@ -41,8 +41,8 @@ STATIC_LZ4_BITMAP(LBM_TIMER_BACKGROUND);
class TimerWidget : public Widget
{
public:
TimerWidget(const WidgetFactory* factory, Window* parent,
const rect_t& rect, Widget::PersistentData* persistentData) :
TimerWidget(const WidgetFactory* factory, Window* parent, const rect_t& rect,
Widget::PersistentData* persistentData) :
Widget(factory, parent, rect, persistentData)
{
}
@@ -81,8 +81,11 @@ class TimerWidget : public Widget
dc->drawBitmapPattern(3, 4, LBM_TIMER, colorFore);
}
// value
splitTimer(sDigitGroup0, sDigitGroup1, sUnit0, sUnit1,
abs(timerState.val), false);
int val = timerState.val;
if (timerData.start && timerData.showElapsed &&
timerData.start != timerState.val)
val = (int)timerData.start - (int)timerState.val;
splitTimer(sDigitGroup0, sDigitGroup1, sUnit0, sUnit1, abs(val), false);
dc->drawSizedText(76, 31, sDigitGroup0, ZLEN(sDigitGroup0),
FONT(XL) | colorFore);
@@ -115,12 +118,16 @@ class TimerWidget : public Widget
FONT(XS) | COLOR_THEME_PRIMARY2);
}
// value
int val = timerState.val;
if (timerData.start && timerData.showElapsed &&
timerData.start != timerState.val)
val = (int)timerData.start - (int)timerState.val;
if (width() > 100 && height() > 40) {
if (abs(timerState.val) >= 3600) {
drawTimer(dc, 3, 20, abs(timerState.val),
if (abs(val) >= 3600) {
drawTimer(dc, 3, 20, abs(val),
COLOR_THEME_PRIMARY2 | LEFT | TIMEHOUR);
} else {
drawTimer(dc, 3, 18, abs(timerState.val),
drawTimer(dc, 3, 18, abs(val),
COLOR_THEME_PRIMARY2 | LEFT | FONT(STD));
}
}
@@ -130,8 +137,12 @@ class TimerWidget : public Widget
drawTimer(dc, 3, 20, abs(timerState.val),
COLOR_THEME_PRIMARY2 | LEFT | FONT(XS) | TIMEHOUR);
} else {
drawTimer(dc, 3, 18, abs(timerState.val),
COLOR_THEME_PRIMARY2 | LEFT);
// value
int val = timerState.val;
if (timerData.start && timerData.showElapsed &&
timerData.start != timerState.val)
val = (int)timerData.start - (int)timerState.val;
drawTimer(dc, 3, 18, abs(val), COLOR_THEME_PRIMARY2 | LEFT);
}
}
}