speculos 0.8.7.dev2__tar.gz → 0.8.7.dev6__tar.gz

{speculos-0.8.7.dev2 → speculos-0.8.7.dev6}/CHANGELOG.md

@@ -5,7 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [0.8.7] - 2024-??-??
+## [0.9.0] - 2024-05-06
+
+### Added
+
+- Finger swipe capabilities (this feature is currently only available on Flex, using the capability
+  will have no effect on other devices)
+- Add support of API_LEVEL_19 for Flex
 
 ### Fixed
 

{speculos-0.8.7.dev2/speculos.egg-info → speculos-0.8.7.dev6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: speculos
-Version: 0.8.7.dev2
+Version: 0.8.7.dev6
 Summary: Ledger Blue, Stax, Flex and Nano S/S+/X application emulator
 Author-email: Ledger <hello@ledger.fr>
 Project-URL: Homepage, https://github.com/LedgerHQ/speculos

{speculos-0.8.7.dev2 → speculos-0.8.7.dev6}/speculos/__version__.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.8.7.dev2'
-__version_tuple__ = version_tuple = (0, 8, 7, 'dev2')
+__version__ = version = '0.8.7.dev6'
+__version_tuple__ = version_tuple = (0, 8, 7, 'dev6')

{speculos-0.8.7.dev2 → speculos-0.8.7.dev6}/speculos/api/finger.py

@@ -18,11 +18,13 @@ class Finger(SephResource):
         action = args["action"]
         delay = args.get("delay", 0.1)
 
+        x1, y1 = args["x"], args["y"]
         if action == "press-and-release":
-            self.seph.handle_finger(args["x"], args["y"], True)
+            self.seph.handle_finger(x1, y1, True)
             self.seph.handle_wait(delay)
-            self.seph.handle_finger(args["x"], args["y"], False)
+            x2, y2 = args.get("x2", x1), args.get("y2", y1)
+            self.seph.handle_finger(x2, y2, False)
         else:
-            self.seph.handle_finger(args["x"], args["y"], action == "press")
+            self.seph.handle_finger(x1, y1, action == "press")
 
         return {}, 200

{speculos-0.8.7.dev2 → speculos-0.8.7.dev6}/speculos/api/resources/finger.schema

@@ -5,6 +5,8 @@
     "properties": {
         "x": { "type": "integer", "minimum": 0 },
         "y": { "type": "integer", "minimum": 0 },
+        "x2": { "type": "integer", "minimum": 0 },
+        "y2": { "type": "integer", "minimum": 0 },
         "action": { "enum": [ "press", "release", "press-and-release" ] },
         "delay": { "type": "number" }
     },

{speculos-0.8.7.dev2 → speculos-0.8.7.dev6}/speculos/client.py

@@ -126,8 +126,29 @@ class Api:
         with self.session.post(f"{self.api_url}/button/{button}", json=data) as response:
             check_status_code(response, f"/button/{button}")
 
-    def finger_touch(self, x: int, y: int, delay: float = 0.5) -> None:
+    def finger_touch(self,
+                     x: int, y: int,
+                     x2: Optional[int] = None, y2: Optional[int] = None,
+                     delay: float = 0.5) -> None:
         data = {"action": "press-and-release", "x": x, "y": y, "delay": delay}
+        if x2 is not None:
+            data["x2"] = x2
+        if y2 is not None:
+            data["y2"] = y2
+        with self.session.post(f"{self.api_url}/finger", json=data) as response:
+            check_status_code(response, "/finger")
+
+    def finger_swipe(self, x: int, y: int, direction: str, delay: float = 0.5) -> None:
+        x2, y2 = x, y
+        if direction == "up":
+            y2 -= 10
+        elif direction == "down":
+            y2 += 10
+        elif direction == "left":
+            x2 -= 10
+        elif direction == "right":
+            x2 += 10
+        data = {"action": "press-and-release", "x": x, "y": y, "x2": x2, "y2": y2, "delay": delay}
         with self.session.post(f"{self.api_url}/finger", json=data) as response:
             check_status_code(response, "/finger")
 

{speculos-0.8.7.dev2 → speculos-0.8.7.dev6}/speculos/mcu/screen.py

@@ -5,7 +5,7 @@ from PyQt5.QtGui import QPainter, QColor, QPixmap
 from PyQt5.QtGui import QIcon, QKeyEvent, QMouseEvent
 from PyQt5.QtCore import QEvent, Qt, QSocketNotifier, QSettings, QRect
 from PyQt5.sip import voidptr
-from typing import List, Optional, Union
+from typing import List, Optional
 
 from speculos.observer import TextEvent
 from . import bagl
@@ -124,10 +124,9 @@ class App(QMainWindow):
         self.setGeometry(window_x, window_y, window_width, window_height)
         self.setFixedSize(window_width, window_height)
 
-        flags: Union[Qt.WindowFlags, Qt.WindowType] = Qt.FramelessWindowHint
         if display.ontop:
-            flags |= Qt.CustomizeWindowHint | Qt.WindowStaysOnTopHint
-        self.setWindowFlags(flags)
+            flags = Qt.CustomizeWindowHint | Qt.WindowStaysOnTopHint
+            self.setWindowFlags(flags)
 
         self.setAutoFillBackground(True)
         p = self.palette()
@@ -171,20 +170,13 @@ class App(QMainWindow):
         QApplication.setOverrideCursor(Qt.DragMoveCursor)
 
     def mouseReleaseEvent(self, event: QMouseEvent):
+        self.mouse_offset = event.pos()
         x, y = self._get_x_y()
         if x >= 0 and x < self._width and y >= 0 and y < self._height:
+            # Send the release
             self.seph.handle_finger(x, y, False)
         QApplication.restoreOverrideCursor()
 
-    def mouseMoveEvent(self, event: QMouseEvent):
-        '''Move the window.'''
-
-        x = event.globalX()
-        y = event.globalY()
-        x_w = self.mouse_offset.x()
-        y_w = self.mouse_offset.y()
-        self.move(x - x_w, y - y_w)
-
     def closeEvent(self, event: QEvent):
         '''
         Called when the window is closed. We save the current window position to

{speculos-0.8.7.dev2 → speculos-0.8.7.dev6/speculos.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: speculos
-Version: 0.8.7.dev2
+Version: 0.8.7.dev6
 Summary: Ledger Blue, Stax, Flex and Nano S/S+/X application emulator
 Author-email: Ledger <hello@ledger.fr>
 Project-URL: Homepage, https://github.com/LedgerHQ/speculos

{speculos-0.8.7.dev2 → speculos-0.8.7.dev6}/speculos.egg-info/SOURCES.txt

@@ -115,6 +115,7 @@ speculos/api/static/swagger/swagger-ui-standalone-preset.js
 speculos/api/static/swagger/swagger-ui.css
 speculos/api/static/swagger/swagger.json
 speculos/cxlib/flex-api-level-cx-18.elf
+speculos/cxlib/flex-api-level-cx-19.elf
 speculos/cxlib/nanos-cx-2.0.elf
 speculos/cxlib/nanos-cx-2.1.elf
 speculos/cxlib/nanosp-api-level-cx-1.elf
@@ -142,6 +143,7 @@ speculos/cxlib/stax-api-level-cx-7.elf
 speculos/cxlib/stax-api-level-cx-8.elf
 speculos/cxlib/stax-api-level-cx-9.elf
 speculos/fonts/flex-fonts-18.bin
+speculos/fonts/flex-fonts-19.bin
 speculos/fonts/nanosp-fonts-18.bin
 speculos/fonts/nanox-fonts-18.bin
 speculos/fonts/stax-fonts-1.bin

{speculos-0.8.7.dev2 → speculos-0.8.7.dev6}/src/bolos/fonts_info.c

@@ -229,6 +229,7 @@ void parse_fonts(void *code, unsigned long text_load_addr,
   case SDK_API_LEVEL_14:
   case SDK_API_LEVEL_15:
   case SDK_API_LEVEL_18:
+  case SDK_API_LEVEL_19:
     break;
   default:
     // Unsupported API_LEVEL, will not parse fonts!

{speculos-0.8.7.dev2 → speculos-0.8.7.dev6}/src/launcher.c

@@ -822,7 +822,7 @@ int main(int argc, char *argv[])
     }
     break;
   case MODEL_FLEX:
-    if (sdk_version != SDK_API_LEVEL_18) {
+    if (sdk_version != SDK_API_LEVEL_18 && sdk_version != SDK_API_LEVEL_19) {
       errx(1, "invalid SDK version for the Ledger Flex");
     }
     break;

{speculos-0.8.7.dev2 → speculos-0.8.7.dev6}/src/sdk.h

@@ -33,6 +33,7 @@ typedef enum {
   SDK_API_LEVEL_16,
   SDK_API_LEVEL_17,
   SDK_API_LEVEL_18,
+  SDK_API_LEVEL_19,
   SDK_COUNT
 } sdk_version_t;