Skip to content

Commit

Permalink
Release 2.4.3
Browse files Browse the repository at this point in the history
  • Loading branch information
@grjanoszsilabs
grjanoszsilabs committed Mar 11, 2022
1 parent 1d31702 commit d2b1464
Show file tree
Hide file tree
Showing 14 changed files with 124 additions and 302 deletions.
16 changes: 15 additions & 1 deletion Podfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@ PODS:
- Realm/Headers (4.3.2)
- RealmSwift (4.3.2):
- Realm (= 4.3.2)
- RxCocoa (6.2.0):
- RxRelay (= 6.2.0)
- RxSwift (= 6.2.0)
- RxRelay (6.2.0):
- RxSwift (= 6.2.0)
- RxSwift (6.2.0)
- SVProgressHUD (2.2.5)
- UICircularProgressRing (4.1.0)
- WYPopoverController (0.2.2)
Expand All @@ -45,6 +51,8 @@ DEPENDENCIES:
- Quick
- Realm (~> 4.3.2)
- RealmSwift
- RxCocoa (~> 6.2.0)
- RxSwift (~> 6.2.0)
- SVProgressHUD (~> 2.2.5)
- UICircularProgressRing (~> 4.1.0)
- WYPopoverController (~> 0.2.2)
Expand All @@ -67,6 +75,9 @@ SPEC REPOS:
- Quick
- Realm
- RealmSwift
- RxCocoa
- RxRelay
- RxSwift
- SVProgressHUD
- UICircularProgressRing
- WYPopoverController
Expand Down Expand Up @@ -99,11 +110,14 @@ SPEC CHECKSUMS:
Quick: 6d9559f40647bc4d510103842ef2fdd882d753e2
Realm: 5e92902e2875dff4bb0fd02f67bb737c3d5db2bc
RealmSwift: 9a360fc7bae04fc2e308a34fbd899d5faa2d6b22
RxCocoa: 4baf94bb35f2c0ab31bc0cb9f1900155f646ba42
RxRelay: e72dbfd157807478401ef1982e1c61c945c94b2f
RxSwift: d356ab7bee873611322f134c5f9ef379fa183d8f
SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
UICircularProgressRing: 5a32c01f54474571b1e66e8fa050c0f83d6d981b
WYPopoverController: 00d879c25bddd1fd873dcc21aa98c8308d7f1555
XMLDictionary: fa07b6ff422b3a91d47a5de9bc82e3fc04fbd167

PODFILE CHECKSUM: 8636490deec038a8698cfeaa47fe53c04131ed21
PODFILE CHECKSUM: fa38ccfd90caab8b342bbeb884f33901d78598f1

