bryan
/
BangleApps
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correct display of expired (negative) timers

master
Travis Evans 2025-02-16 17:41:09 -06:00
parent 0a0c6f4d21
commit e8e069866f
2 changed files with 36 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
apps/tevtimer/app.js
View File

@ -140,22 +140,30 @@ class TimerView {
this._update_fonts();
let update_interval = Infinity;
for (var id of ROW_IDS) {
const elem = this.layout[id];
let mode = tt.SETTINGS.view_mode[id];
if (mode == 'start hh:mm:ss') {
elem.label = tt.format_duration(this.tri_timer.origin / Math.abs(this.tri_timer.rate), true);
update_interval = Math.min(update_interval, 1);
} else if (mode == 'current hh:mm:ss') {
elem.label = tt.format_duration(this.tri_timer.get() / Math.abs(this.tri_timer.rate), true);
update_interval = Math.min(update_interval, 1);
} else if (mode == 'time hh:mm:ss') {
elem.label = locale.time(new Date()).trim();
update_interval = Math.min(update_interval, 1);
} else if (mode == 'start hh:mm') {
elem.label = tt.format_duration(this.tri_timer.origin / Math.abs(this.tri_timer.rate), false);
update_interval = Math.min(update_interval, 60);
} else if (mode == 'current hh:mm') {
elem.label = tt.format_duration(this.tri_timer.get() / Math.abs(this.tri_timer.rate), false);
update_interval = Math.min(update_interval, 60);
} else if (mode == 'time hh:mm') {
elem.label = locale.time(new Date(), 1).trim();
update_interval = Math.min(update_interval, 60);
} else if (mode == 'name') {
elem.label = this.tri_timer.display_name();
@ -164,8 +172,31 @@ class TimerView {
this.layout.render(elem);
}
if (this.tri_timer.is_running()) {
if (this.timer_timeout) {
clearTimeout(this.timer_timeout);
this.timer_timeout = null;
}
// Set up timeout to render timer again when needed
if (update_interval !== Infinity) {
// Calculate approximate time next render is needed.
let next_update = this.tri_timer.get() % update_interval;
if (next_update < 0) {
next_update = 1 + next_update;
}
// Convert next_update from seconds to milliseconds and add
// compensating factor of 50ms due to timeouts apparently
// sometimes triggering too early.
next_update = next_update / Math.abs(this.tri_timer.rate) + 50;
console.debug('Next render update scheduled in ' + next_update);
this.timer_timeout = setTimeout(
() => { this.timer_timeout = null; this.render('timer'); },
next_update
);
}
}
}
if (!item || item == 'status') {
@ -173,37 +204,6 @@ class TimerView {
this.tri_timer.is_running() ? 'Pause' : 'Start';
this.layout.render(this.layout.buttons);
}
if (this.tri_timer.is_running() && this.tri_timer.get() > 0) {
if (this.timer_timeout) {
clearTimeout(this.timer_timeout);
this.timer_timeout = null;
}
// Calculate approximate time next display update is needed.
// Usual case: update when numbers change once per second.
let next_tick = this.tri_timer.get() % 1;
if (this.tri_timer.rate > 0) {
next_tick = 1 - next_tick;
}
// Convert next_tick from seconds to milliseconds and add
// compensating factor of 50ms due to timeouts apparently
// sometimes triggering too early.
next_tick = next_tick / Math.abs(this.tri_timer.rate) + 50;
// For slow-update view mode, only update about every 60
// seconds instead of every second
if (tt.SETTINGS.view_mode == 3) {
console.debug(this.tri_timer.time_to_next_event());
next_tick = this.tri_timer.time_to_next_event() % 60000;
}
console.debug('Next render update scheduled in ' + next_tick);
this.timer_timeout = setTimeout(
() => { this.timer_timeout = null; this.render('timer'); },
next_tick
);
}
}
_update_fonts() {
@ -223,6 +223,7 @@ class TimerView {
}
tt.set_timers_dirty();
this.render('status');
this.render('timer');
}
}

3
apps/tevtimer/lib.js
View File

@ -327,6 +327,9 @@ function format_triangle(tri_timer) {
function format_duration(msec, have_seconds) {
if (msec < 0) {
return '-' + format_duration(-msec, have_seconds);
}
const time = Time_utils.decodeTime(msec);
time.h += time.d * 24;
let str = time.h + ":" + ("0" + time.m).substr(-2);