restore ww pumps for 0.7.0-dev #1176
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,7 +18,7 @@ source $(dirname $0)/oref0-bash-common-functions.sh || (echo "ERROR: Failed to r | |
|
|
||
| # TODO: deprecate g4-upload and g4-local-only | ||
| usage "$@" <<EOT | ||
| Usage: $self <--dir=directory> <--serial=pump_serial_#> [--tty=/dev/ttySOMETHING] [--max_iob=0] [--ns-host=https://mynightscout.herokuapp.com] [--api-secret=[myplaintextapisecret|token=subjectname-plaintexthashsecret] [--cgm=(G4-upload|G4-local-only|G4-go|G5|MDT|xdrip|xdrip-js)] [--bleserial=SM123456] [--blemac=FE:DC:BA:98:76:54] [--dexcom_tx_sn=12A34B] [--btmac=AB:CD:EF:01:23:45] [--enable='autotune'] [--radio_locale=(WW|US)] | ||
| EOT | ||
|
|
||
| # defaults | ||
|
|
@@ -104,9 +104,6 @@ case $i in | |
| -p=*|--btpeb=*) | ||
| BT_PEB="${i#*=}" | ||
| ;; | ||
| -pt=*|--pushover_token=*) | ||
| PUSHOVER_TOKEN="${i#*=}" | ||
| ;; | ||
|
|
@@ -284,7 +281,11 @@ function copy_go_binaries () { | |
|
|
||
| function move_mmtune () { | ||
| request_stop_local_binary Go-mmtune | ||
| if [ -f /usr/local/bin/mmtune ]; then | ||
| mv /usr/local/bin/mmtune /usr/local/bin/Go-mmtune || die "Couldn't move mmtune to Go-mmtune" | ||
| else | ||
| die "Couldn't move_mmtune() because /usr/local/bin/mmtune exists" | ||
| fi | ||
| } | ||
|
|
||
|
|
||
|
|
@@ -376,7 +377,7 @@ if [[ -z "$DIR" || -z "$serial" ]]; then | |
| fi | ||
| read -p "Would you like to [D]ownload released precompiled Go pump communication library or install an [U]nofficial (possibly untested) version.[D]/U " -r | ||
| if [[ $REPLY =~ ^[Uu]$ ]]; then | ||
| read -p "You could either build the Medtronic library from [S]ource, or type the version tag you would like to use, example 'v2019.01.21' [S]/<version> " -r | ||
| if [[ $REPLY =~ ^[Ss]$ ]]; then | ||
| buildgofromsource=true | ||
| echo "Building Go pump binaries from source" | ||
|
|
@@ -395,7 +396,7 @@ if [[ -z "$DIR" || -z "$serial" ]]; then | |
| ecc1medtronicversion="tags/$REPLY" | ||
| echo "Will use https://github.com/ecc1/medtronic/releases/$REPLY." | ||
|
|
||
| read -p "Also enter the ecc1/dexcom version, example 'v2018.12.05' <version> " -r | ||
| ecc1dexcomversion="tags/$REPLY" | ||
| echo "Will use https://github.com/ecc1/dexcom/$REPLY if Go-dexcom is needed." | ||
| fi | ||
|
|
@@ -420,20 +421,6 @@ if [[ -z "$DIR" || -z "$serial" ]]; then | |
| # Force uppercase, just in case the user entered ww | ||
| radio_locale=${radio_locale^^} | ||
|
|
||
| if [[ -z "${radio_locale}" ]]; then | ||
| radio_locale='US' | ||
| fi | ||
|
|
@@ -533,12 +520,6 @@ if [[ -z "$DIR" || -z "$serial" ]]; then | |
| echo | ||
| echo | ||
|
|
||
| fi | ||
|
|
||
| echo -n "Setting up oref0 in $directory for pump $serial with $CGM CGM, " | ||
|
|
@@ -617,9 +598,6 @@ fi | |
| if [[ ! -z "$radio_locale" ]]; then | ||
| echo -n " --radio_locale='$radio_locale'" | tee -a $OREF0_RUNAGAIN | ||
| fi | ||
| if [[ ! -z "$BLE_MAC" ]]; then | ||
| echo -n " --blemac='$BLE_MAC'" | tee -a $OREF0_RUNAGAIN | ||
| fi | ||
|
|
@@ -741,7 +719,7 @@ if prompt_yn "" N; then | |
| preferences_from_args+="\"min_5m_carbimpact\":$min_5m_carbimpact " | ||
| fi | ||
| function join_by { local IFS="$1"; shift; echo "$*"; } | ||
| # merge existing preferences with preferences from arguments. (preferences from arguments take precedence) | ||
| echo "{ $(join_by , ${preferences_from_args[@]}) }" > arg_prefs.json | ||
| if [[ -s preferences.json ]]; then | ||
| cat arg_prefs.json | jq --slurpfile existing_prefs preferences.json '$existing_prefs[0] + .' > updated_prefs.json && rm arg_prefs.json | ||
|
|
@@ -758,6 +736,8 @@ if prompt_yn "" N; then | |
| set_pref_string .enable "$ENABLE" | ||
| set_pref_string .ttyport "$ttyport" | ||
| set_pref_string .myopenaps_path "$directory" | ||
| set_pref_string .pump_serial "$serial" | ||
| set_pref_string .radio_locale "$radio_locale" | ||
| if [[ ! -z "$BT_PEB" ]]; then | ||
| set_pref_string .bt_peb "$BT_PEB" | ||
| fi | ||
|
|
@@ -998,15 +978,6 @@ if prompt_yn "" N; then | |
| fi | ||
| fi | ||
|
|
||
| echo Checking kernel for mraa installation | ||
| #if uname -r 2>&1 | egrep "^4.1[0-9]"; then # don't install mraa on 4.10+ kernels | ||
| # echo "Skipping mraa install for kernel 4.10+" | ||
|
|
@@ -1040,39 +1011,37 @@ if prompt_yn "" N; then | |
| #echo Installing latest openaps dev && sudo pip install --default-timeout=1000 git+https://github.com/openaps/openaps.git@dev || die "Couldn't install openaps" | ||
| #fi | ||
|
|
||
| # Create pump device | ||
| # We only need the openaps pump device for mdt CGM and mmeowlink users, which Go doesn't support yet | ||
| if [[ ${CGM,,} =~ "mdt" ]]; then | ||
| cd $directory || die "Can't cd $directory" | ||
| echo "Removing any existing pump device:" | ||
| ( killall -g openaps; killall -g oref0-pump-loop) 2>/dev/null; openaps device remove pump 2>/dev/null | ||
| if [[ -z "$ttyport" ]]; then | ||
| openaps device add pump medtronic $serial || die "Can't add pump" | ||
| # add carelink to pump.ini. TODO: check if this workaround can be removed | ||
| grep -q radio_type pump.ini || echo "radio_type=carelink" >> pump.ini | ||
| # carelinks can't listen for silence or mmtune, so just do a preflight check instead | ||
| openaps alias add wait-for-silence 'report invoke monitor/temp_basal.json' | ||
| openaps alias add wait-for-long-silence 'report invoke monitor/temp_basal.json' | ||
| openaps alias add mmtune 'report invoke monitor/temp_basal.json' | ||
| fi | ||
| elif [[ "$ttyport" =~ "mmeowlink" ]]; then # e.g. for TI USB | ||
| # radio_locale requires openaps 0.2.0-dev or later | ||
| openaps device add pump mmeowlink subg_rfspy $ttyport $serial $radio_locale || die "Can't add pump" | ||
| #openaps alias add wait-for-silence '! bash -c "(mmeowlink-any-pump-comms.py --port '$ttyport' --wait-for 1 | grep -q comms && echo -n Radio ok, || openaps mmtune) && echo -n \" Listening: \"; for i in $(seq 1 100); do echo -n .; mmeowlink-any-pump-comms.py --port '$ttyport' --wait-for 30 2>/dev/null | egrep -v subg | egrep No && break; done"' | ||
| #openaps alias add wait-for-long-silence '! bash -c "echo -n \"Listening: \"; for i in $(seq 1 200); do echo -n .; mmeowlink-any-pump-comms.py --port '$ttyport' --wait-for 45 2>/dev/null | egrep -v subg | egrep No && break; done"' | ||
| # TODO: check in codebase if https://github.com/ps2/subg_rfspy/tree/master/tools python scripts are still used | ||
| if [[ ${radio_locale,,} =~ "ww" ]]; then | ||
| if [ -d "$HOME/src/subg_rfspy/" ]; then | ||
| echo "$HOME/src/subg_rfspy/ already exists; pulling latest" | ||
| (cd $HOME/src/subg_rfspy && git fetch && git pull) || die "Couldn't pull latest subg_rfspy" | ||
| else | ||
| echo -n "Cloning subg_rfspy: " | ||
| (cd $HOME/src && git clone https://github.com/ps2/subg_rfspy) || die "Couldn't clone oref0" | ||
| fi | ||
| fi | ||
| else # in all other case create a pump.ini with serial and radio_locale. TODO: can we skip creating a pump.ini. I can't find references of it's being used | ||
|
Contributor
There was a problem hiding this comment. I think that xdrip-js uses
Contributor
Author
There was a problem hiding this comment. i don't want to suggest to remove it now. As far as I can see I removed all the references to the pump.ini from the oref0 code base. I hope @efidoman @jpcunningh @thebookins can say if their software somehow uses pump.ini. I just checked Lookout, but can't find any reference: https://github.com/xdrip-js/Lookout/search?q=pump.ini&unscoped_q=pump.ini
Contributor
There was a problem hiding this comment. The only use might be for |
||
| echo '[device "pump"]' > pump.ini | ||
| echo "serial = $serial" >> pump.ini | ||
| echo "radio_locale = $radio_locale" >> pump.ini | ||
|
|
@@ -1285,13 +1254,9 @@ if prompt_yn "" N; then | |
| mkdir -p $HOME/go | ||
| source $HOME/.bash_profile | ||
|
|
||
| #Necessary to "bootstrap" Go commands... | ||
| if [[ ${radio_locale,,} =~ "ww" ]]; then | ||
| echo 868.4 > $directory/monitor/medtronic_frequency.ini | ||
| else | ||
| echo 916.55 > $directory/monitor/medtronic_frequency.ini | ||
| fi | ||
|
|
@@ -1347,16 +1312,6 @@ if prompt_yn "" N; then | |
| move_mmtune | ||
| fi | ||
|
|
||
| # clear any extraneous input before prompting | ||
| while(read -r -t 0.1); do true; done | ||
|
|
||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.