v2.1.4

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = tconnectsync
-version = 2.1.1
+version = 2.1.4
 author = James Woglom
 author_email = j@wogloms.net
 description = Syncs Tandem Source (formerly t:connect) insulin pump data to Nightscout for the t:slim X2

tconnectsync/secret.py

@@ -79,6 +79,7 @@ NIGHTSCOUT_PROFILE_UPLOAD_MODE = get_one_of('NIGHTSCOUT_PROFILE_UPLOAD_MODE', 'a
 # Default Nightscout profile segment fields which aren't stored by Tandem
 NIGHTSCOUT_PROFILE_CARBS_HR_VALUE = get('NIGHTSCOUT_PROFILE_CARBS_HR_VALUE', '20')
 NIGHTSCOUT_PROFILE_DELAY_VALUE = get('NIGHTSCOUT_PROFILE_DELAY_VALUE', '20')
+IGNORE_ZERO_UNIT_BASAL = get_bool('IGNORE_ZERO_UNIT_BASAL', 'false')
 
 ENABLE_TESTING_MODES = get_bool('ENABLE_TESTING_MODES', 'false')
 SKIP_NS_LAST_UPLOADED_CHECK = get_bool('SKIP_NS_LAST_UPLOADED_CHECK', 'false')

tconnectsync/sync/tandemsource/heroku_helpers.py

@@ -1,5 +1,5 @@
 from ...features import DEFAULT_FEATURES
-from .choose_device import TandemSourceChooseDevice
+from .choose_device import ChooseDevice
 from .process import ProcessTimeRange
 from ... import secret
 
@@ -13,5 +13,5 @@ def run_oneshot(tconnect, nightscout, pretend=False, features=DEFAULT_FEATURES,
     if not secret_arg:
         secret_arg = secret
 
-    tconnectDevice = TandemSourceChooseDevice(secret_arg, tconnect).choose()
-    return ProcessTimeRange(tconnect, nightscout, tconnectDevice, pretend, features).process(time_start, time_end)
+    tconnectDevice = ChooseDevice(secret_arg, tconnect).choose()
+    return ProcessTimeRange(tconnect, nightscout, tconnectDevice, pretend, features).process(time_start, time_end)

tconnectsync/sync/tandemsource/process_basal.py

@@ -1,6 +1,7 @@
 import logging
 import arrow
 
+from ...secret import IGNORE_ZERO_UNIT_BASAL
 from ...features import DEFAULT_FEATURES
 from ... import features
 from ...eventparser.generic import Events, decode_raw_events, EVENT_LEN
@@ -54,7 +55,9 @@ class ProcessBasal:
 
         ns_entries = []
         for item in with_duration:
-            ns_entries.append(self.basal_to_nsentry(*item))
+            ns = self.basal_to_nsentry(*item)
+            if ns:
+                ns_entries.append(ns)
 
         return ns_entries
 
@@ -73,16 +76,24 @@ class ProcessBasal:
 
     def basal_to_nsentry(self, start, duration, event):
         if type(event) == eventtypes.LidBasalRateChange:
+            value = insulin_float_round(event.commandedbasalrate)
+            if IGNORE_ZERO_UNIT_BASAL and value < 0.01:
+                logger.info("Ignoring basal entry with %.2f unit basal because IGNORE_ZERO_UNIT_BASAL=true: %s" % (value, event))
+                return None
             return NightscoutEntry.basal(
-                value = insulin_float_round(event.commandedbasalrate),
+                value = value,
                 duration_mins = duration.seconds / 60,
                 created_at = start.format(),
                 reason = ', '.join(bitmask_to_list(event.changetype)),
                 pump_event_id = "%s" % event.eventId
             )
         if type(event) == eventtypes.LidBasalDelivery:
+            value = insulin_milliunits_to_real(event.commandedRate)
+            if IGNORE_ZERO_UNIT_BASAL and value < 0.01:
+                logger.info("Ignoring basal entry with %.2f unit basal because IGNORE_ZERO_UNIT_BASAL=true: %s" % (value, event))
+                return None
             return NightscoutEntry.basal(
-                value = insulin_milliunits_to_real(event.commandedRate),
+                value = value,
                 duration_mins = duration.seconds / 60,
                 created_at = start.format(),
                 reason = ', '.join(bitmask_to_list(event.commandedRateSource)),

tconnectsync/sync/tandemsource/process_user_mode.py

@@ -204,7 +204,7 @@ class ProcessUserMode:
                 reason=reason + " - " + NOT_ENDED,
                 duration=duration_mins,
                 event_type=EXERCISE_EVENTTYPE,
-                pump_event_id = "%s,%s" % (start.eventId, stop.eventId)
+                pump_event_id = "%s" % start.eventId
             )
 
     def process_unended_sleep_stop(self, event, sleep_last_upload):