Skip to content

Commit 66f5222

Browse files
ps2ps2
authored
Merge pull request #144 from LoopKit/dev
Release 3.2
2 parents df428f6 + aaa6786 commit 66f5222

File tree

156 files changed

+3765
-405
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

156 files changed

+3765
-405
lines changed

‎.gitignore

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ profile
1818
DerivedData
1919
*.hmap
2020
*.ipa
21-
project.xcworkspace
2221

2322
# Bundler
2423
.bundle
@@ -27,7 +26,7 @@ Carthage
2726
# We recommend against adding the Pods directory to your .gitignore. However
2827
# you should judge for yourself, the pros and cons are mentioned at:
2928
# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
30-
#
29+
#
3130
# Note: if you ignore the Pods directory, make sure to uncomment
3231
# `pod install` in .travis.yml
3332
#

‎.travis.yml

+9-14
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,13 @@
11
language: objective-c
2-
osx_image: xcode10
2+
osx_image: xcode11
33

4-
# cache: cocoapods
5-
# podfile: Example/Podfile
6-
7-
before_install:
8-
# - gem install cocoapods # Since Travis is not always on latest version
9-
# - pod install --project-directory=Example
4+
before_script:
5+
- carthage bootstrap
106

117
script:
12-
# Build cocoapods example project
13-
# - set -o pipefail && xcodebuild -workspace Example/xDripG5.xcworkspace -scheme xDripG5-Example -sdk iphonesimulator -destination name="iPhone SE" ONLY_ACTIVE_ARCH=NO | xcpretty
14-
# Build Travis project and run tests
15-
- xcodebuild -project CGMBLEKit.xcodeproj -scheme CGMBLEKit build -destination name="iPhone SE" test
16-
- xcodebuild -project CGMBLEKit.xcodeproj -scheme "CGMBLEKit Example" build -destination name="iPhone SE"
17-
- xcodebuild -project CGMBLEKit.xcodeproj -scheme ResetTransmitter build -destination name="iPhone SE"
18-
# - pod lib lint
8+
# Build frameworks and run tests
9+
- xcodebuild -project CGMBLEKit.xcodeproj -scheme Shared build -destination name="iPhone 8" test
10+
# Build apps
11+
- xcodebuild -project CGMBLEKit.xcodeproj -scheme "CGMBLEKit Example" build -destination name="iPhone 8"
12+
- xcodebuild -project CGMBLEKit.xcodeproj -scheme ResetTransmitter build -destination name="iPhone 8"
13+

‎CGMBLEKit Example/AppDelegate.swift

+6-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import CoreBluetooth
1212

1313
@UIApplicationMain
1414
class AppDelegate: UIResponder, UIApplicationDelegate, TransmitterDelegate, TransmitterCommandSource {
15-
15+
1616
var window: UIWindow?
1717

1818
static var sharedDelegate: AppDelegate {
@@ -132,4 +132,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate, TransmitterDelegate, Tran
132132
}
133133
}
134134
}
135+
136+
func transmitterDidConnect(_ transmitter: Transmitter) {
137+
// Ignore
138+
}
139+
135140
}

‎CGMBLEKit Example/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>APPL</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>3.1</string>
18+
<string>3.2</string>
1919
<key>CFBundleVersion</key>
2020
<string>1</string>
2121
<key>LSRequiresIPhoneOS</key>

‎CGMBLEKit Example/ViewController.swift

+3
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,9 @@ class ViewController: UIViewController, TransmitterDelegate, UITextFieldDelegate
183183
subtitleLabel.text = String(describing: glucose.map { $0.glucose })
184184
}
185185

186+
func transmitterDidConnect(_ transmitter: Transmitter) {
187+
// Ignore
188+
}
186189

187190
}
188191

‎CGMBLEKit Example/da.lproj/Localizable.strings

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
/* Title displayed during backfill response */
2+
"Backfill" = "Backfill";
3+
4+
/* Title displayed during error response */
5+
"Error" = "Error";
6+
7+
/* Title displayed during unknown data response */
8+
"Unknown Data" = "Unknown Data";

