From 37b9558fc7057d5cf699beea757ac18e1a7fd64b Mon Sep 17 00:00:00 2001 From: Travis Evans Date: Fri, 14 Feb 2025 21:32:35 -0600 Subject: [PATCH] Clean up edit menus for timer-only operation --- apps/tevtimer/app.js | 127 ++++--------------------------------------- apps/tevtimer/lib.js | 3 +- 2 files changed, 12 insertions(+), 118 deletions(-) diff --git a/apps/tevtimer/app.js b/apps/tevtimer/app.js index d8b6de44c..3f70fe902 100644 --- a/apps/tevtimer/app.js +++ b/apps/tevtimer/app.js @@ -332,82 +332,27 @@ class TimerViewMenu { title: 'Edit: ' + this.tri_timer.display_name(), back: () => { this.top_menu(); }, }, - 'Direction': { - value: this.tri_timer.rate >= 0, - format: v => (v ? 'Up' : 'Down'), - onchange: v => { - this.tri_timer.rate = -this.tri_timer.rate; - tt.set_timers_dirty(); - } - }, - 'Start (Tri)': this.edit_start_tri_menu.bind(this), - 'Start (HMS)': this.edit_start_hms_menu.bind(this), - 'Increment': { - value: this.tri_timer.increment, - min: 1, - max: 9999, + 'Start': this.edit_start_hms_menu.bind(this), + 'Vibrate pattern': require("buzz_menu").pattern( + this.tri_timer.vibrate_pattern, + v => this.tri_timer.vibrate_pattern = v), + 'Buzz count': { + value: this.tri_timer.buzz_count, + min: 0, + max: 15, step: 1, wrap: true, + format: v => v === 0 ? "Forever" : v, onchange: v => { - this.tri_timer.increment = v; + this.tri_timer.buzz_count = v; tt.set_timers_dirty(); }, }, - 'Events': this.edit_events_menu.bind(this), }; E.showMenu(edit_menu); } - edit_start_tri_menu() { - let origin_tri = tt.as_triangle( - this.tri_timer.origin, this.tri_timer.increment); - - const edit_start_tri_menu = { - '': { - title: 'Start (Tri)', - back: this.edit_menu.bind(this), - }, - 'Outer': { - value: origin_tri[0], - min: 0, - max: Math.floor(9999 / this.tri_timer.increment) - * this.tri_timer.increment, - step: this.tri_timer.increment, - wrap: true, - noList: true, - onchange: v => { - origin_tri[0] = v; - edit_start_tri_menu.Inner.max = origin_tri[0]; - origin_tri[1] = (this.tri_timer.rate >= 0) ? - 1 : origin_tri[0]; - edit_start_tri_menu.Inner.value = origin_tri[1]; - this.tri_timer.origin = tt.as_linear( - origin_tri, this.tri_timer.increment - ); - tt.set_timers_dirty(); - } - }, - 'Inner': { - value: origin_tri[1], - min: 0, - max: origin_tri[0], - step: 1, - wrap: true, - noList: true, - onchange: v => { - origin_tri[1] = v; - this.tri_timer.origin = tt.as_linear( - origin_tri, this.tri_timer.increment - ); - tt.set_timers_dirty(); - } - }, - }; - - E.showMenu(edit_start_tri_menu); - } - edit_start_hms_menu() { let origin_hms = { h: Math.floor(this.tri_timer.origin / 3600), @@ -463,58 +408,6 @@ class TimerViewMenu { E.showMenu(edit_start_hms_menu); } - - edit_events_menu() { - const events_menu = { - '': { - title: 'Events', - back: () => { this.edit_menu(); } - }, - 'Outer alarm': { - value: this.tri_timer.outer_alarm, - format: v => (v ? 'On' : 'Off'), - onchange: v => { - this.tri_timer.outer_alarm = v; - tt.set_timers_dirty(); - }, - }, - 'Outer action': { - value: tt.ACTIONS.indexOf(this.tri_timer.outer_action), - min: 0, - max: tt.ACTIONS.length - 1, - format: v => tt.ACTIONS[v], - onchange: v => { - this.tri_timer.outer_action = tt.ACTIONS[v]; - tt.set_timers_dirty(); - }, - }, - 'End alarm': { - value: this.tri_timer.end_alarm, - format: v => (v ? 'On' : 'Off'), - onchange: v => { - this.tri_timer.end_alarm = v; - tt.set_timers_dirty(); - }, - }, - 'Vibrate pattern': require("buzz_menu").pattern( - this.tri_timer.vibrate_pattern, - v => this.tri_timer.vibrate_pattern = v), - 'Buzz count': { - value: this.tri_timer.buzz_count, - min: 0, - max: 15, - step: 1, - wrap: true, - format: v => v === 0 ? "Forever" : v, - onchange: v => { - this.tri_timer.buzz_count = v; - tt.set_timers_dirty(); - }, - }, - }; - - E.showMenu(events_menu); - } } diff --git a/apps/tevtimer/lib.js b/apps/tevtimer/lib.js index 0ff1fd096..f3c4a3aac 100644 --- a/apps/tevtimer/lib.js +++ b/apps/tevtimer/lib.js @@ -313,7 +313,8 @@ function load_timers() { // Deserealize timer objects timers = timers.map(t => TriangleTimer.load(t)); } else { - timers = [new TriangleTimer()]; + timers = [new TriangleTimer(600, false, -0.001)]; + timers[0].end_alarm = true; } return timers; }