فهرست منبع

Remove TDD.JSON and calls to tdd.json

Jon Mårtensson 3 سال پیش
والد
کامیت
6247d118b6

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 1 - 1
FreeAPS/Resources/javascript/bundle/determine-basal.js


+ 1 - 1
FreeAPS/Resources/javascript/middleware/determine_basal.js

@@ -1,4 +1,4 @@
-function middleware(iob, currenttemp, glucose, profile, autosens, meal, reservoir, clock, pumphistory, preferences, basalprofile, tdd, tdd_averages) {
+function middleware(iob, currenttemp, glucose, profile, autosens, meal, reservoir, clock, pumphistory, preferences, basalprofile) {
     // modify anything
     // return any reason what has changed.
     return "Nothing changed";

+ 5 - 4
FreeAPS/Resources/javascript/prepare/determine-basal.js

@@ -1,11 +1,11 @@
 //для enact/smb-suggested.json параметры: monitor/iob.json monitor/temp_basal.json monitor/glucose.json settings/profile.json settings/autosens.json --meal monitor/meal.json --microbolus --reservoir monitor/reservoir.json
 
-function generate(iob, currenttemp, glucose, profile, autosens = null, meal = null, microbolusAllowed = false, reservoir = null, clock = new Date(), pump_history, preferences, basalProfile, tdd, tdd_averages) {
+function generate(iob, currenttemp, glucose, profile, autosens = null, meal = null, microbolusAllowed = false, reservoir = null, clock = new Date(), pump_history, preferences, basalProfile, tdd_averages) {
 
     var clock = new Date();
     
     try {
-        var middlewareReason = middleware(iob, currenttemp, glucose, profile, autosens, meal, reservoir, clock, pump_history, preferences, basalProfile, tdd, tdd_averages);
+        var middlewareReason = middleware(iob, currenttemp, glucose, profile, autosens, meal, reservoir, clock, pump_history, preferences, basalProfile, tdd_averages);
         console.log("Middleware reason: " + (middlewareReason || "Nothing changed"));
     } catch (error) {
         console.log("Invalid middleware: " + error);
@@ -37,16 +37,17 @@ function generate(iob, currenttemp, glucose, profile, autosens = null, meal = nu
     if (basalProfile) {
         basalprofile = basalProfile;
     }
-    
+    /*
     var tdd_ = {};
     if (tdd) {
         tdd_ = tdd;
     }
+     */
     
     var tdd_averages_ = {};
     if (tdd_averages) {
         tdd_averages_ = tdd_averages;
     }
     
-    return freeaps_determineBasal(glucose_status, currenttemp, iob, profile, autosens_data, meal_data, freeaps_basalSetTemp, microbolusAllowed, reservoir_data, clock, pumphistory, preferences, basalprofile, tdd_, tdd_averages_);
+    return freeaps_determineBasal(glucose_status, currenttemp, iob, profile, autosens_data, meal_data, freeaps_basalSetTemp, microbolusAllowed, reservoir_data, clock, pumphistory, preferences, basalprofile, tdd_averages_);
 }

+ 2 - 3
FreeAPS/Sources/APS/APSManager.swift

@@ -668,9 +668,9 @@ final class BaseAPSManager: APSManager, Injectable {
             }
             nightscout.uploadStatus()
 
-            // Update the tdd.json
+            // Update the TDD value
             tdd(enacted_: enacted)
-            // Update statistics.json. Only run if enabled in preferences
+            // Update statistics. Only run if enabled in preferences
             if settingsManager.settings.displayStatistics {
                 statistics()
             }
@@ -679,7 +679,6 @@ final class BaseAPSManager: APSManager, Injectable {
 
     private func tdd(enacted_: Suggestion) {
         let tddStartedAt = Date()
-        // Add to tdd.json:
         let preferences = settingsManager.preferences
         let currentTDD = enacted_.tdd ?? 0
 

+ 1 - 1
FreeAPS/Sources/APS/OpenAPS/Constants.swift

@@ -54,7 +54,7 @@ extension OpenAPS {
         static let iob = "monitor/iob.json"
         static let cgmState = "monitor/cgm-state.json"
         static let podAge = "monitor/pod-age.json"
-        static let tdd = "monitor/tdd.json"
+        // static let tdd = "monitor/tdd.json"
         static let tdd_averages = "monitor/tdd_averages.json"
         static let alertHistory = "monitor/alerthistory.json"
         static let statistics = "monitor/statistics.json"

+ 0 - 4
FreeAPS/Sources/APS/OpenAPS/OpenAPS.swift

@@ -41,7 +41,6 @@ final class OpenAPS {
 
                 self.storage.save(meal, as: Monitor.meal)
 
-                let tdd = self.loadFileFromStorage(name: OpenAPS.Monitor.tdd)
                 let tdd_averages = self.loadFileFromStorage(name: OpenAPS.Monitor.tdd_averages)
 
                 // iob
@@ -72,7 +71,6 @@ final class OpenAPS {
                     pumpHistory: pumpHistory,
                     preferences: preferences,
                     basalProfile: basalProfile,
-                    tdd: tdd,
                     tdd_averages: tdd_averages
                 )
                 debug(.openAPS, "SUGGESTED: \(suggested)")
@@ -305,7 +303,6 @@ final class OpenAPS {
         pumpHistory: JSON,
         preferences: JSON,
         basalProfile: JSON,
-        tdd: JSON,
         tdd_averages: JSON
     ) -> RawJSON {
         dispatchPrecondition(condition: .onQueue(processQueue))
@@ -335,7 +332,6 @@ final class OpenAPS {
                     pumpHistory,
                     preferences,
                     basalProfile,
-                    tdd,
                     tdd_averages
                 ]
             )