Merge branch 'master' into UPLOAD-1132-mrn-validation

Dockerfile

@@ -1,7 +1,7 @@
 FROM ubuntu:18.04
 
 ENV DEBIAN_FRONTEND noninteractive
-ENV NODE_VERSION "v12.13.0"
+ENV NODE_VERSION "v16.14.2"
 
 # Lots of packages. Some dependencies and stuff for GUI.
 RUN apt-get -qq -y update && \

README.md

@@ -23,7 +23,7 @@ This README is focused on just the details of getting the uploader running local
 ## How to set it up
 
 1. Clone this repository.
-1. Make sure you have node v12.x installed. If you are managing node installations with [`nvm`](https://github.com/creationix/nvm 'GitHub: nvm'), which we **highly recommend**, you can just do `nvm use` when navigating to this repository to switch to the correct version of node. (In this repository, the correct version of node will always be the version of node packaged by the version of Electron that we are using and specified in the `.nvmrc` file.)
+1. Make sure you have node v16.x installed. If you are managing node installations with [`nvm`](https://github.com/creationix/nvm 'GitHub: nvm'), which we **highly recommend**, you can just do `nvm use` when navigating to this repository to switch to the correct version of node. (In this repository, the correct version of node will always be the version of node packaged by the version of Electron that we are using and specified in the `.nvmrc` file.)
 1. Run `npm install` or, preferably, `yarn`
 1. Set the config for the environment you want to target (see [Config](#config) below)
 1. Run the following command:

app/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tidepool-uploader",
   "productName": "tidepool-uploader",
-  "version": "2.55.1-mrn-validation.1",
+  "version": "2.55.1-mrn-validation.2",
   "description": "Tidepool Project Universal Uploader",
   "main": "./main.prod.js",
   "author": {

lib/drivers/insulet/insuletSimulator.js

@@ -104,9 +104,14 @@ exports.make = (config = {}) => {
     }
 
     if (schedName != null) {
-      e.suppressed = suppressed.with_scheduleName(schedName)
-        .with_rate(rate)
-        .done();
+      e.suppressed = suppressed.with_scheduleName(schedName);
+
+      if (suppressed.rate == null || Number.isNaN(suppressed.rate)) {
+        // only use previous rate if rate not available
+        e.suppressed.with_rate(rate);
+      }
+
+      e.suppressed = e.suppressed.done();
     } else {
       delete e.suppressed;
     }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tidepool-uploader",
-  "version": "2.55.1-mrn-validation.1",
+  "version": "2.55.1-mrn-validation.2",
   "description": "Tidepool Project Universal Uploader",
   "private": true,
   "main": "main.prod.js",