Merge branch 'dev' into offline-xdrip

Conflicts:
	bin/oref0-setup.sh

Author: scottleibrand

bin/oref0-bluetoothup.sh

@@ -23,24 +23,37 @@ if [ "$DEBUG" != "" ]; then
 fi
 
 # start bluetoothd if bluetoothd is not running
+# Added a bunch of if is_debian_jessie checks as stretch seems to behave better here.
+
 if ! ( ps -fC bluetoothd >/dev/null ) ; then
-   echo bluetoothd not running! Starting bluetoothd...
-   sudo $EXECUTABLE 2>&1 | tee -a /var/log/openaps/bluetoothd.log &
+   if is_debian_jessie ; then
+      echo bluetoothd not running! Starting bluetoothd.
+      sudo $EXECUTABLE 2>&1 | tee -a /var/log/openaps/bluetoothd.log &
+   else
+      echo bluetoothd not running! Starting bluetoothd via systemctl.
+      sudo systemctl bluetooth start
+   fi
 fi
 
 if is_edison && ! ( hciconfig -a hci${adapter} | grep -q "PSCAN" ) ; then
-   echo Bluetooth PSCAN not enabled! Restarting bluetoothd...
-   sudo killall bluetoothd
-   sudo $EXECUTABLE 2>&1 | tee -a /var/log/openaps/bluetoothd.log &
+   if is_debian_jessie ; then
+      echo Bluetooth PSCAN not enabled! Restarting bluetoothd...
+      sudo killall bluetoothd 
+      sudo $EXECUTABLE 2>&1 | tee -a /var/log/openaps/bluetoothd.log &
+   else
+      echo Bluetooth PSCAN not enabled! Restarting bluetoothd via systemctl...
+      sudo systemctl bluetooth restart
+   fi
 fi
 
 if ( hciconfig -a hci${adapter} | grep -q "DOWN" ) ; then
+   # Not sure that this is needed on Stretch, add an is_debian_jessie check here if something different required.
    echo Bluetooth hci DOWN! Bringing it to UP.
    sudo hciconfig hci${adapter} up
-   sudo $EXECUTABLE 2>&1 | tee -a /var/log/openaps/bluetoothd.log &
-fi
+ fi
 
 if !( hciconfig -a hci${adapter} | grep -q $HOSTNAME ) ; then
-   echo Bluetooth hci name does not match hostname: $HOSTNAME. Setting bluetooth hci name.
-   sudo hciconfig hci${adapter} name $HOSTNAME
+      # Not sure that this is needed on Stretch, add an is_debian_jessie check here if something different required.
+      echo Bluetooth hci name does not match hostname: $HOSTNAME. Setting bluetooth hci name.
+      sudo hciconfig hci${adapter} name $HOSTNAME
 fi

bin/oref0-pump-loop.sh

