Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

jade: update Jade api to 1.0.33 #768

Merged
merged 2 commits into from
Dec 11, 2024
Merged

jade: update Jade api to 1.0.33 #768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
21f6025
jade setup_environment: tweak qemu clone following issue with upstrea…
JamieDriver Dec 6, 2024
f4f7fe5
jade: update Jade api to 1.0.33
JamieDriver Sep 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions hwilib/devices/jade.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

from .jadepy import jade
from .jadepy.jade import JadeAPI, JadeError
from .jadepy.jade_serial import JadeSerialImpl

from serial.tools import list_ports

Expand Down Expand Up @@ -58,7 +59,6 @@
# The test emulator port
SIMULATOR_PATH = 'tcp:127.0.0.1:30121'

JADE_DEVICE_IDS = [(0x10c4, 0xea60), (0x1a86, 0x55d4), (0x0403, 0x6001), (0x1a86, 0x7523)]
HAS_NETWORKING = hasattr(jade, '_http_request')

py_enumerate = enumerate # To use the enumerate built-in, since the name is overridden below
Expand Down Expand Up @@ -533,7 +533,7 @@ def _get_device_entry(device_model: str, device_path: str) -> Dict[str, Any]:
# Scan com ports looking for the relevant vid and pid, and use 'path' to
# hold the path to the serial port device, eg. /dev/ttyUSB0
for devinfo in list_ports.comports():
if (devinfo.vid, devinfo.pid) in JADE_DEVICE_IDS:
if (devinfo.vid, devinfo.pid) in JadeSerialImpl.JADE_DEVICE_IDS:
results.append(_get_device_entry('jade', devinfo.device))

# If we can connect to the simulator, add it too
Expand Down
2 changes: 1 addition & 1 deletion hwilib/devices/jadepy/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

This is a slightly stripped down version of the official [Jade](https://github.com/Blockstream/Jade) python library.

This stripped down version was made from tag [0.1.38](https://github.com/Blockstream/Jade/releases/tag/0.1.38)
This stripped down version was made from tag [1.0.33](https://github.com/Blockstream/Jade/releases/tag/1.0.33)

## Changes

Expand Down
2 changes: 1 addition & 1 deletion hwilib/devices/jadepy/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .jade import JadeAPI
from .jade_error import JadeError

__version__ = "0.2.0"
__version__ = "1.0.33"
Loading
Loading