Merge pull request #144 from LoopKit/dev

Release 3.2

.gitignore

@@ -18,7 +18,6 @@ profile
 DerivedData
 *.hmap
 *.ipa
-project.xcworkspace
 
 # Bundler
 .bundle
@@ -27,7 +26,7 @@ Carthage
 # We recommend against adding the Pods directory to your .gitignore. However
 # you should judge for yourself, the pros and cons are mentioned at:
 # http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
-# 
+#
 # Note: if you ignore the Pods directory, make sure to uncomment
 # `pod install` in .travis.yml
 #

.travis.yml

@@ -1,18 +1,13 @@
 language: objective-c
-osx_image: xcode10
+osx_image: xcode11
 
-# cache: cocoapods
-# podfile: Example/Podfile
-
-before_install:
-# - gem install cocoapods # Since Travis is not always on latest version
-# - pod install --project-directory=Example
+before_script:
+    - carthage bootstrap
 
 script:
-# Build cocoapods example project
-# - set -o pipefail && xcodebuild -workspace Example/xDripG5.xcworkspace -scheme xDripG5-Example -sdk iphonesimulator -destination name="iPhone SE" ONLY_ACTIVE_ARCH=NO | xcpretty
-# Build Travis project and run tests
-- xcodebuild -project CGMBLEKit.xcodeproj -scheme CGMBLEKit build -destination name="iPhone SE" test
-- xcodebuild -project CGMBLEKit.xcodeproj -scheme "CGMBLEKit Example" build -destination name="iPhone SE"
-- xcodebuild -project CGMBLEKit.xcodeproj -scheme ResetTransmitter build -destination name="iPhone SE"
-# - pod lib lint
+    # Build frameworks and run tests
+    - xcodebuild -project CGMBLEKit.xcodeproj -scheme Shared build -destination name="iPhone 8" test 
+    # Build apps
+    - xcodebuild -project CGMBLEKit.xcodeproj -scheme "CGMBLEKit Example" build -destination name="iPhone 8"
+    - xcodebuild -project CGMBLEKit.xcodeproj -scheme ResetTransmitter build -destination name="iPhone 8"
+

CGMBLEKit Example/AppDelegate.swift

@@ -12,7 +12,7 @@ import CoreBluetooth
 
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate, TransmitterDelegate, TransmitterCommandSource {
-
+    
     var window: UIWindow?
 
     static var sharedDelegate: AppDelegate {
@@ -132,4 +132,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate, TransmitterDelegate, Tran
             }
         }
     }
+
+    func transmitterDidConnect(_ transmitter: Transmitter) {
+        // Ignore
+    }
+
 }

CGMBLEKit Example/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.1</string>
+	<string>3.2</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>

CGMBLEKit Example/ViewController.swift

@@ -183,6 +183,9 @@ class ViewController: UIViewController, TransmitterDelegate, UITextFieldDelegate
         subtitleLabel.text = String(describing: glucose.map { $0.glucose })
     }
 
+    func transmitterDidConnect(_ transmitter: Transmitter) {
+        // Ignore
+    }
 
 }
 

CGMBLEKit Example/da.lproj/Localizable.strings

@@ -0,0 +1,8 @@
+/* Title displayed during backfill response */
+"Backfill" = "Backfill";
+
+/* Title displayed during error response */
+"Error" = "Error";
+
+/* Title displayed during unknown data response */
+"Unknown Data" = "Unknown Data";

CGMBLEKit Example/da.lproj/Main.strings

