From 9acbde4e1c648bfd9448408bc7fa0f864eade873 Mon Sep 17 00:00:00 2001
From: Benjamin Koch <bbbsnowball@gmail.com>
Date: Fri, 26 May 2023 03:49:26 +0200
Subject: [PATCH] make RS485 logging less verbose
---
firmware/rust1/src/modbus_server.rs | 2 +-
firmware/rust1/src/rs485.rs | 14 +++++++++++---
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/firmware/rust1/src/modbus_server.rs b/firmware/rust1/src/modbus_server.rs
index e325607..a5aab11 100644
--- a/firmware/rust1/src/modbus_server.rs
+++ b/firmware/rust1/src/modbus_server.rs
@@ -287,7 +287,7 @@ impl<REGS: ModbusRegisters> RS485Handler for ModbusServer<REGS> {
where F: FnOnce(&[u8]) {
match rx {
Ok(rx_char) => {
- info!("RX {:?}", rx_char);
+ //info!("RX {:?}", rx_char);
self.rxcrc.update(&[rx_char]);
if !self.rxbuf.is_full() {
diff --git a/firmware/rust1/src/rs485.rs b/firmware/rust1/src/rs485.rs
index d3e3ad2..5561c8e 100644
--- a/firmware/rust1/src/rs485.rs
+++ b/firmware/rust1/src/rs485.rs
@@ -292,6 +292,8 @@ impl<H: RS485Handler> RS485<H> {
).await;
match x {
Either4::First(_) => {
+ let debug_autobaud = false;
+
let mut sum = 0;
let mut first = 0;
let mut ok = false;
@@ -299,7 +301,9 @@ impl<H: RS485Handler> RS485<H> {
for i in 0..din.len() {
if din[i] == 0 {
bit_index = 0;
- info!("SM in {}: {:08x} -> start", i, din[i]);
+ if debug_autobaud {
+ info!("SM in {}: {:08x} -> start", i, din[i]);
+ }
} else {
let mut delay = timeout_start_value - din[i];
if bit_index == 0 {
@@ -312,7 +316,9 @@ impl<H: RS485Handler> RS485<H> {
}
let millis = (delay) as f32 / SM_FREQ as f32 * 1000. * 2.;
let baud = 1000. / millis;
- info!("SM in {} ({}): {:08x} -> {} -> {} ms -> {}", i, bit_index, din[i], delay, millis, baud);
+ if debug_autobaud {
+ info!("SM in {} ({}): {:08x} -> {} -> {} ms -> {}", i, bit_index, din[i], delay, millis, baud);
+ }
if bit_index == 0 {
sum = 0;
first = delay;
@@ -339,7 +345,9 @@ impl<H: RS485Handler> RS485<H> {
}
let millis = (delay) as f32 / SM_FREQ as f32 * 1000. * 2.;
let baud = 1000. / millis;
- info!("SM in ({}): {:08x} -> {} -> {} ms -> {}", bit_index, x, delay, millis, baud);
+ if debug_autobaud {
+ info!("SM in ({}): {:08x} -> {} -> {} ms -> {}", bit_index, x, delay, millis, baud);
+ }
if bit_index == 0 {
sum = 0;
first = delay;
--
GitLab