Skip to content

Commit b2d483a

Browse files
ps2ps2
authored
Merge pull request #115 from LoopKit/dev
Release 3.0
2 parents bb87823 + 5e43d0e commit b2d483a

File tree

69 files changed

+2950
-79
lines changed

Some content is hidden

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

69 files changed

+2950
-79
lines changed

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,5 @@ Carthage
3333
#
3434

3535
Pods/
36-
36+
Carthage/
37+
.gitmodules

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: objective-c
2-
osx_image: xcode9.3
2+
osx_image: xcode10
33

44
# cache: cocoapods
55
# podfile: Example/Podfile

‎CGMBLEKit Example/AppDelegate.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, TransmitterDelegate, Tran
4242

4343
var glucose: Glucose?
4444

45-
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
45+
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
4646

4747
transmitterID = UserDefaults.standard.transmitterID
4848

‎CGMBLEKit Example/Info.plist‎

Lines changed: 1 addition & 1 deletion
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>2.1.1</string>
18+
<string>3.0</string>
1919
<key>CFBundleVersion</key>
2020
<string>1</string>
2121
<key>LSRequiresIPhoneOS</key>

‎CGMBLEKit.xcodeproj/project.pbxproj‎

Lines changed: 543 additions & 21 deletions
Large diffs are not rendered by default.

‎CGMBLEKit.xcodeproj/xcshareddata/xcschemes/CGMBLEKit Example.xcscheme‎

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1010"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "437AFEF62038EC43008C4892"
18+
BuildableName = "CGMBLEKit Example.app"
19+
BlueprintName = "CGMBLEKit Example"
20+
ReferencedContainer = "container:CGMBLEKit.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<Testables>
31+
</Testables>
32+
<MacroExpansion>
33+
<BuildableReference
34+
BuildableIdentifier = "primary"
35+
BlueprintIdentifier = "437AFEF62038EC43008C4892"
36+
BuildableName = "CGMBLEKit Example.app"
37+
BlueprintName = "CGMBLEKit Example"
38+
ReferencedContainer = "container:CGMBLEKit.xcodeproj">
39+
</BuildableReference>
40+
</MacroExpansion>
41+
<AdditionalOptions>
42+
</AdditionalOptions>
43+
</TestAction>
44+
<LaunchAction
45+
buildConfiguration = "Debug"
46+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
47+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
48+
launchStyle = "0"
49+
useCustomWorkingDirectory = "NO"
50+
ignoresPersistentStateOnLaunch = "NO"
51+
debugDocumentVersioning = "YES"
52+
debugServiceExtension = "internal"
53+
allowLocationSimulation = "YES">
54+
<BuildableProductRunnable
55+
runnableDebuggingMode = "0">
56+
<BuildableReference
57+
BuildableIdentifier = "primary"
58+
BlueprintIdentifier = "437AFEF62038EC43008C4892"
59+
BuildableName = "CGMBLEKit Example.app"
60+
BlueprintName = "CGMBLEKit Example"
61+
ReferencedContainer = "container:CGMBLEKit.xcodeproj">
62+
</BuildableReference>
63+
</BuildableProductRunnable>
64+
<AdditionalOptions>
65+
</AdditionalOptions>
66+
</LaunchAction>
67+
<ProfileAction
68+
buildConfiguration = "Release"
69+
shouldUseLaunchSchemeArgsEnv = "YES"
70+
savedToolIdentifier = ""
71+
useCustomWorkingDirectory = "NO"
72+
debugDocumentVersioning = "YES">
73+
<BuildableProductRunnable
74+
runnableDebuggingMode = "0">
75+
<BuildableReference
76+
BuildableIdentifier = "primary"
77+
BlueprintIdentifier = "437AFEF62038EC43008C4892"
78+
BuildableName = "CGMBLEKit Example.app"
79+
BlueprintName = "CGMBLEKit Example"
80+
ReferencedContainer = "container:CGMBLEKit.xcodeproj">
81+
</BuildableReference>
82+
</BuildableProductRunnable>
83+
</ProfileAction>
84+
<AnalyzeAction
85+
buildConfiguration = "Debug">
86+
</AnalyzeAction>
87+
<ArchiveAction
88+
buildConfiguration = "Release"
89+
revealArchiveInOrganizer = "YES">
90+
</ArchiveAction>
91+
</Scheme>

