Skip to content

Commit

Permalink
Merge pull request #23 from SiliconLabs/release-3.0.1
Browse files Browse the repository at this point in the history 
24Q4 Patch-1: Bug fixes
  • Loading branch information
@mantosh83
mantosh83 authored Feb 4, 2025
2 parents ae7ff65 + 143119a commit 6540c45
Show file tree
Hide file tree
Showing 28 changed files with 1,193 additions and 112 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Simplicity Connect includes many demos to test sample apps in the Silicon Labs G
- **Matter**: Commission and control of the Matter devices over Thread and Wi-Fi.
- **Wi-Fi OTA Firmware Update**: The Wi-Fi OTA firmware update demo demonstrates how to update the SiWx91x user application firmware over Wi-Fi connection, by downloading the image from the mobile phone.
- **Wi-Fi 917 Sensors**: The Wi-Fi 917 Sensor demo demonstrates to read and display sensor data from 917 Dev Kit.
- **Wi-Fi Throughput**: Wi-Fi demo feature for measuring data throughput between SiWx91X device and the mobile phone
- **Wi-Fi Throughput**: Wi-Fi demo feature for measuring data throughput between SiWx91X device and the mobile phone.

## Development Features
Simplicity Connect helps developers create and troubleshoot Bluetooth applications running on Silicon Labs’ BLE hardware. Here’s a rundown of some example functionalities.
Expand Down
62 changes: 56 additions & 6 deletions SiliconLabsApp.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1031,6 +1031,14 @@
4D9E26252212CA7000617DBA /* SILRangeTestBoardInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D9E26242212CA7000617DBA /* SILRangeTestBoardInfo.swift */; };
4D9E26262212CA7000617DBA /* SILRangeTestBoardInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D9E26242212CA7000617DBA /* SILRangeTestBoardInfo.swift */; };
4D9E26272212CA7000617DBA /* SILRangeTestBoardInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D9E26242212CA7000617DBA /* SILRangeTestBoardInfo.swift */; };
721169172D38FBC500065E3F /* slider-default7-handle.png in Resources */ = {isa = PBXBuildFile; fileRef = 7211690A2D38FBC500065E3F /* slider-default7-handle.png */; };
721169182D38FBC500065E3F /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 7211690B2D38FBC500065E3F /* [email protected] */; };
721169192D38FBC500065E3F /* slider-default7-track.png in Resources */ = {isa = PBXBuildFile; fileRef = 7211690C2D38FBC500065E3F /* slider-default7-track.png */; };
7211691A2D38FBC500065E3F /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 7211690D2D38FBC500065E3F /* [email protected] */; };
7211691B2D38FBC500065E3F /* slider-default7-trackBackground.png in Resources */ = {isa = PBXBuildFile; fileRef = 7211690E2D38FBC500065E3F /* slider-default7-trackBackground.png */; };
7211691C2D38FBC500065E3F /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 7211690F2D38FBC500065E3F /* [email protected] */; };
7211691F2D38FBC500065E3F /* NMRangeSlider.m in Sources */ = {isa = PBXBuildFile; fileRef = 721169142D38FBC500065E3F /* NMRangeSlider.m */; };
721169202D38FBC500065E3F /* NMRangeSlider.podspec in Resources */ = {isa = PBXBuildFile; fileRef = 721169152D38FBC500065E3F /* NMRangeSlider.podspec */; };
721423922AD69E8B00DC3FA2 /* PlugViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 721423912AD69E8B00DC3FA2 /* PlugViewController.m */; };
7254545F2ACC1710003967CA /* Cluster.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7254545E2ACC1710003967CA /* Cluster.storyboard */; };
725454622ACC82B9003967CA /* WindowOpenCloseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 725454612ACC82B9003967CA /* WindowOpenCloseViewController.m */; };
Expand Down Expand Up @@ -2130,6 +2138,15 @@
63D66014C77760FCDAC6A134 /* Pods-SiliconLabsApp Dev.release-wireless-gecko.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SiliconLabsApp Dev.release-wireless-gecko.xcconfig"; path = "Pods/Target Support Files/Pods-SiliconLabsApp Dev/Pods-SiliconLabsApp Dev.release-wireless-gecko.xcconfig"; sourceTree = "<group>"; };
6E7E1967C516A49F37A0A7B8 /* Pods_WirelessGecko.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_WirelessGecko.framework; sourceTree = BUILT_PRODUCTS_DIR; };
71F25116C7DF08741307B3E0 /* Pods_BlueGecko.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_BlueGecko.framework; sourceTree = BUILT_PRODUCTS_DIR; };
7211690A2D38FBC500065E3F /* slider-default7-handle.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "slider-default7-handle.png"; sourceTree = "<group>"; };
7211690B2D38FBC500065E3F /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
7211690C2D38FBC500065E3F /* slider-default7-track.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "slider-default7-track.png"; sourceTree = "<group>"; };
7211690D2D38FBC500065E3F /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
7211690E2D38FBC500065E3F /* slider-default7-trackBackground.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "slider-default7-trackBackground.png"; sourceTree = "<group>"; };
7211690F2D38FBC500065E3F /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
721169132D38FBC500065E3F /* NMRangeSlider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NMRangeSlider.h; sourceTree = "<group>"; };
721169142D38FBC500065E3F /* NMRangeSlider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NMRangeSlider.m; sourceTree = "<group>"; };
721169152D38FBC500065E3F /* NMRangeSlider.podspec */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = NMRangeSlider.podspec; sourceTree = "<group>"; };
721423902AD69E8B00DC3FA2 /* PlugViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PlugViewController.h; sourceTree = "<group>"; };
721423912AD69E8B00DC3FA2 /* PlugViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PlugViewController.m; sourceTree = "<group>"; };
722F5EF560719504746B876B /* Pods-BlueGecko.release-wireless-gecko.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-BlueGecko.release-wireless-gecko.xcconfig"; path = "Pods/Target Support Files/Pods-BlueGecko/Pods-BlueGecko.release-wireless-gecko.xcconfig"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -3731,6 +3748,7 @@
1E6AF7FB23CDB2F600EE8280 /* Filter */ = {
isa = PBXGroup;
children = (
721169162D38FBC500065E3F /* RangeSlider */,
1EEE316123F58EE10076E731 /* Cells */,
1E6AF80223CDB33600EE8280 /* SILBrowserFilterViewController.h */,
1E6AF80323CDB33600EE8280 /* SILBrowserFilterViewController.m */,
Expand Down Expand Up @@ -4864,6 +4882,30 @@
path = Board;
sourceTree = "<group>";
};
721169122D38FBC500065E3F /* DefaultTheme7 */ = {
isa = PBXGroup;
children = (
7211690A2D38FBC500065E3F /* slider-default7-handle.png */,
7211690B2D38FBC500065E3F /* [email protected] */,
7211690C2D38FBC500065E3F /* slider-default7-track.png */,
7211690D2D38FBC500065E3F /* [email protected] */,
7211690E2D38FBC500065E3F /* slider-default7-trackBackground.png */,
7211690F2D38FBC500065E3F /* [email protected] */,
);
path = DefaultTheme7;
sourceTree = "<group>";
};
721169162D38FBC500065E3F /* RangeSlider */ = {
isa = PBXGroup;
children = (
721169122D38FBC500065E3F /* DefaultTheme7 */,
721169132D38FBC500065E3F /* NMRangeSlider.h */,
721169142D38FBC500065E3F /* NMRangeSlider.m */,
721169152D38FBC500065E3F /* NMRangeSlider.podspec */,
);
path = RangeSlider;
sourceTree = "<group>";
};
729B0EDC2A99DFCC0019C33C /* ViewModel */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -5853,6 +5895,7 @@
1E26EC5A255019CA002FFAAB /* SILAppAdvertiser.storyboard in Resources */,
1EA78D0C2435DCBF001656E9 /* SILDeviceSelectionViewController.xib in Resources */,
1E0C1273298BE79900BCADFC /* SILAppTypeESLDemo.storyboard in Resources */,
721169202D38FBC500065E3F /* NMRangeSlider.podspec in Resources */,
7254545F2ACC1710003967CA /* Cluster.storyboard in Resources */,
80671C40271EE2A4009B6284 /* BRD4184A_LowPoly.mtl in Resources */,
4C2CB43E240EBC550079040D /* SILMapNameEditorViewController.xib in Resources */,
Expand Down Expand Up @@ -5883,24 +5926,30 @@
1E26EC5B255019CA002FFAAB /* SILAppAdvertiserDetails.storyboard in Resources */,
4C9EAB5F24042FB00023FFB1 /* Roboto-LightItalic.ttf in Resources */,
1E1457FF266E0579009792C2 /* SILAppTypeThroughput.storyboard in Resources */,
7211691B2D38FBC500065E3F /* slider-default7-trackBackground.png in Resources */,
2051321A270365A800C27B92 /* Assets.xcassets in Resources */,
72F453C82BE8FA13000E38C1 /* PrivacyInfo.xcprivacy in Resources */,
0C2FCBB81F9A542300F4F259 /* SILDebugAdvDetailsViewController.xib in Resources */,
4C95EB7723FEC8600091FB5A /* SILAppBluetoothBrowserDetails.storyboard in Resources */,
0C2FCBB91F9A542300F4F259 /* SILRetailBeaconDetailsViewController.xib in Resources */,
721169192D38FBC500065E3F /* slider-default7-track.png in Resources */,
80671C3B271EE2A4009B6284 /* BRD4184A_LowPoly.scn in Resources */,
1E90F5E82473E8340013AABD /* SILDebugServicesMenuTableViewCell.xib in Resources */,
1EEE315823F57CED0076E731 /* SILSavedSearchesTableViewCell.xib in Resources */,
7211691A2D38FBC500065E3F /* [email protected] in Resources */,
721169172D38FBC500065E3F /* slider-default7-handle.png in Resources */,
1E4D8F6126035FE000924430 /* SILIOPTest.storyboard in Resources */,
0C2FCBBB1F9A542300F4F259 /* SILDebugCharacteristicPropertyView.xib in Resources */,
0C2FCBBF1F9A542300F4F259 /* SILRetailBeaconAppViewController.xib in Resources */,
1E4DB3BA266A720600405BD2 /* SILCreateGattDescriptorViewController.xib in Resources */,
1E26EC9E255019E0002FFAAB /* SILRemoveServiceListWarningDialogViewController.xib in Resources */,
7211691C2D38FBC500065E3F /* [email protected] in Resources */,
1E4DB3AC266A720600405BD2 /* SILCreateGattServiceViewController.xib in Resources */,
1E29C34629D596F000D239C4 /* SILESLImageUpdatePopup.xib in Resources */,
20513227270365A800C27B92 /* TBSense_Rev_Lowpoly_2.obj in Resources */,
20513229270365A800C27B92 /* BRD4160_NewGoldBackText.jpg in Resources */,
1EDA0A0F253472EE0031961D /* SILErrorDetailsViewController.xib in Resources */,
721169182D38FBC500065E3F /* [email protected] in Resources */,
72CA90052AC1C96600FE70BA /* SILSelectedMatterDeviceCell.xib in Resources */,
0C2FCBC01F9A542300F4F259 /* SILDebugServiceTableViewCell~ipad.xib in Resources */,
1EA78D0B2435DCBF001656E9 /* SILDeviceSelectionCollectionViewCell.xib in Resources */,
Expand Down Expand Up @@ -6853,6 +6902,7 @@
0C2FCB591F9A542300F4F259 /* SILBeacon.m in Sources */,
1EC1F1E9260CE9D000508552 /* SILDiscoverGATTTestCase.swift in Sources */,
80FB2ED327FF29CD00241470 /* UIViewController+ShowExportFiles.swift in Sources */,
7211691F2D38FBC500065E3F /* NMRangeSlider.m in Sources */,
0C2FCB5C1F9A542300F4F259 /* SILOTASetupViewController.m in Sources */,
1E7CD33A260DDE740022FE80 /* SILIOPTesterCentralManager.swift in Sources */,
433810762C6A392300213F3D /* SILWifiThroughputGaugeView.swift in Sources */,
Expand Down Expand Up @@ -7483,7 +7533,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_RESOURCE_RULES_PATH = "";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 15;
CURRENT_PROJECT_VERSION = 1;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 52444FG85C;
DISPLAY_NAME = "Si Connect";
Expand All @@ -7496,12 +7546,12 @@
"GCC_PREPROCESSOR_DEFINITIONS[arch=*]" = "$(inherited)";
INFOPLIST_FILE = "$(SRCROOT)/SiliconLabsApp/SupportingFiles/BlueGecko/Info.plist";
INFOPLIST_KEY_UIStatusBarStyle = UIStatusBarStyleLightContent;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 3.0.0;
MARKETING_VERSION = 3.0.1;
PRODUCT_BUNDLE_IDENTIFIER = com.silabs.BlueGeckoDemoApp;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand All @@ -7525,7 +7575,7 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_RESOURCE_RULES_PATH = "";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 15;
CURRENT_PROJECT_VERSION = 1;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 52444FG85C;
Expand All @@ -7538,12 +7588,12 @@
GCC_PREFIX_HEADER = "$(SRCROOT)/SiliconLabsApp/SupportingFiles/BlueGecko/BlueGecko.pch";
INFOPLIST_FILE = "$(SRCROOT)/SiliconLabsApp/SupportingFiles/BlueGecko/Info.plist";
INFOPLIST_KEY_UIStatusBarStyle = UIStatusBarStyleLightContent;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 3.0.0;
MARKETING_VERSION = 3.0.1;
PRODUCT_BUNDLE_IDENTIFIER = com.silabs.BlueGeckoDemoApp;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
Expand Down
1 change: 1 addition & 0 deletions SiliconLabsApp/Categories/SILBluetoothBrowser+Constants.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ extern NSInteger const NoDeviceFoundIndex;
extern const float AnimationExpandableControllerTime;
extern const float AnimationExpandableControllerDelay;
extern NSInteger DefaultDBMValue;
extern NSInteger DefaultDBMMaxValue;
extern NSString* const CommaAndSpaceText;
extern NSString * const QuoteText;
extern NSString * const RSSITitle;
Expand Down
1 change: 1 addition & 0 deletions SiliconLabsApp/Categories/SILBluetoothBrowser+Constants.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
const float AnimationExpandableControllerTime = 0.4;
const float AnimationExpandableControllerDelay = 0.0;
NSInteger DefaultDBMValue = -100;
NSInteger DefaultDBMMaxValue = -0;
NSString * const CommaAndSpaceText = @", ";
NSString * const QuoteText = @"\"";
NSString * const RSSITitle = @"RSSI > ";
Expand Down
1 change: 1 addition & 0 deletions SiliconLabsApp/Models/SILBrowserSavedSearches.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

@property (strong, nonatomic, readonly) NSString *searchByDeviceNameText;
@property (nonatomic, readonly) NSInteger dBmValue;
@property (nonatomic, readonly) NSInteger dBmMaxValue;
@property (strong, nonatomic, readonly) NSArray<SILBrowserBeaconType*>* beaconTypes;
@property (nonatomic, readonly) BOOL isFavourite;
@property (nonatomic, readonly) BOOL isConnectable;
Expand Down
72 changes: 63 additions & 9 deletions SiliconLabsApp/Redesign/SettingsView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,28 @@ struct SettingsView: View {
var body: some View {
let appInfo = NSLocalizedString("app_info", comment: "")
NavBarViewWithButtons(title: "Settings") {
VStack {
Spacer()
if #available(iOS 15, *) {
Text(LocalizedStringKey(appInfo)).accentColor(.blue)
}else {
LabelView(text: appInfo)

ScrollView {
VStack {
Spacer()
CardViewWithPicker()
Spacer()
Section {
if #available(iOS 15, *) {
Text(LocalizedStringKey(appInfo)).accentColor(.blue)
}else {
LabelView(text: appInfo)
}
}
.padding()

Spacer()
Text("App version \(version)").padding(.bottom, 20)
}
Spacer()
Text("App version \(version)").padding(.bottom, 20)
.frame(maxWidth: .infinity)
.background(Color(.sil_background()))

}
.frame(maxWidth: .infinity)
.background(Color(.sil_background()))
} trailingInNavBar: {
EmptyView()
Expand Down Expand Up @@ -58,3 +69,46 @@ fileprivate struct LabelView: UIViewRepresentable {
uiView.text = text
}
}

struct CardViewWithPicker: View {

var timeOutValue = ["15 seconds", "1 minute", "2 minutes", " 5 minutes", "10 minutes", "No timeout"]
@State private var selectedOption: String = UserDefaults.standard.string(forKey: "SelectedOption") ?? "1 minute"

var body: some View {
HStack(alignment: .center, spacing: 2) {
Text("Select Scaning Timeout:")
.font(.subheadline)
.foregroundColor(Color.black)

Spacer()

Picker("Options", selection: $selectedOption) {
ForEach(timeOutValue, id: \.self) { option in
Text(option).tag(option)
.foregroundColor(Color.black)
}
}
.tint(.blue)
.pickerStyle(MenuPickerStyle())
.onChange(of: selectedOption) { newValue in
saveToUserDefaults(newValue) // Save the selected value to UserDefaults
}

}
.padding()
.background(
RoundedRectangle(cornerRadius: 5)
.fill(Color(.white))
.shadow(color: Color.black.opacity(0.1), radius: 5, x: 0, y: 2)
)
.padding()

}

// Function to save to UserDefaults
private func saveToUserDefaults(_ value: String) {
UserDefaults.standard.set(value, forKey: "SelectedOption")
}
}

Loading

0 comments on commit 6540c45

Please sign in to comment.