Skip to content

Improved oref0-setup #1244

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 26 commits into from
Apr 16, 2019
Merged

Improved oref0-setup #1244

Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
f386204
Fix for x12 status check
cluckj Feb 11, 2019
1fd6451
Spacing
cluckj Feb 11, 2019
ead101a
Merge pull request #28 from openaps/dev
cluckj Mar 9, 2019
4191ff7
Remove workarounds for missing x12 settings
cluckj Mar 9, 2019
36463ed
Remove workarounds for missing x12 settings
cluckj Mar 9, 2019
35908e6
Spacing...
cluckj Mar 9, 2019
d11ef5c
Merge pull request #29 from openaps/dev
cluckj Mar 11, 2019
bd5a619
Improving automation of hardware setups, support for more kinds of Go…
cluckj Mar 12, 2019
f7341ef
Update installer options, deprecate MDT, conflict changes with #1176
cluckj Mar 14, 2019
3247975
Merge pull request #30 from openaps/dev
cluckj Mar 14, 2019
59cf674
Deprecate G4-upload and G4-local-only, setup readability
cluckj Mar 14, 2019
a331f1b
Bugfixes, cleanup, and deprecate mmeowlink...
cluckj Mar 14, 2019
b438d18
Refactor interactive setup...
cluckj Mar 14, 2019
47d47f0
Refactor, can ensure building from source for certain setups without …
cluckj Mar 14, 2019
1b1434e
Better support for custom radiotags and diy radios
cluckj Mar 14, 2019
2f4cd78
Comments, and activate SPI only on the Pi
cluckj Mar 14, 2019
474a8e2
Typo...
cluckj Mar 14, 2019
58d78b8
Restore mmeowlink
cluckj Mar 14, 2019
de3c5e0
Merge pull request #31 from openaps/dev
cluckj Mar 17, 2019
95a3634
Missing quotation marks
cluckj Mar 18, 2019
1ac9448
Move updating jq earlier in the install script
cluckj Mar 21, 2019
958ade7
Merge pull request #33 from cluckj/patch-6
cluckj Mar 28, 2019
0e00b8f
Merge branch 'dev' of https://github.com/openaps/oref0 into openaps-dev
cluckj Apr 15, 2019
d750500
Merge branch 'openaps-dev' into updated-setup
cluckj Apr 15, 2019
6edd7d6
Revert to original repo, and do the config change with sed
cluckj Apr 15, 2019
c2a8763
Additional comments, remove redundant jq installs
cluckj Apr 15, 2019
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
Prev Previous commit
Next Next commit
Remove workarounds for missing x12 settings
  • Loading branch information
