From c658680a00237208a995f83180159c9002aff769 Mon Sep 17 00:00:00 2001 From: Anatol Ulrich Date: Tue, 20 Apr 2021 12:24:49 +0200 Subject: [PATCH 1/5] temp fix for serialport on macos 11 --- xtask/Cargo.toml | 3 ++- xtask/src/tasks.rs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml index 2bd3968..06cb7e2 100644 --- a/xtask/Cargo.toml +++ b/xtask/Cargo.toml @@ -12,6 +12,7 @@ hidapi = "1.2.2" ihex = "1.1.2" pids = { path = "../common/pids" } rusb = "0.5.5" -serialport = "3.3.0" +#serialport = "3.3.0" +serialport = { git = "https://gitlab.com/spookyvision1/serialport-rs.git", branch = "fix-usb-deprecation"} tempfile = "3.2.0" xmas-elf = "0.7.0" \ No newline at end of file diff --git a/xtask/src/tasks.rs b/xtask/src/tasks.rs index 5fd6c1b..f2cd382 100644 --- a/xtask/src/tasks.rs +++ b/xtask/src/tasks.rs @@ -198,7 +198,7 @@ pub fn serial_term() -> color_eyre::Result<()> { } }; - let mut port = serialport::open(&dongle.port_name)?; + let mut port = serialport::new(&dongle.port_name, 9600).open()?; static CONTINUE: AtomicBool = AtomicBool::new(true); From 0101a78c505f8a669c29b787f458ccfe7d16bf1b Mon Sep 17 00:00:00 2001 From: Anatol Ulrich Date: Tue, 20 Apr 2021 13:06:37 +0200 Subject: [PATCH 2/5] speed bump lol --- xtask/src/tasks.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xtask/src/tasks.rs b/xtask/src/tasks.rs index f2cd382..abcb1be 100644 --- a/xtask/src/tasks.rs +++ b/xtask/src/tasks.rs @@ -198,7 +198,7 @@ pub fn serial_term() -> color_eyre::Result<()> { } }; - let mut port = serialport::new(&dongle.port_name, 9600).open()?; + let mut port = serialport::new(&dongle.port_name, 115200).open()?; static CONTINUE: AtomicBool = AtomicBool::new(true); From 269cff0a45441369880b52e3bb275535a571890a Mon Sep 17 00:00:00 2001 From: Anatol Ulrich <45840+spookyvision@users.noreply.github.com> Date: Tue, 20 Apr 2021 20:47:31 +0200 Subject: [PATCH 3/5] Update xtask/Cargo.toml Co-authored-by: James Munns --- xtask/Cargo.toml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml index 06cb7e2..efe085f 100644 --- a/xtask/Cargo.toml +++ b/xtask/Cargo.toml @@ -12,7 +12,9 @@ hidapi = "1.2.2" ihex = "1.1.2" pids = { path = "../common/pids" } rusb = "0.5.5" -#serialport = "3.3.0" +# Note: we are using a fork due compatibility problems. +# See https://github.com/ferrous-systems/embedded-trainings-2020/issues/148 for more details. +# serialport = "3.3.0" serialport = { git = "https://gitlab.com/spookyvision1/serialport-rs.git", branch = "fix-usb-deprecation"} tempfile = "3.2.0" -xmas-elf = "0.7.0" \ No newline at end of file +xmas-elf = "0.7.0" From a7b88ffa2c5d206ad40dfc9d4cd6ff37c6914ca8 Mon Sep 17 00:00:00 2001 From: Anatol Ulrich Date: Tue, 20 Apr 2021 21:00:38 +0200 Subject: [PATCH 4/5] point to ferrous repo --- xtask/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml index efe085f..9ab9aea 100644 --- a/xtask/Cargo.toml +++ b/xtask/Cargo.toml @@ -15,6 +15,6 @@ rusb = "0.5.5" # Note: we are using a fork due compatibility problems. # See https://github.com/ferrous-systems/embedded-trainings-2020/issues/148 for more details. # serialport = "3.3.0" -serialport = { git = "https://gitlab.com/spookyvision1/serialport-rs.git", branch = "fix-usb-deprecation"} +serialport = { git = "https://github.com/ferrous-systems/serialport-rs-hotfix.git", branch = "fix-usb-deprecation"} tempfile = "3.2.0" xmas-elf = "0.7.0" From 7d6fb39dfc5d4d9469546ed695a5f46196a209f1 Mon Sep 17 00:00:00 2001 From: Anatol Ulrich Date: Tue, 20 Apr 2021 21:01:57 +0200 Subject: [PATCH 5/5] prepare updated version number --- xtask/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml index 9ab9aea..89342e1 100644 --- a/xtask/Cargo.toml +++ b/xtask/Cargo.toml @@ -14,7 +14,7 @@ pids = { path = "../common/pids" } rusb = "0.5.5" # Note: we are using a fork due compatibility problems. # See https://github.com/ferrous-systems/embedded-trainings-2020/issues/148 for more details. -# serialport = "3.3.0" +# serialport = "4.0.2" serialport = { git = "https://github.com/ferrous-systems/serialport-rs-hotfix.git", branch = "fix-usb-deprecation"} tempfile = "3.2.0" xmas-elf = "0.7.0"