feat: Added automatic loading of Apps from the macropad_apps/python directory at load time.

Performance improvements to the lighting system. Renamed app_router to macropad_os.
2022-09-20 00:44:42 -04:00
parent d95d351bfd
commit 26ce2d1734
8 changed files with 72 additions and 34 deletions
@@ -0,0 +1,77 @@
+import time
+from .app_state import AppState
+
+from macropad_os.system_apps import OptionsApp, DebugApp
+
+
+class MacropadOS(object):
+    def __init__(self, macropad, config, apps):
+        print("app router")
+        self.macropad = macropad
+        self.app_index = 0
+        self.apps = [a(macropad, config) for a in apps]
+        self.options = OptionsApp(macropad, config)
+        self.current_app = self.apps[self.app_index]
+        self.config = config
+        self.encoder_state = False
+        self.options_time = 500000000  # .5 seconds in nanoseconds
+        self.click_time = 0
+        self.debug_app = DebugApp(macropad, config, "DEBUG APP")
+        self.debug_app_active = self.config.debug_app_enabled()
+        if self.debug_app_active:
+            self.apps.append(self.debug_app)
+
+    def swap_to_app(self, app):
+        """
+        TODO: Calculate the size of the stack and the max size of hte stack and then fully close apps if need be.
+        :param app:
+        :return:
+        """
+        print("Pausing current app")
+        self.current_app.pause()
+        print("Selecting new app")
+        self.current_app = app
+        if self.current_app._state is AppState.STOPPED:
+            print("Starting new app")
+            self.current_app.start()
+        if self.current_app._state is AppState.PAUSED:
+            print("Starting new app")
+            self.current_app.resume()
+
+    def start(self) -> None:
+        print(self.current_app)
+        self.current_app.start()
+        self.current_app.resume()
+
+        while True:
+            # detect if the current app is what should be running
+            # stop current app and start new one if not
+            self.current_app.loop()
+            # any other finite state machine logic that comes up
+            if self.macropad.encoder_switch_debounced.pressed and not self.encoder_state:
+                self.macropad.play_tone(1000, .1)
+                self.encoder_state = True
+                self.click_time = time.monotonic_ns()
+
+            elif self.macropad.encoder_switch_debounced.released and self.encoder_state:
+                self.encoder_state = False
+                if self.current_app is self.options:
+                    print("Moving from options to the last opened app.")
+                    if self.debug_app_active != self.config.debug_app_enabled():
+                        if self.debug_app_active:
+                            self.apps.append(self.debug_app)
+                        else:
+                            self.apps.remove(self.debug_app)
+                        self.debug_app_active = self.config.debug_app_enabled()
+                else:
+                    self.app_index += 1
+                    print("Moving to the next app on the list. ")
+                self.swap_to_app(self.apps[self.app_index % len(self.apps)])
+                print("released encoder")
+            if self.encoder_state and self.click_time:
+                self.release_time = time.monotonic_ns()
+                if (time.monotonic_ns() - self.click_time) > self.options_time:
+                    self.macropad.play_tone(1000, .1)
+                    self.swap_to_app(self.options)
+                    self.encoder_state = False
+            self.macropad.encoder_switch_debounced.update()