@cluckj
cluckj authored Mar 9, 2019
commit 4191ff7c1d1052caac74a8bb6bac4549df7e4277
39 changes: 12 additions & 27 deletions bin/oref0-pump-loop.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -624,26 +624,14 @@ function refresh_old_profile {
# get-settings report invoke settings/model.json settings/bg_targets_raw.json settings/bg_targets.json settings/insulin_sensitivities_raw.json settings/insulin_sensitivities.json settings/basal_profile.json settings/settings.json settings/carb_ratios.json settings/pumpprofile.json settings/profile.json
function get_settings {
SUCCESS=1
if grep -q 12 settings/model.json
then
# If we have a 512 or 712, then remove the incompatible reports, so the loop will work
# On the x12 pumps, these 'reports' are simulated by static json files created during the oref0-setup.sh run.
[[ $SUCCESS -eq 1 ]] && retry_return check_model 2>&3 >&4 || SUCCESS=0
[[ $SUCCESS -eq 1 ]] && retry_return read_insulin_sensitivities 2>&3 >&4 || SUCCESS=0
[[ $SUCCESS -eq 1 ]] && retry_return read_carb_ratios 2>&3 >&4 || SUCCESS=0
[[ $SUCCESS -eq 1 ]] && retry_return openaps report invoke settings/insulin_sensitivities.json settings/bg_targets.json 2>&3 >&4 || SUCCESS=0
else
# On all other supported pumps, we should be able to get all the data we need from the pump.
[[ $SUCCESS -eq 1 ]] && retry_return check_model 2>&3 >&4 || SUCCESS=0
[[ $SUCCESS -eq 1 ]] && retry_return read_insulin_sensitivities 2>&3 >&4 || SUCCESS=0
[[ $SUCCESS -eq 1 ]] && retry_return read_carb_ratios 2>&3 >&4 || SUCCESS=0
[[ $SUCCESS -eq 1 ]] && retry_return read_bg_targets 2>&3 >&4 || SUCCESS=0
[[ $SUCCESS -eq 1 ]] && retry_return read_basal_profile 2>&3 >&4 || SUCCESS=0
[[ $SUCCESS -eq 1 ]] && retry_return read_settings 2>&3 >&4 || SUCCESS=0
[[ $SUCCESS -eq 1 ]] && retry_return openaps report invoke settings/insulin_sensitivities.json settings/bg_targets.json 2>&3 >&4 || SUCCESS=0
# NON_X12_ITEMS="settings/bg_targets_raw.json settings/bg_targets.json settings/basal_profile.json settings/settings.json"
fi
# retry_return openaps report invoke settings/insulin_sensitivities_raw.json settings/insulin_sensitivities.json settings/carb_ratios.json $NON_X12_ITEMS 2>&3 >&4 | tail -1 || return 1

[[ $SUCCESS -eq 1 ]] && retry_return check_model 2>&3 >&4 || SUCCESS=0
[[ $SUCCESS -eq 1 ]] && retry_return read_insulin_sensitivities 2>&3 >&4 || SUCCESS=0
[[ $SUCCESS -eq 1 ]] && retry_return read_carb_ratios 2>&3 >&4 || SUCCESS=0
[[ $SUCCESS -eq 1 ]] && retry_return read_bg_targets 2>&3 >&4 || SUCCESS=0
[[ $SUCCESS -eq 1 ]] && retry_return read_basal_profile 2>&3 >&4 || SUCCESS=0
[[ $SUCCESS -eq 1 ]] && retry_return read_settings 2>&3 >&4 || SUCCESS=0
[[ $SUCCESS -eq 1 ]] && retry_return openaps report invoke settings/insulin_sensitivities.json settings/bg_targets.json 2>&3 >&4 || SUCCESS=0

# If there was a failure, force a full refresh on the next loop
if [[ $SUCCESS -eq 0 ]]; then
Expand Down Expand Up @@ -886,13 +874,10 @@ function valid_pump_settings() {

[[ $SUCCESS -eq 1 ]] && valid_insulin_sensitivities >&3 || { [[ $SUCCESS -eq 0 ]] || echo "Invalid insulin_sensitivites.json"; SUCCESS=0; }
[[ $SUCCESS -eq 1 ]] && valid_carb_ratios >&3 || { [[ $SUCCESS -eq 0 ]] || echo "Invalid carb_ratios.json"; SUCCESS=0; }

if ! grep -q 12 settings/model.json; then
[[ $SUCCESS -eq 1 ]] && valid_bg_targets >&3 || { [[ $SUCCESS -eq 0 ]] || echo "Invalid bg_targets.json"; SUCCESS=0; }
[[ $SUCCESS -eq 1 ]] && valid_basal_profile >&3 || { [[ $SUCCESS -eq 0 ]] || echo "Invalid basal_profile.json"; SUCCESS=0; }
[[ $SUCCESS -eq 1 ]] && valid_settings >&3 || { [[ $SUCCESS -eq 0 ]] || echo "Invalid settings.json"; SUCCESS=0; }
fi

[[ $SUCCESS -eq 1 ]] && valid_bg_targets >&3 || { [[ $SUCCESS -eq 0 ]] || echo "Invalid bg_targets.json"; SUCCESS=0; }
[[ $SUCCESS -eq 1 ]] && valid_basal_profile >&3 || { [[ $SUCCESS -eq 0 ]] || echo "Invalid basal_profile.json"; SUCCESS=0; }
[[ $SUCCESS -eq 1 ]] && valid_settings >&3 || { [[ $SUCCESS -eq 0 ]] || echo "Invalid settings.json"; SUCCESS=0; }

if [[ $SUCCESS -eq 0 ]]; then
return 1
else
Expand Down