Skip to content

fix(fw): make editing date & time easier #7767

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
philmoz wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(fw): make editing date & time easier #7767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions radio/src/gui/128x64/radio_setup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,12 @@ uint8_t viewOptCheckBox(coord_t y, const char* title, uint8_t value, uint8_t att
void menuRadioSetup(event_t event)
{
#if defined(RTCLOCK)
struct gtm t;
gettime(&t);
static struct gtm t;
struct gtm ct;
gettime(&ct);

if (event == EVT_ENTRY)
t = ct;

if ((menuVerticalPosition == ITEM_RADIO_SETUP_DATE + HEADER_LINE ||
menuVerticalPosition == ITEM_RADIO_SETUP_TIME + HEADER_LINE) &&
Expand Down Expand Up @@ -306,11 +310,13 @@ void menuRadioSetup(event_t event)
lcdDrawNumber(RADIO_SETUP_2ND_COLUMN-2, y, t.tm_year+TM_YEAR_BASE, rowattr);
lcdDrawChar(lcdNextPos, y, '-');
if (rowattr && s_editMode > 0) t.tm_year = checkIncDec(event, t.tm_year, 123, 137, 0);
else t.tm_year = ct.tm_year;
break;
case 1:
lcdDrawNumber(lcdNextPos, y, t.tm_mon+1, rowattr|LEADING0, 2);
lcdDrawChar(lcdNextPos, y, '-');
if (rowattr && s_editMode > 0) t.tm_mon = checkIncDec(event, t.tm_mon, 0, 11, 0);
else t.tm_mon = ct.tm_mon;
break;
case 2:
{
Expand All @@ -320,6 +326,7 @@ void menuRadioSetup(event_t event)
dlim += dmon[t.tm_mon];
lcdDrawNumber(lcdNextPos, y, t.tm_mday, rowattr|LEADING0, 2);
if (rowattr && s_editMode > 0) t.tm_mday = checkIncDec(event, t.tm_mday, 1, dlim, 0);
else t.tm_mday = ct.tm_mday;
break;
}
}
Expand All @@ -338,15 +345,18 @@ void menuRadioSetup(event_t event)
lcdDrawNumber(LCD_W-6*FW-5, y, t.tm_hour, rowattr|LEADING0, 2);
lcdDrawChar(lcdNextPos + 1, y, ':');
if (rowattr && s_editMode > 0) t.tm_hour = checkIncDec(event, t.tm_hour, 0, 23, 0);
else t.tm_hour = ct.tm_hour;
break;
case 1:
lcdDrawNumber(lcdNextPos + 1, y, t.tm_min, rowattr|LEADING0, 2);
lcdDrawChar(lcdNextPos + 1, y, ':');
if (rowattr && s_editMode > 0) t.tm_min = checkIncDec(event, t.tm_min, 0, 59, 0);
else t.tm_min = ct.tm_min;
break;
case 2:
lcdDrawNumber(lcdNextPos + 1, y, t.tm_sec, rowattr|LEADING0, 2);
if (rowattr && s_editMode > 0) t.tm_sec = checkIncDec(event, t.tm_sec, 0, 59, 0);
else t.tm_sec = ct.tm_sec;
break;
}
}
Expand Down
14 changes: 12 additions & 2 deletions radio/src/gui/212x64/radio_setup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,12 @@ uint8_t viewOptCheckBox(coord_t y, const char* title, uint8_t value, uint8_t att
void menuRadioSetup(event_t event)
{
#if defined(RTCLOCK)
struct gtm t;
gettime(&t);
static struct gtm t;
struct gtm ct;
gettime(&ct);

if (event == EVT_ENTRY)
t = ct;

if ((menuVerticalPosition==ITEM_RADIO_SETUP_DATE || menuVerticalPosition==ITEM_RADIO_SETUP_TIME) &&
(s_editMode>0) &&
Expand Down Expand Up @@ -313,10 +317,12 @@ void menuRadioSetup(event_t event)
case 0:
lcdDrawNumber(RADIO_SETUP_DATE_COLUMN, y, t.tm_year+TM_YEAR_BASE, rowattr|RIGHT);
if (rowattr && s_editMode>0) t.tm_year = checkIncDec(event, t.tm_year, 123, 137, 0);
else t.tm_year = ct.tm_year;
break;
case 1:
lcdDrawNumber(RADIO_SETUP_DATE_COLUMN+3*FW-2, y, t.tm_mon+1, rowattr|LEADING0|RIGHT, 2);
if (rowattr && s_editMode>0) t.tm_mon = checkIncDec(event, t.tm_mon, 0, 11, 0);
else t.tm_mon = ct.tm_mon;
break;
case 2:
{
Expand All @@ -326,6 +332,7 @@ void menuRadioSetup(event_t event)
dlim += dmon[t.tm_mon];
lcdDrawNumber(RADIO_SETUP_DATE_COLUMN+6*FW-4, y, t.tm_mday, rowattr|LEADING0|RIGHT, 2);
if (rowattr && s_editMode>0) t.tm_mday = checkIncDec(event, t.tm_mday, 1, dlim, 0);
else t.tm_mday = ct.tm_mday;
break;
}
}
Expand All @@ -345,14 +352,17 @@ void menuRadioSetup(event_t event)
case 0:
lcdDrawNumber(RADIO_SETUP_TIME_COLUMN, y, t.tm_hour, rowattr|LEADING0|RIGHT, 2);
if (rowattr && s_editMode>0) t.tm_hour = checkIncDec(event, t.tm_hour, 0, 23, 0);
else t.tm_hour = ct.tm_hour;
break;
case 1:
lcdDrawNumber(RADIO_SETUP_TIME_COLUMN+3*FWNUM, y, t.tm_min, rowattr|LEADING0|RIGHT, 2);
if (rowattr && s_editMode>0) t.tm_min = checkIncDec(event, t.tm_min, 0, 59, 0);
else t.tm_min = ct.tm_min;
break;
case 2:
lcdDrawNumber(RADIO_SETUP_TIME_COLUMN+6*FWNUM, y, t.tm_sec, rowattr|LEADING0|RIGHT, 2);
if (rowattr && s_editMode>0) t.tm_sec = checkIncDec(event, t.tm_sec, 0, 59, 0);
else t.tm_sec = ct.tm_sec;
break;
}
}
Expand Down
1 change: 1 addition & 0 deletions radio/src/gui/colorlcd/libui/numberedit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,7 @@ NumberEdit::NumberEdit(Window* parent, const rect_t& rect, int vmin, int vmax,

void NumberEdit::openEdit()
{
if (onEditStart) onEditStart();
if (edit == nullptr) {
edit = new NumberArea(
this,
Expand Down
6 changes: 6 additions & 0 deletions radio/src/gui/colorlcd/libui/numberedit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,11 @@ class NumberEdit : public TextButton
onEdited = std::move(handler);
}

void setOnEditStartHandler(std::function<void()> handler)
{
onEditStart = std::move(handler);
}

int32_t getValue() const { return _getValue != nullptr ? _getValue() : 0; }

protected:
Expand All @@ -103,6 +108,7 @@ class NumberEdit : public TextButton
std::function<int()> _getValue;
std::function<void(int)> _setValue;
std::function<void(int)> onEdited;
std::function<void()> onEditStart;
int vdefault = 0;
int vmin;
int vmax;
Expand Down
29 changes: 20 additions & 9 deletions radio/src/gui/colorlcd/radio/radio_setup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,26 +55,37 @@ class DateNumberEdit : public NumberEdit
std::function<int()> getValue,
std::function<void(int)> setValue) :
NumberEdit(parent, {x, y, DT_EDT_W, 0}, vmin, vmax,
getValue,
[=](int32_t newValue) {
setValue(newValue);
SET_DIRTY();
})
[=]() {
if (isEditing) return editValue;
return getValue();
},
[=](int newValue) {
if (isEditing)
editValue = newValue;
})
{
lastValue = this->getValue();
if (leading0)
setDisplayHandler([](int32_t value) { return formatNumberAsString(value, LEADING0, 2); });
setOnEditStartHandler([=]() {
isEditing = true;
editValue = getValue();
});
setOnEditedHandler([=](int newValue) {
isEditing = false;
setValue(newValue);
});
}

static LAYOUT_ORIENTATION(DT_EDT_W, EdgeTxStyles::EDIT_FLD_WIDTH_NARROW, LAYOUT_SCALE(52))

protected:
int32_t lastValue;
int editValue;
bool isEditing = false;

void checkEvents() override
{
if (lastValue != getValue())
update();
if (!isEditing)
NumberEdit::checkEvents();
}
};

Expand Down