From 9ccfeb8181932492467cc1b9bd144da0b6ad73b3 Mon Sep 17 00:00:00 2001
From: sparky8512 <76499194+sparky8512@users.noreply.github.com>
Date: Tue, 12 Jan 2021 11:23:37 -0800
Subject: [PATCH] Correct one more int/float mixage

Also, pull the change into the JSON parser for consistency.

Related to issue #12
---
 starlink_grpc.py |  2 +-
 starlink_json.py | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/starlink_grpc.py b/starlink_grpc.py
index 09ec8d0..d4f8e04 100644
--- a/starlink_grpc.py
+++ b/starlink_grpc.py
@@ -231,7 +231,7 @@ def history_ping_stats(parse_samples, verbose=False):
             count_unsched += 1
             total_unsched_drop += d
             if d >= 1:
-                count_full_unsched += d
+                count_full_unsched += 1
         # scheduled=false and obstructed=true do not ever appear to overlap,
         # but in case they do in the future, treat that as just unscheduled
         # in order to avoid double-counting it.
diff --git a/starlink_json.py b/starlink_json.py
index 383e875..4365040 100644
--- a/starlink_json.py
+++ b/starlink_json.py
@@ -100,13 +100,13 @@ def history_ping_stats(filename, parse_samples, verbose=False):
     # index to next data sample after the newest one.
     offset = current % samples
 
-    tot = 0
+    tot = 0.0
     count_full_drop = 0
     count_unsched = 0
-    total_unsched_drop = 0
+    total_unsched_drop = 0.0
     count_full_unsched = 0
     count_obstruct = 0
-    total_obstruct_drop = 0
+    total_obstruct_drop = 0.0
     count_full_obstruct = 0
 
     second_runs = [0] * 60
@@ -126,9 +126,10 @@ def history_ping_stats(filename, parse_samples, verbose=False):
 
     for i in sample_range:
         d = history["popPingDropRate"][i]
-        tot += d
         if d >= 1:
-            count_full_drop += d
+            # just in case...
+            d = 1
+            count_full_drop += 1
             run_length += 1
         elif run_length > 0:
             if init_run_length is None:
@@ -145,7 +146,7 @@ def history_ping_stats(filename, parse_samples, verbose=False):
             count_unsched += 1
             total_unsched_drop += d
             if d >= 1:
-                count_full_unsched += d
+                count_full_unsched += 1
         # scheduled=false and obstructed=true do not ever appear to overlap,
         # but in case they do in the future, treat that as just unscheduled
         # in order to avoid double-counting it.
@@ -153,7 +154,8 @@ def history_ping_stats(filename, parse_samples, verbose=False):
             count_obstruct += 1
             total_obstruct_drop += d
             if d >= 1:
-                count_full_obstruct += d
+                count_full_obstruct += 1
+        tot += d
 
     # If the entire sample set is one big drop run, it will be both initial
     # fragment (continued from prior sample range) and final one (continued