Skip to content

Commit d2b1464

Browse files
grjanoszsilabsgrjanoszsilabs
committed
Release 2.4.3
1 parent 1d31702 commit d2b1464

14 files changed

+124
-302
lines changed

‎Podfile.lock

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@ PODS:
2323
- Realm/Headers (4.3.2)
2424
- RealmSwift (4.3.2):
2525
- Realm (= 4.3.2)
26+
- RxCocoa (6.2.0):
27+
- RxRelay (= 6.2.0)
28+
- RxSwift (= 6.2.0)
29+
- RxRelay (6.2.0):
30+
- RxSwift (= 6.2.0)
31+
- RxSwift (6.2.0)
2632
- SVProgressHUD (2.2.5)
2733
- UICircularProgressRing (4.1.0)
2834
- WYPopoverController (0.2.2)
@@ -45,6 +51,8 @@ DEPENDENCIES:
4551
- Quick
4652
- Realm (~> 4.3.2)
4753
- RealmSwift
54+
- RxCocoa (~> 6.2.0)
55+
- RxSwift (~> 6.2.0)
4856
- SVProgressHUD (~> 2.2.5)
4957
- UICircularProgressRing (~> 4.1.0)
5058
- WYPopoverController (~> 0.2.2)
@@ -67,6 +75,9 @@ SPEC REPOS:
6775
- Quick
6876
- Realm
6977
- RealmSwift
78+
- RxCocoa
79+
- RxRelay
80+
- RxSwift
7081
- SVProgressHUD
7182
- UICircularProgressRing
7283
- WYPopoverController
@@ -99,11 +110,14 @@ SPEC CHECKSUMS:
99110
Quick: 6d9559f40647bc4d510103842ef2fdd882d753e2
100111
Realm: 5e92902e2875dff4bb0fd02f67bb737c3d5db2bc
101112
RealmSwift: 9a360fc7bae04fc2e308a34fbd899d5faa2d6b22
113+
RxCocoa: 4baf94bb35f2c0ab31bc0cb9f1900155f646ba42
114+
RxRelay: e72dbfd157807478401ef1982e1c61c945c94b2f
115+
RxSwift: d356ab7bee873611322f134c5f9ef379fa183d8f
102116
SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
103117
UICircularProgressRing: 5a32c01f54474571b1e66e8fa050c0f83d6d981b
104118
WYPopoverController: 00d879c25bddd1fd873dcc21aa98c8308d7f1555
105119
XMLDictionary: fa07b6ff422b3a91d47a5de9bc82e3fc04fbd167
106120

107-
PODFILE CHECKSUM: 8636490deec038a8698cfeaa47fe53c04131ed21
121+
PODFILE CHECKSUM: fa38ccfd90caab8b342bbeb884f33901d78598f1
108122

109123
COCOAPODS: 1.10.1

‎SiliconLabsApp.xcodeproj/project.pbxproj