@@ -0,0 +1,27 @@
+
+/* Class = "UILabel"; text = "Run alongside G5 app"; ObjectID = "3i8-2m-QFG"; */
+"3i8-2m-QFG.text" = "Kør langs G5-appen";
+
+/* Class = "UILabel"; text = "Transmitter ID"; ObjectID = "5y6-vU-qC3"; */
+"5y6-vU-qC3.text" = "Senders id";
+
+/* Class = "UILabel"; text = "Waiting for first reading"; ObjectID = "9p7-LX-EMK"; */
+"9p7-LX-EMK.text" = "Venter på førstebehandling";
+
+/* Class = "UIButton"; normalTitle = "Start"; ObjectID = "HEQ-Bp-kx7"; */
+"HEQ-Bp-kx7.normalTitle" = "Start";
+
+/* Class = "UIButton"; normalTitle = "Calibrate"; ObjectID = "HYW-Ex-7LC"; */
+"HYW-Ex-7LC.normalTitle" = "Kalibrer";
+
+/* Class = "UIButton"; normalTitle = "Stop"; ObjectID = "JAM-9K-KeE"; */
+"JAM-9K-KeE.normalTitle" = "Hold op";
+
+/* Class = "UILabel"; text = "Stay connected"; ObjectID = "NSs-9e-3Sl"; */
+"NSs-9e-3Sl.text" = "Forbliv forbundet";
+
+/* Class = "UITextField"; text = "500000"; ObjectID = "e0T-ru-tWD"; */
+"e0T-ru-tWD.text" = "500000";
+
+/* Class = "UILabel"; text = "––"; ObjectID = "zAF-A7-1Oc"; */
+"zAF-A7-1Oc.text" = "––";

CGMBLEKit Example/de.lproj/Localizable.strings

@@ -0,0 +1,8 @@
+/* Title displayed during backfill response */
+"Backfill" = "Auffüllen";
+
+/* Title displayed during error response */
+"Error" = "Fehler";
+
+/* Title displayed during unknown data response */
+"Unknown Data" = "Unbekannte Daten";

CGMBLEKit Example/de.lproj/Main.strings

@@ -0,0 +1,27 @@
+
+/* Class = "UILabel"; text = "Run alongside G5 app"; ObjectID = "3i8-2m-QFG"; */
+"3i8-2m-QFG.text" = "Neben G5-App ausführen";
+
+/* Class = "UILabel"; text = "Transmitter ID"; ObjectID = "5y6-vU-qC3"; */
+"5y6-vU-qC3.text" = "Transmitter-ID";
+
+/* Class = "UILabel"; text = "Waiting for first reading"; ObjectID = "9p7-LX-EMK"; */
+"9p7-LX-EMK.text" = "Warte auf den ersten Wert";
+
+/* Class = "UIButton"; normalTitle = "Start"; ObjectID = "HEQ-Bp-kx7"; */
+"HEQ-Bp-kx7.normalTitle" = "Start";
+
+/* Class = "UIButton"; normalTitle = "Calibrate"; ObjectID = "HYW-Ex-7LC"; */
+"HYW-Ex-7LC.normalTitle" = "Kalibrieren";
+
+/* Class = "UIButton"; normalTitle = "Stop"; ObjectID = "JAM-9K-KeE"; */
+"JAM-9K-KeE.normalTitle" = "Stop";
+
+/* Class = "UILabel"; text = "Stay connected"; ObjectID = "NSs-9e-3Sl"; */
+"NSs-9e-3Sl.text" = "Verbunden bleiben";
+
+/* Class = "UITextField"; text = "500000"; ObjectID = "e0T-ru-tWD"; */
+"e0T-ru-tWD.text" = "500000";
+
+/* Class = "UILabel"; text = "––"; ObjectID = "zAF-A7-1Oc"; */
+"zAF-A7-1Oc.text" = "––";

CGMBLEKit Example/en.lproj/Localizable.strings

@@ -0,0 +1,8 @@
+/* Title displayed during backfill response */
+"Backfill" = "Backfill";
+
+/* Title displayed during error response */
+"Error" = "Error";
+
+/* Title displayed during unknown data response */
+"Unknown Data" = "Unknown Data";

CGMBLEKit Example/en.lproj/Main.strings

