Skip to content

wait for bolus to complete and refresh pumphistory after SMB/enact #667

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
scottleibrand merged 17 commits into from
Sep 24, 2017
Merged

wait for bolus to complete and refresh pumphistory after SMB/enact #667

Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
1145a63
don't set temp first if temp duration >20m
scottleibrand Sep 20, 2017
fe42e33
echo -n
scottleibrand Sep 20, 2017
5ddbea5
only refresh pumphistory (twice) if it's more than 30m old
scottleibrand Sep 20, 2017
d438f17
don't print enact/smb-suggested.json
scottleibrand Sep 20, 2017
ef9dc49
if pump is suspended, return false
scottleibrand Sep 20, 2017
87182de
wait for bolus to complete and refresh pumphistory after SMB
scottleibrand Sep 20, 2017
0560b2e
only refresh after SMB/enact; wait_for_silence 10 if bolusing
scottleibrand Sep 20, 2017
cc894bc
syntax
scottleibrand Sep 20, 2017
9f1eab3
gather has a bolusing check; no need for a full smb_verify_status
scottleibrand Sep 20, 2017
cc57920
check for recent bolused.json instead
scottleibrand Sep 20, 2017
ae0cafc
make SMB model failure explicit
scottleibrand Sep 20, 2017
b71688e
echo -n
scottleibrand Sep 20, 2017
0002127
10s is too short for a 0.8U SMB: try a third time after 20s more
scottleibrand Sep 21, 2017
68f4ecd
refresh_profile every 5m after a temp set, every 15m otherwise
scottleibrand Sep 22, 2017
9eb2e7b
print correct profileage
scottleibrand Sep 22, 2017
dd6b55e
refresh_profile every 3m after temp/SMB
scottleibrand Sep 22, 2017
8193327
Merge branch 'dev' into refresh-if-temp-recent
scottleibrand Sep 24, 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
11 changes: 9 additions & 2 deletions bin/oref0-pump-loop.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ smb_main() {
))
fi
) \
&& ( refresh_profile; refresh_pumphistory_24h; true ) \
&& ( refresh_profile 15; refresh_pumphistory_24h; true ) \
&& refresh_after_bolus_or_enact \
&& echo Completed supermicrobolus pump-loop at $(date): \
&& touch monitor/pump_loop_completed -r monitor/pump_loop_enacted \
Expand Down Expand Up @@ -224,6 +224,8 @@ function smb_bolus {

function refresh_after_bolus_or_enact {
if (find enact/ -mmin -2 -size +5c | grep -q bolused.json || (cat monitor/temp_basal.json | json -c "this.duration > 28" | grep -q duration)); then
# refresh profile if >5m old to give SMB a chance to deliver
refresh_profile 3
gather || ( wait_for_silence 10 && gather ) || ( wait_for_silence 20 && gather )
true
fi
Expand Down Expand Up @@ -504,7 +506,12 @@ function refresh_pumphistory_and_enact {
}

function refresh_profile {
find settings/ -mmin -10 -size +5c | grep -q settings.json && echo Settings less than 10m old \
if [ -z $1 ]; then
profileage=10
else
profileage=$1
fi
find settings/ -mmin -$profileage -size +5c | grep -q settings.json && echo Settings less than $profileage minutes old \
|| (echo -n Settings refresh && openaps get-settings 2>/dev/null >/dev/null && echo ed)
}

Expand Down