eneuber/paramod-rust
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Nachkommastellen einschränken

Browse Source
This commit is contained in:
Eric Neuber 2026-02-16 22:55:52 +01:00
parent 7fb98b95f8
commit 79cbde6b4a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/modbus.rs
View File

@ -46,14 +46,14 @@ pub fn start_modbus_polling_thread(
match typ { match typ {
"INT16" => client.read_input_registers(addr, 1).await.ok().map(|v| { "INT16" => client.read_input_registers(addr, 1).await.ok().map(|v| {
let raw = v[0] as i16; let raw = v[0] as i16;
if raw == -32768 || raw == 32767 { None } else { Some(raw as f64 * factor) } if raw == -32768 || raw == 32767 { None } else { Some(((raw as f64 * factor) * 10.0).round() / 10.0) }
}).flatten(), }).flatten(),
"UINT16" => client.read_input_registers(addr, 1).await.ok().map(|v| { "UINT16" => client.read_input_registers(addr, 1).await.ok().map(|v| {
if v[0] == 0xFFFF { None } else { Some(v[0] as f64 * factor) } if v[0] == 0xFFFF { None } else { Some(((v[0] as f64 * factor) * 10.0).round() / 10.0) }
}).flatten(), }).flatten(),
"UINT32" => client.read_input_registers(addr, 2).await.ok().map(|v| { "UINT32" => client.read_input_registers(addr, 2).await.ok().map(|v| {
let raw = (v[0] as u32) << 16 | (v[1] as u32); let raw = (v[0] as u32) << 16 | (v[1] as u32);
if raw == 0xFFFFFFFF { None } else { Some(raw as f64 * factor) } if raw == 0xFFFFFFFF { None } else { Some(((raw as f64 * factor) * 10.0).round() / 10.0) }
}).flatten(), }).flatten(),
_ => Some(0.0), _ => Some(0.0),
} }
@ -75,14 +75,14 @@ pub fn start_modbus_polling_thread(
match typ { match typ {
"INT16" => client.read_holding_registers(addr, 1).await.ok().map(|v| { "INT16" => client.read_holding_registers(addr, 1).await.ok().map(|v| {
let raw = v[0] as i16; let raw = v[0] as i16;
if raw == -32768 || raw == 32767 { None } else { Some(raw as f64 * factor) } if raw == -32768 || raw == 32767 { None } else { Some(((raw as f64 * factor) * 10.0).round() / 10.0) }
}).flatten(), }).flatten(),
"UINT16" => client.read_holding_registers(addr, 1).await.ok().map(|v| { "UINT16" => client.read_holding_registers(addr, 1).await.ok().map(|v| {
if v[0] == 0xFFFF { None } else { Some(v[0] as f64 * factor) } if v[0] == 0xFFFF { None } else { Some(((v[0] as f64 * factor) * 10.0).round() / 10.0) }
}).flatten(), }).flatten(),
"UINT32" => client.read_holding_registers(addr, 2).await.ok().map(|v| { "UINT32" => client.read_holding_registers(addr, 2).await.ok().map(|v| {
let raw = (v[0] as u32) << 16 | (v[1] as u32); let raw = (v[0] as u32) << 16 | (v[1] as u32);
if raw == 0xFFFFFFFF { None } else { Some(raw as f64 * factor) } if raw == 0xFFFFFFFF { None } else { Some(((raw as f64 * factor) * 10.0).round() / 10.0) }
}).flatten(), }).flatten(),
_ => Some(0.0), _ => Some(0.0),
} }