Skip to content

Commit

Permalink
Update dependencies, run cargo fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
afilini committed Mar 13, 2024
1 parent 47e90cf commit ddbda1a
Show file tree
Hide file tree
Showing 49 changed files with 538 additions and 477 deletions.
121 changes: 67 additions & 54 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ This command should first compile the emulator, then the firmware, and then laun

The dependencies you'll need are:

* **nightly** `cargo` with both the native (local) and `thumbv7em-none-eabihf` targets installed
* `cargo` (ideally >= 1.76) with both the native (local) and `thumbv7em-none-eabihf` targets installed
* The C toolchain for ARM-v7 (`arm-none-eabi-*`)
* `qemu-system-arm` to emulate the firmware
* FLTK to run the emulator GUI
Expand Down
8 changes: 4 additions & 4 deletions dummy-uniffi/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
// Portal Hardware Wallet firmware and supporting software libraries
//
//
// Copyright (C) 2024 Alekos Filini
//
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
//
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>.

Expand Down
8 changes: 4 additions & 4 deletions emulator/build.rs
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
// Portal Hardware Wallet firmware and supporting software libraries
//
//
// Copyright (C) 2024 Alekos Filini
//
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
//
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>.

Expand Down
8 changes: 4 additions & 4 deletions emulator/src/bin/gui.rs
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
// Portal Hardware Wallet firmware and supporting software libraries
//
//
// Copyright (C) 2024 Alekos Filini
//
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
//
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>.

Expand Down
10 changes: 5 additions & 5 deletions emulator/src/gui.rs
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
// Portal Hardware Wallet firmware and supporting software libraries
//
//
// Copyright (C) 2024 Alekos Filini
//
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
//
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>.

Expand Down Expand Up @@ -181,7 +181,7 @@ pub fn init_gui(
.send(format!("> DisplayAddress({})", value))
.unwrap();
match sdk_cloned.display_address(value).await {
Ok(v) => log_cloned.send(format!("< {}", v)).unwrap(),
Ok(v) => log_cloned.send(format!("< {:?}", v)).unwrap(),
Err(e) => log::warn!("Display addr err: {:?}", e),
}
});
Expand Down
Loading

0 comments on commit ddbda1a

Please sign in to comment.