From 8cb632180cab04d59165afc8b1a302f563177f54 Mon Sep 17 00:00:00 2001 From: bunnie Date: Tue, 14 Jun 2022 04:30:58 +0800 Subject: [PATCH] fix fractional decimal places on integer conversions --- services/shellchat/src/cmds/sensors.rs | 2 +- services/status/src/main.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/services/shellchat/src/cmds/sensors.rs b/services/shellchat/src/cmds/sensors.rs index beff3d36d..f984200da 100644 --- a/services/shellchat/src/cmds/sensors.rs +++ b/services/shellchat/src/cmds/sensors.rs @@ -26,7 +26,7 @@ impl<'a> ShellCmdApi<'a> for Sensors { ((env.llio.adc_vccbram().unwrap() as u32) * 1000) / 1365, ((env.llio.adc_usb_p().unwrap() as u32) * 1000) / 1365, ((env.llio.adc_usb_n().unwrap() as u32) * 1000) / 1365, - milli_celcius / 1000, (milli_celcius % 1000) / 10 + milli_celcius / 1000, (milli_celcius % 1000) / 100 // 1 decimal extra ).unwrap(); Ok(Some(ret)) diff --git a/services/status/src/main.rs b/services/status/src/main.rs index ebeb8e5db..a87a26717 100644 --- a/services/status/src/main.rs +++ b/services/status/src/main.rs @@ -387,7 +387,7 @@ fn main() -> ! { }; wattage_mw = wattage_mw.abs(); if battstats_phase { - write!(&mut battstats_tv, "{}.{}W{}{}.{}V {}%", + write!(&mut battstats_tv, "{}.{:02}W{}{}.{:02}V {}%", wattage_mw / 1000, wattage_mw % 1000, sign, stats.voltage as u32 / 1000, (stats.voltage as u32 % 1000) / 10, // 2 decimal places