Set default debug level to "info", shorten chart variable names

Author: nullstalgia

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "null-iron-heart"
 repository = "https://github.com/nullstalgia/null-iron-heart"
-version = "0.1.2"
+version = "0.1.3"
 edition = "2021"
 
 [dependencies]

Cargo.toml

@@ -80,7 +80,7 @@ saved_address = ""
 rr_ignore_after_empty = 0
 
 [misc]
-log_level = "debug"
+log_level = "info"
 # Useful for OBS
 write_bpm_to_file = false
 # Writes under BPM
@@ -89,13 +89,13 @@ bpm_file_path = "bpm.txt"
 log_sessions_to_csv = false
 log_sessions_csv_path = "session_logs"
 session_stats_use_12hr = true
-session_chart_bpm_enabled = true
-session_chart_rr_enabled = true
-session_chart_rr_max = 2.0
-session_chart_rr_clamp_high = true
-session_chart_rr_clamp_low = false
+chart_bpm_enabled = true
+chart_rr_enabled = true
+chart_rr_max = 2.0
+chart_rr_clamp_high = true
+chart_rr_clamp_low = false
 # False to show charts side-by-side
-session_charts_combine = true
+charts_combine = true
 
 [dummy]
 # Ignore BLE entirely, send values for testing

README.md

@@ -269,7 +269,7 @@ impl App {
         let dummy_settings_clone = self.settings.dummy.clone();
         debug!("Spawning Dummy thread");
         self.state = AppState::HeartRateView;
-        self.chart_high_rr = self.settings.misc.session_chart_rr_max;
+        self.chart_high_rr = self.settings.misc.chart_rr_max;
         self.hr_thread_handle = Some(tokio::spawn(async move {
             start_dummy_thread(hr_tx_clone, dummy_settings_clone, shutdown_requested_clone).await
         }));
@@ -372,12 +372,12 @@ impl App {
 
         if let Some(rr) = new_rr {
             let rr_secs = rr.as_secs_f64();
-            let rr_max = self.settings.misc.session_chart_rr_max;
+            let rr_max = self.settings.misc.chart_rr_max;
             if self.chart_high_rr == 0.0 {
                 self.chart_low_rr = (rr_secs - CHART_RR_VERT_MARGIN).max(rr_secs);
                 self.chart_high_rr = (rr_secs + CHART_RR_VERT_MARGIN).min(rr_max);
             }
-            if self.settings.misc.session_chart_rr_clamp_high && !self.settings.dummy.enabled {
+            if self.settings.misc.chart_rr_clamp_high && !self.settings.dummy.enabled {
                 self.chart_high_rr = *self
                     .rr_history
                     .iter()
@@ -386,7 +386,7 @@ impl App {
             } else {
                 self.chart_high_rr = self.chart_high_rr.max(rr_secs);
             }
-            if self.settings.misc.session_chart_rr_clamp_low {
+            if self.settings.misc.chart_rr_clamp_low {
                 self.chart_high_rr = *self
                     .rr_history
                     .iter()
@@ -401,9 +401,9 @@ impl App {
     }
 
     fn update_chart_data(&mut self) {
-        let bpm_enabled = self.settings.misc.session_chart_bpm_enabled;
-        let rr_enabled = self.settings.misc.session_chart_rr_enabled;
-        let combine = self.settings.misc.session_charts_combine;
+        let bpm_enabled = self.settings.misc.chart_bpm_enabled;
+        let rr_enabled = self.settings.misc.chart_rr_enabled;
+        let combine = self.settings.misc.charts_combine;
         if rr_enabled {
             self.rr_dataset = self
                 .rr_history
@@ -437,7 +437,7 @@ impl App {
 
     pub fn append_to_history(&mut self, hr_data: &HeartRateStatus) {
         let bpm = hr_data.heart_rate_bpm as f64;
-        let rr_max = self.settings.misc.session_chart_rr_max;
+        let rr_max = self.settings.misc.chart_rr_max;
         if bpm > 0.0 {
             self.update_session_stats(bpm, hr_data.rr_intervals.last());
 

src/app.rs

@@ -14,12 +14,12 @@ pub struct MiscSettings {
     pub log_sessions_to_csv: bool,
     pub log_sessions_csv_path: String,
     pub session_stats_use_12hr: bool,
-    pub session_chart_bpm_enabled: bool,
-    pub session_chart_rr_enabled: bool,
-    pub session_chart_rr_max: f64,
-    pub session_chart_rr_clamp_high: bool,
-    pub session_chart_rr_clamp_low: bool,
-    pub session_charts_combine: bool,
+    pub chart_bpm_enabled: bool,
+    pub chart_rr_enabled: bool,
+    pub chart_rr_max: f64,
+    pub chart_rr_clamp_high: bool,
+    pub chart_rr_clamp_low: bool,
+    pub charts_combine: bool,
 }
 
 #[derive(Debug, Deserialize, Serialize, Default)]
@@ -107,28 +107,26 @@ impl Settings {
             .set_default("ble.saved_address", "")?
             .set_default("ble.saved_name", "")?
             .set_default("ble.rr_ignore_after_empty", 0)?
-            // TODO set back to info before release
-            .set_default("misc.log_level", "debug")?
+            .set_default("misc.log_level", "info")?
             .set_default("misc.write_bpm_to_file", false)?
             .set_default("misc.write_rr_to_file", false)?
             .set_default("misc.bpm_file_path", "bpm.txt")?
             .set_default("misc.log_sessions_to_csv", false)?
             .set_default("misc.log_sessions_csv_path", "session_logs")?
             .set_default("misc.session_stats_use_12hr", true)?
-            .set_default("misc.session_chart_bpm_enabled", true)?
-            .set_default("misc.session_chart_rr_enabled", true)?
-            .set_default("misc.session_chart_rr_max", 2.0)?
-            .set_default("misc.session_chart_rr_clamp_high", true)?
-            .set_default("misc.session_chart_rr_clamp_low", false)?
-            .set_default("misc.session_charts_combine", true)?
+            .set_default("misc.chart_bpm_enabled", true)?
+            .set_default("misc.chart_rr_enabled", true)?
+            .set_default("misc.chart_rr_max", 2.0)?
+            .set_default("misc.chart_rr_clamp_high", true)?
+            .set_default("misc.chart_rr_clamp_low", false)?
+            .set_default("misc.charts_combine", true)?
             .set_default("dummy.enabled", false)?
             .set_default("dummy.low_bpm", 50)?
             .set_default("dummy.high_bpm", 120)?
             .set_default("dummy.bpm_speed", 1.5)?
             .set_default("dummy.loops_before_dc", 2)?
             .build()?;
 
-        // You can deserialize (and thus freeze) the entire configuration as
         s.try_deserialize()
     }
     pub fn save(&self) -> Result<(), std::io::Error> {

src/settings.rs

@@ -34,9 +34,9 @@ pub fn heart_rate_display(frame: &mut Frame, app: &App) {
         &app.session_low_bpm,
         app.settings.misc.session_stats_use_12hr,
     );
-    let bpm_chart = app.settings.misc.session_chart_bpm_enabled;
-    let rr_chart = app.settings.misc.session_chart_rr_enabled;
-    let combined = app.settings.misc.session_charts_combine;
+    let bpm_chart = app.settings.misc.chart_bpm_enabled;
+    let rr_chart = app.settings.misc.chart_rr_enabled;
+    let combined = app.settings.misc.charts_combine;
 
     if combined && bpm_chart && rr_chart {
         render_combined_chart(frame, shared_chart, app, true, true);