Merge remote-tracking branch 'refs/remotes/openaps/dev' into 201705_fixes

Author: PieterGit

bin/oref0-determine-basal.js

@@ -102,6 +102,24 @@ if (!module.parent) {
         return console.error("Could not parse input data: ", e);
     }
 
+    //attempting to provide a check for autotune
+    //if autotune directory does not exist, SMB/oref1 should not be able to run
+
+    // console.error("Printing this so you know it's getting to the check for autotune.")
+
+    //printing microbolus before attempting check
+    console.error("Microbolus var is currently set to: ",params['microbolus']);
+
+    if (params['microbolus']) {
+        if (fs.existsSync("autotune")) {
+            console.error("Autotune exists! Hoorah! You can use microbolus-related features.")
+        } else {
+            console.error("Warning: Autotune has not been run. All microboluses will be disabled until you manually run autotune or add it to run nightly in your loop.");
+            params['microbolus'] = false;
+            console.error("Microbolus var is currently set to: ",params['microbolus']);
+        }
+    }
+	
     //console.log(carbratio_data);
     var meal_data = { };
     //console.error("meal_input",meal_input);

bin/oref0-setup.sh

@@ -861,10 +861,11 @@ if [[ $REPLY =~ ^[Yy]$ ]]; then
         echo Resetting spi_serial
         reset_spi_serial.py
     fi
-    echo Attempting to communicate with pump:
-    ( killall -g openaps; killall -g oref0-pump-loop ) 2>/dev/null
-    openaps mmtune
-    echo
+# Commenting out the mmtune as attempt to stop the radio reboot errors that happen when re-setting up. 
+#    echo Attempting to communicate with pump:
+#    ( killall -g openaps; killall -g oref0-pump-loop ) 2>/dev/null
+#    openaps mmtune
+#    echo
 
     read -p "Schedule openaps in cron? y/[N] " -r
     if [[ $REPLY =~ ^[Yy]$ ]]; then