@@ -88,6 +88,7 @@ main() {
             echo Completed oref0-pump-loop at $(date)
             update_display
             run_plugins
+            update_bgproxy
             echo
         else
             # pump-loop errored out for some reason
@@ -112,6 +113,16 @@ function run_script() {
 }
 
 
+function update_bgproxy {
+    if [ "$(get_pref_string .enableEnliteBgproxy '')" == "true" ]; then
+        echo Calling Bgproxy
+        jq 'map({sgv:.sgv, date:.date, dateString:.dateString})' monitor/glucose.json  > monitor/bgproxydata.json
+        bgproxy -f monitor/bgproxydata.json
+        echo Bgproxy completed
+    fi
+
+}
+
 function run_plugins {
         once=plugins/once
         every=plugins/every

bin/oref0-setup.sh

@@ -858,6 +858,10 @@ if prompt_yn "" N; then
         mv -f /etc/cron.daily/logrotate /etc/cron.hourly/logrotate
     fi
 
+    if ! grep -qa "kernel.panic" /etc/sysctl.conf ; then
+      echo -e "# reboot rig 3 seconds after a kernel panic\nkernel.panic = 3" >> /etc/sysctl.conf
+    fi
+
     # configure ns
     if [[ ! -z "$NIGHTSCOUT_HOST" && ! -z "$API_SECRET" ]]; then
         echo "Removing any existing ns device: "
@@ -1118,6 +1122,7 @@ if prompt_yn "" N; then
     #fi
 
     sudo pip install --default-timeout=1000 flask flask-restful  || die "Can't add xdrip cgm - error installing flask packages"
+    sudo pip install --default-timeout=1000 -U flask-cors
 
     # xdrip CGM (xDripAPS), also gets installed when using xdrip-js
     if [[ ${CGM,,} =~ "xdrip" || ${CGM,,} =~ "xdrip-js" ]]; then
@@ -1133,7 +1138,8 @@ if prompt_yn "" N; then
     if [[ ${CGM,,} =~ "xdrip-js" ]]; then
         echo xdrip-js selected as CGM, so configuring xdrip-js
         git clone https://github.com/xdrip-js/Logger.git $HOME/src/Logger
-        cd $HOME/src/Logger
+        cd $HOME/src/Logger            
+	sudo apt-get install -y bluez-tools
         sudo npm run global-install
         touch /tmp/reboot-required
     fi
@@ -1273,14 +1279,17 @@ if prompt_yn "" N; then
     # Install Golang
     mkdir -p $HOME/go
     source $HOME/.bash_profile
-    if go version | grep go1.11.; then
+    golangversion=1.12.5
+    if go version | grep go${golangversion}.; then
         echo Go already installed
     else
+        echo "Removing possible old go install..."
+        rm -rf /usr/local/go/*
         echo "Installing Golang..."
         if uname -m | grep armv; then
-            cd /tmp && wget -c https://storage.googleapis.com/golang/go1.11.linux-armv6l.tar.gz && tar -C /usr/local -xzvf /tmp/go1.11.linux-armv6l.tar.gz
+            cd /tmp && wget -c https://storage.googleapis.com/golang/go${golangversion}.linux-armv6l.tar.gz && tar -C /usr/local -xzvf /tmp/go${golangversion}.linux-armv6l.tar.gz
         elif uname -m | grep i686; then
-            cd /tmp && wget -c https://dl.google.com/go/go1.11.linux-386.tar.gz && tar -C /usr/local -xzvf /tmp/go1.11.linux-386.tar.gz
+            cd /tmp && wget -c https://dl.google.com/go/go${golangversion}.linux-386.tar.gz && tar -C /usr/local -xzvf /tmp/go${golangversion}.linux-386.tar.gz
         fi
     fi
     if ! grep GOROOT $HOME/.bash_profile; then

lib/autotune/index.js

@@ -100,7 +100,7 @@ function tuneAllTheThings (inputs) {
 
     // tune insulinPeakTime
     var newPeak = peak;
-    if (peakDeviations) {
+    if (peakDeviations && peakDeviations[2]) {
         var currentPeakMeanDev = peakDeviations[2].meanDeviation;
         var currentPeakRMSDev = peakDeviations[2].RMSDeviation;
         //console.error(currentPeakMeanDev);

lib/determine-basal/determine-basal.js

@@ -78,21 +78,21 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
     }
     if (minAgo > 12 || minAgo < -5) { // Dexcom data is too old, or way in the future
         rT.reason = "If current system time "+systemTime+" is correct, then BG data is too old. The last BG data was read "+minAgo+"m ago at "+bgTime;
-    // if BG is too old/noisy, or is completely unchanging, cancel any high temps and shorten any long zero temps
-  } else if ( glucose_status.short_avgdelta === 0 && glucose_status.long_avgdelta === 0 ) {
+    // if BG is too old/noisy, or is changing less than 1 mg/dL/5m for 45m, cancel any high temps and shorten any long zero temps
+    } else if ( bg > 60 && glucose_status == 0 && glucose_status.short_avgdelta > -1 && glucose_status.short_avgdelta < 1 && glucose_status.long_avgdelta > -1 && glucose_status.long_avgdelta < 1 ) {
         if ( glucose_status.last_cal && glucose_status.last_cal < 3 ) {
             rT.reason = "CGM was just calibrated";
         } else {
             rT.reason = "Error: CGM data is unchanged for the past ~45m";
         }
     }
-    if (bg <= 10 || bg === 38 || noise >= 3 || minAgo > 12 || minAgo < -5 || ( glucose_status.short_avgdelta === 0 && glucose_status.long_avgdelta === 0 ) ) {
-        if (currenttemp.rate >= basal) { // high temp is running
-            rT.reason += ". Canceling high temp basal of "+currenttemp.rate;
+    if (bg <= 10 || bg === 38 || noise >= 3 || minAgo > 12 || minAgo < -5 || ( bg > 60 && glucose_status == 0 && glucose_status.short_avgdelta > -1 && glucose_status.short_avgdelta < 1 && glucose_status.long_avgdelta > -1 && glucose_status.long_avgdelta < 1 ) ) {
+        if (currenttemp.rate > basal) { // high temp is running
+            rT.reason += ". Replacing high temp basal of "+currenttemp.rate+" with neutral temp of "+basal;
             rT.deliverAt = deliverAt;
             rT.temp = 'absolute';
-            rT.duration = 0;
-            rT.rate = 0;
+            rT.duration = 30;
+            rT.rate = basal;
             return rT;
             //return tempBasalFunctions.setTempBasal(basal, 30, profile, rT, currenttemp);
         } else if ( currenttemp.rate === 0 && currenttemp.duration > 30 ) { //shorten long zero temps to 30m

lib/profile/index.js

@@ -62,6 +62,9 @@ function defaults ( ) {
     , offline_hotspot: false // enabled an offline-only local wifi hotspot if no Internet available
     , noisyCGMTargetMultiplier: 1.3 // increase target by this amount when looping off raw/noisy CGM data
     , suspend_zeros_iob: true // recognize pump suspends as non insulin delivery events
+    // send the glucose data to the pump emulating an enlite sensor. This allows to setup high / low warnings when offline and see trend.
+    // To enable this feature, enable the sensor, set a sensor with id 0000000, go to start sensor and press find lost sensor.
+    , enableEnliteBgproxy: false
     // TODO: make maxRaw a preference here usable by oref0-raw in myopenaps-cgm-loop
     //, maxRaw: 200 // highest raw/noisy CGM value considered safe to use for looping
   };

lib/profile/targets.js

@@ -47,6 +47,9 @@ function lookup (inputs, profile) {
             //console.error(temptargets_data[i]);
             tempTargets = bgTargets;
             break;
+        } else if (! temptargets_data[i].targetBottom || ! temptargets_data[i].targetTop) {
+            console.error("eventualBG target range invalid: " + temptargets_data[i].targetBottom + "-" + temptargets_data[i].targetTop);
+            break;
         } else if (now >= start && now < expires ) {
             //console.error(temptargets_data[i]);
             tempTargets.high = temptargets_data[i].targetTop;

tests/determine-basal.test.js

@@ -78,7 +78,7 @@ describe('determine-basal', function ( ) {
    //function determine_basal(glucose_status, currenttemp, iob_data, profile)
 
     // standard initial conditions for all determine-basal test cases unless overridden
-    var glucose_status = {"delta":0,"glucose":115,"long_avgdelta":0.1,"short_avgdelta":0};
+    var glucose_status = {"delta":0,"glucose":115,"long_avgdelta":1.1,"short_avgdelta":0};
     var currenttemp = {"duration":0,"rate":0,"temp":"absolute"};
     var iob_data = {"iob":0,"activity":0,"bolussnooze":0};
     var autosens = {"ratio":1.0};
@@ -126,7 +126,7 @@ describe('determine-basal', function ( ) {
     it('should do nothing when low and rising w/o IOB', function () {
         var glucose_status = {"delta":6,"glucose":75,"long_avgdelta":6,"short_avgdelta":6};
         var output = determine_basal(glucose_status, currenttemp, iob_data, profile, autosens, meal_data, tempBasalFunctions);
-        console.log(output);
+        //console.log(output);
         output.rate.should.equal(0.9);
         output.duration.should.equal(30);
         //output.reason.should.match(/75<80.*setting current basal/);
@@ -248,27 +248,30 @@ describe('determine-basal', function ( ) {
     });
 
     it('should temp to 0 when LOW w/ positive IOB', function () {
-        var glucose_status = {"delta":0,"glucose":39,"long_avgdelta":0.1,"short_avgdelta":0};
+        var glucose_status = {"delta":0,"glucose":39,"long_avgdelta":-1.1,"short_avgdelta":0};
         var iob_data = {"iob":1,"activity":0.01,"bolussnooze":0.5};
         var output = determine_basal(glucose_status, currenttemp, iob_data, profile, autosens, meal_data, tempBasalFunctions);
+        //console.log(output);
         output.rate.should.equal(0);
         output.duration.should.be.above(29);
         //output.reason.should.match(/BG 39<80/);
     });
 
     it('should low temp when LOW w/ negative IOB', function () {
-        var glucose_status = {"delta":0,"glucose":39,"long_avgdelta":0.1,"short_avgdelta":0};
+        var glucose_status = {"delta":0,"glucose":39,"long_avgdelta":-1.1,"short_avgdelta":0};
         var iob_data = {"iob":-2.5,"activity":-0.03,"bolussnooze":0};
         var output = determine_basal(glucose_status, currenttemp, iob_data, profile, autosens, meal_data, tempBasalFunctions);
+        //console.log(output);
         output.rate.should.be.below(0.8);
         output.duration.should.be.above(29);
         //output.reason.should.match(/BG 39<80/);
     });
 
     it('should temp to 0 when LOW w/ no IOB', function () {
-        var glucose_status = {"delta":0,"glucose":39,"long_avgdelta":0.1,"short_avgdelta":0};
+        var glucose_status = {"delta":0,"glucose":39,"long_avgdelta":-1.1,"short_avgdelta":0};
         var iob_data = {"iob":0,"activity":0,"bolussnooze":0};
         var output = determine_basal(glucose_status, currenttemp, iob_data, profile, autosens, meal_data, tempBasalFunctions);
+        //console.log(output);
         output.rate.should.equal(0);
         output.duration.should.be.above(29);
         //output.reason.should.match(/BG 39<80/);
@@ -476,7 +479,7 @@ describe('determine-basal', function ( ) {
         var output = determine_basal({glucose:10},currenttemp, iob_data, profile, autosens, meal_data, tempBasalFunctions);
         //console.log(output);
         output.rate.should.be.below(1);
-        output.reason.should.match(/Canceling high temp/);
+        output.reason.should.match(/Replacing high temp/);
     });
 
     it('profile should contain min_bg,max_bg', function () {
@@ -725,6 +728,7 @@ describe('determine-basal', function ( ) {
         profile.current_basal = 0.825;
         profile.model = "523";
         var output = determine_basal(glucose_status, currenttemp, iob_data, profile, autosens, meal_data, tempBasalFunctions);
+        //console.log(output);
         //output.rate.should.equal(0);
         //output.duration.should.equal(0);
         output.rate.should.equal(0.825);
@@ -738,6 +742,7 @@ describe('determine-basal', function ( ) {
         profile.current_basal = 0.875;
         profile.model = "522";
         var output = determine_basal(glucose_status, currenttemp, iob_data, profile, autosens, meal_data, tempBasalFunctions);
+        //console.log(output);
         //output.rate.should.equal(0);
         //output.duration.should.equal(0);
         output.rate.should.equal(0.9);