Dev

bin/glucose-stats.awk

@@ -0,0 +1,18 @@
+BEGIN {
+    min=1000
+    if (!min_bg) { min_bg=70 }
+    if (!max_bg) { max_bg=180 }
+}
+{ sum+=$1; count++; squares+=$1^2; }
+($1 < 39) { next }
+($1 < min) { min=$1 }
+($1 > max) { max=$1 }
+($1 <= max_bg && $1 >= min_bg) { inrange++ }
+($1 > max_bg) { high++ }
+($1 < min_bg) { low++ }
+END { # print "Count: " count;
+    printf "Count %.0f / Min %.0f / Max %.0f / Average %.1f / StdDev %.1f / ", count, min, max, sum/count, sqrt(squares/count-(sum/count)^2)
+    #printf "%%TIR / low / high (%.0f-%.0f): ", min_bg, max_bg
+    printf "%.1f%% TIR / %.1f%% low / %.1f%% high (%.0f-%.0f)\n", inrange/(high+inrange+low)*100, low/(high+inrange+low)*100, high/(high+inrange+low)*100, min_bg, max_bg
+    printf "%.0f,%.1f,%.1f,%.1f,%.1f", count, sum/count, low/(high+inrange+low)*100, high/(high+inrange+low)*100, sqrt(squares/count-(sum/count)^2)
+}

bin/mm-format-ns-treatments.sh

@@ -18,7 +18,8 @@ EOT
 # | json -e "this.type = 'mm://openaps/$self'" \
 model=$(jq -r . $MODEL)
 
-oref0-normalize-temps $HISTORY \
+
+run_remote_command "oref0-normalize-temps $HISTORY" \
   | jq '[ .[]
     | .medtronic = ( [ "mm://openaps/'$self'/", ( . | if ._type then ._type else .eventType end ) ] | join("") )
     | .created_at = if .created_at then .created_at else .timestamp end

bin/nightscout.sh

@@ -237,7 +237,7 @@ ns)
         |  openaps use ${ZONE} select --date dateString --current now --gaps - ${FILE}  | jq .
     ;;
     latest-entries-time)
-      PREVIOUS_TIME=$(ns-get host $NIGHTSCOUT_HOST entries.json 'find[type]=sgv'  | jq .[0])
+      PREVIOUS_TIME=$(ns-get host $NIGHTSCOUT_HOST entries.json 'find[type][$eq]=sgv'  | jq .[0])
       test -z "${PREVIOUS_TIME}" && echo -n 0 || echo $PREVIOUS_TIME | jq .dateString
       exit 0
     ;;

bin/ns-status.js

@@ -2,10 +2,12 @@
 'use strict';
 
 var os = require("os");
+var fs = require('fs');
+var moment = require("moment");
 
 var requireUtils = require('../lib/require-utils');
-var safeRequire = requireUtils.safeRequire;
 var requireWithTimestamp = requireUtils.requireWithTimestamp;
+var safeLoadFile = requireUtils.safeLoadFile;
 
 /*
   Prepare Status info to for upload to Nightscout
@@ -23,7 +25,7 @@ var requireWithTimestamp = requireUtils.requireWithTimestamp;
 
 */
 
