v2.1.3

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = tconnectsync
-version = 2.0.9
+version = 2.1.3
 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/eventparser/raw_event.py

@@ -38,4 +38,4 @@ class RawEvent:
         # but represent the user's time zone setting. So we keep the time
         # referenced on them, but force the timezone to what the user
         # requests via the TZ secret.
-        return arrow.get(TANDEM_EPOCH + self.timestampRaw, tzinfo=TIMEZONE_NAME)
+        return arrow.get(TANDEM_EPOCH + self.timestampRaw, tzinfo='UTC').replace(tzinfo=TIMEZONE_NAME)

tconnectsync/secret.py

@@ -54,6 +54,7 @@ if not get('NS_SECRET') and get('API_SECRET'):
 NS_SKIP_TLS_VERIFY = get_bool('NS_SKIP_TLS_VERIFY', 'false')
 NS_IGNORE_CONN_ERRORS = get_bool('NS_IGNORE_CONN_ERRORS', 'false')
 
+# This should be the timezone your pump is set to.
 TIMEZONE_NAME = get('TIMEZONE_NAME', 'America/New_York')
 
 if not get('TIMEZONE_NAME') and get('TZ'):

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_user_mode.py

@@ -198,13 +198,13 @@ class ProcessUserMode:
             if start.exercisechoice == eventtypes.LidAaUserModeChange.ExercisechoiceEnum.Timed:
                 reason = "Exercise (Timed)"
 
-            duration_mins = (time_end.eventTimestamp - start.eventTimestamp).seconds / 60
+            duration_mins = (time_end - start.eventTimestamp).seconds / 60
             return NightscoutEntry.activity(
                 created_at=start.eventTimestamp.format(),
                 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):