@@ -0,0 +1,27 @@
+
+/* Class = "UILabel"; text = "Run alongside G5 app"; ObjectID = "3i8-2m-QFG"; */
+"3i8-2m-QFG.text" = "Run alongside G5 app";
+
+/* Class = "UILabel"; text = "Transmitter ID"; ObjectID = "5y6-vU-qC3"; */
+"5y6-vU-qC3.text" = "Transmitter ID";
+
+/* Class = "UILabel"; text = "Waiting for first reading"; ObjectID = "9p7-LX-EMK"; */
+"9p7-LX-EMK.text" = "Waiting for first reading";
+
+/* Class = "UIButton"; normalTitle = "Start"; ObjectID = "HEQ-Bp-kx7"; */
+"HEQ-Bp-kx7.normalTitle" = "Start";
+
+/* Class = "UIButton"; normalTitle = "Calibrate"; ObjectID = "HYW-Ex-7LC"; */
+"HYW-Ex-7LC.normalTitle" = "Calibrate";
+
+/* Class = "UIButton"; normalTitle = "Stop"; ObjectID = "JAM-9K-KeE"; */
+"JAM-9K-KeE.normalTitle" = "Stop";
+
+/* Class = "UILabel"; text = "Stay connected"; ObjectID = "NSs-9e-3Sl"; */
+"NSs-9e-3Sl.text" = "Stay connected";
+
+/* Class = "UITextField"; text = "500000"; ObjectID = "e0T-ru-tWD"; */
+"e0T-ru-tWD.text" = "500000";
+
+/* Class = "UILabel"; text = "––"; ObjectID = "zAF-A7-1Oc"; */
+"zAF-A7-1Oc.text" = "––";

CGMBLEKit Example/es.lproj/Localizable.strings

@@ -0,0 +1,8 @@
+/* Title displayed during backfill response */
+"Backfill" = "Rellenar";
+
+/* Title displayed during error response */
+"Error" = "Error";
+
+/* Title displayed during unknown data response */
+"Unknown Data" = "Datos desconocidos";

CGMBLEKit Example/es.lproj/Main.strings

@@ -0,0 +1,27 @@
+
+/* Class = "UILabel"; text = "Run alongside G5 app"; ObjectID = "3i8-2m-QFG"; */
+"3i8-2m-QFG.text" = "Ejecutar junto con la app del G5";
+
+/* Class = "UILabel"; text = "Transmitter ID"; ObjectID = "5y6-vU-qC3"; */
+"5y6-vU-qC3.text" = "Identificador del transmisor";
+
+/* Class = "UILabel"; text = "Waiting for first reading"; ObjectID = "9p7-LX-EMK"; */
+"9p7-LX-EMK.text" = "Esperando por el primero dato";
+
+/* Class = "UIButton"; normalTitle = "Start"; ObjectID = "HEQ-Bp-kx7"; */
+"HEQ-Bp-kx7.normalTitle" = "Comenzar";
+
+/* Class = "UIButton"; normalTitle = "Calibrate"; ObjectID = "HYW-Ex-7LC"; */
+"HYW-Ex-7LC.normalTitle" = "Calibrar";
+
+/* Class = "UIButton"; normalTitle = "Stop"; ObjectID = "JAM-9K-KeE"; */
+"JAM-9K-KeE.normalTitle" = "Parar";
+
+/* Class = "UILabel"; text = "Stay connected"; ObjectID = "NSs-9e-3Sl"; */
+"NSs-9e-3Sl.text" = "Mantenerse conectado";
+
+/* Class = "UITextField"; text = "500000"; ObjectID = "e0T-ru-tWD"; */
+"e0T-ru-tWD.text" = "500000";
+
+/* Class = "UILabel"; text = "––"; ObjectID = "zAF-A7-1Oc"; */
+"zAF-A7-1Oc.text" = "––";

CGMBLEKit Example/fi.lproj/Localizable.strings

@@ -0,0 +1,9 @@
+/* Title displayed during backfill response */
+"Backfill" = "Täyttö";
+
+/* Title displayed during error response */
+"Error" = "Virhe";
+
+/* Title displayed during unknown data response */
+"Unknown Data" = "Tuntematon tieto";
+

CGMBLEKit Example/fi.lproj/Main.strings

