0ccc3c.diff

commit 0ccc3ce7901a07217892255f8ca386bf8b4af405
Author: pi <pi@markpi>
Date:   Sun Jun 12 15:22:00 2016 -0700

    openaps-report invoke settings/settings.json settings/bg_targets.json settings/insulin_sensitivities.json settings/basal_profile.json settings/profile.json monitor/clock.json monitor/clock-zoned.json monitor/battery.json monitor/reservoir.json monitor/status.json monitor/temp_basal.json monitor/pumphistory.json monitor/pumphistory-zoned.json monitor/iob.json
    
          TODO: better change descriptions
          /usr/local/bin/openaps-report invoke settings/settings.json settings/bg_targets.json settings/insulin_sensitivities.json settings/basal_profile.json settings/profile.json monitor/clock.json monitor/clock-zoned.json monitor/battery.json monitor/reservoir.json monitor/status.json monitor/temp_basal.json monitor/pumphistory.json monitor/pumphistory-zoned.json monitor/iob.json

diff --git a/monitor/clock-zoned.json b/monitor/clock-zoned.json
index b2b8f57..169d53f 100644
--- a/monitor/clock-zoned.json
+++ b/monitor/clock-zoned.json
@@ -1 +1 @@
-"2016-06-12T15:14:32-07:00"
\ No newline at end of file
+"2016-06-12T15:19:31-07:00"
\ No newline at end of file
diff --git a/monitor/clock.json b/monitor/clock.json
index 908d6d8..879fff4 100644
--- a/monitor/clock.json
+++ b/monitor/clock.json
@@ -1 +1 @@
-"2016-06-12T15:19:24"
\ No newline at end of file
+"2016-06-12T15:19:31"
\ No newline at end of file
diff --git a/monitor/iob.json b/monitor/iob.json
index aee4a12..8fa8d08d 100644
--- a/monitor/iob.json
+++ b/monitor/iob.json
@@ -1,8 +1,8 @@
 {
   "netbasalinsulin": -0.25, 
-  "activity": -0.0016, 
-  "basaliob": -0.05, 
+  "activity": 0.0015, 
+  "basaliob": -0.044, 
   "hightempinsulin": 0, 
-  "bolussnooze": 0, 
-  "iob": -0.05
+  "bolussnooze": 5.542, 
+  "iob": 5.536
 }
