From 6b55c1b862da456259442b62a278a83eab085195 Mon Sep 17 00:00:00 2001 From: PieterGit Date: Sun, 8 Jan 2017 23:48:33 +0100 Subject: [PATCH 1/4] fix blocker bug for ww pumps and for dex usb --- bin/oref0-setup.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/oref0-setup.sh b/bin/oref0-setup.sh index 47cd4efa..57a17533 100755 --- a/bin/oref0-setup.sh +++ b/bin/oref0-setup.sh @@ -452,7 +452,7 @@ else 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"' - if [[ ${radio_locale,,} =~ "WW" ]]; then + if [[ "$radio_locale" =~ "WW" ]]; then # add subg-ww-radio-parameters script to mmtune for WW pump. See https://github.com/oskarpearson/mmeowlink/issues/51 or https://github.com/oskarpearson/mmeowlink/wiki/Non-USA-pump-settings for details sed -i"" 's/^\(mmtune.*\); \(echo -n .*mmtune:\)/\1; echo -n subg-ww-radio-parameters:; \/usr\/local\/bin\/oref0-subg-ww-radio-parameters-timeout; \2/g' openaps.ini @@ -565,7 +565,7 @@ if [[ $REPLY =~ ^[Yy]$ ]]; then (crontab -l; crontab -l | grep -q "cd $directory && ps aux | grep -v grep | grep -q 'openaps monitor-xdrip'" || echo "* * * * * cd $directory && ps aux | grep -v grep | grep -q 'openaps monitor-xdrip' || ( date; openaps monitor-xdrip) | tee -a /var/log/openaps/xdrip-loop.log; cp -up $directory/xdrip/glucose.json $directory/monitor/glucose.json") | crontab - (crontab -l; crontab -l | grep -q "xDripAPS.py" || echo "@reboot python $HOME/.xDripAPS/xDripAPS.py") | crontab - elif [[ $ENABLE =~ dexusb ]]; then - (crontab -l; crontab -l | grep -q "@reboot .*dexusb-cgm" || echo "@reboot /usr/bin/python -u /usr/local/bin/oref0-dexusb-cgm-loop >> /var/log/openaps/cgm-dexusb-loop.log 2>&1" ) | crontab - + (crontab -l; crontab -l | grep -q "@reboot .*dexusb-cgm" || echo "@reboot cd $directory && /usr/bin/python -u /usr/local/bin/oref0-dexusb-cgm-loop >> /var/log/openaps/cgm-dexusb-loop.log 2>&1" ) | crontab - elif ! [[ ${CGM,,} =~ "mdt" ]]; then # use nightscout for cgm (crontab -l; crontab -l | grep -q "cd $directory && ps aux | grep -v grep | grep -q 'openaps get-bg'" || echo "* * * * * cd $directory && ps aux | grep -v grep | grep -q 'openaps get-bg' || ( date; openaps get-bg ; cat cgm/glucose.json | json -a sgv dateString | head -1 ) | tee -a /var/log/openaps/cgm-loop.log") | crontab - fi From 60c48a17540a6cc1ef0e15e88746e1c0f61d4361 Mon Sep 17 00:00:00 2001 From: PieterGit Date: Mon, 9 Jan 2017 00:04:53 +0100 Subject: [PATCH 2/4] additional upcasing for radio_locale for cli --- bin/oref0-setup.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/oref0-setup.sh b/bin/oref0-setup.sh index 57a17533..98ab5df3 100755 --- a/bin/oref0-setup.sh +++ b/bin/oref0-setup.sh @@ -42,7 +42,8 @@ case $i in shift # past argument=value ;; -rl=*|--radio_locale=*) - radio_locale="${i#*=}" + # Force uppercase, just in case the user entered ww + radio_locale="${i#*=^^}" shift # past argument=value ;; -t=*|--tty=*) From af5c1dceb88c0a02300e0af479778429db6a02f3 Mon Sep 17 00:00:00 2001 From: Scott Leibrand Date: Sun, 8 Jan 2017 16:08:33 -0800 Subject: [PATCH 3/4] Compare lowercase radio_locale to "ww" --- bin/oref0-setup.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/bin/oref0-setup.sh b/bin/oref0-setup.sh index 98ab5df3..747561d1 100755 --- a/bin/oref0-setup.sh +++ b/bin/oref0-setup.sh @@ -42,8 +42,7 @@ case $i in shift # past argument=value ;; -rl=*|--radio_locale=*) - # Force uppercase, just in case the user entered ww - radio_locale="${i#*=^^}" + radio_locale="${i#*=}" shift # past argument=value ;; -t=*|--tty=*) @@ -453,7 +452,7 @@ else 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"' - if [[ "$radio_locale" =~ "WW" ]]; then + if [[ "${radio_locale,,}" =~ "ww" ]]; then # add subg-ww-radio-parameters script to mmtune for WW pump. See https://github.com/oskarpearson/mmeowlink/issues/51 or https://github.com/oskarpearson/mmeowlink/wiki/Non-USA-pump-settings for details sed -i"" 's/^\(mmtune.*\); \(echo -n .*mmtune:\)/\1; echo -n subg-ww-radio-parameters:; \/usr\/local\/bin\/oref0-subg-ww-radio-parameters-timeout; \2/g' openaps.ini From fc293cc99fadcd6bf52d03cea320b270f59e6465 Mon Sep 17 00:00:00 2001 From: Scott Leibrand Date: Sun, 8 Jan 2017 16:10:57 -0800 Subject: [PATCH 4/4] Don't need quotes --- bin/oref0-setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/oref0-setup.sh b/bin/oref0-setup.sh index 747561d1..119e83cc 100755 --- a/bin/oref0-setup.sh +++ b/bin/oref0-setup.sh @@ -452,7 +452,7 @@ else 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"' - if [[ "${radio_locale,,}" =~ "ww" ]]; then + if [[ ${radio_locale,,} =~ "ww" ]]; then # add subg-ww-radio-parameters script to mmtune for WW pump. See https://github.com/oskarpearson/mmeowlink/issues/51 or https://github.com/oskarpearson/mmeowlink/wiki/Non-USA-pump-settings for details sed -i"" 's/^\(mmtune.*\); \(echo -n .*mmtune:\)/\1; echo -n subg-ww-radio-parameters:; \/usr\/local\/bin\/oref0-subg-ww-radio-parameters-timeout; \2/g' openaps.ini