@@ -0,0 +1,27 @@
+/* Class = "UILabel"; text = "Run alongside G5 app"; ObjectID = "3i8-2m-QFG"; */
+"3i8-2m-QFG.text" = "Käytä G5-appin rinnalla";
+
+/* Class = "UILabel"; text = "Transmitter ID"; ObjectID = "5y6-vU-qC3"; */
+"5y6-vU-qC3.text" = "Lähettimen ID";
+
+/* Class = "UILabel"; text = "Waiting for first reading"; ObjectID = "9p7-LX-EMK"; */
+"9p7-LX-EMK.text" = "Odotetaan ensimmäistä lukemaa";
+
+/* Class = "UIButton"; normalTitle = "Start"; ObjectID = "HEQ-Bp-kx7"; */
+"HEQ-Bp-kx7.normalTitle" = "Aloita";
+
+/* Class = "UIButton"; normalTitle = "Calibrate"; ObjectID = "HYW-Ex-7LC"; */
+"HYW-Ex-7LC.normalTitle" = "Kalibroi";
+
+/* Class = "UIButton"; normalTitle = "Stop"; ObjectID = "JAM-9K-KeE"; */
+"JAM-9K-KeE.normalTitle" = "Pysäytä";
+
+/* Class = "UILabel"; text = "Stay connected"; ObjectID = "NSs-9e-3Sl"; */
+"NSs-9e-3Sl.text" = "Pidä yhdistettynä";
+
+/* Class = "UITextField"; text = "500000"; ObjectID = "e0T-ru-tWD"; */
+"e0T-ru-tWD.text" = "500000";
+
+/* Class = "UILabel"; text = "––"; ObjectID = "zAF-A7-1Oc"; */
+"zAF-A7-1Oc.text" = "––";
+

CGMBLEKit Example/fr.lproj/Localizable.strings

@@ -0,0 +1,8 @@
+/* Title displayed during backfill response */
+"Backfill" = "Récupération des données antérieures";
+
+/* Title displayed during error response */
+"Error" = "Erreur";
+
+/* Title displayed during unknown data response */
+"Unknown Data" = "Donnée inconnue";

CGMBLEKit Example/fr.lproj/Main.strings

@@ -0,0 +1,27 @@
+
+/* Class = "UILabel"; text = "Run alongside G5 app"; ObjectID = "3i8-2m-QFG"; */
+"3i8-2m-QFG.text" = "Faire fonctionner l’application G5 en parallèle";
+
+/* Class = "UILabel"; text = "Transmitter ID"; ObjectID = "5y6-vU-qC3"; */
+"5y6-vU-qC3.text" = "ID du transmetteur";
+
+/* Class = "UILabel"; text = "Waiting for first reading"; ObjectID = "9p7-LX-EMK"; */
+"9p7-LX-EMK.text" = "En attente de la première mesure";
+
+/* Class = "UIButton"; normalTitle = "Start"; ObjectID = "HEQ-Bp-kx7"; */
+"HEQ-Bp-kx7.normalTitle" = "Commencer";
+
+/* Class = "UIButton"; normalTitle = "Calibrate"; ObjectID = "HYW-Ex-7LC"; */
+"HYW-Ex-7LC.normalTitle" = "Étalonner";
+
+/* Class = "UIButton"; normalTitle = "Stop"; ObjectID = "JAM-9K-KeE"; */
+"JAM-9K-KeE.normalTitle" = "Arrêter";
+
+/* Class = "UILabel"; text = "Stay connected"; ObjectID = "NSs-9e-3Sl"; */
+"NSs-9e-3Sl.text" = "Rester connecté";
+
+/* Class = "UITextField"; text = "500000"; ObjectID = "e0T-ru-tWD"; */
+"e0T-ru-tWD.text" = "500000";
+
+/* Class = "UILabel"; text = "––"; ObjectID = "zAF-A7-1Oc"; */
+"zAF-A7-1Oc.text" = "––";

CGMBLEKit Example/it.lproj/Localizable.strings

@@ -0,0 +1,8 @@
+/* Title displayed during backfill response */
+"Backfill" = "Backfill";
+
+/* Title displayed during error response */
+"Error" = "Error";
+
+/* Title displayed during unknown data response */
+"Unknown Data" = "Unknown Data";

CGMBLEKit Example/it.lproj/Main.strings

