diff --git a/wasp/apps/faces.py b/wasp/apps/faces.py index 24a1b11..4a303c4 100644 --- a/wasp/apps/faces.py +++ b/wasp/apps/faces.py @@ -26,6 +26,7 @@ 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 1c8a9b5..c1fca85 100644 --- a/wasp/boards/manifest_240x240.py +++ b/wasp/boards/manifest_240x240.py @@ -7,6 +7,7 @@ manifest = ( 'apps/calc.py', 'apps/clock.py', 'apps/chrono.py', + 'apps/dual_clock.py', 'apps/faces.py', 'apps/fibonacci_clock.py', 'apps/flashlight.py', @@ -25,6 +26,7 @@ manifest = ( 'apps/SleepTk.py', 'fonts/__init__.py', 'fonts/clock.py', + 'fonts/clock_dual.py', 'fonts/sans18.py', 'fonts/sans24.py', 'fonts/sans28.py', diff --git a/wasp/wasp.py b/wasp/wasp.py index d3a1a8d..1fddccb 100644 --- a/wasp/wasp.py +++ b/wasp/wasp.py @@ -24,13 +24,12 @@ import widgets from apps.launcher import LauncherApp from apps.pager import PagerApp, CrashApp, NotificationApp -from micropython import const -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) +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 class EventType(): """Enumerated interface actions. @@ -180,6 +179,7 @@ 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) @@ -520,9 +520,6 @@ 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