From 5841be5f9c990740570126a816e2f801643f4e08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Noah=20H=C3=BCsser?= Date: Thu, 19 Nov 2020 02:05:22 +0100 Subject: [PATCH 1/7] Prepare for the 0.10.0 release --- .github/FUNDING.yml | 1 + CHANGELOG.md | 28 ++++++++++++++++++++------- Cargo.toml | 13 +++++-------- README.md | 46 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 73 insertions(+), 15 deletions(-) create mode 100644 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 0000000..3ad34cb --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1 @@ +github: [probe-rs] \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index bd9ef63..3a1bf68 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed +## [0.10.0] + +### Added + +- Updated to probe-rs 0.10.0. Please consult its own changelog for new features and fixes. +- Added logging to sentry.io. This is 100% OPT-IN! You will be asked only if an unhandled error or panic occurs, and only if you give consent, data is transmitted. If you do not trust us either way, you can disable the `sentry` feature when you install the crate. The completely anonymous data can be investigated on sentry.io by anyone who likes to see it. Unfortunately sentry.io does not feature public orgs yet, so please reach out to @Yatekii to be added. +Sentry helps us track down tricky issues that only occur in very specific cases. It is very much appreciated if you log upcomming errors this way (#125)! +- Added printing of the git hash cargo-embed was compiled with and the current package version (#116). + +### Changed + +- FTDI support is now optional. To enable FTDI support, please use the `ftdi` feature (#131). + ## [0.9.1] ### Added @@ -133,10 +146,11 @@ An example is this config: ## [0.6.0] - Initial release -[Unreleased]: https://github.com/probe-rs/probe-rs/compare/v0.9.1...master -[0.9.1]: https://github.com/probe-rs/probe-rs/releases/tag/v0.9.1..v0.9.0 -[0.9.0]: https://github.com/probe-rs/probe-rs/releases/tag/v0.9.0..v0.8.0 -[0.8.0]: https://github.com/probe-rs/probe-rs/releases/tag/v0.8.0..v0.7.0 -[0.7.0]: https://github.com/probe-rs/probe-rs/releases/tag/v0.7.0..v0.6.1 -[0.6.1]: https://github.com/probe-rs/probe-rs/releases/tag/v0.6.1..v0.6.0 -[0.6.0]: https://github.com/probe-rs/probe-rs/releases/tag/v0.6.0 +[Unreleased]: https://github.com/probe-rs/cargo-embed/compare/v0.10.0..master +[0.10.0]: https://github.com/probe-rs/cargo-embed/releases/tag/v0.9.0..v0.10.0 +[0.9.1]: https://github.com/probe-rs/cargo-embed/releases/tag/v0.9.0..v0.9.1 +[0.9.0]: https://github.com/probe-rs/cargo-embed/releases/tag/v0.8.0..v0.9.0 +[0.8.0]: https://github.com/probe-rs/cargo-embed/releases/tag/v0.7.0..v0.8.0 +[0.7.0]: https://github.com/probe-rs/cargo-embed/releases/tag/v0.6.1..v0.7.0 +[0.6.1]: https://github.com/probe-rs/cargo-embed/releases/tag/v0.6.0..v0.6.1 +[0.6.0]: https://github.com/probe-rs/cargo-embed/releases/tag/v0.6.0 diff --git a/Cargo.toml b/Cargo.toml index cdad107..71e118b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cargo-embed" -version = "0.9.1" +version = "0.10.0" authors = ["Noah Hüsser "] edition = "2018" description = "A utility to develop software for embedded ARM and RISC-V cores." @@ -18,9 +18,9 @@ ftdi = ["probe-rs/ftdi"] sentry = ["probe-rs-cli-util/sentry"] [dependencies] -probe-rs = { version = "0.9.0", git = "https://github.com/probe-rs/probe-rs" } -gdb-server = { version = "0.9.0", git = "https://github.com/probe-rs/probe-rs" } -probe-rs-cli-util = { version = "0.9.0", git = "https://github.com/probe-rs/probe-rs", default-features = false } +probe-rs = { version = "0.10.0", git = "https://github.com/probe-rs/probe-rs" } +gdb-server = { version = "0.10.0", git = "https://github.com/probe-rs/probe-rs" } +probe-rs-cli-util = { version = "0.10.0", git = "https://github.com/probe-rs/probe-rs", default-features = false } structopt = "0.3.18" git-version = "0.3.4" @@ -32,7 +32,7 @@ colored = "2.0.0" serde = { version = "1.0", features = ["derive"] } serde_json = { version = "1.0.51" } config = { version = "0.10.1", features = ["toml", "json", "yaml"], default-features = false } -probe-rs-rtt = { version = "0.4.0" } +probe-rs-rtt = { version = "0.5.0" } chrono = "0.4" # Version 0.17.8 doesn't compile on Windows crossterm = "<= 0.17.7" @@ -40,6 +40,3 @@ goblin = "0.2.0" tui = { version = "0.12.0", default-features = false, features = ["crossterm"] } anyhow = "1.0.31" textwrap = "0.12.1" - -[patch.crates-io] -probe-rs = { version = "0.9.0", git = "https://github.com/probe-rs/probe-rs" } diff --git a/README.md b/README.md index 3918b6b..eea498c 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,10 @@ It can flash targets, just like cargo-flash but can do much more, such as loggin Various chip families including but not limited to nRF5x, STM32 and LPC800 can be worked with using DAPLink, ST-Link or J-Link. It supports all the targets & probes [probe-rs](https://github.com/probe-rs/probe-rs) supports. +## Support + +If you think cargo-embedded makes your embedded journey more enjoyable or even earns you money, please consider supporting the project on [Github Sponsors](https://github.com/sponsors/probe-rs/) for better support and more features. + ## Installation You can install this utility with cargo: @@ -45,6 +49,48 @@ Instead of a TOML file, you can also use a JSON or YAML file. Choose what suits You can find all available options in the [default.toml](src/config/default.toml). Commented out options are the ones that are `None` by default. +## Building + +`cargo-embed` can be built using cargo, after installing the necessary prerequisites. See the list below for your operating +system. + +### FTDI Support + +FTDI support is optional. You can enable it with the `ftdi` feature. You also need the correct prerequisites from the next section installed. + +### Prerequisites + +cargo-embed depends on the [libusb](https://libusb.info/) and optionally on [libftdi](https://www.intra2net.com/en/developer/libftdi/) libraries, which need to be installed to build cargo-embed. + +#### Linux + +On Ubuntu, the following packages need to be installed: + +``` +> sudo apt install -y pkg-config libusb-dev libusb-1.0 libftdi1-dev +``` + +#### Windows + +On Windows you can use [vcpkg](https://github.com/microsoft/vcpkg#quick-start-windows) to install the prerequisites: + +``` +# dynamic linking 64-bit +> vcpkg install libftdi1:x64-windows libusb:x64-windows +> set VCPKGRS_DYNAMIC=1 + +# static linking 64-bit +> vcpkg install libftdi1:x64-windows-static-md libusb:x64-windows-static-md +``` + +#### macOS + +On macOS, [homebrew](https://brew.sh/) is the suggested method to install libftdi: + +``` +> brew install libftdi +``` + # Sentry logging We use Sentry to record crash data. This helps us trace crashes better. From 8bb22b903a9201d1b03c45532ba8a565ef7e9bd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Noah=20H=C3=BCsser?= Date: Thu, 19 Nov 2020 14:34:29 +0100 Subject: [PATCH 2/7] Fixed a typo --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a1bf68..23b1332 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,7 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Updated to probe-rs 0.10.0. Please consult its own changelog for new features and fixes. - Added logging to sentry.io. This is 100% OPT-IN! You will be asked only if an unhandled error or panic occurs, and only if you give consent, data is transmitted. If you do not trust us either way, you can disable the `sentry` feature when you install the crate. The completely anonymous data can be investigated on sentry.io by anyone who likes to see it. Unfortunately sentry.io does not feature public orgs yet, so please reach out to @Yatekii to be added. -Sentry helps us track down tricky issues that only occur in very specific cases. It is very much appreciated if you log upcomming errors this way (#125)! +Sentry helps us track down tricky issues that only occur in very specific cases. It is very much appreciated if you log upcoming errors this way (#125)! - Added printing of the git hash cargo-embed was compiled with and the current package version (#116). ### Changed From 878ac9e8c72f44c3540f805b8b659f8c8cf8e365 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Noah=20H=C3=BCsser?= Date: Thu, 19 Nov 2020 21:10:24 +0100 Subject: [PATCH 3/7] Fallback to 'crates.io' if no commit hash could be determined --- src/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.rs b/src/main.rs index 3de2204..f254c24 100644 --- a/src/main.rs +++ b/src/main.rs @@ -40,7 +40,7 @@ lazy_static::lazy_static! { const CARGO_NAME: &'static str = env!("CARGO_PKG_NAME"); const CARGO_VERSION: &'static str = env!("CARGO_PKG_VERSION"); -const GIT_VERSION: &'static str = git_version::git_version!(); +const GIT_VERSION: &'static str = git_version::git_version!(fallback="crates.io"); #[derive(Debug, StructOpt)] struct Opt { From a27c39c5b723007e5b03fca0a2fd4d7ed3f45fb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Noah=20H=C3=BCsser?= Date: Thu, 19 Nov 2020 21:16:30 +0100 Subject: [PATCH 4/7] Bump rtt properly --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 71e118b..f2c1205 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,7 +32,7 @@ colored = "2.0.0" serde = { version = "1.0", features = ["derive"] } serde_json = { version = "1.0.51" } config = { version = "0.10.1", features = ["toml", "json", "yaml"], default-features = false } -probe-rs-rtt = { version = "0.5.0" } +probe-rs-rtt = { version = "0.10.0" } chrono = "0.4" # Version 0.17.8 doesn't compile on Windows crossterm = "<= 0.17.7" From 359f7a6b52473d58bbe978ae61173509cf19d595 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Noah=20H=C3=BCsser?= Date: Thu, 19 Nov 2020 21:16:52 +0100 Subject: [PATCH 5/7] Update lock --- Cargo.lock | 156 ++++++++++++++++++++++++++--------------------------- 1 file changed, 76 insertions(+), 80 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4cefe99..cd3d68e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -273,7 +273,7 @@ checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba" [[package]] name = "cargo-embed" -version = "0.9.1" +version = "0.10.0" dependencies = [ "anyhow", "chrono", @@ -287,7 +287,7 @@ dependencies = [ "indicatif", "lazy_static", "log", - "probe-rs", + "probe-rs 0.10.0 (git+https://github.com/probe-rs/probe-rs)", "probe-rs-cli-util", "probe-rs-rtt", "serde", @@ -579,28 +579,6 @@ version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7531096570974c3a9dcf9e4b8e1cede1ec26cf5046219fb3b9d897503b9be59" -[[package]] -name = "failure" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" -dependencies = [ - "backtrace", - "failure_derive", -] - -[[package]] -name = "failure_derive" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "synstructure", -] - [[package]] name = "fallible-iterator" version = "0.2.0" @@ -814,8 +792,8 @@ dependencies = [ [[package]] name = "gdb-server" -version = "0.9.0" -source = "git+https://github.com/probe-rs/probe-rs#030341ac63af4cc0c813f52f4281c8f2fc5d602f" +version = "0.10.0" +source = "git+https://github.com/probe-rs/probe-rs#09fa14698050447b2f22401c11ae24a6ac740ad7" dependencies = [ "anyhow", "async-std", @@ -825,7 +803,7 @@ dependencies = [ "log", "memchr", "nom 6.0.0", - "probe-rs", + "probe-rs 0.10.0 (git+https://github.com/probe-rs/probe-rs)", ] [[package]] @@ -1108,9 +1086,9 @@ dependencies = [ [[package]] name = "instant" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb1fc4429a33e1f80d41dc9fea4d108a88bec1de8053878898ae448a0b52f613" +checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec" dependencies = [ "cfg-if 1.0.0", ] @@ -1662,8 +1640,37 @@ checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" [[package]] name = "probe-rs" -version = "0.9.0" -source = "git+https://github.com/probe-rs/probe-rs#030341ac63af4cc0c813f52f4281c8f2fc5d602f" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddad22daa4f8b3048750a51b99a8e3e19313a3805009b8918fce3440ee7a4472" +dependencies = [ + "anyhow", + "base64 0.13.0", + "bitfield", + "enum-primitive-derive", + "gimli", + "goblin", + "hidapi", + "ihex", + "jaylink", + "jep106", + "lazy_static", + "log", + "num-traits", + "object", + "probe-rs-t2rust 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rusb", + "scroll", + "serde", + "serde_yaml", + "svg", + "thiserror", +] + +[[package]] +name = "probe-rs" +version = "0.10.0" +source = "git+https://github.com/probe-rs/probe-rs#09fa14698050447b2f22401c11ae24a6ac740ad7" dependencies = [ "anyhow", "base64 0.13.0", @@ -1681,7 +1688,7 @@ dependencies = [ "log", "num-traits", "object", - "probe-rs-t2rust", + "probe-rs-t2rust 0.7.0 (git+https://github.com/probe-rs/probe-rs)", "rusb", "scroll", "serde", @@ -1692,8 +1699,8 @@ dependencies = [ [[package]] name = "probe-rs-cli-util" -version = "0.9.0" -source = "git+https://github.com/probe-rs/probe-rs#030341ac63af4cc0c813f52f4281c8f2fc5d602f" +version = "0.10.0" +source = "git+https://github.com/probe-rs/probe-rs#09fa14698050447b2f22401c11ae24a6ac740ad7" dependencies = [ "anyhow", "cargo_metadata", @@ -1704,7 +1711,7 @@ dependencies = [ "indicatif", "lazy_static", "log", - "probe-rs", + "probe-rs 0.10.0 (git+https://github.com/probe-rs/probe-rs)", "sentry", "serde", "simplelog", @@ -1714,20 +1721,33 @@ dependencies = [ [[package]] name = "probe-rs-rtt" -version = "0.4.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08122b8ba5a934dd10a16a0cd0cab4f1ada1be500782b77bc49c1cd93cb8b03" +checksum = "28a1edbeaff3821f35357a58b035dee2c4d2655dc1ab87899803eb2e79c88e30" dependencies = [ "log", - "probe-rs", + "probe-rs 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", "scroll", "thiserror", ] [[package]] name = "probe-rs-t2rust" -version = "0.6.0" -source = "git+https://github.com/probe-rs/probe-rs#030341ac63af4cc0c813f52f4281c8f2fc5d602f" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "856b6a25368ebfc253dbd0be8deb666a8a6e1d90eb630560d5f5cdcf8dc35b7f" +dependencies = [ + "base64 0.13.0", + "proc-macro2", + "quote", + "scroll", + "serde_yaml", +] + +[[package]] +name = "probe-rs-t2rust" +version = "0.7.0" +source = "git+https://github.com/probe-rs/probe-rs#09fa14698050447b2f22401c11ae24a6ac740ad7" dependencies = [ "base64 0.13.0", "proc-macro2", @@ -2053,9 +2073,9 @@ dependencies = [ [[package]] name = "sentry" -version = "0.20.1" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "144e85b28d129f056ef91664fe2b985eade906d2838752c2f61c9f233cd98e4a" +checksum = "933beb0343c84eefd69a368318e9291b179e09e51982d49c65d7b362b0e9466f" dependencies = [ "httpdate", "reqwest", @@ -2063,15 +2083,14 @@ dependencies = [ "sentry-backtrace", "sentry-contexts", "sentry-core", - "sentry-failure", "sentry-panic", ] [[package]] name = "sentry-anyhow" -version = "0.20.1" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e6a984e366219d09cd3c34e87dc477367678564b6412a5492854cce122c73e6" +checksum = "6176c8099ad6fcef14b8d5ce3e5717e060e26f1ab23453f45ea48be904bcd4a7" dependencies = [ "anyhow", "sentry-core", @@ -2079,9 +2098,9 @@ dependencies = [ [[package]] name = "sentry-backtrace" -version = "0.20.1" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92dabd890482f152fb6d261fe2034a193facc2c99c0c571bbf7687c356fcb2e8" +checksum = "38e528fb457baf53fcd6c90beb420705f35c12c3d8caed8817dcf7be00eff7c7" dependencies = [ "backtrace", "lazy_static", @@ -2091,9 +2110,9 @@ dependencies = [ [[package]] name = "sentry-contexts" -version = "0.20.1" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "039ac50d2d740d51c5d376c2e9e93725eea662fa3acdcbcfe1b8b93a3b30c478" +checksum = "ce3a560a34cffac347f0b588fc29b31db969e27bf57208f946d6a2d588668b0b" dependencies = [ "hostname", "lazy_static", @@ -2106,9 +2125,9 @@ dependencies = [ [[package]] name = "sentry-core" -version = "0.20.1" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fe4fe890b12416701f838c702898a9c5e574c333cfbbee9fb7855a14e6490a3" +checksum = "17b8c235063c1007fd8e2fc7e35ce7eac09dd678d198ecc996daee33d46b3dcc" dependencies = [ "im", "lazy_static", @@ -2118,22 +2137,11 @@ dependencies = [ "serde_json", ] -[[package]] -name = "sentry-failure" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ead35e7019f77a79ed0345b3f3c28427139100f87f318c1c3e2788db2cdea8b7" -dependencies = [ - "failure", - "sentry-backtrace", - "sentry-core", -] - [[package]] name = "sentry-panic" -version = "0.20.1" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab8a3ac989339a76efd6155f9d02675ce4b04419cd8083ca58d083c222554147" +checksum = "04ee338d8292fcdcfb032929c9f53bc0dfac8e0b9d3096be79ceee96818851ed" dependencies = [ "sentry-backtrace", "sentry-core", @@ -2141,9 +2149,9 @@ dependencies = [ [[package]] name = "sentry-types" -version = "0.20.1" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8124f0e9bc1113ecbcc8c3746e0e590943cf23e7d09c70a088c116869bb12e3" +checksum = "5fbbea6debac0a24880a38239d4c2fc3dbb0b1b398f621bea03ed761796b7dfb" dependencies = [ "chrono", "debugid", @@ -2333,18 +2341,6 @@ dependencies = [ "unicode-xid", ] -[[package]] -name = "synstructure" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "unicode-xid", -] - [[package]] name = "tap" version = "1.0.0" @@ -2379,9 +2375,9 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf11676eb135389f21fcda654382c4859bbfc1d2f36e4425a2f829bb41b1e20e" +checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" dependencies = [ "winapi-util", ] From c2c3cd1cd112f167f9cbbb4345a30f05ead71cef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Noah=20H=C3=BCsser?= Date: Thu, 19 Nov 2020 21:19:18 +0100 Subject: [PATCH 6/7] Run rustfmt --- src/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.rs b/src/main.rs index f254c24..6d5a8e5 100644 --- a/src/main.rs +++ b/src/main.rs @@ -40,7 +40,7 @@ lazy_static::lazy_static! { const CARGO_NAME: &'static str = env!("CARGO_PKG_NAME"); const CARGO_VERSION: &'static str = env!("CARGO_PKG_VERSION"); -const GIT_VERSION: &'static str = git_version::git_version!(fallback="crates.io"); +const GIT_VERSION: &'static str = git_version::git_version!(fallback = "crates.io"); #[derive(Debug, StructOpt)] struct Opt { From d7c7fd848dce02f88459d0f0ca33c332138ee19a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Noah=20H=C3=BCsser?= Date: Thu, 19 Nov 2020 21:55:15 +0100 Subject: [PATCH 7/7] Fix build from master --- Cargo.lock | 55 ++++++------------------------------------------------ Cargo.toml | 2 +- 2 files changed, 7 insertions(+), 50 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cd3d68e..efc06d6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -287,7 +287,7 @@ dependencies = [ "indicatif", "lazy_static", "log", - "probe-rs 0.10.0 (git+https://github.com/probe-rs/probe-rs)", + "probe-rs", "probe-rs-cli-util", "probe-rs-rtt", "serde", @@ -803,7 +803,7 @@ dependencies = [ "log", "memchr", "nom 6.0.0", - "probe-rs 0.10.0 (git+https://github.com/probe-rs/probe-rs)", + "probe-rs", ] [[package]] @@ -1638,35 +1638,6 @@ version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" -[[package]] -name = "probe-rs" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddad22daa4f8b3048750a51b99a8e3e19313a3805009b8918fce3440ee7a4472" -dependencies = [ - "anyhow", - "base64 0.13.0", - "bitfield", - "enum-primitive-derive", - "gimli", - "goblin", - "hidapi", - "ihex", - "jaylink", - "jep106", - "lazy_static", - "log", - "num-traits", - "object", - "probe-rs-t2rust 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rusb", - "scroll", - "serde", - "serde_yaml", - "svg", - "thiserror", -] - [[package]] name = "probe-rs" version = "0.10.0" @@ -1688,7 +1659,7 @@ dependencies = [ "log", "num-traits", "object", - "probe-rs-t2rust 0.7.0 (git+https://github.com/probe-rs/probe-rs)", + "probe-rs-t2rust", "rusb", "scroll", "serde", @@ -1711,7 +1682,7 @@ dependencies = [ "indicatif", "lazy_static", "log", - "probe-rs 0.10.0 (git+https://github.com/probe-rs/probe-rs)", + "probe-rs", "sentry", "serde", "simplelog", @@ -1722,28 +1693,14 @@ dependencies = [ [[package]] name = "probe-rs-rtt" version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28a1edbeaff3821f35357a58b035dee2c4d2655dc1ab87899803eb2e79c88e30" +source = "git+https://github.com/probe-rs/probe-rs-rtt#f6fbf9e01f6715133c9ad5c9ec3948552b8185fb" dependencies = [ "log", - "probe-rs 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", + "probe-rs", "scroll", "thiserror", ] -[[package]] -name = "probe-rs-t2rust" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "856b6a25368ebfc253dbd0be8deb666a8a6e1d90eb630560d5f5cdcf8dc35b7f" -dependencies = [ - "base64 0.13.0", - "proc-macro2", - "quote", - "scroll", - "serde_yaml", -] - [[package]] name = "probe-rs-t2rust" version = "0.7.0" diff --git a/Cargo.toml b/Cargo.toml index f2c1205..355ebee 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,7 +32,7 @@ colored = "2.0.0" serde = { version = "1.0", features = ["derive"] } serde_json = { version = "1.0.51" } config = { version = "0.10.1", features = ["toml", "json", "yaml"], default-features = false } -probe-rs-rtt = { version = "0.10.0" } +probe-rs-rtt = { version = "0.10.0", git = "https://github.com/probe-rs/probe-rs-rtt" } chrono = "0.4" # Version 0.17.8 doesn't compile on Windows crossterm = "<= 0.17.7"