-function mmtuneStatus (status) {
+function mmtuneStatus (status, cwd, mmtune_input) {
     var mmtune = requireWithTimestamp(cwd + mmtune_input);
     if (mmtune) {
         if (mmtune.scanDetails && mmtune.scanDetails.length) {
@@ -35,7 +37,7 @@ function mmtuneStatus (status) {
     }
 }
 
-function preferencesStatus (status) {
+function preferencesStatus (status, cwd ,preferences_input) {
     var preferences = requireWithTimestamp(cwd + preferences_input);
     if (preferences) {
       status.preferences = preferences;
@@ -47,8 +49,8 @@ function preferencesStatus (status) {
     }
 }
 
-function uploaderStatus (status) {
-    var uploader = require(cwd + uploader_input);
+function uploaderStatus (status, cwd, uploader_input) {
+    var uploader = JSON.parse(fs.readFileSync(cwd + uploader_input, 'utf8'));
     if (uploader) {
         if (typeof uploader === 'number') {
             status.uploader = {
@@ -60,9 +62,12 @@ function uploaderStatus (status) {
     }
 }
 
-if (!module.parent) {
 
-    var argv = require('yargs')
+
+
+var ns_status = function ns_status(argv_params) {
+
+    var argv = require('yargs')(argv_params)
         .usage("$0 <clock.json> <iob.json> <suggested.json> <enacted.json> <battery.json> <reservoir.json> <status.json> [--uploader uploader.json] [mmtune.json] [--preferences preferences.json]")
         .option('preferences', {
             alias: 'p',
@@ -77,10 +82,16 @@ if (!module.parent) {
             default: false
         })
         .strict(true)
+        .fail(function (msg, err, yargs) {
+            if (err) {
+                return console.error('Error found', err);
+            }
+            return console.error('Parsing of command arguments failed', msg)
+            })
         .help('help');
-
     var params = argv.argv;
     var inputs = params._;
+
     var clock_input = inputs[0];
     var iob_input = inputs[1];
     var suggested_input = inputs[2];
@@ -94,9 +105,11 @@ if (!module.parent) {
 
     if (inputs.length < 7 || inputs.length > 8) {
         argv.showHelp();
-        process.exit(1);
+        return;
     }
 
+    // TODO: For some reason the following line does not work (../package.json ia not found).
+    //var pjson = JSON.parse(fs.readFileSync('../package.json', 'utf8'));
     var pjson = require('../package.json');
 
     var cwd = process.cwd() + '/';
@@ -117,6 +130,7 @@ if (!module.parent) {
         if (iobArray && iobArray.length) {
             iob = iobArray[0];
             iob.timestamp = iob.time;
+            iob.mills = moment(iob.time).valueOf();
             delete iob.time;
         }
 
@@ -129,6 +143,14 @@ if (!module.parent) {
           }
         }
 
+        if (enacted && enacted.timestamp) {
+          enacted.mills = moment(enacted.timestamp).valueOf();
+        }
+
+        if (suggested && suggested.timestamp) {
+          suggested.mills = moment(suggested.timestamp).valueOf();
+        }
+
         var status = {
             device: 'openaps://' + os.hostname(),
             openaps: {
@@ -138,27 +160,41 @@ if (!module.parent) {
                 version: pjson.version
             },
             pump: {
-                clock: safeRequire(cwd + clock_input),
-                battery: safeRequire(cwd + battery_input),
-                reservoir: safeRequire(cwd + reservoir_input),
+                clock: safeLoadFile(cwd + clock_input),
+                battery: safeLoadFile(cwd + battery_input),
+                reservoir: safeLoadFile(cwd + reservoir_input),
                 status: requireWithTimestamp(cwd + status_input)
-            }
+            },
+            created_at: new Date()
         };
 
         if (mmtune_input) {
-            mmtuneStatus(status);
+            mmtuneStatus(status, cwd, mmtune_input);
         }
 
         if (preferences_input) {
-            preferencesStatus(status);
+            preferencesStatus(status, cwd ,preferences_input);
         }
 
         if (uploader_input) {
-            uploaderStatus(status);
+            uploaderStatus(status, cwd, uploader_input);
         }
 
-        console.log(JSON.stringify(status));
+        return JSON.stringify(status);
     } catch (e) {
         return console.error("Could not parse input data: ", e);
     }
 }
+
+if (!module.parent) {
+    // remove the first parameter.
+    var command = process.argv;
+    command.shift();
+    command.shift();
+    var result = ns_status(command);
+    if(result !== undefined) {
+        console.log(result);
+    }
+}
+
+exports = module.exports = ns_status

bin/openaps-install.sh

@@ -42,6 +42,8 @@ if cat /etc/os-release | grep 'PRETTY_NAME="Debian GNU/Linux 8 (jessie)"' &> /de
     echo "Acquire::Check-Valid-Until false;" | tee -a /etc/apt/apt.conf.d/10-nocheckvalid
     # Replace apt sources.list with archive.debian.org locations
     echo -e "deb http://security.debian.org/ jessie/updates main\n#deb-src http://security.debian.org/ jessie/updates main\n\ndeb http://archive.debian.org/debian/ jessie-backports main\n#deb-src http://archive.debian.org/debian/ jessie-backports main\n\ndeb http://archive.debian.org/debian/ jessie main contrib non-free\n#deb-src http://archive.debian.org/debian/ jessie main contrib non-free" > /etc/apt/sources.list
+    echo "Please consider upgrading your rig to Jubilinux 0.3.0 (Debian Stretch)!"
+    echo "Jubilinux 0.2.0, based on Debian Jessie, is no longer receiving security or software updates!"
 fi
 
 #Workaround for Jubilinux to install nodejs/npm from nodesource

bin/openaps-packages.sh

@@ -12,28 +12,35 @@ apt-get install -y sudo
 sudo apt-get update && sudo apt-get -y upgrade
 sudo apt-get install -y git python python-dev software-properties-common python-numpy python-pip watchdog strace tcpdump screen acpid vim locate lm-sensors || die "Couldn't install packages"
 
-# We require jq >= 1.5 for --slurpfile for merging preferences. Debian Jessie ships with 1.4
+# We require jq >= 1.5 for --slurpfile for merging preferences. Debian Jessie ships with 1.4.
 if cat /etc/os-release | grep 'PRETTY_NAME="Debian GNU/Linux 8 (jessie)"' &> /dev/null; then
+   echo "Please consider upgrading your rig to Jubilinux 0.3.0 (Debian Stretch)!"
    sudo apt-get -y -t jessie-backports install jq || die "Couldn't install jq from jessie-backports"
 else
+   # Debian Stretch & Buster ship with jq >= 1.5, so install from apt
    sudo apt-get -y install jq || die "Couldn't install jq"
 fi
 
-# install/upgrade to latest node 8 if neither node 8 nor node 10+ LTS are installed
+# Install/upgrade to latest version of node (v10) using apt if neither node 8 nor node 10+ LTS are installed
 if ! nodejs --version | grep -e 'v8\.' -e 'v1[02468]\.' &> /dev/null ; then
-        # nodesource doesn't support armv6
-        if ! arch | grep -e 'armv6' &> /dev/null ; then
-            sudo bash -c "curl -sL https://deb.nodesource.com/setup_8.x | bash -" || die "Couldn't setup node 8"
-            sudo apt-get install -y nodejs=8.* || die "Couldn't install nodejs"
-        else
-            sudo apt-get install -y nodejs npm || die "Couldn't install nodejs and npm"
-            npm install npm@latest -g || die "Couldn't update npm"
-        fi
-        ## You may also need development tools to build native addons:
-        ##sudo apt-get install gcc g++ make
+   if getent passwd edison; then
+     # Only on the Edison, use nodesource setup script to add nodesource repository to sources.list.d, then install nodejs (npm is a part of the package)
+     curl -sL https://deb.nodesource.com/setup_8.x | bash -
+     sudo apt-get install -y nodejs=8.* || die "Couldn't install nodejs"
+   else
+     sudo apt-get install -y nodejs npm || die "Couldn't install nodejs and npm"
+   fi
+
+   # Upgrade npm to the latest version using its self-updater
+   sudo npm install npm@latest -g || die "Couldn't update npm"
+
+   ## You may also need development tools to build native addons:
+   ## sudo apt-get install gcc g++ make
 fi
 
-sudo pip install -U openaps || die "Couldn't install openaps toolkit"
+# upgrade setuptools to avoid "'install_requires' must be a string" error
+sudo pip install setuptools -U # no need to die if this fails
+sudo pip install -U --default-timeout=1000 git+https://github.com/openaps/openaps.git || die "Couldn't install openaps toolkit"
 sudo pip install -U openaps-contrib || die "Couldn't install openaps-contrib"
 sudo openaps-install-udev-rules || die "Couldn't run openaps-install-udev-rules"
 sudo activate-global-python-argcomplete || die "Couldn't run activate-global-python-argcomplete"

bin/oref0-autotune-prep.js

@@ -104,6 +104,7 @@ if (!module.parent) {
         var glucose_data = JSON.parse(fs.readFileSync(glucose_input, 'utf8'));
     } catch (e) {
         console.error("Warning: could not parse "+glucose_input);
+        return console.error("Warning: could not parse "+glucose_input", e);
     }
 
     var carb_data = { };

bin/oref0-autotune.sh

@@ -248,7 +248,7 @@ do
             cp profile.pump.json profile.json
             exit
         else
-            die "Could not run oref0-autotune-core autotune.$i.json profile.json profile.pump.json"
+            die "Could not run oref0-autotune-core autotune.$i.json profile.json profile.pump.json. Make sure Nightscout contains BG-values for the selected date range, Autotune(Web) does not work without BG-values. See documentation on the how-to check http://nightscout.github.io/nightscout/reports/#day-to-day ."
         fi
     else
         # Copy tuned profile produced by autotune to profile.json for use with next day of data