Skip to content

Commit 45b422f

Browse files
ps2ps2
authored
Merge pull request #170 from ps2/dev
v0.7.1
2 parents 0c80001 + 48e3327 commit 45b422f

File tree

13 files changed

+38
-36
lines changed

13 files changed

+38
-36
lines changed

‎MinimedKit/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>0.7.0</string>
18+
<string>0.7.1</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

‎MinimedKit/PumpModel.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public enum PumpModel: String {
5151
return (generation >= 23) ? 40 : 10
5252
}
5353

54-
var reservoirCapacity: Int {
54+
public var reservoirCapacity: Int {
5555
switch size {
5656
case 5:
5757
return 176

‎MinimedKitTests/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>BNDL</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>0.7.0</string>
18+
<string>0.7.1</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

‎NightscoutUploadKit/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>0.7.0</string>
18+
<string>0.7.1</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

‎NightscoutUploadKitTests/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>BNDL</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>0.7.0</string>
18+
<string>0.7.1</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

‎RileyLink.xcodeproj/project.pbxproj

+18-18
Original file line numberDiff line numberDiff line change
@@ -1943,11 +1943,11 @@
19431943
CLANG_WARN_UNREACHABLE_CODE = YES;
19441944
CODE_SIGN_IDENTITY = "iPhone Developer";
19451945
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
1946-
CURRENT_PROJECT_VERSION = 9;
1946+
CURRENT_PROJECT_VERSION = 10;
19471947
DEBUG_INFORMATION_FORMAT = dwarf;
19481948
DEFINES_MODULE = YES;
19491949
DYLIB_COMPATIBILITY_VERSION = 1;
1950-
DYLIB_CURRENT_VERSION = 9;
1950+
DYLIB_CURRENT_VERSION = 10;
19511951
DYLIB_INSTALL_NAME_BASE = "@rpath";
19521952
ENABLE_STRICT_OBJC_MSGSEND = YES;
19531953
GCC_NO_COMMON_BLOCKS = YES;
@@ -1971,11 +1971,11 @@
19711971
CODE_SIGN_IDENTITY = "iPhone Developer";
19721972
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
19731973
COPY_PHASE_STRIP = NO;
1974-
CURRENT_PROJECT_VERSION = 9;
1974+
CURRENT_PROJECT_VERSION = 10;
19751975
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
19761976
DEFINES_MODULE = YES;
19771977
DYLIB_COMPATIBILITY_VERSION = 1;
1978-
DYLIB_CURRENT_VERSION = 9;
1978+
DYLIB_CURRENT_VERSION = 10;
19791979
DYLIB_INSTALL_NAME_BASE = "@rpath";
19801980
ENABLE_STRICT_OBJC_MSGSEND = YES;
19811981
GCC_NO_COMMON_BLOCKS = YES;
@@ -2034,11 +2034,11 @@
20342034
CLANG_WARN_UNREACHABLE_CODE = YES;
20352035
CODE_SIGN_IDENTITY = "iPhone Developer";
20362036
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
2037-
CURRENT_PROJECT_VERSION = 9;
2037+
CURRENT_PROJECT_VERSION = 10;
20382038
DEBUG_INFORMATION_FORMAT = dwarf;
20392039
DEFINES_MODULE = YES;
20402040
DYLIB_COMPATIBILITY_VERSION = 1;
2041-
DYLIB_CURRENT_VERSION = 9;
2041+
DYLIB_CURRENT_VERSION = 10;
20422042
DYLIB_INSTALL_NAME_BASE = "@rpath";
20432043
ENABLE_STRICT_OBJC_MSGSEND = YES;
20442044
GCC_NO_COMMON_BLOCKS = YES;
@@ -2064,11 +2064,11 @@
20642064
CODE_SIGN_IDENTITY = "iPhone Developer";
20652065
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
20662066
COPY_PHASE_STRIP = NO;
2067-
CURRENT_PROJECT_VERSION = 9;
2067+
CURRENT_PROJECT_VERSION = 10;
20682068
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
20692069
DEFINES_MODULE = YES;
20702070
DYLIB_COMPATIBILITY_VERSION = 1;
2071-
DYLIB_CURRENT_VERSION = 9;
2071+
DYLIB_CURRENT_VERSION = 10;
20722072
DYLIB_INSTALL_NAME_BASE = "@rpath";
20732073
ENABLE_STRICT_OBJC_MSGSEND = YES;
20742074
GCC_NO_COMMON_BLOCKS = YES;
@@ -2127,11 +2127,11 @@
21272127
CLANG_WARN_UNREACHABLE_CODE = YES;
21282128
CODE_SIGN_IDENTITY = "iPhone Developer";
21292129
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
2130-
CURRENT_PROJECT_VERSION = 9;
2130+
CURRENT_PROJECT_VERSION = 10;
21312131
DEBUG_INFORMATION_FORMAT = dwarf;
21322132
DEFINES_MODULE = YES;
21332133
DYLIB_COMPATIBILITY_VERSION = 1;
2134-
DYLIB_CURRENT_VERSION = 9;
2134+
DYLIB_CURRENT_VERSION = 10;
21352135
DYLIB_INSTALL_NAME_BASE = "@rpath";
21362136
ENABLE_STRICT_OBJC_MSGSEND = YES;
21372137
GCC_NO_COMMON_BLOCKS = YES;
@@ -2156,11 +2156,11 @@
21562156
CODE_SIGN_IDENTITY = "iPhone Developer";
21572157
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
21582158
COPY_PHASE_STRIP = NO;
2159-
CURRENT_PROJECT_VERSION = 9;
2159+
CURRENT_PROJECT_VERSION = 10;
21602160
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
21612161
DEFINES_MODULE = YES;
21622162
DYLIB_COMPATIBILITY_VERSION = 1;
2163-
DYLIB_CURRENT_VERSION = 9;
2163+
DYLIB_CURRENT_VERSION = 10;
21642164
DYLIB_INSTALL_NAME_BASE = "@rpath";
21652165
ENABLE_STRICT_OBJC_MSGSEND = YES;
21662166
GCC_NO_COMMON_BLOCKS = YES;
@@ -2229,7 +2229,7 @@
22292229
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
22302230
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
22312231
COPY_PHASE_STRIP = NO;
2232-
CURRENT_PROJECT_VERSION = 9;
2232+
CURRENT_PROJECT_VERSION = 10;
22332233
ENABLE_TESTABILITY = YES;
22342234
GCC_C_LANGUAGE_STANDARD = gnu99;
22352235
GCC_DYNAMIC_NO_PIC = NO;
@@ -2271,7 +2271,7 @@
22712271
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
22722272
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
22732273
COPY_PHASE_STRIP = YES;
2274-
CURRENT_PROJECT_VERSION = 9;
2274+
CURRENT_PROJECT_VERSION = 10;
22752275
ENABLE_NS_ASSERTIONS = NO;
22762276
GCC_C_LANGUAGE_STANDARD = gnu99;
22772277
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -2376,11 +2376,11 @@
23762376
CLANG_WARN_UNREACHABLE_CODE = YES;
23772377
CODE_SIGN_IDENTITY = "iPhone Developer";
23782378
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
2379-
CURRENT_PROJECT_VERSION = 9;
2379+
CURRENT_PROJECT_VERSION = 10;
23802380
DEBUG_INFORMATION_FORMAT = dwarf;
23812381
DEFINES_MODULE = YES;
23822382
DYLIB_COMPATIBILITY_VERSION = 1;
2383-
DYLIB_CURRENT_VERSION = 9;
2383+
DYLIB_CURRENT_VERSION = 10;
23842384
DYLIB_INSTALL_NAME_BASE = "@rpath";
23852385
ENABLE_STRICT_OBJC_MSGSEND = YES;
23862386
FRAMEWORK_SEARCH_PATHS = (
@@ -2409,11 +2409,11 @@
24092409
CODE_SIGN_IDENTITY = "iPhone Developer";
24102410
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
24112411
COPY_PHASE_STRIP = NO;
2412-
CURRENT_PROJECT_VERSION = 9;
2412+
CURRENT_PROJECT_VERSION = 10;
24132413
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
24142414
DEFINES_MODULE = YES;
24152415
DYLIB_COMPATIBILITY_VERSION = 1;
2416-
DYLIB_CURRENT_VERSION = 9;
2416+
DYLIB_CURRENT_VERSION = 10;
24172417
DYLIB_INSTALL_NAME_BASE = "@rpath";
24182418
ENABLE_STRICT_OBJC_MSGSEND = YES;
24192419
FRAMEWORK_SEARCH_PATHS = (

‎RileyLink/RileyLink-Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<key>CFBundlePackageType</key>
2020
<string>APPL</string>
2121
<key>CFBundleShortVersionString</key>
22-
<string>0.7.0</string>
22+
<string>0.7.1</string>
2323
<key>CFBundleSignature</key>
2424
<string>????</string>
2525
<key>CFBundleVersion</key>

‎RileyLinkBLEKit/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>0.7.0</string>
18+
<string>0.7.1</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

‎RileyLinkBLEKitTests/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>BNDL</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>0.7.0</string>
18+
<string>0.7.1</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

‎RileyLinkKit/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>0.7.0</string>
18+
<string>0.7.1</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

‎RileyLinkKit/UI/RileyLinkDeviceTableViewController.swift

+9-7
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,11 @@ public class RileyLinkDeviceTableViewController: UITableViewController, TextFiel
1515

1616
public var device: RileyLinkDevice!
1717

18-
var rssiFetchTimer: NSTimer!
18+
var rssiFetchTimer: NSTimer? {
19+
willSet {
20+
rssiFetchTimer?.invalidate()
21+
}
22+
}
1923

2024
private var appeared = false
2125

@@ -29,8 +33,6 @@ public class RileyLinkDeviceTableViewController: UITableViewController, TextFiel
2933
title = device.name
3034

3135
self.observe()
32-
33-
rssiFetchTimer = NSTimer.scheduledTimerWithTimeInterval(3, target: self, selector: #selector(updateRSSI), userInfo: nil, repeats: true)
3436
}
3537

3638
func updateRSSI()
@@ -82,14 +84,14 @@ public class RileyLinkDeviceTableViewController: UITableViewController, TextFiel
8284
if appeared {
8385
tableView.reloadData()
8486
}
87+
88+
rssiFetchTimer = NSTimer.scheduledTimerWithTimeInterval(3, target: self, selector: #selector(updateRSSI), userInfo: nil, repeats: true)
8589

8690
appeared = true
8791
}
8892

89-
public override func viewDidDisappear(animated: Bool) {
90-
super.viewDidDisappear(animated)
91-
92-
rssiFetchTimer.invalidate()
93+
public override func viewWillDisappear(animated: Bool) {
94+
super.viewWillDisappear(animated)
9395
rssiFetchTimer = nil
9496
}
9597

‎RileyLinkKitTests/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>BNDL</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>0.7.0</string>
18+
<string>0.7.1</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

‎RileyLinkTests/RileyLinkTests-Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<key>CFBundlePackageType</key>
1414
<string>BNDL</string>
1515
<key>CFBundleShortVersionString</key>
16-
<string>0.7.0</string>
16+
<string>0.7.1</string>
1717
<key>CFBundleSignature</key>
1818
<string>????</string>
1919
<key>CFBundleVersion</key>

0 commit comments

Comments
 (0)