소스 검색

Merge remote-tracking branch 'ivalkou/dev' into Crowdin

Jon B.M 4 년 전
부모
커밋
c153547f6c
3개의 변경된 파일2개의 추가작업 그리고 4개의 파일을 삭제
  1. 1 1
      Config.xcconfig
  2. 1 1
      FreeAPS/Sources/Models/Suggestion.swift
  3. 0 2
      FreeAPS/Sources/Modules/Home/HomeStateModel.swift

+ 1 - 1
Config.xcconfig

@@ -2,6 +2,6 @@ APP_DISPLAY_NAME = FreeAPS X
 BUILD_VERSION = 0.2.4
 DEVELOPER_TEAM = ##TEAM_ID##
 BUNDLE_IDENTIFIER = ru.artpancreas.$(DEVELOPMENT_TEAM).FreeAPS
-APP_GROUP_ID = group.com.$(DEVELOPMENT_TEAM).loopkit.LoopGroups
+APP_GROUP_ID = group.com.$(DEVELOPMENT_TEAM).loopkit.LoopGroup
 
 #include? "ConfigOverride.xcconfig"

+ 1 - 1
FreeAPS/Sources/Models/Suggestion.swift

@@ -16,7 +16,7 @@ struct Suggestion: JSON, Equatable {
     let temp: TempType?
     let bg: Decimal?
     let reservoir: Decimal?
-    let isf: Int?
+    let isf: Decimal?
     var timestamp: Date?
     var recieved: Bool?
 }

+ 0 - 2
FreeAPS/Sources/Modules/Home/HomeStateModel.swift

@@ -42,7 +42,6 @@ extension Home {
         @Published var errorDate: Date? = nil
         @Published var bolusProgress: Decimal?
         @Published var eventualBG: Int?
-        @Published var isf: Int?
         @Published var carbsRequired: Decimal?
         @Published var allowManualTemp = false
         @Published var units: GlucoseUnits = .mmolL
@@ -281,7 +280,6 @@ extension Home {
             }
 
             eventualBG = suggestion.eventualBG
-            isf = suggestion.isf
         }
 
         private func setupReservoir() {