From 0162b306be5d96d5005b75153b19add7c4e6cc3b Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Wed, 15 Jun 2022 09:54:49 -0400
Subject: [PATCH 1/3] Remove the dual_clock watch face

I don't use this and it saves us some space due to the font
---
 wasp/apps/faces.py              | 1 -
 wasp/boards/manifest_240x240.py | 2 --
 2 files changed, 3 deletions(-)

diff --git a/wasp/apps/faces.py b/wasp/apps/faces.py
index 4a303c4..24a1b11 100644
--- a/wasp/apps/faces.py
+++ b/wasp/apps/faces.py
@@ -26,7 +26,6 @@ class FacesApp():
         choices.append(('clock', 'Clock'))
         choices.append(('week_clock', 'WeekClock'))
         choices.append(('chrono', 'Chrono'))
-        choices.append(('dual_clock', 'DualClock'))
         choices.append(('fibonacci_clock', 'FibonacciClock'))
 
         self.choices = choices
diff --git a/wasp/boards/manifest_240x240.py b/wasp/boards/manifest_240x240.py
index c1fca85..1c8a9b5 100644
--- a/wasp/boards/manifest_240x240.py
+++ b/wasp/boards/manifest_240x240.py
@@ -7,7 +7,6 @@ manifest = (
     'apps/calc.py',
     'apps/clock.py',
     'apps/chrono.py',
-    'apps/dual_clock.py',
     'apps/faces.py',
     'apps/fibonacci_clock.py',
     'apps/flashlight.py',
@@ -26,7 +25,6 @@ manifest = (
     'apps/SleepTk.py',
     'fonts/__init__.py',
     'fonts/clock.py',
-    'fonts/clock_dual.py',
     'fonts/sans18.py',
     'fonts/sans24.py',
     'fonts/sans28.py',

From d3846be32d78871677f0a6ad90600e427a41d97c Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Wed, 15 Jun 2022 10:24:36 -0400
Subject: [PATCH 2/3] Do not enable Faces by default

---
 wasp/wasp.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/wasp/wasp.py b/wasp/wasp.py
index 1fddccb..97eec79 100644
--- a/wasp/wasp.py
+++ b/wasp/wasp.py
@@ -179,7 +179,6 @@ class Manager():
         self.register('apps.stopwatch.StopwatchApp', True, no_except=True)
         self.register('apps.heart.HeartApp', True, no_except=True)
 
-        self.register('apps.faces.FacesApp', no_except=True)
         self.register('apps.settings.SettingsApp', no_except=True)
         self.register('apps.software.SoftwareApp', no_except=True)
 

From 04380f9362b816245def86184060b7363b6b319d Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Wed, 15 Jun 2022 15:26:27 -0400
Subject: [PATCH 3/3] Add missing conditionals for raise-to-wake

---
 wasp/wasp.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/wasp/wasp.py b/wasp/wasp.py
index 97eec79..d3a1a8d 100644
--- a/wasp/wasp.py
+++ b/wasp/wasp.py
@@ -24,12 +24,13 @@ import widgets
 
 from apps.launcher import LauncherApp
 from apps.pager import PagerApp, CrashApp, NotificationApp
+from micropython import const
 
-RAISE_WAKE_Y_SWITCH_THRESHOLD = -1536
-RAISE_WAKE_SPEED_MODIFIER = 8
-RAISE_WAKE_X_THRESHOLD = 512
-RAISE_WAKE_Y_THRESHOLD = 0
-RAISE_WAKE_REQUIRED_SPEED = 512
+RAISE_WAKE_Y_SWITCH_THRESHOLD = const(-768)
+RAISE_WAKE_SPEED_MODIFIER = const(8)
+RAISE_WAKE_X_THRESHOLD = const(512)
+RAISE_WAKE_Y_THRESHOLD = const(0)
+RAISE_WAKE_REQUIRED_SPEED = const(256)
 
 class EventType():
     """Enumerated interface actions.
@@ -519,6 +520,9 @@ class Manager():
         self.raise_wake_last_y = y
         self.raise_wake_last_z = z
 
+        if abs(x) > RAISE_WAKE_X_THRESHOLD or y > RAISE_WAKE_Y_THRESHOLD:
+            return False
+
         if y < RAISE_WAKE_Y_SWITCH_THRESHOLD:
             return delta_z > RAISE_WAKE_REQUIRED_SPEED