‎CGMBLEKit Example/da.lproj/Main.strings

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
2+
/* Class = "UILabel"; text = "Run alongside G5 app"; ObjectID = "3i8-2m-QFG"; */
3+
"3i8-2m-QFG.text" = "Kør langs G5-appen";
4+
5+
/* Class = "UILabel"; text = "Transmitter ID"; ObjectID = "5y6-vU-qC3"; */
6+
"5y6-vU-qC3.text" = "Senders id";
7+
8+
/* Class = "UILabel"; text = "Waiting for first reading"; ObjectID = "9p7-LX-EMK"; */
9+
"9p7-LX-EMK.text" = "Venter på førstebehandling";
10+
11+
/* Class = "UIButton"; normalTitle = "Start"; ObjectID = "HEQ-Bp-kx7"; */
12+
"HEQ-Bp-kx7.normalTitle" = "Start";
13+
14+
/* Class = "UIButton"; normalTitle = "Calibrate"; ObjectID = "HYW-Ex-7LC"; */
15+
"HYW-Ex-7LC.normalTitle" = "Kalibrer";
16+
17+
/* Class = "UIButton"; normalTitle = "Stop"; ObjectID = "JAM-9K-KeE"; */
18+
"JAM-9K-KeE.normalTitle" = "Hold op";
19+
20+
/* Class = "UILabel"; text = "Stay connected"; ObjectID = "NSs-9e-3Sl"; */
21+
"NSs-9e-3Sl.text" = "Forbliv forbundet";
22+
23+
/* Class = "UITextField"; text = "500000"; ObjectID = "e0T-ru-tWD"; */
24+
"e0T-ru-tWD.text" = "500000";
25+
26+
/* Class = "UILabel"; text = "––"; ObjectID = "zAF-A7-1Oc"; */
27+
"zAF-A7-1Oc.text" = "––";

‎CGMBLEKit Example/de.lproj/Localizable.strings

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
/* Title displayed during backfill response */
2+
"Backfill" = "Auffüllen";
3+
4+
/* Title displayed during error response */
5+
"Error" = "Fehler";
6+
7+
/* Title displayed during unknown data response */
8+
"Unknown Data" = "Unbekannte Daten";

‎CGMBLEKit Example/de.lproj/Main.strings

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
2+
/* Class = "UILabel"; text = "Run alongside G5 app"; ObjectID = "3i8-2m-QFG"; */
3+
"3i8-2m-QFG.text" = "Neben G5-App ausführen";
4+
5+
/* Class = "UILabel"; text = "Transmitter ID"; ObjectID = "5y6-vU-qC3"; */
6+
"5y6-vU-qC3.text" = "Transmitter-ID";
7+
8+
/* Class = "UILabel"; text = "Waiting for first reading"; ObjectID = "9p7-LX-EMK"; */
9+
"9p7-LX-EMK.text" = "Warte auf den ersten Wert";
10+
11+
/* Class = "UIButton"; normalTitle = "Start"; ObjectID = "HEQ-Bp-kx7"; */
12+
"HEQ-Bp-kx7.normalTitle" = "Start";
13+
14+
/* Class = "UIButton"; normalTitle = "Calibrate"; ObjectID = "HYW-Ex-7LC"; */
15+
"HYW-Ex-7LC.normalTitle" = "Kalibrieren";
16+
17+
/* Class = "UIButton"; normalTitle = "Stop"; ObjectID = "JAM-9K-KeE"; */
18+
"JAM-9K-KeE.normalTitle" = "Stop";
19+
20+
/* Class = "UILabel"; text = "Stay connected"; ObjectID = "NSs-9e-3Sl"; */
21+
"NSs-9e-3Sl.text" = "Verbunden bleiben";
22+
23+
/* Class = "UITextField"; text = "500000"; ObjectID = "e0T-ru-tWD"; */
24+
"e0T-ru-tWD.text" = "500000";
25+
26+
/* Class = "UILabel"; text = "––"; ObjectID = "zAF-A7-1Oc"; */
27+
"zAF-A7-1Oc.text" = "––";