COCOAPODS: 1.10.1
60 changes: 4 additions & 56 deletions SiliconLabsApp.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -787,10 +787,6 @@
200818E427037214003ED510 /* SILAppSelectionHelpViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 200818E327037214003ED510 /* SILAppSelectionHelpViewController.m */; };
205131182703636D00C27B92 /* SILAppTypeMotion.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 205131162703636D00C27B92 /* SILAppTypeMotion.storyboard */; };
205131192703636D00C27B92 /* SILAppTypeEnvironment.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 205131172703636D00C27B92 /* SILAppTypeEnvironment.storyboard */; };
2051311E2703638900C27B92 /* SILEnvironmentViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2051311B2703638900C27B92 /* SILEnvironmentViewController.swift */; };
2051311F2703638900C27B92 /* SILMotionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2051311D2703638900C27B92 /* SILMotionViewController.swift */; };
205131242703639400C27B92 /* SILMotionViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 205131212703639400C27B92 /* SILMotionViewModel.swift */; };
205131252703639400C27B92 /* SILEnvironmentViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 205131232703639400C27B92 /* SILEnvironmentViewModel.swift */; };
205131E0270365A800C27B92 /* ThunderBoardTypes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20513127270365A700C27B92 /* ThunderBoardTypes.swift */; };
205131E1270365A800C27B92 /* BleManager+DiscoveryFiltering.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20513128270365A700C27B92 /* BleManager+DiscoveryFiltering.swift */; };
205131E5270365A800C27B92 /* SILAppSelectionHelpViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2051312D270365A700C27B92 /* SILAppSelectionHelpViewController.xib */; };
Expand All @@ -817,7 +813,6 @@
2051320E270365A800C27B92 /* DemoConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20513156270365A700C27B92 /* DemoConfiguration.swift */; };
2051320F270365A800C27B92 /* SimulatedEnvironmentalDemoConnection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20513157270365A700C27B92 /* SimulatedEnvironmentalDemoConnection.swift */; };
20513211270365A800C27B92 /* BatteryIcon.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20513159270365A700C27B92 /* BatteryIcon.swift */; };
20513213270365A800C27B92 /* UIDevice+extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2051315B270365A700C27B92 /* UIDevice+extensions.swift */; };
20513214270365A800C27B92 /* StrengthCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2051315C270365A700C27B92 /* StrengthCell.swift */; };
20513215270365A800C27B92 /* BrightnessSlider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2051315D270365A700C27B92 /* BrightnessSlider.swift */; };
20513216270365A800C27B92 /* WeakTimer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2051315E270365A700C27B92 /* WeakTimer.swift */; };
Expand Down Expand Up @@ -1675,10 +1670,6 @@
200818E327037214003ED510 /* SILAppSelectionHelpViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SILAppSelectionHelpViewController.m; sourceTree = "<group>"; };
205131162703636D00C27B92 /* SILAppTypeMotion.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = SILAppTypeMotion.storyboard; sourceTree = "<group>"; };
205131172703636D00C27B92 /* SILAppTypeEnvironment.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = SILAppTypeEnvironment.storyboard; sourceTree = "<group>"; };
2051311B2703638900C27B92 /* SILEnvironmentViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SILEnvironmentViewController.swift; sourceTree = "<group>"; };
2051311D2703638900C27B92 /* SILMotionViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SILMotionViewController.swift; sourceTree = "<group>"; };
205131212703639400C27B92 /* SILMotionViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SILMotionViewModel.swift; sourceTree = "<group>"; };
205131232703639400C27B92 /* SILEnvironmentViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SILEnvironmentViewModel.swift; sourceTree = "<group>"; };
20513127270365A700C27B92 /* ThunderBoardTypes.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ThunderBoardTypes.swift; sourceTree = "<group>"; };
20513128270365A700C27B92 /* BleManager+DiscoveryFiltering.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "BleManager+DiscoveryFiltering.swift"; sourceTree = "<group>"; };
2051312C270365A700C27B92 /* WYPopoverController+SILHelpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "WYPopoverController+SILHelpers.h"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1706,7 +1697,6 @@
20513156270365A700C27B92 /* DemoConfiguration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DemoConfiguration.swift; sourceTree = "<group>"; };
20513157270365A700C27B92 /* SimulatedEnvironmentalDemoConnection.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SimulatedEnvironmentalDemoConnection.swift; sourceTree = "<group>"; };
20513159270365A700C27B92 /* BatteryIcon.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BatteryIcon.swift; sourceTree = "<group>"; };
2051315B270365A700C27B92 /* UIDevice+extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIDevice+extensions.swift"; sourceTree = "<group>"; };
2051315C270365A700C27B92 /* StrengthCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StrengthCell.swift; sourceTree = "<group>"; };
2051315D270365A700C27B92 /* BrightnessSlider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BrightnessSlider.swift; sourceTree = "<group>"; };
2051315E270365A700C27B92 /* WeakTimer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WeakTimer.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -2249,7 +2239,6 @@
2051315E270365A700C27B92 /* WeakTimer.swift */,
2051313C270365A700C27B92 /* Logging.swift */,
2051316B270365A700C27B92 /* Throttle.swift */,
2051315B270365A700C27B92 /* UIDevice+extensions.swift */,
);
path = Utilities;
sourceTree = "<group>";
Expand Down Expand Up @@ -2453,8 +2442,6 @@
isa = PBXGroup;
children = (
80B5FF7F275F911E008F08A8 /* WifiCommissioning */,
205131222703639400C27B92 /* Environment */,
205131202703639400C27B92 /* Motion */,
1EFC76B426AEE0120035594E /* Blinky */,
1EFC76BC26AEE02A0035594E /* Throughput */,
1EFC767B26AEDFA40035594E /* GattConfigurator */,
Expand Down Expand Up @@ -3975,38 +3962,6 @@
path = Warning;
sourceTree = "<group>";
};
2051311A2703638900C27B92 /* Environment */ = {
isa = PBXGroup;
children = (
2051311B2703638900C27B92 /* SILEnvironmentViewController.swift */,
);
path = Environment;
sourceTree = "<group>";
};
2051311C2703638900C27B92 /* Motion */ = {
isa = PBXGroup;
children = (
2051311D2703638900C27B92 /* SILMotionViewController.swift */,
);
path = Motion;
sourceTree = "<group>";
};
205131202703639400C27B92 /* Motion */ = {
isa = PBXGroup;
children = (
205131212703639400C27B92 /* SILMotionViewModel.swift */,
);
path = Motion;
sourceTree = "<group>";
};
205131222703639400C27B92 /* Environment */ = {
isa = PBXGroup;
children = (
205131232703639400C27B92 /* SILEnvironmentViewModel.swift */,
);
path = Environment;
sourceTree = "<group>";
};
20513126270365A700C27B92 /* ThunderBoard */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -4420,8 +4375,6 @@
isa = PBXGroup;
children = (
80B5FF93275F912F008F08A8 /* WifiCommissioning */,
2051311A2703638900C27B92 /* Environment */,
2051311C2703638900C27B92 /* Motion */,
1E973CF02672693400B5FC71 /* Blinky */,
1E4D8F4326035FE000924430 /* IOP Test App */,
1E26EC5C255019E0002FFAAB /* Advertiser */,
Expand Down Expand Up @@ -5695,7 +5648,6 @@
0C2FCB081F9A542300F4F259 /* SILAppearance.m in Sources */,
0C2FCB0A1F9A542300F4F259 /* SILBigRedButton.m in Sources */,
1E90F5F12476C3C90013AABD /* SILKeychainInfoViewController.swift in Sources */,
2051311E2703638900C27B92 /* SILEnvironmentViewController.swift in Sources */,
1E4DB386266A71E000405BD2 /* SILLocalGattServerViewController.swift in Sources */,
80B5FF89275F911E008F08A8 /* SILWifiCommissioningWriteCommandType.swift in Sources */,
1E973CD6267268D100B5FC71 /* SILBlinkyPeripheralDelegate.swift in Sources */,
Expand Down Expand Up @@ -5850,7 +5802,6 @@
2051321F270365A800C27B92 /* DeviceExtensions.swift in Sources */,
20513241270365A800C27B92 /* UIImage+Color.swift in Sources */,
0C2FCB341F9A542300F4F259 /* SILPopoverViewController.m in Sources */,
205131252703639400C27B92 /* SILEnvironmentViewModel.swift in Sources */,
20513247270365A800C27B92 /* MotionSenseBoardDemoViewController.swift in Sources */,
0C2FCB351F9A542300F4F259 /* SILThermometerSegmentedControl.m in Sources */,
1EC1F1E2260CE96800508552 /* SILDiscoverTestConnectionParameters.swift in Sources */,
Expand Down Expand Up @@ -5970,7 +5921,6 @@
20513268270365A800C27B92 /* RGBCell.swift in Sources */,
1E4D8F5B26035FE000924430 /* SILIOPTesterViewController.swift in Sources */,
80B5FFA0275F912F008F08A8 /* SILWifiCommissioningDisconnectPopup.swift in Sources */,
20513213270365A800C27B92 /* UIDevice+extensions.swift in Sources */,
2051320E270365A800C27B92 /* DemoConfiguration.swift in Sources */,
1E56B2222636EF96004F3EA6 /* SILIOPSecurityTestHelper.swift in Sources */,
1E4DB3B4266A720600405BD2 /* SILGattConfiguratorDescriptorButtonCellView.swift in Sources */,
Expand Down Expand Up @@ -6067,7 +6017,6 @@
1394F95E2566BD4400795E5A /* SILBigButton.swift in Sources */,
1EC1F274260CEBFE00508552 /* SILOTAAckTestCase.swift in Sources */,
1E4DB375266A71AE00405BD2 /* SILDemoNavigationViewController.swift in Sources */,
2051311F2703638900C27B92 /* SILMotionViewController.swift in Sources */,
205131E8270365A800C27B92 /* EnvironmentalDemoConnection.swift in Sources */,
133D39C32554514600BFB484 /* SILAdvertiserNotification.swift in Sources */,
1E3FC7D8252B5E40002F740D /* UITextField+DoneButton.swift in Sources */,
Expand All @@ -6077,7 +6026,6 @@
0C2FCB671F9A542300F4F259 /* SILConstants.m in Sources */,
1EABF868251B7511006358C8 /* SILCharacteristicWriteViewController.swift in Sources */,
4C3BA289240D58DF00CF3268 /* SILKeychainViewController.swift in Sources */,
205131242703639400C27B92 /* SILMotionViewModel.swift in Sources */,
1EFC766D26AEDF770035594E /* SILGattXmlMarkerType.swift in Sources */,
20513215270365A800C27B92 /* BrightnessSlider.swift in Sources */,
1E26EC86255019E0002FFAAB /* SILAdvertiserTypeCellView.swift in Sources */,
Expand Down Expand Up @@ -6624,7 +6572,7 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_RESOURCE_RULES_PATH = "";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 46;
CURRENT_PROJECT_VERSION = 48;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 52444FG85C;
DISPLAY_NAME = "EFR Connect";
Expand All @@ -6634,7 +6582,7 @@
INFOPLIST_FILE = "$(SRCROOT)/SiliconLabsApp/SupportingFiles/BlueGecko/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 2.4.2;
MARKETING_VERSION = 2.4.3;
PRODUCT_BUNDLE_IDENTIFIER = com.silabs.BlueGeckoDemoApp;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand All @@ -6658,7 +6606,7 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_RESOURCE_RULES_PATH = "";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 46;
CURRENT_PROJECT_VERSION = 48;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 52444FG85C;
DISPLAY_NAME = "EFR Connect";
Expand All @@ -6667,7 +6615,7 @@
INFOPLIST_FILE = "$(SRCROOT)/SiliconLabsApp/SupportingFiles/BlueGecko/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 2.4.2;
MARKETING_VERSION = 2.4.3;
PRODUCT_BUNDLE_IDENTIFIER = com.silabs.BlueGeckoDemoApp;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down
10 changes: 0 additions & 10 deletions SiliconLabsApp/ThunderBoard/Demos/Selection/NavBar.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,6 @@
import UIKit

class NavBar: UIView {


@IBOutlet weak var height: NSLayoutConstraint!

override func layoutSubviews() {
super.layoutSubviews()
if UIDevice.current.hasNoth {
height.constant = 148
}
}

override func draw(_ rect: CGRect) {
super.draw(rect)
Expand Down
36 changes: 0 additions & 36 deletions SiliconLabsApp/ThunderBoard/Utilities/UIDevice+extensions.swift
View file

This file was deleted.

36 changes: 0 additions & 36 deletions SiliconLabsApp/ViewControllers/Environment/SILEnvironmentViewController.swift
View file

This file was deleted.

38 changes: 0 additions & 38 deletions SiliconLabsApp/ViewControllers/Motion/SILMotionViewController.swift
View file

This file was deleted.

4 changes: 4 additions & 0 deletions SiliconLabsApp/ViewControllers/RangeTestApp/Peripheral/SILRangeTestCharacteristic.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,4 +195,8 @@ extension SILRangeTestCharacteristic {
return false
}
}

func getServiceCharacteristicEnum() -> SILRangeTestServiceCharacteristics? {
return SILRangeTestCharacteristic.rangeTestServiceCharacteristics.first(where: { $1 == self.uuid.uuidString.lowercased() })?.key
}
}
Loading

0 comments on commit d2b1464

Please sign in to comment.