Bug (typo) and some missing semicolons in oref0 (determine_basal.js).

New determine_basal.js
Typo in stats (wrong variable used).
New version. 0.3.6

Config.xcconfig

@@ -1,5 +1,5 @@
 APP_DISPLAY_NAME = FreeAPS X
-APP_VERSION = 0.3.5
+APP_VERSION = 0.3.6
 APP_BUILD_NUMBER = 1
 BRANCH = bdb
 DEVELOPER_TEAM = ##TEAM_ID##

FreeAPS/Resources/javascript/prepare/autosens.js

@@ -2,8 +2,9 @@
 
 function generate(glucose_data, pumphistory_data, basalprofile, profile_data, carb_data = {}, temptarget_data = {}) {
     if (glucose_data.length < 72) {
-        return {"ratio": 1, "error": "not enough glucose data to calculate autosens"};
-    }
+        return { "ratio": 1, "error": "not enough glucose data to calculate autosens" };
+    };
+    
     var iob_inputs = {
         history: pumphistory_data,
         profile: profile_data

FreeAPS/Resources/javascript/prepare/autotune-core.js

@@ -1,8 +1,8 @@
-function generate(prepped_glucose_data,previous_autotune_data,pumpprofile_data){
+function generate(prepped_glucose_data,previous_autotune_data,pumpprofile_data) {
   if (!pumpprofile_data.useCustomPeakTime) {
       previous_autotune_data.dia = pumpprofile_data.dia;
       previous_autotune_data.insulinPeakTime = pumpprofile_data.insulinPeakTime;
-    }
+    };
 
     // Always keep the curve value up to date with what's in the user preferences
     previous_autotune_data.curve = pumpprofile_data.curve;

FreeAPS/Resources/javascript/prepare/autotune-prep.js

@@ -1,6 +1,6 @@
-function generate(pumphistory_data,profile_data,glucose_data,pumpprofile_data,carb_data={ },categorize_uam_as_basal=false,tune_insulin_curve=false){
-    if ( typeof(profile_data.carb_ratio) === 'undefined' || profile_data.carb_ratio < 2 ) {
-        if ( typeof(pumpprofile_data.carb_ratio) === 'undefined' || pumpprofile_data.carb_ratio < 2 ) {
+function generate(pumphistory_data, profile_data, glucose_data, pumpprofile_data, carb_data = {} , categorize_uam_as_basal = false, tune_insulin_curve = false) {
+    if (typeof(profile_data.carb_ratio) === 'undefined' || profile_data.carb_ratio < 2) {
+        if (typeof(pumpprofile_data.carb_ratio) === 'undefined' || pumpprofile_data.carb_ratio < 2) {
             console.log('{ "carbs": 0, "mealCOB": 0, "reason": "carb_ratios ' + profile_data.carb_ratio + ' and ' + pumpprofile_data.carb_ratio + ' out of bounds" }');
             return console.error("Error: carb_ratios " + profile_data.carb_ratio + ' and ' + pumpprofile_data.carb_ratio + " out of bounds");
         } else {
@@ -23,12 +23,12 @@ function generate(pumphistory_data,profile_data,glucose_data,pumpprofile_data,ca
     profile_data.curve = pumpprofile_data.curve;
 
     // Have to sort history - NS sort doesn't account for different zulu and local timestamps
-    pumphistory_data.sort( function( firstValue, secondValue ){
-        try{
+    pumphistory_data.sort( function( firstValue, secondValue ) {
+        try {
             var a = new Date(firstValue.timestamp);
             var b = new Date(secondValue.timestamp);
             return b.getTime() - a.getTime();
-        }catch(e){
+        } catch(e) {
             return 0;
         }
     } );

FreeAPS/Resources/javascript/prepare/determine-basal.js

@@ -7,7 +7,7 @@ function generate(iob, currenttemp, glucose, profile, autosens = null, meal = nu
         console.log("Middleware reason: " + (middlewareReason || "Nothing changed"));
     } catch (error) {
         console.log("Invalid middleware: " + error);
-    }
+    };
 
     var glucose_status = freeaps_glucoseGetLast(glucose);
     var autosens_data = null;

FreeAPS/Resources/javascript/prepare/iob.js

@@ -1,6 +1,6 @@
 //для monitor/iob.json параметры: monitor/pumphistory-24h-zoned.json settings/profile.json monitor/clock-zoned.json settings/autosens.json
 
-function generate(pumphistory_data, profile_data, clock_data, autosens_data = null){
+function generate(pumphistory_data, profile_data, clock_data, autosens_data = null) {
     var inputs = {
         history: pumphistory_data
         , history24: null
@@ -8,7 +8,7 @@ function generate(pumphistory_data, profile_data, clock_data, autosens_data = nu
         , clock: clock_data
     };
 
-      if ( autosens_data ) {
+      if (autosens_data) {
         inputs.autosens = autosens_data;
       }
       return freeaps_iob(inputs);

FreeAPS/Resources/javascript/prepare/meal.js

@@ -1,7 +1,7 @@
 //для monitor/meal.json параметры: monitor/pumphistory-24h-zoned.json settings/profile.json monitor/clock-zoned.json monitor/glucose.json settings/basal_profile.json monitor/carbhistory.json
 
-function generate(pumphistory_data, profile_data, clock_data, glucose_data, basalprofile_data, carbhistory = false){
-    if ( typeof(profile_data.carb_ratio) === 'undefined' || profile_data.carb_ratio < 3 ) {
+function generate(pumphistory_data, profile_data, clock_data, glucose_data, basalprofile_data, carbhistory = false) {
+    if (typeof(profile_data.carb_ratio) === 'undefined' || profile_data.carb_ratio < 3) {
         return {"error":"Error: carb_ratio " + profile_data.carb_ratio + " out of bounds"};
     }
 
@@ -11,7 +11,7 @@ function generate(pumphistory_data, profile_data, clock_data, glucose_data, basa
     }
 
     if (typeof basalprofile_data[0] === 'undefined') {
-        return {"error":"Error: bad basalprofile_data: " + JSON.stringify(basalprofile_data)};
+        return { "error":"Error: bad basalprofile_data: " + JSON.stringify(basalprofile_data) };
     }
 
     var inputs = {

FreeAPS/Resources/javascript/prepare/profile.js

@@ -1,7 +1,7 @@
 //для pumpprofile.json параметры: settings/settings.json settings/bg_targets.json settings/insulin_sensitivities.json settings/basal_profile.json preferences.json settings/carb_ratios.json settings/temptargets.json settings/model.json
 //для profile.json параметры: settings/settings.json settings/bg_targets.json settings/insulin_sensitivities.json settings/basal_profile.json preferences.json settings/carb_ratios.json settings/temptargets.json settings/model.json settings/autotune.json
 
-function generate(pumpsettings_data, bgtargets_data, isf_data, basalprofile_data, preferences_input = false, carbratio_input = false, temptargets_input = false, model_input = false, autotune_input = false){
+function generate(pumpsettings_data, bgtargets_data, isf_data, basalprofile_data, preferences_input = false, carbratio_input = false, temptargets_input = false, model_input = false, autotune_input = false) {
     if (bgtargets_data.units !== 'mg/dL') {
         if (bgtargets_data.units === 'mmol/L') {
             for (var i = 0, len = bgtargets_data.targets.length; i < len; i++) {
@@ -10,7 +10,7 @@ function generate(pumpsettings_data, bgtargets_data, isf_data, basalprofile_data
             }
             bgtargets_data.units = 'mg/dL';
         } else {
-            return { "error" : 'BG Target data is expected to be expressed in mg/dL or mmol/L. Found '+bgtargets_data.units};
+            return { "error" : 'BG Target data is expected to be expressed in mg/dL or mmol/L. Found '+ bgtargets_data.units };
         }
     }
 
@@ -21,7 +21,7 @@ function generate(pumpsettings_data, bgtargets_data, isf_data, basalprofile_data
             }
             isf_data.units = 'mg/dL';
         } else {
-            return { "error" : 'ISF is expected to be expressed in mg/dL or mmol/L. Found '+isf_data.units};
+            return { "error" : 'ISF is expected to be expressed in mg/dL or mmol/L. Found '+ isf_data.units };
         }
     }
 
@@ -50,7 +50,7 @@ function generate(pumpsettings_data, bgtargets_data, isf_data, basalprofile_data
           errors.push("Carb ratio should have units field set to 'grams' or 'exchanges'.");
         }
         if (errors.length) {
-          return { "error" : errors.join(' ')};
+          return { "error" : errors.join(' ') };
         }
         carbratio_data = carbratio_input;
     }

FreeAPS/Sources/APS/APSManager.swift

@@ -1114,7 +1114,7 @@ final class BaseAPSManager: APSManager, Injectable {
         // round output values
         daysBG = roundDecimal(daysBG, 1)
 
-        if bg_7 != 0 {
+        if bg_1 != 0 {
             bgString1day =
                 " Average BG (mmol/l) 24 hours): \(roundDecimal(bg_1 * 0.0555, 1)). Average BG (mmg/dl) 24 hours: \(roundDecimal(bg_1, 0))."
             HbA1c_string_1 =