‎CGMBLEKit Example/en.lproj/Localizable.strings

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
/* Title displayed during backfill response */
2+
"Backfill" = "Backfill";
3+
4+
/* Title displayed during error response */
5+
"Error" = "Error";
6+
7+
/* Title displayed during unknown data response */
8+
"Unknown Data" = "Unknown Data";

‎CGMBLEKit Example/en.lproj/Main.strings

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
2+
/* Class = "UILabel"; text = "Run alongside G5 app"; ObjectID = "3i8-2m-QFG"; */
3+
"3i8-2m-QFG.text" = "Run alongside G5 app";
4+
5+
/* Class = "UILabel"; text = "Transmitter ID"; ObjectID = "5y6-vU-qC3"; */
6+
"5y6-vU-qC3.text" = "Transmitter ID";
7+
8+
/* Class = "UILabel"; text = "Waiting for first reading"; ObjectID = "9p7-LX-EMK"; */
9+
"9p7-LX-EMK.text" = "Waiting for first reading";
10+
11+
/* Class = "UIButton"; normalTitle = "Start"; ObjectID = "HEQ-Bp-kx7"; */
12+
"HEQ-Bp-kx7.normalTitle" = "Start";
13+
14+
/* Class = "UIButton"; normalTitle = "Calibrate"; ObjectID = "HYW-Ex-7LC"; */
15+
"HYW-Ex-7LC.normalTitle" = "Calibrate";
16+
17+
/* Class = "UIButton"; normalTitle = "Stop"; ObjectID = "JAM-9K-KeE"; */
18+
"JAM-9K-KeE.normalTitle" = "Stop";
19+
20+
/* Class = "UILabel"; text = "Stay connected"; ObjectID = "NSs-9e-3Sl"; */
21+
"NSs-9e-3Sl.text" = "Stay connected";
22+
23+
/* Class = "UITextField"; text = "500000"; ObjectID = "e0T-ru-tWD"; */
24+
"e0T-ru-tWD.text" = "500000";
25+
26+
/* Class = "UILabel"; text = "––"; ObjectID = "zAF-A7-1Oc"; */
27+
"zAF-A7-1Oc.text" = "––";

‎CGMBLEKit Example/es.lproj/Localizable.strings

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
/* Title displayed during backfill response */
2+
"Backfill" = "Rellenar";
3+
4+
/* Title displayed during error response */
5+
"Error" = "Error";
6+
7+
/* Title displayed during unknown data response */
8+
"Unknown Data" = "Datos desconocidos";

‎CGMBLEKit Example/es.lproj/Main.strings

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
2+
/* Class = "UILabel"; text = "Run alongside G5 app"; ObjectID = "3i8-2m-QFG"; */
3+
"3i8-2m-QFG.text" = "Ejecutar junto con la app del G5";
4+
5+
/* Class = "UILabel"; text = "Transmitter ID"; ObjectID = "5y6-vU-qC3"; */
6+
"5y6-vU-qC3.text" = "Identificador del transmisor";
7+
8+
/* Class = "UILabel"; text = "Waiting for first reading"; ObjectID = "9p7-LX-EMK"; */
9+
"9p7-LX-EMK.text" = "Esperando por el primero dato";
10+
11+
/* Class = "UIButton"; normalTitle = "Start"; ObjectID = "HEQ-Bp-kx7"; */
12+
"HEQ-Bp-kx7.normalTitle" = "Comenzar";
13+
14+
/* Class = "UIButton"; normalTitle = "Calibrate"; ObjectID = "HYW-Ex-7LC"; */
15+
"HYW-Ex-7LC.normalTitle" = "Calibrar";
16+
17+
/* Class = "UIButton"; normalTitle = "Stop"; ObjectID = "JAM-9K-KeE"; */
18+
"JAM-9K-KeE.normalTitle" = "Parar";
19+
20+
/* Class = "UILabel"; text = "Stay connected"; ObjectID = "NSs-9e-3Sl"; */
21+
"NSs-9e-3Sl.text" = "Mantenerse conectado";
22+
23+
/* Class = "UITextField"; text = "500000"; ObjectID = "e0T-ru-tWD"; */
24+
"e0T-ru-tWD.text" = "500000";
25+
26+
/* Class = "UILabel"; text = "––"; ObjectID = "zAF-A7-1Oc"; */
27+
"zAF-A7-1Oc.text" = "––";

