bug roll-up [CPP-732][CPP-741][CPP-735][CPP-734][CPP-731][CPP-466] (#597)

Fixes:

    Don't abbreviate "WARN", use "WARNING" instead
    Fix-up description for "NTRIP enable" settings
    Advanced system monitor: add units to stack column, format CPU usage with at least one decimal always
    Change plot axis to not use bold fonts
    Format network tx/rx bytes as float so that fractional information is maintained

Author: Jason Mobarak

Cargo.lock

@@ -906,6 +906,22 @@ command = "cargo"
 cwd = "console_backend"
 args = ["test", "--features", "tests", "${@}", "--", "--nocapture"]
 
+[tasks.rust-tests-filter]
+dependencies = ["store-version", "copy-capnp"]
+command = "cargo"
+cwd = "console_backend"
+args = [
+  'test',
+  '--package',
+  'console-backend',
+  '--lib',
+  '--all-features',
+  '--',
+  '${RUST_TEST_FILTER}',
+  '--exact',
+  '--nocapture',
+]
+
 [tasks.rust-type-check]
 dependencies = ["store-version", "copy-capnp"]
 command = "cargo"

Makefile.toml

@@ -41,7 +41,7 @@ parking_lot = "0.12.1"
 regex = { version = "1.5.6" }
 rust-ini = "0.18.0"
 sbp = { version = "4.3.3", features = ["json", "link", "swiftnav"] }
-sbp-settings = "0.6.9"
+sbp-settings = "0.6.10"
 env_logger = { version = "0.9", optional = true }
 mimalloc = { version = "0.1", default-features = false }
 indicatif = { version = "0.16", optional = true }

console_backend/Cargo.toml

@@ -258,8 +258,8 @@ mod tests {
         let entry = tab.network_info.get(interface_name_pre).unwrap();
         assert_eq!(entry.ipv4_address, "127.0.0.1");
         assert!(entry.running);
-        assert_eq!(entry.tx_usage, format!("  {}B", tx_bytes));
-        assert_eq!(entry.rx_usage, format!("  {}B", rx_bytes));
+        assert_eq!(entry.tx_usage, format!("{:.1}B", tx_bytes as f64));
+        assert_eq!(entry.rx_usage, format!("{:.1}B", rx_bytes as f64));
         let bad_flags = 0b0100000;
         let msg = MsgNetworkStateResp {
             sender_id,

console_backend/src/advanced_networking_tab.rs

@@ -39,7 +39,7 @@ pub fn handle_log_msg(msg: MsgLog) {
         | SbpMsgLevel::Alert
         | SbpMsgLevel::Critical
         | SbpMsgLevel::Error => error!(target: DEVICE, "{}", text),
-        SbpMsgLevel::Warn | SbpMsgLevel::Notice => warn!(target: DEVICE, "{}", text),
+        SbpMsgLevel::Warning | SbpMsgLevel::Notice => warn!(target: DEVICE, "{}", text),
         SbpMsgLevel::Info => info!(target: DEVICE, "{}", text),
         _ => debug!(target: DEVICE, "{}", text),
     }
@@ -122,7 +122,7 @@ enum SbpMsgLevel {
     Alert = 1,
     Critical = 2,
     Error = 3,
-    Warn = 4,
+    Warning = 4,
     Notice = 5,
     Info = 6,
     Debug = 7,
@@ -136,7 +136,7 @@ impl From<u8> for SbpMsgLevel {
             1 => SbpMsgLevel::Alert,
             2 => SbpMsgLevel::Critical,
             3 => SbpMsgLevel::Error,
-            4 => SbpMsgLevel::Warn,
+            4 => SbpMsgLevel::Warning,
             5 => SbpMsgLevel::Notice,
             6 => SbpMsgLevel::Info,
             7 => SbpMsgLevel::Debug,
@@ -181,7 +181,12 @@ fn splitable_log_formatter(record: &Record) -> String {
     let level = if record.target() != DEVICE {
         CONSOLE
     } else {
-        record.level().as_str()
+        let level = record.level().as_str();
+        if level == "WARN" {
+            "WARNING"
+        } else {
+            level
+        }
     };
     let timestamp = Local::now().format("%b %d %Y %H:%M:%S").to_string();
     let mut msg = record.args().to_string();

console_backend/src/log_panel.rs

@@ -353,12 +353,12 @@ pub fn meters_per_deg(lat_deg: f64) -> (f64, f64) {
 ///
 /// - The number of bytes converted to a human readable string.
 pub fn bytes_to_human_readable(bytes: u128) -> String {
-    let mut bytes = bytes;
+    let mut bytes = bytes as f64;
     for unit in ["B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB"].iter() {
-        if bytes < 1024 {
-            return format!("{:3.1}{}", bytes, unit);
+        if bytes < 1024.0 {
+            return format!("{:3.1}{}", bytes as f64, unit);
         } else {
-            bytes /= 1024;
+            bytes /= 1024.0;
         }
     }
     format!("{:.1}YB", bytes)
@@ -543,17 +543,18 @@ mod tests {
             .for_each(|(idx, &unit)| {
                 assert_eq!(
                     bytes_to_human_readable(u128::pow(1024, idx as u32)),
-                    format!("{:3.1}{}", 1, unit)
+                    format!("{:3.1}{}", 1.0, unit)
                 );
             });
         assert_eq!(
             bytes_to_human_readable(u128::pow(1024, 8)),
-            format!("{:.1}YB", 1)
+            format!("{:.1}YB", 1.0)
         );
         assert_eq!(
             bytes_to_human_readable(u128::pow(1024, 9)),
-            format!("{:.1}YB", 1024)
+            format!("{:.1}YB", 1024.0)
         );
+        assert_eq!(bytes_to_human_readable(230123123), "219.5MB");
     }
 
     #[test]

console_backend/src/utils.rs

@@ -178,7 +178,7 @@ QtObject {
     }
 
     systemMonitor: QtObject {
-        readonly property var columnHeaders: ["Thread Name", "CPU %", "Stack Free"]
+        readonly property var columnHeaders: ["Thread Name", "CPU %", "Stack Free (B)"]
         readonly property var metricColumnHeaders: ["Metric", "Value"]
         readonly property string currLabel: "Curr"
         readonly property string maxLabel: "Max"
@@ -214,7 +214,7 @@ QtObject {
         readonly property var defaultThreadsList: {
             "Thread Name": "",
             "CPU %": "",
-            "Stack Free": ""
+            "Stack Free (B)": ""
         }
         readonly property var defaultMetricsList: {
             "Metric": "",
@@ -579,7 +579,7 @@ QtObject {
         readonly property font axisLabelsFont: Qt.font({
             "family": fontFamily,
             "pixelSize": smallPixelSize,
-            "bold": true
+            "bold": false
         })
         readonly property int tickPixelSize: 10
         readonly property int buttonHeight: 40

resources/Constants/Constants.qml

@@ -41,14 +41,14 @@ Rectangle {
 
     function row(entry) {
         return {
-            [Constants.settingsTable.tableLeftColumnHeader]: entry.name,
+            [Constants.settingsTable.tableLeftColumnHeader]: entry.name.replace(/_/g, " "),
             [Constants.settingsTable.tableRightColumnHeader]: entry.valueOnDevice || "---"
         };
     }
 
     function headerRow(entry) {
         return {
-            [Constants.settingsTable.tableLeftColumnHeader]: entry.group,
+            [Constants.settingsTable.tableLeftColumnHeader]: entry.group.replace(/_/g, " "),
             [Constants.settingsTable.tableRightColumnHeader]: ""
         };
     }

resources/SettingsTabComponents/SettingsTable.qml

@@ -29,7 +29,7 @@ struct LogLevelFront {
 
 enum LogLevel {
     error @0;
-    warn @1;
+    warning @1;
     info @2;
     debug @3;
     trace @4;

src/main/resources/base/console_backend.capnp

@@ -403,7 +403,8 @@ def _process_message_buffer(self, buffer):
             data[Keys.OBS_LATENCY][:] = [[entry.key, entry.val] for entry in m.advancedSystemMonitorStatus.obsLatency]
             data[Keys.OBS_PERIOD][:] = [[entry.key, entry.val] for entry in m.advancedSystemMonitorStatus.obsPeriod]
             data[Keys.THREADS_TABLE][:] = [
-                [entry.name, entry.cpu, entry.stackFree] for entry in m.advancedSystemMonitorStatus.threadsTable
+                [entry.name, "%.1f" % entry.cpu, entry.stackFree]
+                for entry in m.advancedSystemMonitorStatus.threadsTable
             ]
             data[Keys.CSAC_TELEM_LIST][:] = [
                 [entry.key, entry.val] for entry in m.advancedSystemMonitorStatus.csacTelemList