aboutsummaryrefslogtreecommitdiff
path: root/src/device_trezor/device_trezor_base.cpp
diff options
context:
space:
mode:
authorDusan Klinec <dusan.klinec@gmail.com>2019-04-22 12:37:20 +0200
committerDusan Klinec <dusan.klinec@gmail.com>2019-04-25 00:31:10 +0200
commit0aaf5e2ac8768618e4d0546ea992c9e6c1b71a41 (patch)
treeed4bc5adba81bc354eb6307392fc78fb479d228a /src/device_trezor/device_trezor_base.cpp
parentMerge pull request #5466 (diff)
downloadmonero-0aaf5e2ac8768618e4d0546ea992c9e6c1b71a41.tar.xz
device/trezor: device sorting and filtering improved
- Trezor type detection refactored, T1 disabled (was enabled before which was a bug) - Sort connected devices by env TREZOR_PATH - Compatibility with Trezor ecosystem using TREZOR_PATH env var - Enables to pick particular Trezor to use in GUI as we don't have the multi-device selection yet - Dump all detected devices to log for better debugging / troubleshooting
Diffstat (limited to 'src/device_trezor/device_trezor_base.cpp')
-rw-r--r--src/device_trezor/device_trezor_base.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/device_trezor/device_trezor_base.cpp b/src/device_trezor/device_trezor_base.cpp
index 5adadbfc4..b7adf433d 100644
--- a/src/device_trezor/device_trezor_base.cpp
+++ b/src/device_trezor/device_trezor_base.cpp
@@ -115,10 +115,14 @@ namespace trezor {
MDEBUG("Enumerating Trezor devices...");
enumerate(trans);
+ sort_transports_by_env(trans);
- MDEBUG("Enumeration yielded " << trans.size() << " devices");
+ MDEBUG("Enumeration yielded " << trans.size() << " Trezor devices");
for (auto &cur : trans) {
MDEBUG(" device: " << *(cur.get()));
+ }
+
+ for (auto &cur : trans) {
std::string cur_path = cur->get_path();
if (boost::starts_with(cur_path, this->name)) {
MDEBUG("Device Match: " << cur_path);