License

[batteryviewer] / batteryviewer.c

diff --git a/batteryviewer.c b/batteryviewer.c
index e21e585a0afeb5f6d539296b4364560ccf716cf6..a0fae4cd361a0f5917a203ecb781a0aa50962410 100644 (file)
--- a/batteryviewer.c
+++ b/batteryviewer.c
@@ -1,3 +1,19 @@
+/* batteryviewer: Display battery metrics
+ * Copyright (C) 2023 Scott Worley <scottworley@scottworley.com>
+
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+

 // For vasprintf
 #define _GNU_SOURCE
 
 // For vasprintf
 #define _GNU_SOURCE
 


@@ -63,10 +79,14 @@ static gboolean collect_data(struct State *state) {
   float now = g_get_monotonic_time() / 1e6;
   float voltage = fatof(state->voltage_filename);
   float current = fatof(state->current_filename);
   float now = g_get_monotonic_time() / 1e6;
   float voltage = fatof(state->voltage_filename);
   float current = fatof(state->current_filename);

-  bv_chart_add_point(state->voltage, now, voltage);
-  bv_chart_add_point(state->current, now, current);
-  gtk_widget_queue_draw(GTK_WIDGET(state->voltage));
-  gtk_widget_queue_draw(GTK_WIDGET(state->current));
+  if (!isnan(voltage)) {
+    bv_chart_add_point(state->voltage, now, voltage);
+    gtk_widget_queue_draw(GTK_WIDGET(state->voltage));
+  }
+  if (!isnan(current)) {
+    bv_chart_add_point(state->current, now, current);
+    gtk_widget_queue_draw(GTK_WIDGET(state->current));
+  }

   return TRUE;
 }
 
   return TRUE;
 }
 


@@ -121,8 +141,11 @@ int main(int argc, char **argv) {
       .current_filename = sasprintf("%s/current_now", battery_dir),
   };
 
       .current_filename = sasprintf("%s/current_now", battery_dir),
   };
 

-  GtkApplication *app = gtk_application_new("com.scottworley.batteryviewer",
-                                            G_APPLICATION_DEFAULT_FLAGS);
+  GtkApplication *app = gtk_application_new(
+      "com.scottworley.batteryviewer",
+      // G_APPLICATION_FLAGS_NONE is deprecated, but
+      // G_APPLICATION_DEFAULT_FLAGS isn't available on Stable Debian yet.
+      G_APPLICATION_FLAGS_NONE);

   g_signal_connect(app, "activate", G_CALLBACK(activate), &state);
   int status = g_application_run(G_APPLICATION(app), argc, argv);
   g_object_unref(app);
   g_signal_connect(app, "activate", G_CALLBACK(activate), &state);
   int status = g_application_run(G_APPLICATION(app), argc, argv);
   g_object_unref(app);