License

[batteryviewer] / batteryviewer.c

diff --git a/batteryviewer.c b/batteryviewer.c
index 19666f4e11db18aada3dcc2c15c7d426d6a12d8a..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
 
@@ -61,8 +77,16 @@ static float fatof(const char *filename) {
 
 static gboolean collect_data(struct State *state) {
   float now = g_get_monotonic_time() / 1e6;
-  fprintf(stderr, "%f: Voltage: %f, current: %f\n", now,
-          fatof(state->voltage_filename), fatof(state->current_filename));
+  float voltage = fatof(state->voltage_filename);
+  float current = fatof(state->current_filename);
+  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;
 }
 
@@ -77,9 +101,6 @@ static void activate(GtkApplication *app, gpointer user_data) {
 
   struct State *state = (struct State *)user_data;
   state->voltage = BV_CHART(bv_chart_new());
-  bv_chart_add_point(state->voltage, 0.0, 0.0);
-  bv_chart_add_point(state->voltage, 1.0, 1.0);
-  bv_chart_add_point(state->voltage, 3.0, 2.0);
   gboolean expand = TRUE;
   gboolean fill = TRUE;
   guint padding = 0;
@@ -87,8 +108,6 @@ static void activate(GtkApplication *app, gpointer user_data) {
                      padding);
 
   state->current = BV_CHART(bv_chart_new());
-  bv_chart_add_point(state->current, 0.0, 1.0);
-  bv_chart_add_point(state->current, 1.0, 0.0);
   gtk_box_pack_end(GTK_BOX(box), GTK_WIDGET(state->current), expand, fill,
                    padding);
 
@@ -122,8 +141,11 @@ int main(int argc, char **argv) {
       .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);