\ No newline at end of file
diff --git a/monitor/pumphistory-zoned.json b/monitor/pumphistory-zoned.json
index 50580e6..2ba7e68 100644
--- a/monitor/pumphistory-zoned.json
+++ b/monitor/pumphistory-zoned.json
@@ -1,14 +1,9 @@
 [
   {
-    "correction_estimate": 0.0, 
-    "unknown_byte[10]": 0, 
-    "_description": "BolusWizard 2016-06-12T15:13:07 head[2], body[13] op[0x5b]", 
-    "bg_target_low": 90, 
-    "_body": "335009285a0038000000003878", 
-    "_byte[5]": 0, 
-    "_head": "5b00", 
-    "_byte[7]": 0, 
-    "bolus_estimate": 5.6, 
+    "_type": "Bolus", 
+    "_description": "Bolus 2016-06-12T15:13:07 head[4], body[0] op[0x01]", 
+    "timestamp": "2016-06-12T15:13:07-07:00", 
+    "_body": "", 
     "appended": [
       {
         "_type": "UnabsorbedInsulinBolus", 
@@ -24,18 +19,35 @@
         "_date": ""
       }
     ], 
-    "food_estimate": 5.6, 
-    "carb_input": 51, 
-    "sensitivity": 40, 
+    "programmed": 5.6, 
+    "duration": 0, 
+    "amount": 5.6, 
+    "_head": "01383800", 
+    "type": "normal", 
+    "_date": "478d4f0c10"
+  }, 
+  {
+    "unknown_byte[8]": 0, 
     "_type": "BolusWizard", 
     "bg": 0, 
+    "_byte[5]": 0, 
+    "unknown_byte[10]": 0, 
+    "_description": "BolusWizard 2016-06-12T15:13:07 head[2], body[13] op[0x5b]", 
     "timestamp": "2016-06-12T15:13:07-07:00", 
+    "_body": "335009285a0038000000003878", 
     "bg_target_high": 120, 
+    "sensitivity": 40, 
+    "carb_ratio": 9, 
+    "food_estimate": 5.6, 
     "unabsorbed_insulin_total": 0.0, 
+    "correction_estimate": 0.0, 
+    "carb_input": 51, 
+    "_head": "5b00", 
     "unabsorbed_insulin_count": "??", 
+    "_byte[7]": 0, 
+    "bolus_estimate": 5.6, 
     "_date": "478d0f0c10", 
-    "unknown_byte[8]": 0, 
-    "carb_ratio": 9
+    "bg_target_low": 90
   }, 
   {
     "_type": "OldBolusWizardChange", 
diff --git a/monitor/pumphistory.json b/monitor/pumphistory.json
index 63be0fb..dcc622b 100644
--- a/monitor/pumphistory.json
+++ b/monitor/pumphistory.json
@@ -1,21 +1,9 @@
 [
   {
-    "_type": "BolusWizard", 
-    "bg": 0, 
-    "bg_target_high": 120, 
-    "correction_estimate": 0.0, 
-    "unknown_byte[10]": 0, 
-    "_description": "BolusWizard 2016-06-12T15:13:07 head[2], body[13] op[0x5b]", 
+    "_type": "Bolus", 
+    "_description": "Bolus 2016-06-12T15:13:07 head[4], body[0] op[0x01]", 
     "timestamp": "2016-06-12T15:13:07", 
-    "_body": "335009285a0038000000003878", 
-    "carb_input": 51, 
-    "_head": "5b00", 
-    "unabsorbed_insulin_total": 0.0, 
-    "_byte[5]": 0, 
-    "unabsorbed_insulin_count": "??", 
-    "_byte[7]": 0, 
-    "_date": "478d0f0c10", 
-    "bolus_estimate": 5.6, 
+    "_body": "", 
     "appended": [
       {
         "_type": "UnabsorbedInsulinBolus", 
@@ -31,6 +19,30 @@
         "_date": ""
       }
     ], 
+    "programmed": 5.6, 
+    "_head": "01383800", 
+    "amount": 5.6, 
+    "duration": 0, 
+    "type": "normal", 
+    "_date": "478d4f0c10"
+  }, 
+  {
+    "_type": "BolusWizard", 
+    "bg": 0, 
+    "bg_target_high": 120, 
+    "correction_estimate": 0.0, 
+    "unknown_byte[10]": 0, 
+    "_description": "BolusWizard 2016-06-12T15:13:07 head[2], body[13] op[0x5b]", 
+    "timestamp": "2016-06-12T15:13:07", 
+    "_body": "335009285a0038000000003878", 
+    "carb_input": 51, 
+    "_head": "5b00", 
+    "unabsorbed_insulin_total": 0.0, 
+    "_byte[5]": 0, 
+    "unabsorbed_insulin_count": "??", 
+    "_byte[7]": 0, 
+    "_date": "478d0f0c10", 
+    "bolus_estimate": 5.6, 
     "unknown_byte[8]": 0, 
     "carb_ratio": 9, 
     "food_estimate": 5.6, 
diff --git a/monitor/reservoir.json b/monitor/reservoir.json
index 04347e2..6e11b79 100644
--- a/monitor/reservoir.json
+++ b/monitor/reservoir.json
@@ -1 +1 @@
-59.4
\ No newline at end of file
+55.8
\ No newline at end of file
diff --git a/monitor/status.json b/monitor/status.json
index b3710c2..557b2e0 100644
--- a/monitor/status.json
+++ b/monitor/status.json
@@ -1,5 +1,5 @@
 {
   "status": "normal", 
-  "bolusing": true, 
+  "bolusing": false, 
   "suspended": false
 }
\ No newline at end of file