py/fil3s: upate to clockwise petal numbering

python_payload/apps/fil3s/browser.py

@@ -39,15 +39,15 @@ class Browser(ActionView):
         self._scan_path()
 
     def _on_action(self, index: int) -> None:
-        if index == 1:
+        if index == 4:
             if self.current_pos > 0:
                 self.current_pos -= 1
                 self._update_position()
-        if index == 2:
-            self._up()
         if index == 3:
+            self._up()
+        if index == 2:
             self._select()
-        elif index == 4:
+        elif index == 1:
             if self.current_pos < len(self.dir_entries) - 1:
                 self.current_pos += 1
                 self._update_position()
@@ -144,10 +144,10 @@ class Browser(ActionView):
     def _update_actions(self) -> None:
         self.actions = [
             Action(icon="\ue3e3", label="Menu", enabled=False),
-            Action(icon="\ue5cb", label="Prev", enabled=self.prev_enabled),
-            Action(icon="\ue5c4", label="Back", enabled=self.up_enabled),
-            Action(icon="\ue876", label="Select"),
             Action(icon="\ue409", label="Next", enabled=self.next_enabled),
+            Action(icon="\ue876", label="Select"),
+            Action(icon="\ue5c4", label="Back", enabled=self.up_enabled),
+            Action(icon="\ue5cb", label="Prev", enabled=self.prev_enabled),
         ]
 
     def _update_position(self) -> None:

python_payload/apps/fil3s/common/action_view.py

@@ -47,7 +47,7 @@ class ActionView(BaseView):
         self.input = InputController()
 
         for i in range(0, 5):
-            petal_angle = 2.0 * pi / 5.0
+            petal_angle = 2.0 * -pi / 5.0
             self.action_x[i] = int(cos(-petal_angle * float(i) - pi / 2.0) * 100.0)
             self.action_y[i] = int(sin(-petal_angle * float(i) - pi / 2.0) * 100.0)
 

python_payload/apps/fil3s/reader.py

@@ -42,10 +42,10 @@ class Reader(ActionView):
 
         self.actions = [
             None,
-            Action(icon="\ue8d4", label="Scroll X"),
-            Action(icon="\ue5c4", label="Back"),
-            Action(icon="\ue8b6", label="Zoom"),
             Action(icon="\ue8d5", label="Scroll Y"),
+            Action(icon="\ue8b6", label="Zoom"),
+            Action(icon="\ue5c4", label="Back"),
+            Action(icon="\ue8d4", label="Scroll X"),
         ]
 
         # TODO: Buffered reading?
@@ -62,14 +62,14 @@ class Reader(ActionView):
         if self.is_loading:
             return
 
-        if self.input.captouch.petals[4].whole.pressed:
+        if self.input.captouch.petals[6].whole.pressed:
             self._back()
-        elif self.input.captouch.petals[6].whole.pressed:
+        elif self.input.captouch.petals[4].whole.pressed:
             self.zoom_enabled = not self.zoom_enabled
 
         # TODO: Use "joystick-style" input for scrolling
-        self.scroll_x.update(self.input.captouch.petals[2].gesture, delta_ms)
-        self.scroll_y.update(self.input.captouch.petals[8].gesture, delta_ms)
+        self.scroll_x.update(self.input.captouch.petals[8].gesture, delta_ms)
+        self.scroll_y.update(self.input.captouch.petals[2].gesture, delta_ms)
         x = self.scroll_x.position[0] * 0.2
         y = self.scroll_y.position[0] * 0.2
         self.viewport_offset = (x - 80, y - 80)