‎CGMBLEKit Example/fi.lproj/Localizable.strings

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
/* Title displayed during backfill response */
2+
"Backfill" = "Täyttö";
3+
4+
/* Title displayed during error response */
5+
"Error" = "Virhe";
6+
7+
/* Title displayed during unknown data response */
8+
"Unknown Data" = "Tuntematon tieto";
9+

‎CGMBLEKit Example/fi.lproj/Main.strings

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
/* Class = "UILabel"; text = "Run alongside G5 app"; ObjectID = "3i8-2m-QFG"; */
2+
"3i8-2m-QFG.text" = "Käytä G5-appin rinnalla";
3+
4+
/* Class = "UILabel"; text = "Transmitter ID"; ObjectID = "5y6-vU-qC3"; */
5+
"5y6-vU-qC3.text" = "Lähettimen ID";
6+
7+
/* Class = "UILabel"; text = "Waiting for first reading"; ObjectID = "9p7-LX-EMK"; */
8+
"9p7-LX-EMK.text" = "Odotetaan ensimmäistä lukemaa";
9+
10+
/* Class = "UIButton"; normalTitle = "Start"; ObjectID = "HEQ-Bp-kx7"; */
11+
"HEQ-Bp-kx7.normalTitle" = "Aloita";
12+
13+
/* Class = "UIButton"; normalTitle = "Calibrate"; ObjectID = "HYW-Ex-7LC"; */
14+
"HYW-Ex-7LC.normalTitle" = "Kalibroi";
15+
16+
/* Class = "UIButton"; normalTitle = "Stop"; ObjectID = "JAM-9K-KeE"; */
17+
"JAM-9K-KeE.normalTitle" = "Pysäytä";
18+
19+
/* Class = "UILabel"; text = "Stay connected"; ObjectID = "NSs-9e-3Sl"; */
20+
"NSs-9e-3Sl.text" = "Pidä yhdistettynä";
21+
22+
/* Class = "UITextField"; text = "500000"; ObjectID = "e0T-ru-tWD"; */
23+
"e0T-ru-tWD.text" = "500000";
24+
25+
/* Class = "UILabel"; text = "––"; ObjectID = "zAF-A7-1Oc"; */
26+
"zAF-A7-1Oc.text" = "––";
27+

‎CGMBLEKit Example/fr.lproj/Localizable.strings

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
/* Title displayed during backfill response */
2+
"Backfill" = "Récupération des données antérieures";
3+
4+
/* Title displayed during error response */
5+
"Error" = "Erreur";
6+
7+
/* Title displayed during unknown data response */
8+
"Unknown Data" = "Donnée inconnue";

