diff --git a/apps/daisy/ChangeLog b/apps/daisy/ChangeLog index 11138f412..ab4161a31 100644 --- a/apps/daisy/ChangeLog +++ b/apps/daisy/ChangeLog @@ -13,3 +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-rendnered 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 diff --git a/apps/daisy/README.md b/apps/daisy/README.md index 5cc3060dc..1fc2bb5c2 100644 --- a/apps/daisy/README.md +++ b/apps/daisy/README.md @@ -4,11 +4,10 @@ cyclic information line that includes, day, date, steps, battery, sunrise and sunset times* -Written by: [Hugh Barney](https://github.com/hughbarney) For support -and discussion please post in the [Bangle JS -Forum](http://forum.espruino.com/microcosms/1424/) +Written by: [Hugh Barney](https://github.com/hughbarney) and [David Volovskiy](https://github.com/voloved) +For support and discussion please post in the [Bangle JS Forum](http://forum.espruino.com/microcosms/1424/) -* Derived from [The Ring](https://banglejs.com/apps/?id=thering) proof of concept and the [Pastel clock](https://banglejs.com/apps/?q=pastel) +* Derived from [The Ring](https://banglejs.com/apps/?id=thering) proof of concept and the [Pastel clock](https://banglejs.com/apps/?q=pastel), though all rings are dynamically created. * Includes the [Lazybones](https://banglejs.com/apps/?q=lazybones) Idle warning timer * Touch the top right/top left to cycle through the info display (Day, Date, Steps, Sunrise, Sunset, Heart Rate, Battery Estimate) * The heart rate monitor is turned on only when Heart rate is selected and will take a few seconds to settle @@ -25,6 +24,7 @@ See [#1248](https://github.com/espruino/BangleApps/issues/1248) * Hours - Displays the ring as though it's the hour hand on an analog clock. * Minutes - Displays the ring as though it's the minute hand on an analog clock. * Seconds - Displays the ring as though it's the seconds hand on an analog clock. + * Day - Displays the ring as how much of the day is left. Functionally, it fills the ring half as quickly as the Hours option. * Steps - Displays the ring as the amount of steps taken that day out of Step Target setting. * Battery - Displays the ring as the amount of battery percentage left. * Sun - Displays the ring as the amount of time that has passed from sunrise to sunset in the day and the amount of time between sunset and sunrise at night. diff --git a/apps/daisy/app.js b/apps/daisy/app.js index d5c8beb5b..72aff9c43 100644 --- a/apps/daisy/app.js +++ b/apps/daisy/app.js @@ -136,12 +136,12 @@ function updateSunRiseSunSet(now, lat, lon, sunLeftCalcs){ sunSet = extractTime(times.sunset); if (!sunLeftCalcs) return; - let sunLeft = times.dusk - dateCopy; + let sunLeft = times.sunset - dateCopy; if (sunLeft < 0) { // If it's already night dateCopy.setDate(dateCopy.getDate() + 1); let timesTmrw = SunCalc.getTimes(dateCopy, lat, lon); isDaytime = false; - sunStart = times.dusk; + sunStart = times.sunset; sunFull = timesTmrw.sunrise - sunStart; sunEnd = getMinutesFromDate(timesTmrw.sunrise); night = getMinutesFromDate(timesTmrw.sunriseEnd); @@ -152,7 +152,7 @@ function updateSunRiseSunSet(now, lat, lon, sunLeftCalcs){ dateCopy.setDate(dateCopy.getDate() - 1); let timesYest = SunCalc.getTimes(dateCopy, lat, lon); isDaytime = false; - sunStart = timesYest.dusk; + sunStart = timesYest.sunset; sunFull = times.sunrise - sunStart; sunEnd = getMinutesFromDate(times.sunrise); night = getMinutesFromDate(times.sunriseEnd); @@ -160,9 +160,9 @@ function updateSunRiseSunSet(now, lat, lon, sunLeftCalcs){ else { // We're in the middle of the day isDaytime = true; sunStart = times.sunriseEnd; - sunFull = times.sunset - sunStart; - sunEnd = getMinutesFromDate(times.sunset); - night = getMinutesFromDate(times.dusk); + sunFull = times.sunsetStart - sunStart; + sunEnd = getMinutesFromDate(times.sunsetStart); + night = getMinutesFromDate(times.sunset); } } } diff --git a/apps/daisy/metadata.json b/apps/daisy/metadata.json index d75402153..59b533020 100644 --- a/apps/daisy/metadata.json +++ b/apps/daisy/metadata.json @@ -1,8 +1,8 @@ { "id": "daisy", "name": "Daisy", - "version": "0.15", + "version": "0.16", "dependencies": {"mylocation":"app"}, - "description": "A beautiful digital clock with large ring guage, idle timer and a cyclic information line that includes, day, date, steps, battery, sunrise and sunset times", + "description": "A beautiful digital clock with large ring gauge, idle timer and a cyclic information line that includes, day, date, steps, battery, sunrise and sunset times", "icon": "app.png", "type": "clock", "tags": "clock",