@@ -0,0 +1,27 @@
+
+/* Class = "UILabel"; text = "Run alongside G5 app"; ObjectID = "3i8-2m-QFG"; */
+"3i8-2m-QFG.text" = "Esegui insieme all’app G5";
+
+/* Class = "UILabel"; text = "Transmitter ID"; ObjectID = "5y6-vU-qC3"; */
+"5y6-vU-qC3.text" = "ID trasmettitore";
+
+/* Class = "UILabel"; text = "Waiting for first reading"; ObjectID = "9p7-LX-EMK"; */
+"9p7-LX-EMK.text" = "In attesa della prima lettura";
+
+/* Class = "UIButton"; normalTitle = "Start"; ObjectID = "HEQ-Bp-kx7"; */
+"HEQ-Bp-kx7.normalTitle" = "Avvia";
+
+/* Class = "UIButton"; normalTitle = "Calibrate"; ObjectID = "HYW-Ex-7LC"; */
+"HYW-Ex-7LC.normalTitle" = "Calibra";
+
+/* Class = "UIButton"; normalTitle = "Stop"; ObjectID = "JAM-9K-KeE"; */
+"JAM-9K-KeE.normalTitle" = "Interrompi";
+
+/* Class = "UILabel"; text = "Stay connected"; ObjectID = "NSs-9e-3Sl"; */
+"NSs-9e-3Sl.text" = "Rimani connesso";
+
+/* Class = "UITextField"; text = "500000"; ObjectID = "e0T-ru-tWD"; */
+"e0T-ru-tWD.text" = "500000";
+
+/* Class = "UILabel"; text = "––"; ObjectID = "zAF-A7-1Oc"; */
+"zAF-A7-1Oc.text" = "––";

CGMBLEKit Example/ja.lproj/Localizable.strings

@@ -0,0 +1,8 @@
+/* Title displayed during backfill response */
+"Backfill" = "埋め戻し";
+
+/* Title displayed during error response */
+"Error" = "エラー";
+
+/* Title displayed during unknown data response */
+"Unknown Data" = "不明なデータ";

CGMBLEKit Example/ja.lproj/Main.strings

@@ -0,0 +1,27 @@
+
+/* Class = "UILabel"; text = "Run alongside G5 app"; ObjectID = "3i8-2m-QFG"; */
+"3i8-2m-QFG.text" = "G5アプリのそばで使用してください";
+
+/* Class = "UILabel"; text = "Transmitter ID"; ObjectID = "5y6-vU-qC3"; */
+"5y6-vU-qC3.text" = "トランスミッタ ID";
+
+/* Class = "UILabel"; text = "Waiting for first reading"; ObjectID = "9p7-LX-EMK"; */
+"9p7-LX-EMK.text" = "最初の読み取りを待っています";
+
+/* Class = "UIButton"; normalTitle = "Start"; ObjectID = "HEQ-Bp-kx7"; */
+"HEQ-Bp-kx7.normalTitle" = "開始";
+
+/* Class = "UIButton"; normalTitle = "Calibrate"; ObjectID = "HYW-Ex-7LC"; */
+"HYW-Ex-7LC.normalTitle" = "較正";
+
+/* Class = "UIButton"; normalTitle = "Stop"; ObjectID = "JAM-9K-KeE"; */
+"JAM-9K-KeE.normalTitle" = "停止";
+
+/* Class = "UILabel"; text = "Stay connected"; ObjectID = "NSs-9e-3Sl"; */
+"NSs-9e-3Sl.text" = "接続を維持";
+
+/* Class = "UITextField"; text = "500000"; ObjectID = "e0T-ru-tWD"; */
+"e0T-ru-tWD.text" = "500000";
+
+/* Class = "UILabel"; text = "––"; ObjectID = "zAF-A7-1Oc"; */
+"zAF-A7-1Oc.text" = "––";

CGMBLEKit Example/nb.lproj/Localizable.strings

@@ -0,0 +1,8 @@
+/* Title displayed during backfill response */
+"Backfill" = "Hent historikk";
+
+/* Title displayed during error response */
+"Error" = "Feil";
+
+/* Title displayed during unknown data response */
+"Unknown Data" = "Ukjent data";