Lines changed: 4 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -787,10 +787,6 @@
787787
200818E427037214003ED510 /* SILAppSelectionHelpViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 200818E327037214003ED510 /* SILAppSelectionHelpViewController.m */; };
788788
205131182703636D00C27B92 /* SILAppTypeMotion.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 205131162703636D00C27B92 /* SILAppTypeMotion.storyboard */; };
789789
205131192703636D00C27B92 /* SILAppTypeEnvironment.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 205131172703636D00C27B92 /* SILAppTypeEnvironment.storyboard */; };
790-
2051311E2703638900C27B92 /* SILEnvironmentViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2051311B2703638900C27B92 /* SILEnvironmentViewController.swift */; };
791-
2051311F2703638900C27B92 /* SILMotionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2051311D2703638900C27B92 /* SILMotionViewController.swift */; };
792-
205131242703639400C27B92 /* SILMotionViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 205131212703639400C27B92 /* SILMotionViewModel.swift */; };
793-
205131252703639400C27B92 /* SILEnvironmentViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 205131232703639400C27B92 /* SILEnvironmentViewModel.swift */; };
794790
205131E0270365A800C27B92 /* ThunderBoardTypes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20513127270365A700C27B92 /* ThunderBoardTypes.swift */; };
795791
205131E1270365A800C27B92 /* BleManager+DiscoveryFiltering.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20513128270365A700C27B92 /* BleManager+DiscoveryFiltering.swift */; };
796792
205131E5270365A800C27B92 /* SILAppSelectionHelpViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2051312D270365A700C27B92 /* SILAppSelectionHelpViewController.xib */; };
@@ -817,7 +813,6 @@
817813
2051320E270365A800C27B92 /* DemoConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20513156270365A700C27B92 /* DemoConfiguration.swift */; };
818814
2051320F270365A800C27B92 /* SimulatedEnvironmentalDemoConnection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20513157270365A700C27B92 /* SimulatedEnvironmentalDemoConnection.swift */; };
819815
20513211270365A800C27B92 /* BatteryIcon.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20513159270365A700C27B92 /* BatteryIcon.swift */; };
820-
20513213270365A800C27B92 /* UIDevice+extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2051315B270365A700C27B92 /* UIDevice+extensions.swift */; };
821816
20513214270365A800C27B92 /* StrengthCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2051315C270365A700C27B92 /* StrengthCell.swift */; };
822817
20513215270365A800C27B92 /* BrightnessSlider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2051315D270365A700C27B92 /* BrightnessSlider.swift */; };
823818
20513216270365A800C27B92 /* WeakTimer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2051315E270365A700C27B92 /* WeakTimer.swift */; };
@@ -1675,10 +1670,6 @@
16751670
200818E327037214003ED510 /* SILAppSelectionHelpViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SILAppSelectionHelpViewController.m; sourceTree = "<group>"; };
16761671
205131162703636D00C27B92 /* SILAppTypeMotion.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = SILAppTypeMotion.storyboard; sourceTree = "<group>"; };
16771672
205131172703636D00C27B92 /* SILAppTypeEnvironment.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = SILAppTypeEnvironment.storyboard; sourceTree = "<group>"; };
1678-
2051311B2703638900C27B92 /* SILEnvironmentViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SILEnvironmentViewController.swift; sourceTree = "<group>"; };
1679-
2051311D2703638900C27B92 /* SILMotionViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SILMotionViewController.swift; sourceTree = "<group>"; };
1680-
205131212703639400C27B92 /* SILMotionViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SILMotionViewModel.swift; sourceTree = "<group>"; };
1681-
205131232703639400C27B92 /* SILEnvironmentViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SILEnvironmentViewModel.swift; sourceTree = "<group>"; };
16821673
20513127270365A700C27B92 /* ThunderBoardTypes.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ThunderBoardTypes.swift; sourceTree = "<group>"; };
16831674
20513128270365A700C27B92 /* BleManager+DiscoveryFiltering.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "BleManager+DiscoveryFiltering.swift"; sourceTree = "<group>"; };
16841675
2051312C270365A700C27B92 /* WYPopoverController+SILHelpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "WYPopoverController+SILHelpers.h"; sourceTree = "<group>"; };
@@ -1706,7 +1697,6 @@
17061697
20513156270365A700C27B92 /* DemoConfiguration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DemoConfiguration.swift; sourceTree = "<group>"; };
17071698
20513157270365A700C27B92 /* SimulatedEnvironmentalDemoConnection.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SimulatedEnvironmentalDemoConnection.swift; sourceTree = "<group>"; };
17081699
20513159270365A700C27B92 /* BatteryIcon.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BatteryIcon.swift; sourceTree = "<group>"; };
1709-
2051315B270365A700C27B92 /* UIDevice+extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIDevice+extensions.swift"; sourceTree = "<group>"; };
17101700
2051315C270365A700C27B92 /* StrengthCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StrengthCell.swift; sourceTree = "<group>"; };
17111701
2051315D270365A700C27B92 /* BrightnessSlider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BrightnessSlider.swift; sourceTree = "<group>"; };
17121702
2051315E270365A700C27B92 /* WeakTimer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WeakTimer.swift; sourceTree = "<group>"; };
@@ -2249,7 +2239,6 @@
22492239
2051315E270365A700C27B92 /* WeakTimer.swift */,
22502240
2051313C270365A700C27B92 /* Logging.swift */,
22512241
2051316B270365A700C27B92 /* Throttle.swift */,
2252-
2051315B270365A700C27B92 /* UIDevice+extensions.swift */,
22532242
);
22542243
path = Utilities;
22552244
sourceTree = "<group>";
@@ -2453,8 +2442,6 @@
24532442
isa = PBXGroup;
24542443
children = (
24552444
80B5FF7F275F911E008F08A8 /* WifiCommissioning */,
2456-
205131222703639400C27B92 /* Environment */,
2457-
205131202703639400C27B92 /* Motion */,
24582445
1EFC76B426AEE0120035594E /* Blinky */,
24592446
1EFC76BC26AEE02A0035594E /* Throughput */,
24602447
1EFC767B26AEDFA40035594E /* GattConfigurator */,
@@ -3975,38 +3962,6 @@
39753962
path = Warning;
39763963
sourceTree = "<group>";
39773964
};
3978-
2051311A2703638900C27B92 /* Environment */ = {
3979-
isa = PBXGroup;
3980-
children = (
3981-
2051311B2703638900C27B92 /* SILEnvironmentViewController.swift */,
3982-
);
3983-
path = Environment;
3984-
sourceTree = "<group>";
3985-
};
3986-
2051311C2703638900C27B92 /* Motion */ = {
3987-
isa = PBXGroup;
3988-
children = (
3989-
2051311D2703638900C27B92 /* SILMotionViewController.swift */,
3990-
);
3991-
path = Motion;
3992-
sourceTree = "<group>";
3993-
};
3994-
205131202703639400C27B92 /* Motion */ = {
3995-
isa = PBXGroup;
3996-
children = (
3997-
205131212703639400C27B92 /* SILMotionViewModel.swift */,
3998-
);
3999-
path = Motion;
4000-
sourceTree = "<group>";
4001-
};
4002-
205131222703639400C27B92 /* Environment */ = {
4003-
isa = PBXGroup;
4004-
children = (
4005-
205131232703639400C27B92 /* SILEnvironmentViewModel.swift */,
4006-
);
4007-
path = Environment;
4008-
sourceTree = "<group>";
4009-
};
40103965
20513126270365A700C27B92 /* ThunderBoard */ = {
40113966
isa = PBXGroup;
40123967
children = (
@@ -4420,8 +4375,6 @@
44204375
isa = PBXGroup;
44214376
children = (
44224377
80B5FF93275F912F008F08A8 /* WifiCommissioning */,
4423-
2051311A2703638900C27B92 /* Environment */,
4424-
2051311C2703638900C27B92 /* Motion */,
44254378
1E973CF02672693400B5FC71 /* Blinky */,
44264379
1E4D8F4326035FE000924430 /* IOP Test App */,
44274380
1E26EC5C255019E0002FFAAB /* Advertiser */,
@@ -5695,7 +5648,6 @@
56955648
0C2FCB081F9A542300F4F259 /* SILAppearance.m in Sources */,
56965649
0C2FCB0A1F9A542300F4F259 /* SILBigRedButton.m in Sources */,
56975650
1E90F5F12476C3C90013AABD /* SILKeychainInfoViewController.swift in Sources */,
5698-
2051311E2703638900C27B92 /* SILEnvironmentViewController.swift in Sources */,
56995651
1E4DB386266A71E000405BD2 /* SILLocalGattServerViewController.swift in Sources */,
57005652
80B5FF89275F911E008F08A8 /* SILWifiCommissioningWriteCommandType.swift in Sources */,
57015653
1E973CD6267268D100B5FC71 /* SILBlinkyPeripheralDelegate.swift in Sources */,
@@ -5850,7 +5802,6 @@
58505802
2051321F270365A800C27B92 /* DeviceExtensions.swift in Sources */,
58515803
20513241270365A800C27B92 /* UIImage+Color.swift in Sources */,
58525804
0C2FCB341F9A542300F4F259 /* SILPopoverViewController.m in Sources */,
5853-
205131252703639400C27B92 /* SILEnvironmentViewModel.swift in Sources */,
58545805
20513247270365A800C27B92 /* MotionSenseBoardDemoViewController.swift in Sources */,
58555806
0C2FCB351F9A542300F4F259 /* SILThermometerSegmentedControl.m in Sources */,
58565807
1EC1F1E2260CE96800508552 /* SILDiscoverTestConnectionParameters.swift in Sources */,
@@ -5970,7 +5921,6 @@
59705921
20513268270365A800C27B92 /* RGBCell.swift in Sources */,
59715922
1E4D8F5B26035FE000924430 /* SILIOPTesterViewController.swift in Sources */,
59725923
80B5FFA0275F912F008F08A8 /* SILWifiCommissioningDisconnectPopup.swift in Sources */,
5973-
20513213270365A800C27B92 /* UIDevice+extensions.swift in Sources */,
59745924
2051320E270365A800C27B92 /* DemoConfiguration.swift in Sources */,
59755925
1E56B2222636EF96004F3EA6 /* SILIOPSecurityTestHelper.swift in Sources */,
59765926
1E4DB3B4266A720600405BD2 /* SILGattConfiguratorDescriptorButtonCellView.swift in Sources */,
@@ -6067,7 +6017,6 @@
60676017
1394F95E2566BD4400795E5A /* SILBigButton.swift in Sources */,
60686018
1EC1F274260CEBFE00508552 /* SILOTAAckTestCase.swift in Sources */,
60696019
1E4DB375266A71AE00405BD2 /* SILDemoNavigationViewController.swift in Sources */,
6070-
2051311F2703638900C27B92 /* SILMotionViewController.swift in Sources */,
60716020
205131E8270365A800C27B92 /* EnvironmentalDemoConnection.swift in Sources */,
60726021
133D39C32554514600BFB484 /* SILAdvertiserNotification.swift in Sources */,
60736022
1E3FC7D8252B5E40002F740D /* UITextField+DoneButton.swift in Sources */,
@@ -6077,7 +6026,6 @@
60776026
0C2FCB671F9A542300F4F259 /* SILConstants.m in Sources */,
60786027
1EABF868251B7511006358C8 /* SILCharacteristicWriteViewController.swift in Sources */,
60796028
4C3BA289240D58DF00CF3268 /* SILKeychainViewController.swift in Sources */,
6080-
205131242703639400C27B92 /* SILMotionViewModel.swift in Sources */,
60816029
1EFC766D26AEDF770035594E /* SILGattXmlMarkerType.swift in Sources */,
60826030
20513215270365A800C27B92 /* BrightnessSlider.swift in Sources */,
60836031
1E26EC86255019E0002FFAAB /* SILAdvertiserTypeCellView.swift in Sources */,
@@ -6624,7 +6572,7 @@
66246572
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
66256573
CODE_SIGN_RESOURCE_RULES_PATH = "";
66266574
CODE_SIGN_STYLE = Automatic;
6627-
CURRENT_PROJECT_VERSION = 46;
6575+
CURRENT_PROJECT_VERSION = 48;
66286576
DEFINES_MODULE = YES;
66296577
DEVELOPMENT_TEAM = 52444FG85C;
66306578
DISPLAY_NAME = "EFR Connect";
@@ -6634,7 +6582,7 @@
66346582
INFOPLIST_FILE = "$(SRCROOT)/SiliconLabsApp/SupportingFiles/BlueGecko/Info.plist";
66356583
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
66366584
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
6637-
MARKETING_VERSION = 2.4.2;
6585+
MARKETING_VERSION = 2.4.3;
66386586
PRODUCT_BUNDLE_IDENTIFIER = com.silabs.BlueGeckoDemoApp;
66396587
PRODUCT_NAME = "$(TARGET_NAME)";
66406588
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -6658,7 +6606,7 @@
66586606
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
66596607
CODE_SIGN_RESOURCE_RULES_PATH = "";
66606608
CODE_SIGN_STYLE = Automatic;
6661-
CURRENT_PROJECT_VERSION = 46;
6609+
CURRENT_PROJECT_VERSION = 48;
66626610
DEFINES_MODULE = YES;
66636611
DEVELOPMENT_TEAM = 52444FG85C;
66646612
DISPLAY_NAME = "EFR Connect";
@@ -6667,7 +6615,7 @@
66676615
INFOPLIST_FILE = "$(SRCROOT)/SiliconLabsApp/SupportingFiles/BlueGecko/Info.plist";
66686616
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
66696617
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
6670-
MARKETING_VERSION = 2.4.2;
6618+
MARKETING_VERSION = 2.4.3;
66716619
PRODUCT_BUNDLE_IDENTIFIER = com.silabs.BlueGeckoDemoApp;
66726620
PRODUCT_NAME = "$(TARGET_NAME)";
66736621
PROVISIONING_PROFILE_SPECIFIER = "";

‎SiliconLabsApp/ThunderBoard/Demos/Selection/NavBar.swift

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,6 @@
99
import UIKit
1010

1111
class NavBar: UIView {
12-
13-
14-
@IBOutlet weak var height: NSLayoutConstraint!
15-
16-
override func layoutSubviews() {
17-
super.layoutSubviews()
18-
if UIDevice.current.hasNoth {
19-
height.constant = 148
20-
}
21-
}
2212

2313
override func draw(_ rect: CGRect) {
2414
super.draw(rect)

‎SiliconLabsApp/ThunderBoard/Utilities/UIDevice+extensions.swift

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎SiliconLabsApp/ViewControllers/Environment/SILEnvironmentViewController.swift

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎SiliconLabsApp/ViewControllers/Motion/SILMotionViewController.swift

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎SiliconLabsApp/ViewControllers/RangeTestApp/Peripheral/SILRangeTestCharacteristic.swift

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,4 +195,8 @@ extension SILRangeTestCharacteristic {
195195
return false
196196
}
197197
}
198+
199+
func getServiceCharacteristicEnum() -> SILRangeTestServiceCharacteristics? {
200+
return SILRangeTestCharacteristic.rangeTestServiceCharacteristics.first(where: { $1 == self.uuid.uuidString.lowercased() })?.key
201+
}
198202
}

0 commit comments

Comments
 (0)