Code refactoring
This commit is contained in:
Данила Горнушко
parent
488431d253
commit
daa938e580
1 changed files with 104 additions and 119 deletions
123
src/main.rs
123
src/main.rs
|
|
@ -164,7 +164,7 @@ fn init_logger(
|
|||
} else {
|
||||
message
|
||||
}
|
||||
))
|
||||
));
|
||||
})
|
||||
.level(log_level)
|
||||
.chain(fern::log_file(path).expect("Failed to setup app_dispatch!"))
|
||||
|
|
@ -179,7 +179,7 @@ fn init_logger(
|
|||
"{} {}",
|
||||
now.format(time_format_string),
|
||||
message
|
||||
))
|
||||
));
|
||||
})
|
||||
.filter(|metadata| {
|
||||
metadata.level() == Level::Info && metadata.target().contains("stats10min")
|
||||
|
|
@ -210,7 +210,7 @@ fn init_logger(
|
|||
} else {
|
||||
message
|
||||
}
|
||||
))
|
||||
));
|
||||
})
|
||||
.level(log_level)
|
||||
.chain(std::io::stdout()),
|
||||
|
|
@ -238,6 +238,7 @@ fn init_logger(
|
|||
Ok(())
|
||||
}
|
||||
|
||||
#[allow(clippy::too_many_lines)]
|
||||
fn main() {
|
||||
// enable colorful logs if running on Windows 10
|
||||
let _ = enable_ansi_support::enable_ansi_support();
|
||||
|
|
@ -271,7 +272,7 @@ fn main() {
|
|||
port.set_timeout(Duration::from_millis(100))
|
||||
.expect("Couldn't set serial port timeout!");
|
||||
let command = format!("@{} name\n", args.device_id);
|
||||
match process_command(&mut port, command) {
|
||||
match process_command(&mut port, &command) {
|
||||
Some(response) => {
|
||||
if response.contains("'HAILSENS'") {
|
||||
info!("Detected hailsens.");
|
||||
|
|
@ -315,7 +316,7 @@ fn main() {
|
|||
|
||||
if args.reset_counters {
|
||||
info!("Resetting counters...");
|
||||
process_command(&mut port, format!("@{} rstcnt\n", args.device_id));
|
||||
process_command(&mut port, format!("@{} rstcnt\n", args.device_id).as_str());
|
||||
}
|
||||
|
||||
let spec = WavSpec {
|
||||
|
|
@ -365,27 +366,26 @@ fn main() {
|
|||
StatsOptions::DetectedNew(cur_stats) => {
|
||||
success_cnt = success_cnt.saturating_add(1);
|
||||
if prev_stats.map_or(true, |v| v != cur_stats) {
|
||||
match prev_stats {
|
||||
Some(prev_stats) => {
|
||||
if let Some(prev_stats) = prev_stats {
|
||||
match (
|
||||
cur_stats.hail_since_startup > prev_stats.hail_since_startup,
|
||||
cur_stats.noise_since_startup > prev_stats.noise_since_startup,
|
||||
) {
|
||||
(true, true) => {
|
||||
info!(target: "detected", "Hail and noise detected, {cur_stats}")
|
||||
info!(target: "detected", "Hail and noise detected, {cur_stats}");
|
||||
}
|
||||
(true, false) => {
|
||||
info!(target: "detected", "Hail detected, {cur_stats}")
|
||||
info!(target: "detected", "Hail detected, {cur_stats}");
|
||||
}
|
||||
(false, true) => {
|
||||
if args.noise_logging {
|
||||
info!(target: "detected", "Noise detected, {cur_stats}")
|
||||
info!(target: "detected", "Noise detected, {cur_stats}");
|
||||
}
|
||||
}
|
||||
(false, false) => (),
|
||||
}
|
||||
}
|
||||
None => info!("Initial {cur_stats}"),
|
||||
} else {
|
||||
info!("Initial {cur_stats}");
|
||||
}
|
||||
if samples_needed
|
||||
&& prev_stats.map_or(args.first_sample, |v| {
|
||||
|
|
@ -398,8 +398,9 @@ fn main() {
|
|||
debug!("New data available: {}", cur_stats.hail_since_startup);
|
||||
debug!("Getting new chunk!");
|
||||
}
|
||||
match get_chunk(&mut port, args.device_id, args.baud_rate, winsize) {
|
||||
Some(data) => {
|
||||
if let Some(data) =
|
||||
get_chunk(&mut port, args.device_id, args.baud_rate, winsize)
|
||||
{
|
||||
debug!("Received new data with len: {}", data.len());
|
||||
|
||||
if let Some(wav_path) = args.wavs_path.as_deref() {
|
||||
|
|
@ -410,8 +411,7 @@ fn main() {
|
|||
|
||||
// Create a new WAV file
|
||||
if let Ok(mut writer) = WavWriter::create(&path, spec) {
|
||||
let mut i16_writer =
|
||||
writer.get_i16_writer(data.len() as u32);
|
||||
let mut i16_writer = writer.get_i16_writer(data.len() as u32);
|
||||
for sample in data {
|
||||
unsafe {
|
||||
i16_writer.write_sample_unchecked(sample);
|
||||
|
|
@ -432,15 +432,13 @@ fn main() {
|
|||
|
||||
success_cnt = success_cnt.saturating_add(1);
|
||||
needed_retry = false;
|
||||
}
|
||||
_ => {
|
||||
} else {
|
||||
error!("Couldn't receive new data!");
|
||||
handle_error_with_timeout(&mut err_cnt, args.request_rate);
|
||||
needed_retry = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if !needed_retry {
|
||||
prev_stats = Some(cur_stats);
|
||||
}
|
||||
|
|
@ -479,10 +477,9 @@ fn handle_error_with_timeout(err_counter: &mut u32, request_rate: u32) {
|
|||
}
|
||||
|
||||
fn get_stats(port: &mut Box<dyn SerialPort>, id: u32) -> StatsOptions {
|
||||
let command = format!("@{} adcstats\n", id);
|
||||
let response = match process_command(port, command) {
|
||||
Some(resp) => resp,
|
||||
None => return StatsOptions::None,
|
||||
let command = format!("@{id} adcstats\n");
|
||||
let Some(response) = process_command(port, &command) else {
|
||||
return StatsOptions::None;
|
||||
};
|
||||
|
||||
let split: Vec<&str> = response
|
||||
|
|
@ -493,14 +490,13 @@ fn get_stats(port: &mut Box<dyn SerialPort>, id: u32) -> StatsOptions {
|
|||
|
||||
for i in split {
|
||||
let num: Result<u32, _> = i.parse();
|
||||
match num {
|
||||
Ok(num) => nums.push(num),
|
||||
Err(_) => {
|
||||
if let Ok(num) = num {
|
||||
nums.push(num);
|
||||
} else {
|
||||
debug!("Can't parse '{i}' as u32");
|
||||
return StatsOptions::None;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
match nums.len() {
|
||||
2 => StatsOptions::Stats(Stats10Min {
|
||||
|
|
@ -527,11 +523,11 @@ fn get_set_param(
|
|||
let mut request_str = format!("@{id} {cmd}");
|
||||
if let Some(i) = new_param {
|
||||
debug!("Setting new {debug_name}: {i}");
|
||||
request_str.push_str(&format!(" {i}"))
|
||||
request_str.push_str(&format!(" {i}"));
|
||||
}
|
||||
request_str.push('\n');
|
||||
debug!("Getting {debug_name}...");
|
||||
let response = process_command(port, request_str).unwrap_or_default();
|
||||
let response = process_command(port, &request_str).unwrap_or_default();
|
||||
let result_str = response.split_whitespace().nth(3);
|
||||
match result_str {
|
||||
Some(num_str) => {
|
||||
|
|
@ -556,9 +552,9 @@ fn get_sample_rate(port: &mut Box<dyn SerialPort>, id: u32) -> u32 {
|
|||
fallback_freq
|
||||
}
|
||||
|
||||
let command = format!("@{} srate\n", id);
|
||||
let command = format!("@{id} srate\n");
|
||||
let response: String;
|
||||
if let Some(res) = process_command(port, command) {
|
||||
if let Some(res) = process_command(port, &command) {
|
||||
response = res;
|
||||
} else {
|
||||
return fallback();
|
||||
|
|
@ -579,7 +575,7 @@ fn get_sample_rate(port: &mut Box<dyn SerialPort>, id: u32) -> u32 {
|
|||
} else {
|
||||
return fallback();
|
||||
}
|
||||
let sample_times: HashMap<i32, Option<f64>> = [
|
||||
let sample_times = HashMap::from([
|
||||
(-1, None),
|
||||
(0, Some(1.5)),
|
||||
(1, Some(3.5)),
|
||||
|
|
@ -589,20 +585,14 @@ fn get_sample_rate(port: &mut Box<dyn SerialPort>, id: u32) -> u32 {
|
|||
(5, Some(39.5)),
|
||||
(6, Some(79.5)),
|
||||
(7, Some(160.5)),
|
||||
]
|
||||
.iter()
|
||||
.cloned()
|
||||
.collect();
|
||||
let adc_div_dict: HashMap<u32, u32> = [
|
||||
(0x0, 1),
|
||||
]);
|
||||
let adc_div_dict = HashMap::from([
|
||||
(0x0, 1u32),
|
||||
(0x2000, 2),
|
||||
(0x2800, 4),
|
||||
(0x3000, 8),
|
||||
(0x3800, 16),
|
||||
]
|
||||
.iter()
|
||||
.cloned()
|
||||
.collect();
|
||||
]);
|
||||
if !sample_times.contains_key(&adc_sample_time) {
|
||||
error!("Received invalid ADC sample time!");
|
||||
return fallback();
|
||||
|
|
@ -623,7 +613,7 @@ fn get_sample_rate(port: &mut Box<dyn SerialPort>, id: u32) -> u32 {
|
|||
res
|
||||
}
|
||||
|
||||
fn process_command(port: &mut Box<dyn SerialPort>, command: String) -> Option<String> {
|
||||
fn process_command(port: &mut Box<dyn SerialPort>, command: &str) -> Option<String> {
|
||||
trace!("Writing command to the serial port: {}", command);
|
||||
if let Err(e) = port.write_all(command.as_bytes()) {
|
||||
error!("Failed to write to serial port!: {}", e);
|
||||
|
|
@ -653,7 +643,7 @@ fn process_command(port: &mut Box<dyn SerialPort>, command: String) -> Option<St
|
|||
|
||||
fn nice_freq_string(freq_hz: u32) -> String {
|
||||
if freq_hz < 1000 {
|
||||
format!("{:.2} Hz", freq_hz)
|
||||
format!("{freq_hz:.2} Hz")
|
||||
} else if freq_hz < 1_000_000 {
|
||||
format!("{:.2} kHz", freq_hz / 1000)
|
||||
} else {
|
||||
|
|
@ -673,7 +663,7 @@ fn get_chunk(
|
|||
baud_rate: u32,
|
||||
win_size: usize,
|
||||
) -> Option<Vec<i16>> {
|
||||
let command = format!("@{} convbuf\n", id);
|
||||
let command = format!("@{id} convbuf\n");
|
||||
trace!("Writing convbuf to the serial port");
|
||||
if let Err(e) = port.write_all(command.as_bytes()) {
|
||||
error!("Failed to write to serial port!: {}", e);
|
||||
|
|
@ -687,10 +677,10 @@ fn get_chunk(
|
|||
std::thread::sleep(calculate_timeout(baud_rate, exp_buf_size(win_size)));
|
||||
match port.read(adc_buffer.as_mut_slice()) {
|
||||
Ok(len) => {
|
||||
if len != exp_buf_size(win_size) {
|
||||
warn!("Received buffer with unexpected data length: {len}");
|
||||
} else {
|
||||
if len == exp_buf_size(win_size) {
|
||||
trace!("Buffer is received with length: {}", len);
|
||||
} else {
|
||||
warn!("Received buffer with unexpected data length: {len}");
|
||||
}
|
||||
}
|
||||
Err(ref e) if e.kind() == std::io::ErrorKind::TimedOut => {
|
||||
|
|
@ -717,30 +707,25 @@ fn get_chunk(
|
|||
None
|
||||
}
|
||||
});
|
||||
match (data_slice, crc_slice) {
|
||||
(Some(data_buf), Some(crc_buf)) => {
|
||||
if let (Some(data_buf), Some(crc_buf)) = (data_slice, crc_slice) {
|
||||
let crc16_obj = Crc::<u16>::new(&CRC_16_IBM_3740);
|
||||
let crc_calculated = crc16_obj.checksum(data_buf);
|
||||
let received_crc = u16::from_le_bytes(crc_buf);
|
||||
if received_crc != crc_calculated {
|
||||
if received_crc == crc_calculated {
|
||||
trace!("CRC is correct!");
|
||||
Some(convert_to_i16(data_buf))
|
||||
} else {
|
||||
error!(
|
||||
"CRC mismatch! Received CRC: {:04X}, Calculated CRC: {:04X}",
|
||||
received_crc, crc_calculated
|
||||
);
|
||||
None
|
||||
}
|
||||
} else {
|
||||
trace!("CRC is correct!");
|
||||
// converting raw bytes to correct format
|
||||
|
||||
Some(convert_to_i16(data_buf))
|
||||
}
|
||||
}
|
||||
_ => {
|
||||
error!("Couldn't slice received data!");
|
||||
None
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn convert_to_i16(buffer: &[u8]) -> Vec<i16> {
|
||||
assert_eq!(
|
||||
|
|
@ -763,7 +748,7 @@ fn header_is_ok(vec: &[u8]) -> bool {
|
|||
vec.get(0..4)
|
||||
.map(|bytes| u32::from_be_bytes(bytes.try_into().unwrap_or_default()))
|
||||
.unwrap_or_default()
|
||||
== 0x55AA55AA
|
||||
== 0x55AA_55AA
|
||||
}
|
||||
|
||||
fn exp_buf_size(win_size: usize) -> usize {
|
||||
|
|
@ -781,15 +766,15 @@ fn current_timestamp_ms() -> u128 {
|
|||
fn sync_datetime(port: &mut Box<dyn SerialPort>, id: u32) {
|
||||
info!("Setting correct date/time on hailsens...");
|
||||
let formatted_date_time = Local::now().format("%Y-%m-%dT%H:%M:%S").to_string();
|
||||
let request_str = format!("@{} date {}\n", id, formatted_date_time);
|
||||
match process_command(port, request_str) {
|
||||
Some(response) => {
|
||||
let request_str = format!("@{id} date {formatted_date_time}\n");
|
||||
if let Some(response) = process_command(port, &request_str) {
|
||||
let response = response.trim();
|
||||
match response.split_whitespace().nth(1) {
|
||||
Some(parsed) => info!("Hailsens date/time: {parsed}"),
|
||||
None => warn!("Received date/time with incorrect format: {response}"),
|
||||
}
|
||||
}
|
||||
None => error!("Couldn't set date/time!"),
|
||||
if let Some(parsed) = response.split_whitespace().nth(1) {
|
||||
info!("Hailsens date/time: {parsed}");
|
||||
} else {
|
||||
warn!("Received date/time with incorrect format: {response}");
|
||||
}
|
||||
} else {
|
||||
error!("Couldn't set date/time!");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue