Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
156 commits
Select commit Hold shift + click to select a range
1d0d4aa
use openaps --nogit option
scottleibrand Jul 15, 2017
148a422
Merge branch 'master' into nogit
scottleibrand Jul 15, 2017
6d808f2
--nogit for myopenaps-cgm-loop too
scottleibrand Jul 15, 2017
f5317c9
remove git-specific stuff
scottleibrand Jul 15, 2017
4da025d
enable SMB/UAM (if enabled in preferences) for a full 6 hours after a…
scottleibrand Jul 22, 2017
418cc97
refresh pumphistory when pump is suspended and we can't enact
scottleibrand Jul 22, 2017
b097c7f
Merge branch 'dev' into gather-when-suspended
scottleibrand Jul 29, 2017
9d96590
Merge branch 'dev' into nogit
scottleibrand Jul 29, 2017
8d204bd
Merge branch 'gather-when-suspended' into nogit
scottleibrand Jul 29, 2017
d338151
check whether decocare-0.0.31 has been installed
scottleibrand Jul 29, 2017
bcef7ad
Merge branch 'update-decocare' into nogit
scottleibrand Jul 29, 2017
ee7271e
automatically install openaps 0.2.1 with --nogit support
scottleibrand Jul 29, 2017
e744e4e
check radio twice, and mmtune if both checks fail
scottleibrand Jul 30, 2017
7590fbf
use any_pump_comms function
scottleibrand Jul 30, 2017
2504e55
debugging
scottleibrand Jul 30, 2017
77ea0df
Calling out the number one beginner error
danamlewis Aug 8, 2017
68ee1ce
oref0-pump-loop reliability and debugging improvements (#575)
scottleibrand Aug 11, 2017
e9478ec
if currentDeviation is null or maxDeviation is 0, set mealCOB to 0 fo…
scottleibrand Aug 11, 2017
454bc1f
Merge branch 'dev' into nogit
scottleibrand Aug 12, 2017
5c54df4
version bump
scottleibrand Aug 12, 2017
61839af
Merge branch 'dev' into bad-deviation
scottleibrand Aug 12, 2017
90612ac
Merge branch 'dev' into number-one-beginner-error-people-refuse-to-ch…
scottleibrand Aug 12, 2017
d603bfb
Merge branch 'bad-deviation' into 0.6.0-dev
scottleibrand Aug 12, 2017
279750d
Merge branch 'number-one-beginner-error-people-refuse-to-check-on-the…
scottleibrand Aug 12, 2017
58a987e
speed up COB calculation
scottleibrand Aug 12, 2017
ffa7ede
Merge remote-tracking branch 'origin/cob-speedup' into 0.6.0-dev
scottleibrand Aug 12, 2017
296d560
remove ' that is confusing vim; indentation
scottleibrand Aug 12, 2017
c8fbd37
chmod +x bin/oref0_nightscout_check.py
scottleibrand Aug 12, 2017
71809c5
refresh meal.json after merge_pumphistory
scottleibrand Aug 12, 2017
7bb2033
newline
scottleibrand Aug 12, 2017
6f0d305
Merge branch 'separate-meal-calcs' into 0.6.0-dev
scottleibrand Aug 12, 2017
3c989c9
don't SMB unless bg > threshold (#602)
scottleibrand Aug 13, 2017
9683781
Exponential curves (#568)
sulkaharo Aug 13, 2017
0859697
Speed up COB calculation by only converting pumphistory to treatments…
scottleibrand Aug 13, 2017
88862cc
remove double declaration of biobContrib (#605)
AdrianLxM Aug 13, 2017
2319c2e
first attempt at allowing unsuspend without SMB (#596)
scottleibrand Aug 14, 2017
c4030a6
Clean up old unused stuff, fix whitespace, etc. (#595)
scottleibrand Aug 14, 2017
623da17
Decocare 0.1.0 (#597)
scottleibrand Aug 14, 2017
65faebf
fix percent grep
scottleibrand Aug 14, 2017
3e8eccd
check for percent mode after failure to make it more obvious
scottleibrand Aug 14, 2017
07f2c88
fix whitespace
scottleibrand Aug 14, 2017
62b527b
stop using DIA for anything but actual IOB/activity calcs (#599)
scottleibrand Aug 14, 2017
82d0b25
don't allow target_bg below 80
scottleibrand Aug 14, 2017
18b066d
only updatePreferences with displayedDefaults
scottleibrand Aug 14, 2017
e2ee0a6
move dia = 3 code so not to interfere with bolus snooze
scottleibrand Aug 14, 2017
46bffa2
Merge branch 'dev' into 0.6.0-dev
scottleibrand Aug 14, 2017
f4a9624
use profile.sens instead of autosens-adjusted sens (#618)
scottleibrand Aug 19, 2017
9a604ce
only print minDelta < expectedDelta when it's true
scottleibrand Aug 21, 2017
7a99a00
Merge branch 'dev' into 0.6.0-dev
scottleibrand Aug 23, 2017
dd6e1a6
don't overreact to negative deviations from a big negative delta (#615)
scottleibrand Aug 23, 2017
159b4da
make carbsReqThreshold configurable (#607)
scottleibrand Aug 23, 2017
6cb71c1
force minimum DIA of 3h (#606)
scottleibrand Aug 23, 2017
e355b0c
Timezone fix to 0.6.0-dev (#624)
scottleibrand Aug 23, 2017
42f4ffd
Merge branch '0.6.0-dev' of github.com:openaps/oref0 into 0.6.0-dev
scottleibrand Aug 23, 2017
6155121
Merge remote-tracking branch 'origin/dev' into 0.6.0-dev
scottleibrand Aug 23, 2017
112b143
ignore bolusing status if pump is suspended
scottleibrand Aug 24, 2017
955bfbe
clarify bolus snooze reason (for #626)
scottleibrand Aug 25, 2017
15f6a43
microBolus 1/2 the insulinReq if IOB doesn't yet cover COB (#621)
scottleibrand Aug 27, 2017
594a085
model remainingCarbs as a /\ shaped bilinear curve (#620)
scottleibrand Aug 27, 2017
99e7944
for purposes of categorizing boluses as SMBs to add to basalIOB, use …
scottleibrand Aug 28, 2017
1e331ec
add max_daily_basal to fix tests
scottleibrand Sep 2, 2017
384b514
always mmtune on falure if mmtune.json is more than 15m old
scottleibrand Sep 3, 2017
041b223
don't necessarily mmtune if pump_loop_completed within 15m
scottleibrand Sep 3, 2017
d536fbf
Merge branch 'always-mmtune-when-old' into 0.6.0-dev
scottleibrand Sep 3, 2017
04d7382
Always mmtune if pump_loop_completed > 15m old (#635)
scottleibrand Sep 4, 2017
3c970f1
stop letting high temp run (#633)
scottleibrand Sep 4, 2017
b60f341
remove -g as it breaks autotune's time filters
scottleibrand Sep 4, 2017
bb15929
Merge branch 'fix-autotune' into 0.6.0-dev
scottleibrand Sep 4, 2017
067ccac
Revert "remove -g as it breaks autotune's time filters"
scottleibrand Sep 4, 2017
621ba48
Merge branch 'dev' into 0.6.0-dev
scottleibrand Sep 5, 2017
d3d3e52
Allow nonzero low temps for SMB (#634)
scottleibrand Sep 5, 2017
abdb96a
Merge branch 'dev' into 0.6.0-dev
scottleibrand Sep 5, 2017
8962fce
don't allow maxSMBBasalMinutes > 30 unless IOB (and COB) are > 0 (#639)
scottleibrand Sep 7, 2017
52f4b30
COB-aware autosens (#629)
scottleibrand Sep 7, 2017
6c2456f
carbs: should only include carbs actually used in calculating COB (#640)
scottleibrand Sep 7, 2017
9c89a54
weight COBpredBG vs. UAMpredBG based on how many carbs remain as COB …
scottleibrand Sep 7, 2017
8cfd6a7
Additional remainingCI debugging (#645)
scottleibrand Sep 7, 2017
4519a13
remove autosens avgDelta-bgi < 6 check (#643)
scottleibrand Sep 7, 2017
9a659a7
Merge branch 'dev' into 0.6.0-dev
scottleibrand Sep 8, 2017
05658ed
Merge branch 'dev' into 0.6.0-dev
scottleibrand Sep 9, 2017
392f032
Disable IPv6 for rig stability purposes (#649)
efidoman Sep 10, 2017
9e78f10
Autotune: calculate CR directly, and use CR*CSF to help calculate ISF…
scottleibrand Sep 10, 2017
d498552
Make remainingCI time responsive to temp targets (#646)
scottleibrand Sep 10, 2017
656fc6f
Merge branch 'dev' into 0.6.0-dev
scottleibrand Sep 10, 2017
30f21a2
Merge pull request #592 from openaps/0.6.0-dev
danamlewis Sep 19, 2017
8e6a44f
only display rate and duration from enact/smb-enacted.json (#654)
scottleibrand Sep 20, 2017
d78d880
don't adjust temptargets (#656)
scottleibrand Sep 20, 2017
1f08518
avoid divide by zero (NaN) in CI Duration (#657)
scottleibrand Sep 20, 2017
d5dbfe9
adjust remainingCATime gradually from 3h up to 4h @ 25% of carbs abso…
scottleibrand Sep 20, 2017
f9ee0b5
adjust remainingCATime for <50% absorbed, exclusive of temptarget adj…
scottleibrand Sep 20, 2017
d61fa92
adjust remainingCATime longer when <50% of carbs remain and we aren't…
scottleibrand Sep 20, 2017
6494a7e
actually allow positive remainingCATimeAdjustment
scottleibrand Sep 20, 2017
9de3a99
round away floating point math
scottleibrand Sep 20, 2017
1d78bb2
comment out remainingCATimeAdjustment for temptargets
scottleibrand Sep 20, 2017
40a937d
round away floating point math
scottleibrand Sep 20, 2017
55c9b42
only adjust remainingCATime if there are meal_data.carbs
scottleibrand Sep 20, 2017
071e5d4
only display remainingCI debugging with COB
scottleibrand Sep 20, 2017
235a085
make SMB model failure explicit
scottleibrand Sep 20, 2017
70b8f97
echo -n
scottleibrand Sep 20, 2017
1d1041e
skip bolusing check for 512/712
scottleibrand Sep 20, 2017
b356e5d
grep quietly
scottleibrand Sep 20, 2017
320d69a
0.5.4
scottleibrand Sep 20, 2017
39d6b83
Merge pull request #659 from openaps/512-support
danamlewis Sep 20, 2017
6a0e831
display curve in preferences by default (#658)
scottleibrand Sep 21, 2017
19a2e36
Less aggressive UAM (#655)
scottleibrand Sep 21, 2017
0c9cc1c
proceed to enact and set clock if pumphistory-zoned is in the future …
scottleibrand Sep 21, 2017
0c76235
calculate autosens ratio with both 8h and 24h of data (#653)
scottleibrand Sep 21, 2017
ccf11cc
Merge branch 'master' into dev
scottleibrand Sep 21, 2017
14e6a29
disable SMB if predicted BG drops below threshold (#661)
scottleibrand Sep 21, 2017
901163d
Refresh pumphistory before setting temps and after SMB/enact (#663)
scottleibrand Sep 21, 2017
1ce5d70
autotune/autosens on by default; don't ask about ~/myopenaps (#664)
scottleibrand Sep 22, 2017
6874788
Update oref0-setup.sh (#666)
jaylagorio Sep 23, 2017
0430c9a
Merge branch 'dev' into fractionCOBAbsorbed-remainingCATime
scottleibrand Sep 24, 2017
c1f353f
more explicit CATimeAdjustment; extend remainingCATimeMin for >90g
scottleibrand Sep 24, 2017
af0ef3a
allow SMBs to consider COBPredBGs > 400
scottleibrand Sep 24, 2017
ec80ac2
check max_iob against net IOB, not just basaliob
scottleibrand Sep 24, 2017
d0fc003
always SMB 1/2 of insulinReq
scottleibrand Sep 24, 2017
266a3b5
remainingCATimeMax = 6
scottleibrand Sep 24, 2017
ed7257d
start setting minIOBPredBG at 70m for insulinPeakTime of 55m
scottleibrand Sep 24, 2017
8cbe050
x12 automation (#665)
danamlewis Sep 24, 2017
bdaf2c9
Merge branch 'dev' into fractionCOBAbsorbed-remainingCATime
scottleibrand Sep 24, 2017
c003116
remove old commented-out let-it-run code
scottleibrand Sep 24, 2017
4fdf0c2
PLGS mode for minGuardBG < threshold
scottleibrand Sep 24, 2017
bacd73c
zero temp if minGuardBG < threshold regardless of delta
scottleibrand Sep 24, 2017
b29b41e
add comment
scottleibrand Sep 24, 2017
4e3d0a0
wait for bolus to complete and refresh pumphistory after SMB/enact (#…
scottleibrand Sep 24, 2017
0649d27
enable autosens and autotune by default (#669)
scottleibrand Sep 24, 2017
32319a6
make sure another rig isn't also talking before proceeding to SMB (#670)
scottleibrand Sep 24, 2017
390888c
Put pump_loop_completed in /tmp/ (#672)
jaylagorio Sep 24, 2017
2989ea2
Revert "Update oref0-setup.sh (#666)"
scottleibrand Sep 24, 2017
014426a
revert incorrect /tmp/pump_loop_completed change
scottleibrand Sep 24, 2017
e915dac
print hour numbers in autosens output (#671)
scottleibrand Sep 25, 2017
597412d
properly calculate minguardBG if COB==0 and UAM is disabled (#673)
scottleibrand Sep 25, 2017
2110ca2
Merge remote-tracking branch 'origin/dev' into fractionCOBAbsorbed-re…
scottleibrand Sep 25, 2017
361c2ff
fix test
scottleibrand Sep 25, 2017
8545216
Merge pull request #662 from openaps/fractionCOBAbsorbed-remainingCATime
danamlewis Sep 25, 2017
d192e52
recalculate IOB and predBGs after each loop (#674)
scottleibrand Sep 25, 2017
02aca03
add allDeviations to meal.json output for UAM monitoring (#675)
scottleibrand Sep 26, 2017
bc8d4de
remove extra minPredBG in rT object (#676)
scottleibrand Sep 26, 2017
fc938f5
autotune de-biasing (#668)
scottleibrand Sep 26, 2017
a3834b4
randomize wait_for_silence before smb_verify_reservoir (#679)
scottleibrand Sep 28, 2017
7d1e805
use lastCarbAge to calculate remainingCATime (#678)
scottleibrand Sep 29, 2017
3bd4605
add an enableSMB_always option (#677)
scottleibrand Sep 29, 2017
a81f007
recalculate IOB before re-doing smb-suggested.json (#680)
scottleibrand Sep 29, 2017
c65ee94
round basalNeeded to .01 to make it easier to read (#681)
scottleibrand Sep 29, 2017
13cd96f
look ahead an additional 15m to get insulin started faster (#683)
scottleibrand Oct 2, 2017
0d80ef0
curl openaps-install.sh (#697)
scottleibrand Oct 6, 2017
9b9a87c
remove ,, for backwards compatibility with bash 3.x on Mac
scottleibrand Oct 6, 2017
cad536b
Merge branch 'dev' of github.com:openaps/oref0 into dev
scottleibrand Oct 6, 2017
8be8b33
don't run loop if rig is too hot (#689)
scottleibrand Oct 6, 2017
30c9b9f
Attempting to --nogit by default for existing user installs
danamlewis Oct 6, 2017
9c8a1a5
Merge pull request #699 from openaps/no-git-default
danamlewis Oct 6, 2017
fc990c2
Blend minGuardBG (#698)
scottleibrand Oct 7, 2017
9ba6bb0
Don't send stale pushovers (#701)
scottleibrand Oct 7, 2017
8eec3aa
typofix
scottleibrand Oct 7, 2017
ff47d46
go back to using a 90m minPredBG lookahead for all insulin types (#695)
scottleibrand Oct 7, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion bin/oref0-pump-loop.sh
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,10 @@ function gather {
&& ( openaps monitor-pump || openaps monitor-pump ) 2>&1 >/dev/null | tail -1 \
&& echo -n ed \
&& merge_pumphistory \
&& echo " pumphistory" || (echo; exit 1) 2>/dev/null
&& echo -n " pumphistory" \
&& openaps report invoke monitor/meal.json 2>&1 >/dev/null | tail -1 \
&& echo " and meal.json" \
|| (echo; exit 1) 2>/dev/null
}

function merge_pumphistory {
Expand Down
2 changes: 1 addition & 1 deletion lib/determine-basal/cob-autosens.js
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ function detectSensitivityandCarbAbsorption(inputs) {
//console.error(gapDelta, lastbg, elapsed_minutes);
nextbg = lastbg + (5/elapsed_minutes * gapDelta);
bucketed_data[j].glucose = Math.round(nextbg);
console.error("Interpolated", bucketed_data[j]);
//console.error("Interpolated", bucketed_data[j]);

elapsed_minutes = elapsed_minutes - 5;
lastbg = nextbg;
Expand Down
2 changes: 1 addition & 1 deletion lib/oref0-setup/alias.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
},
{
"monitor-pump": {
"command": "report invoke monitor/clock.json monitor/temp_basal.json monitor/pumphistory.json monitor/pumphistory-zoned.json monitor/clock-zoned.json monitor/iob.json monitor/meal.json monitor/reservoir.json monitor/battery.json monitor/status.json"
"command": "report invoke monitor/clock.json monitor/temp_basal.json monitor/pumphistory.json monitor/pumphistory-zoned.json monitor/clock-zoned.json monitor/iob.json monitor/reservoir.json monitor/battery.json monitor/status.json"
},
"type": "alias",
"name": "monitor-pump"
Expand Down