Skip to content
Merged
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 authored Mar 9, 2019
commit 36463edf3febb921e105ba291aab3ed113659014
41 changes: 1 addition & 40 deletions bin/oref0-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,7 @@ case $i in
-rl=*|--radio_locale=*)
radio_locale="${i#*=}"
;;
-pm=*|--pumpmodel=*)
pumpmodel="${i#*=}"
;;
-t=*|--tty=*)
-t=*|--tty=*)
ttyport="${i#*=}"
;;
-m=*|--max_iob=*)
Expand Down Expand Up @@ -307,14 +304,6 @@ if [[ -z "$DIR" || -z "$serial" ]]; then
echocolor "Ok, $serial it is."
echo

if prompt_yn "Do you have a 512 or 712 model pump?" N; then
pumpmodel=x12
echocolor "Ok, you'll be using a 512 or 712 pump. Got it. "
echo
else
echocolor "You're using a different model pump. Got it."
fi

echo "What kind of CGM would you like to configure for offline use? Options are:"
echo "G4-Go: will use and upload BGs from a plugged in or BLE-paired G4 receiver to Nightscout"
# TODO: deprecate g4-upload and G4-local-only
Expand Down Expand Up @@ -550,9 +539,6 @@ if [[ ! -z $DEXCOM_CGM_TX_ID ]]; then
fi
echo
echo -n "NS host $NIGHTSCOUT_HOST, "
if [[ ${pumpmodel,,} =~ "x12" ]]; then
echo -n "x12 pump, "
fi

if [[ -z "$ttyport" ]]; then
echo -n Carelink
Expand Down Expand Up @@ -595,9 +581,6 @@ echo -n " --ns-host=$NIGHTSCOUT_HOST --api-secret=$API_SECRET" | tee -a $OREF0_R
if [[ ! -z "$ttyport" ]]; then
echo -n " --tty=$ttyport" | tee -a $OREF0_RUNAGAIN
fi
if [[ ! -z "$pumpmodel" ]]; then
echo -n " --pumpmodel=$pumpmodel" | tee -a $OREF0_RUNAGAIN;
fi
echo -n " --max_iob=$max_iob" | tee -a $OREF0_RUNAGAIN;
if [[ ! -z "$max_daily_safety_multiplier" ]]; then
echo -n " --max_daily_safety_multiplier=$max_daily_safety_multiplier" | tee -a $OREF0_RUNAGAIN
Expand Down Expand Up @@ -1166,13 +1149,6 @@ if prompt_yn "" N; then
sudo update-locale
fi

#Setup files for editing on the x12, and replace get-settings alias
if [[ ${pumpmodel,,} =~ "x12" ]]; then
echo "copying settings files for x12 pumps"
cp $HOME/src/oref0/lib/oref0-setup/bg_targets_raw.json $directory/settings/ && cp $HOME/src/oref0/lib/oref0-setup/basal_profile.json $directory/settings/ && cp $HOME/src/oref0/lib/oref0-setup/settings.json $directory/settings/ || die "Could not copy settings files for x12 pumps"
fi

#Moved this out of the conditional, so that x12 models will work with smb loops
sudo apt-get -y install bc jq ntpdate bash-completion || die "Couldn't install bc etc."
cd $directory || die "Can't cd $directory"
do_openaps_import $HOME/src/oref0/lib/oref0-setup/supermicrobolus.json
Expand Down Expand Up @@ -1413,21 +1389,6 @@ if prompt_yn "" N; then
echo "To pair your G4 Share receiver, open its Settings, select Share, Forget Device (if previously paired), then turn sharing On"
fi

if [[ ${pumpmodel,,} =~ "x12" ]]; then
echo
echo To complete your x12 pump setup, you must edit your basal_profile.json,
echo and may want to edit your settings.json and bg_targets_raw.json as well.
read -p "Press enter to begin editing basal_profile.json, and then press Ctrl-X when done."
nano $directory/settings/basal_profile.json
read -p "Press enter to begin editing settings.json, and then press Ctrl-X when done."
nano $directory/settings/settings.json
read -p "Press enter to begin editing bg_targets_raw.json, and then press Ctrl-X when done."
nano $directory/settings/bg_targets_raw.json
echo To edit your basal_profile.json again in the future, run: nano $directory/settings/basal_profile.json
echo To edit your settings.json to set maxBasal or DIA, run: nano $directory/settings/settings.json
echo To edit your bg_targets_raw.json to set targets, run: nano $directory/settings/bg_targets_raw.json
fi

fi # from 'read -p "Continue? y/[N] " -r' after interactive setup is complete

# Start cron back up in case the user doesn't decide to reboot
Expand Down