‎CGMBLEKit Example/fr.lproj/Main.strings

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
2+
/* Class = "UILabel"; text = "Run alongside G5 app"; ObjectID = "3i8-2m-QFG"; */
3+
"3i8-2m-QFG.text" = "Faire fonctionner l’application G5 en parallèle";
4+
5+
/* Class = "UILabel"; text = "Transmitter ID"; ObjectID = "5y6-vU-qC3"; */
6+
"5y6-vU-qC3.text" = "ID du transmetteur";
7+
8+
/* Class = "UILabel"; text = "Waiting for first reading"; ObjectID = "9p7-LX-EMK"; */
9+
"9p7-LX-EMK.text" = "En attente de la première mesure";
10+
11+
/* Class = "UIButton"; normalTitle = "Start"; ObjectID = "HEQ-Bp-kx7"; */
12+
"HEQ-Bp-kx7.normalTitle" = "Commencer";
13+
14+
/* Class = "UIButton"; normalTitle = "Calibrate"; ObjectID = "HYW-Ex-7LC"; */
15+
"HYW-Ex-7LC.normalTitle" = "Étalonner";
16+
17+
/* Class = "UIButton"; normalTitle = "Stop"; ObjectID = "JAM-9K-KeE"; */
18+
"JAM-9K-KeE.normalTitle" = "Arrêter";
19+
20+
/* Class = "UILabel"; text = "Stay connected"; ObjectID = "NSs-9e-3Sl"; */
21+
"NSs-9e-3Sl.text" = "Rester connecté";
22+
23+
/* Class = "UITextField"; text = "500000"; ObjectID = "e0T-ru-tWD"; */
24+
"e0T-ru-tWD.text" = "500000";
25+
26+
/* Class = "UILabel"; text = "––"; ObjectID = "zAF-A7-1Oc"; */
27+
"zAF-A7-1Oc.text" = "––";

‎CGMBLEKit Example/it.lproj/Localizable.strings

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
/* Title displayed during backfill response */
2+
"Backfill" = "Backfill";
3+
4+
/* Title displayed during error response */
5+
"Error" = "Error";
6+
7+
/* Title displayed during unknown data response */
8+
"Unknown Data" = "Unknown Data";

‎CGMBLEKit Example/it.lproj/Main.strings

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
2+
/* Class = "UILabel"; text = "Run alongside G5 app"; ObjectID = "3i8-2m-QFG"; */
3+
"3i8-2m-QFG.text" = "Esegui insieme all’app G5";
4+
5+
/* Class = "UILabel"; text = "Transmitter ID"; ObjectID = "5y6-vU-qC3"; */
6+
"5y6-vU-qC3.text" = "ID trasmettitore";
7+
8+
/* Class = "UILabel"; text = "Waiting for first reading"; ObjectID = "9p7-LX-EMK"; */
9+
"9p7-LX-EMK.text" = "In attesa della prima lettura";
10+
11+
/* Class = "UIButton"; normalTitle = "Start"; ObjectID = "HEQ-Bp-kx7"; */
12+
"HEQ-Bp-kx7.normalTitle" = "Avvia";
13+
14+
/* Class = "UIButton"; normalTitle = "Calibrate"; ObjectID = "HYW-Ex-7LC"; */
15+
"HYW-Ex-7LC.normalTitle" = "Calibra";
16+
17+
/* Class = "UIButton"; normalTitle = "Stop"; ObjectID = "JAM-9K-KeE"; */
18+
"JAM-9K-KeE.normalTitle" = "Interrompi";
19+
20+
/* Class = "UILabel"; text = "Stay connected"; ObjectID = "NSs-9e-3Sl"; */
21+
"NSs-9e-3Sl.text" = "Rimani connesso";
22+
23+
/* Class = "UITextField"; text = "500000"; ObjectID = "e0T-ru-tWD"; */
24+
"e0T-ru-tWD.text" = "500000";
25+
26+
/* Class = "UILabel"; text = "––"; ObjectID = "zAF-A7-1Oc"; */
27+
"zAF-A7-1Oc.text" = "––";

‎CGMBLEKit Example/ja.lproj/Localizable.strings

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
/* Title displayed during backfill response */
2+
"Backfill" = "埋め戻し";
3+
4+
/* Title displayed during error response */
5+
"Error" = "エラー";
6+
7+
/* Title displayed during unknown data response */
8+
"Unknown Data" = "不明なデータ";

‎CGMBLEKit Example/ja.lproj/Main.strings

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

‎CGMBLEKit Example/nb.lproj/Localizable.strings

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
/* Title displayed during backfill response */
2+
"Backfill" = "Hent historikk";
3+
4+
/* Title displayed during error response */
5+
"Error" = "Feil";
6+
7+
/* Title displayed during unknown data response */
8+
"Unknown Data" = "Ukjent data";

0 commit comments

Comments
 (0)