‎CGMBLEKit.xcodeproj/xcshareddata/xcschemes/CGMBLEKit.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0930"
3+
LastUpgradeVersion = "1010"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎CGMBLEKit.xcodeproj/xcshareddata/xcschemes/CGMBLEKitUI.xcscheme‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1010"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "43A8EC51210D0A7400A81379"
18+
BuildableName = "CGMBLEKitUI.framework"
19+
BlueprintName = "CGMBLEKitUI"
20+
ReferencedContainer = "container:CGMBLEKit.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<Testables>
31+
</Testables>
32+
<AdditionalOptions>
33+
</AdditionalOptions>
34+
</TestAction>
35+
<LaunchAction
36+
buildConfiguration = "Debug"
37+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
38+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
39+
launchStyle = "0"
40+
useCustomWorkingDirectory = "NO"
41+
ignoresPersistentStateOnLaunch = "NO"
42+
debugDocumentVersioning = "YES"
43+
debugServiceExtension = "internal"
44+
allowLocationSimulation = "YES">
45+
<MacroExpansion>
46+
<BuildableReference
47+
BuildableIdentifier = "primary"
48+
BlueprintIdentifier = "43A8EC51210D0A7400A81379"
49+
BuildableName = "CGMBLEKitUI.framework"
50+
BlueprintName = "CGMBLEKitUI"
51+
ReferencedContainer = "container:CGMBLEKit.xcodeproj">
52+
</BuildableReference>
53+
</MacroExpansion>
54+
<AdditionalOptions>
55+
</AdditionalOptions>
56+
</LaunchAction>
57+
<ProfileAction
58+
buildConfiguration = "Release"
59+
shouldUseLaunchSchemeArgsEnv = "YES"
60+
savedToolIdentifier = ""
61+
useCustomWorkingDirectory = "NO"
62+
debugDocumentVersioning = "YES">
63+
<MacroExpansion>
64+
<BuildableReference
65+
BuildableIdentifier = "primary"
66+
BlueprintIdentifier = "43A8EC51210D0A7400A81379"
67+
BuildableName = "CGMBLEKitUI.framework"
68+
BlueprintName = "CGMBLEKitUI"
69+
ReferencedContainer = "container:CGMBLEKit.xcodeproj">
70+
</BuildableReference>
71+
</MacroExpansion>
72+
</ProfileAction>
73+
<AnalyzeAction
74+
buildConfiguration = "Debug">
75+
</AnalyzeAction>
76+
<ArchiveAction
77+
buildConfiguration = "Release"
78+
revealArchiveInOrganizer = "YES">
79+
</ArchiveAction>
80+
</Scheme>

‎CGMBLEKit/Base.lproj/Localizable.strings‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
/* CGM display title */
2+
"Dexcom G5" = "Dexcom G5";
3+
4+
/* CGM display title */
5+
"Dexcom G6" = "Dexcom G6";
6+
7+
/* Error description for unreliable state */
8+
"Glucose data is unavailable" = "Glucose data is unavailable";
9+
10+
"Low Battery" = "Low Battery";
11+
12+
/* Describes a functioning transmitter */
13+
"OK" = "OK";
14+
15+
/* Timeout error description */
16+
"Peripheral did not respond in time" = "Peripheral did not respond in time";
17+
18+
/* Not ready error description */
19+
"Peripheral isnʼt connected" = "Peripheral isnʼt connected";
20+
21+
/* The description of sensor calibration state when sensor calibration is ok. */
22+
"Sensor calibration is OK" = "Sensor calibration is OK";
23+
24+
/* The description of sensor calibration state when raw value is unknown. (1: missing data details) */
25+
"Sensor is in unknown state %1$d" = "Sensor is in unknown state %1$d";
26+
27+
/* The description of sensor calibration state when sensor sensor is stopped. */
28+
"Sensor is stopped" = "Sensor is stopped";
29+
30+
/* The description of sensor calibration state when sensor sensor is warming up. */
31+
"Sensor is warming up" = "Sensor is warming up";
32+
33+
/* The description of sensor calibration state when sensor needs calibration. */
34+
"Sensor needs calibration" = "Sensor needs calibration";
35+
36+
/* Error description */
37+
"Unknown characteristic" = "Unknown characteristic";

0 commit comments

Comments
 (0)