From 4df8b51034957e5ef5a228ae4ae2db54afdc50a2 Mon Sep 17 00:00:00 2001
From: Federico Lolli <federico.lolli@skywarder.eu>
Date: Wed, 20 Mar 2024 22:23:07 +0100
Subject: [PATCH] Changed from default NO-SYNC to default SYNC
---
on-host/Cargo.lock | 108 ++++++++++++++++++++++++++++++++++++++++++++
on-host/src/cli.rs | 7 ++-
on-host/src/main.rs | 8 ++--
3 files changed, 116 insertions(+), 7 deletions(-)
diff --git a/on-host/Cargo.lock b/on-host/Cargo.lock
index 9c61c8c..da7015e 100644
--- a/on-host/Cargo.lock
+++ b/on-host/Cargo.lock
@@ -2,6 +2,21 @@
# It is not intended for manual editing.
version = 3
+[[package]]
+name = "addr2line"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
+dependencies = [
+ "gimli",
+]
+
+[[package]]
+name = "adler"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
[[package]]
name = "aho-corasick"
version = "1.1.2"
@@ -64,6 +79,7 @@ name = "arpist"
version = "0.2.0"
dependencies = [
"clap",
+ "color-eyre",
"csv",
"log",
"serde",
@@ -78,6 +94,21 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+[[package]]
+name = "backtrace"
+version = "0.3.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
+dependencies = [
+ "addr2line",
+ "cc",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+]
+
[[package]]
name = "bitflags"
version = "1.3.2"
@@ -96,6 +127,12 @@ version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+[[package]]
+name = "cc"
+version = "1.0.90"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5"
+
[[package]]
name = "cfg-if"
version = "1.0.0"
@@ -142,6 +179,19 @@ version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1"
+[[package]]
+name = "color-eyre"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55146f5e46f237f7423d74111267d4597b59b0dad0ffaf7303bce9945d843ad5"
+dependencies = [
+ "backtrace",
+ "eyre",
+ "indenter",
+ "once_cell",
+ "owo-colors",
+]
+
[[package]]
name = "colorchoice"
version = "1.0.0"
@@ -200,12 +250,34 @@ dependencies = [
"powerfmt",
]
+[[package]]
+name = "eyre"
+version = "0.6.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec"
+dependencies = [
+ "indenter",
+ "once_cell",
+]
+
+[[package]]
+name = "gimli"
+version = "0.28.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
+
[[package]]
name = "heck"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+[[package]]
+name = "indenter"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
+
[[package]]
name = "io-kit-sys"
version = "0.4.0"
@@ -309,6 +381,15 @@ version = "2.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
+[[package]]
+name = "miniz_oxide"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
+dependencies = [
+ "adler",
+]
+
[[package]]
name = "nix"
version = "0.26.4"
@@ -349,6 +430,27 @@ dependencies = [
"libc",
]
+[[package]]
+name = "object"
+version = "0.32.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+
+[[package]]
+name = "owo-colors"
+version = "3.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
+
[[package]]
name = "pkg-config"
version = "0.3.27"
@@ -417,6 +519,12 @@ version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
+[[package]]
+name = "rustc-demangle"
+version = "0.1.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
+
[[package]]
name = "ryu"
version = "1.0.16"
diff --git a/on-host/src/cli.rs b/on-host/src/cli.rs
index 9da2e5b..906c600 100644
--- a/on-host/src/cli.rs
+++ b/on-host/src/cli.rs
@@ -22,13 +22,12 @@ pub struct Cli {
#[clap(short, long, default_value = "115200")]
pub baud_rate: u32,
- /// SYNC-MODE: for each packet sent wait for a signal from the device before
- /// sending the next one
+ /// disable SYNC MODE (wait for a sync signal from the device before proceding)
#[clap(short, long)]
- pub sync: bool,
+ pub no_sync: bool,
/// The log level
- #[clap(short, long, default_value = "false")]
+ #[clap(short, long)]
pub verbose: bool,
}
diff --git a/on-host/src/main.rs b/on-host/src/main.rs
index 3612dda..1cad812 100644
--- a/on-host/src/main.rs
+++ b/on-host/src/main.rs
@@ -42,8 +42,10 @@ fn main() -> Result<()> {
.env()
.init()?;
- if args.sync {
- info!("SYNC mode enabled");
+ if !args.no_sync {
+ info!("SYNC mode ENABLED");
+ } else {
+ info!("SYNC mode DISABLED");
}
let mut packets = Vec::new();
@@ -95,7 +97,7 @@ fn main() -> Result<()> {
);
// if sync mode is enabled then wait for ACK
- if args.sync {
+ if !args.no_sync {
wait_for_ack(&mut port, &mut buffer);
}
}
--
GitLab