From 726d5c855428239bba598a95f9a4a3e0e9c4f3aa Mon Sep 17 00:00:00 2001
From: Daniel Thompson <daniel@redfelineninja.org.uk>
Date: Sun, 27 Dec 2020 09:13:49 +0000
Subject: [PATCH] apps: chrono: Implement a simple analogue watch face

Signed-off-by: Daniel Thompson <daniel@redfelineninja.org.uk>
---
 README.rst          |   4 ++
 TODO.rst            |   1 +
 docs/apps.rst       |  11 +++++
 res/ChronoApp.png   | Bin 0 -> 5610 bytes
 wasp/apps/chrono.py | 102 ++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 118 insertions(+)
 create mode 100644 res/ChronoApp.png
 create mode 100644 wasp/apps/chrono.py

diff --git a/README.rst b/README.rst
index 4116cce..f565531 100644
--- a/README.rst
+++ b/README.rst
@@ -165,6 +165,10 @@ wasp-os also contains a library of additional applications for you to choose.
 These are disabled by default but can be easily enabled by adding them
 using one of the techniques is the Application Writer's guide.
 
+.. image:: res/ChronoApp.png
+   :alt: Analogue clock application running in the wasp-os simulator
+   :width: 179
+
 .. image:: res/FiboApp.png
    :alt: Fibonacci clock application running in the wasp-os simulator
    :width: 179
diff --git a/TODO.rst b/TODO.rst
index 636605c..78c9fe4 100644
--- a/TODO.rst
+++ b/TODO.rst
@@ -39,6 +39,7 @@ Wasp-os
   * [ ] Introduce fwd/back/vol+/vol- buttons to the music player
   * [ ] Update icon for Alarm app
   * [ ] Update art work for buttons in Confirmation view
+  * [ ] Reduce the size of the battery charge icon slightly (match bell)
 
 * [ ] Applications
 
diff --git a/docs/apps.rst b/docs/apps.rst
index c9a6bb4..f8779f0 100644
--- a/docs/apps.rst
+++ b/docs/apps.rst
@@ -23,6 +23,17 @@ treated as examples they are described in detail as part of the
 Watch faces
 -----------
 
+.. automodule:: apps.chrono
+
+This application is very simple and largely serves as an example of how to
+implement traditional watch faces.
+It is not included by default in any image.
+Instead it can be transferred to the device dynamically using wasptool:
+
+.. code-block:: sh
+
+    ./tools/wasptool --exec wasp/apps/chrono.py --eval 'wasp.system.register(ChronoApp())'
+
 .. automodule:: apps.fibonacci_clock
 
 This app is enabled by default in the simulator.
diff --git a/res/ChronoApp.png b/res/ChronoApp.png
new file mode 100644
index 0000000000000000000000000000000000000000..bbcd751eec43ac199f78c3c477701e856f305394
GIT binary patch
literal 5610
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
F{|!=jDL?=K

literal 0
HcmV?d00001

diff --git a/wasp/apps/chrono.py b/wasp/apps/chrono.py
new file mode 100644
index 0000000..63a8e23
--- /dev/null
+++ b/wasp/apps/chrono.py
@@ -0,0 +1,102 @@
+# SPDX-License-Identifier: LGPL-3.0-or-later
+# Copyright (C) 2020 Daniel Thompson
+
+"""Analogue clock
+~~~~~~~~~~~~~~~~~
+
+Shows the time as a traditional watch face together with a battery meter.
+
+.. figure:: res/ChronoApp.png
+    :width: 179
+
+    Screenshot of the analogue clock application
+"""
+
+import wasp
+
+class ChronoApp():
+    """Simple analogue clock application.
+    """
+    NAME = 'Chrono'
+
+    def foreground(self):
+        """Activate the application.
+
+        Configure the status bar, redraw the display and request a periodic
+        tick callback every second.
+        """
+        wasp.system.bar.clock = False
+        self._draw(True)
+        wasp.system.request_tick(1000)
+
+    def sleep(self):
+        """Prepare to enter the low power mode.
+
+        :returns: True, which tells the system manager not to automatically
+                  switch to the default application before sleeping.
+        """
+        return True
+
+    def wake(self):
+        """Return from low power mode.
+
+        Time will have changes whilst we have been asleep so we must
+        udpate the display (but there is no need for a full redraw because
+        the display RAM is preserved during a sleep.
+        """
+        self._draw()
+
+    def tick(self, ticks):
+        """Periodic callback to update the display."""
+        self._draw()
+
+    def _draw(self, redraw=False):
+        """Draw or lazily update the display.
+
+        The updates are as lazy by default and avoid spending time redrawing
+        if the time on display has not changed. However if redraw is set to
+        True then a full redraw is be performed.
+        """
+        draw = wasp.watch.drawable
+        hi =  wasp.system.theme('accent-hi')
+        mid = wasp.system.theme('accent-mid')
+        lo =  wasp.system.theme('accent-lo')
+
+        if redraw:
+            now = wasp.watch.rtc.get_localtime()
+
+            # Clear the display and draw that static parts of the watch face
+            draw.fill()
+
+            # Redraw the status bar
+            wasp.system.bar.draw()
+
+            # Draw the dividers
+            draw.set_color(mid)
+            for theta in range(12):
+                draw.polar(120, 120, theta * 360 // 12, 111, 119, 2)
+
+            self._hh = 0
+            self._mm = 0
+        else:
+            now = wasp.system.bar.update()
+            if not now or self._mm == now[4]:
+                # Skip the update
+                return
+
+        # Undraw old time
+        hh = (30 * (self._hh % 12)) + (self._mm / 2)
+        mm = 6 * self._mm
+        draw.polar(120, 120, hh, 5, 80, 5, 0)
+        draw.polar(120, 120, mm, 5, 110, 3, 0)
+
+        # Record the minute that is currently being displayed
+        self._hh = now[3]
+        self._mm = now[4]
+
+        # Draw the new time
+        hh = (30 * (self._hh % 12)) + (self._mm / 2)
+        mm = 6 * self._mm
+        draw.polar(120, 120, hh, 5, 80, 5, hi)
+        draw.polar(120, 120, hh, 5, 60, 3, lo)
+        draw.polar(120, 120, mm, 5, 110, 3, hi)