diff --git a/apps/daisy/ChangeLog b/apps/daisy/ChangeLog index b20870418..c797845c5 100644 --- a/apps/daisy/ChangeLog +++ b/apps/daisy/ChangeLog @@ -13,4 +13,4 @@ 0.13: Fixed Battery estimate Default to percentage and improved setting string 0.14: Use `power_usage` module 0.15: Ring can now show hours, minute, or seconds hand, day/night left, or battery; Allowed for 12hr time; Ring now goes up in 5% increments; Step goal can be changed; The info that is set on the watchface will retain when leaving the face -0.16: Ring is now dynamically-created, rather than displaying pre-rendered rings; Seconds update every second; Ability to see Day ring; Hourly Chime is an option; Settings options moved around to avoid popping of Steps option disappearing when not used; In Sun setting, ring is fully illuminated between during all of sunrise and sunset. \ No newline at end of file +0.16: Ring is now dynamically-created, rather than displaying pre-rendered rings; Seconds update every second; Ability to see Day ring; Settings options moved around to avoid popping of Steps option disappearing when not used; In Sun setting, ring is fully illuminated between during all of sunrise and sunset. \ No newline at end of file diff --git a/apps/daisy/app.js b/apps/daisy/app.js index 0a7f201b6..a88f0d1b0 100644 --- a/apps/daisy/app.js +++ b/apps/daisy/app.js @@ -14,7 +14,6 @@ const hyp = Math.sqrt(Math.pow(rad, 2) + Math.pow(rad, 2)); // variable for controlling idle alert let lastStep = getTime(); let warned = 0; -let hourly_buzz_occurred = false; let idle = false; let IDLE_MINUTES = 26; @@ -94,7 +93,6 @@ function loadSettings() { settings.idle_check = (settings.idle_check === undefined ? true : settings.idle_check); settings.batt_hours = (settings.batt_hours === undefined ? false : settings.batt_hours); settings.hr_12 = (global_settings["12hour"] === undefined ? false : global_settings["12hour"]); - settings.hourly_buzz = (settings.hourly_buzz === undefined ? false : settings.hourly_buzz); settings.ring = settings.ring||'Steps'; settings.idxInfo = settings.idxInfo||0; settings.step_target = settings.step_target||10000; @@ -367,19 +365,10 @@ function drawClock() { // recalc sunrise / sunset every hour if (drawCount % 60 == 0) { - let recalcSunLeft = (settings.ring == 'Sun' || settings.hourly_buzz); + let recalcSunLeft = (settings.ring == 'Sun'); updateSunRiseSunSet(date, location.lat, location.lon, recalcSunLeft); } drawCount++; - - if (settings.hourly_buzz) { - if (min != 0) - hourly_buzz_occurred = false; - else if (!hourly_buzz_occurred && isDaytime) { - Bangle.buzz(150); - hourly_buzz_occurred = true; - } - } } function drawSteps() { diff --git a/apps/daisy/settings.js b/apps/daisy/settings.js index 5fe695f48..741d4f3ea 100644 --- a/apps/daisy/settings.js +++ b/apps/daisy/settings.js @@ -7,7 +7,6 @@ 'color': 'Green', 'check_idle' : true, 'batt_hours' : false, - 'hourly_buzz' : false, 'ring' : 'Steps', 'idxInfo' : 0, 'step_target' : 10000}; @@ -73,14 +72,7 @@ var step_options = [100, 1000, 5000, 10000, 15000, 20000]; save(); }, }; - } - appMenu['Hourly Buzz'] = { - value: !!s.hourly_buzz, - onchange: v => { - s.hourly_buzz = v; - save(); - }, - }; + } appMenu['Idle Warning'] = { value: !!s.idle_check, onchange: v => {