From 28d9377a086d50c2e340efa3cbedfd587ea9b05c Mon Sep 17 00:00:00 2001 From: Cooper Quintin Date: Fri, 19 Jan 2024 15:32:01 -0800 Subject: [PATCH] slight cleanup --- .cargo/config.toml | 1 + make.sh | 4 ++-- wavehunter/src/config.rs | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.cargo/config.toml b/.cargo/config.toml index 2280655..b76c88f 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -4,6 +4,7 @@ rustflags = ["-C", "target-feature=+crt-static"] [alias] test_pc = "test --target=x86_64-unknown-linux-gnu" +debug_pc = "--target=x86_64-unknown-linux-gnu" [target.armv7-unknown-linux-gnueabihf] linker = "arm-linux-gnueabihf-gcc" diff --git a/make.sh b/make.sh index 2ab9ac4..0011a83 100755 --- a/make.sh +++ b/make.sh @@ -1,2 +1,2 @@ -cargo build --release -adb push target/armv7-unknown-linux-gnueabihf/release/wavehunter /data/wavehunter/wavehunter +cargo build +adb push target/armv7-unknown-linux-gnueabihf/debug/wavehunter /data/wavehunter/wavehunter diff --git a/wavehunter/src/config.rs b/wavehunter/src/config.rs index 3f6269a..1e6ae39 100644 --- a/wavehunter/src/config.rs +++ b/wavehunter/src/config.rs @@ -19,7 +19,7 @@ pub struct Config { impl Default for Config { fn default() -> Self { Config { - qmdl_store_path: "/data/wavehunter".to_string(), + qmdl_store_path: "/data/wavehunter/qmdl".to_string(), port: 8080, readonly_mode: false, } @@ -33,7 +33,7 @@ pub fn parse_config

(path: P) -> Result where P: AsRe .map_err(WavehunterError::ConfigFileParsingError)?; if let Some(path) = parsed_config.qmdl_store_path { config.qmdl_store_path = path } if let Some(port) = parsed_config.port { config.port = port } - if let Some(debug_mode) = parsed_config.readonly_mode { config.readonly_mode = debug_mode } + if let Some(readonly_mode) = parsed_config.readonly_mode { config.readonly_mode = readonly_mode } } Ok(config) }