Skip to content

Commit dcff9e8

Browse files
committed
Release 2.5.0
1 parent d2b1464 commit dcff9e8

File tree

134 files changed

+3636
-2480
lines changed

Some content is hidden

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

134 files changed

+3636
-2480
lines changed

Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ def shared_pods
1818
pod 'PureLayout', '~> 3.1.4'
1919
pod 'SVProgressHUD', '~> 2.2.5'
2020
pod 'UICircularProgressRing', '~> 4.1.0'
21-
pod 'WYPopoverController', '~> 0.2.2'
21+
pod 'WYPopoverController', :git => 'https://github.com/sammcewan/WYPopoverController.git'
2222
pod 'XMLDictionary', '~> 1.4.1'
2323
pod 'Realm', '~> 4.3.2'
2424
pod 'RealmSwift'

Podfile.lock

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ PODS:
3131
- RxSwift (6.2.0)
3232
- SVProgressHUD (2.2.5)
3333
- UICircularProgressRing (4.1.0)
34-
- WYPopoverController (0.2.2)
34+
- WYPopoverController (0.3.9)
3535
- XMLDictionary (1.4.1)
3636

3737
DEPENDENCIES:
@@ -55,7 +55,7 @@ DEPENDENCIES:
5555
- RxSwift (~> 6.2.0)
5656
- SVProgressHUD (~> 2.2.5)
5757
- UICircularProgressRing (~> 4.1.0)
58-
- WYPopoverController (~> 0.2.2)
58+
- WYPopoverController (from `https://github.com/sammcewan/WYPopoverController.git`)
5959
- XMLDictionary (~> 1.4.1)
6060

6161
SPEC REPOS:
@@ -80,18 +80,22 @@ SPEC REPOS:
8080
- RxSwift
8181
- SVProgressHUD
8282
- UICircularProgressRing
83-
- WYPopoverController
8483
- XMLDictionary
8584

8685
EXTERNAL SOURCES:
8786
Eddystone:
8887
:branch: nservidio/add-properties-to-Generic
8988
:git: https://github.com/IntrepidPursuits/eddystone-ios.git
89+
WYPopoverController:
90+
:git: https://github.com/sammcewan/WYPopoverController.git
9091

9192
CHECKOUT OPTIONS:
9293
Eddystone:
9394
:commit: ecbaed68ff82aecc82a52671fae17552658c2b8d
9495
:git: https://github.com/IntrepidPursuits/eddystone-ios.git
96+
WYPopoverController:
97+
:commit: 9b8011bd95bd95f6fca6a0afa78965fbf645a062
98+
:git: https://github.com/sammcewan/WYPopoverController.git
9599

96100
SPEC CHECKSUMS:
97101
ActionSheetPicker-3.0: eef157d75e151f255c5333d26656c7fbfe905a51
@@ -115,9 +119,9 @@ SPEC CHECKSUMS:
115119
RxSwift: d356ab7bee873611322f134c5f9ef379fa183d8f
116120
SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
117121
UICircularProgressRing: 5a32c01f54474571b1e66e8fa050c0f83d6d981b
118-
WYPopoverController: 00d879c25bddd1fd873dcc21aa98c8308d7f1555
122+
WYPopoverController: a9db25ac2841a686acdc0f3a99bdb21545db32f4
119123
XMLDictionary: fa07b6ff422b3a91d47a5de9bc82e3fc04fbd167
120124

121-
PODFILE CHECKSUM: fa38ccfd90caab8b342bbeb884f33901d78598f1
125+
PODFILE CHECKSUM: 0c27fdd7e95d8fb75e6cc907591fbf6ff042fa18
122126

123-
COCOAPODS: 1.10.1
127+
COCOAPODS: 1.10.2

README.md

Lines changed: 24 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,91 +1,44 @@
1-
# EFR Connect Mobile Application
2-
This is the source code for the EFR Connect mobile application.
1+
# Blue Gecko for iOS
2+
This is the source code for the Blue Gecko mobile application for iOS.
33

4-
## What is EFR Connect BLE mobile app?
4+
## Overview:
55

6-
Silicon Labs EFR Connect is a generic BLE mobile app for testing and debugging Bluetooth® Low Energy applications. With EFR Connect, you can quickly troubleshoot your BLE embedded application code, Over-the-Air (OTA) firmware update, data throughput, and interoperability with Android and iOS mobiles, among the many other features. You can use the EFR Connect app with all Silicon Labs Bluetooth development kits, Systems on Chip (SoC), and modules.
6+
* [Project Overview](#project-overview) - A general overview of the purpose of this project.
7+
* [Project Setup](#project-setup) - How to get set up with the Blue Gecko iOS project.
8+
* [Architecture](#architecture) - A general overview of the app's architecture.
79

8-
## Why download EFR Connect?
9-
EFR Connect radically saves the time you will use for testing and debugging! With EFR Connect, you can quickly see what’s wrong with your code and how to fix and optimize it. EFR Connect is the first BLE mobile app allowing you to test data throughput and mobile interoperability with a single tap on the app.
10+
## Project Overview
1011

11-
## How does it work?
12-
Using EFR Connect BLE mobile app is easy. It runs on your mobile devices such as a smartphone or tablet. It utilizes the Bluetooth adapter on the mobile to scan, connect and interact with nearby BLE hardware.
12+
The Silicon Labs Blue Gecko App displays temperature measurements from the Silicon Labs Wireless Starter Kit (SLWSK). The app can also indicate proximity to the SLWSTK using Find Me Profile (FMP) & Proximity Profiles (PXP). Finally, the SLWSK can be configured as a Retail Beacon to send advertisement data to the App.
1313

14-
After connecting the EFR Connect app and BLE hardware (e.g., a dev kit), the Blinky test on the app shows a green light indicating when your setup is ready to go. The app includes simple demos to teach you how to get started with EFR Connect and all Silicon Labs development tools.
14+
The current retail version can be found on the [US AppStore](https://itunes.apple.com/us/app/silicon-labs-blue-gecko-wstk/id1030932759?mt=8).
1515

16-
The Browser, Advertiser, and Logging features help you to find and fix bugs quickly and test throughput and mobile interoperability simply, with a tap of a button. With our Simplicity Studio’s Network Analyzer tool (free of charge), you can view the packet trace data and dive into the details.
16+
## Project Setup
1717

18-
## Demos and Sample Apps
19-
EFR Connect includes many demos to test sample apps in the Silicon Labs GSDK quickly. Here are demo examples:
18+
In order to load firmware to the device, get set up with [Simplicity Studio](https://www.silabs.com/products/development-tools/software/simplicity-studio).
2019

21-
- **Blinky**: The ”Hello World” of BLE – Toggling a LED is only one tap away.
22-
- **Throughput**: Measure application data throughput between the BLE hardware
23-
and your mobile device in both directions
24-
- **Health Thermometer**: Connect to a BLE hardware kit and receive the temperature data from the on-board sensor.
25-
- **Connected Lighting DMP**: Leverage the dynamic multi-protocol (DMP) sample apps to control a DMP light node from a mobile and protocol-specific switch node (Zigbee, proprietary) while keeping the light status in sync across all devices.
26-
- **Range Test**: Visualize the RSSI and other RF performance data on the mobile phone while running the Range Test sample application on a pair of Silicon Labs radio boards.
27-
- **Motion**: Control a 3D render of a Silicon Labs Thunderboard or Dev Kit that follows the phyiscal board movements.
28-
- **Environment**: Read and display the data from the on-board sensors on a Silicon Labs Thunderboard or Dev Kit.
29-
- **Wi-Fi Commissioning**: Commission a Wi-Fi device over BLE.
20+
The Silicon Labs iOS Application is built to support iOS 11 .0 and higher, and utilizes [CocoaPods](https://cocoapods.org/#install) for library dependency management.
3021

31-
## Development Features
32-
EFR Connect helps developers create and troubleshoot Bluetooth applications running on Silicon Labs’ BLE hardware. Here’s a rundown of some example functionalities.
22+
The application also contains a "hidden" debug button to the immediate right of the navigation bar that becomes visible on TouchDownInside, and contains a local Bluetooth device explorer.
3323

34-
**Bluetooth Browser** - A powerful tool to explore the BLE devices around you. Key features include:
35-
- Scan and sort results with a rich data set
36-
- Label favorite devices to surface on the top of scanning results
37-
- Advanced filtering to identify the types of devices you want to find
38-
- Save filters for later use
39-
- Multiple connections
40-
- Bluetooth 5 advertising extensions
41-
- Rename services and characteristics with 128-bit UUIDs (mappings dictionary)
42-
- Over-the-air (OTA) device firmware upgrade (DFU) in reliable and fast modes
43-
- Configurable MTU and connection interval
44-
- All GATT operations
24+
## Architecture
4525

46-
**Bluetooth Advertiser** – Create and enable multiple parallel advertisement sets:
47-
- Legacy and extended advertising
48-
- Configurable advertisement interval, TX Power, primary/secondary PHYs
49-
- Manual advertisement start/stop and stop based on a time/event limit
50-
- Support for multiple AD types
26+
#### Health Thermometer
5127

52-
**Bluetooth GATT Configurator** – Create and manipulate multiple GATT databases
53-
- Add services, characteristics and descriptors
54-
- Operate the local GATT from the browser when connected to a device
55-
- Import/export GATT database between the mobile device and Simplicity Studio GATT Configurator
28+
To test the Health Thermometer, load the `SOC - Thermometer` firmware in Simplicity Studio. Open the app and select the Health Thermometer cell. You will be presented with a popover. You are able to select Blue Gecko devices or Other devices. Blue Geckos is selected by default. Select Other. You should see a thermometer called Thermometer Example in the list. You should be able to select that thermometer and be brought to a temperature readout screen.
5629

57-
**Bluetooth Interoperability Test** – Verify interoperability between the BLE hardware
58-
and your mobile device
59-
- Runs a sequence of BLE operations to verify interoperability
60-
- Export results log
30+
#### Bluetooth Beaconing
6131

32+
When you enter the Bluetooth Beaconing portion of the app, the app begins to look for several types of "beacons" including iBeacon, AltBeacons, BGBeacons, and Eddystone Beacons.
6233

6334

64-
## Additional information
65-
The app can be found on the [Google PlayStore](https://play.google.com/store/apps/details?id=com.siliconlabs.bledemo&hl=en) and [Apple App Store](https://apps.apple.com/us/app/blue-gecko/id1030932759).
66-
67-
[Learn more about EFR Connect BLE mobile app](https://www.silabs.com/developers/efr-connect-mobile-app).
68-
69-
[Release Notes](https://www.silabs.com/developers/efr-connect-mobile-app)
70-
71-
For more information on Silicon Labs product portfolio please visit [www.silabs.com](https://www.silabs.com).
35+
#### Key Fobs
7236

37+
In order to test the Key Fob mode, make sure that the `SOC - Smart Phone App` firmware is loaded. Open the app and select Key Fobs. Make sure that the hardware is displaying "HTM/KEYFOB MODE" on its LCD display. If it isn't, press the PB0 button. Then press the FIND button in the app. notice that the two small LEDs between the LCD display and the Blue Gecko board are now flashing! If you back out of the Key Fob screen you will see that the app is disconnecting and the LEDs will stop flashing.
7338

74-
## License
75-
76-
Copyright 2021 Silicon Laboratories
77-
78-
Licensed under the Apache License, Version 2.0 (the "License");
79-
you may not use this file except in compliance with the License.
80-
You may obtain a copy of the License at
81-
82-
http://www.apache.org/licenses/LICENSE-2.0
83-
84-
Unless required by applicable law or agreed to in writing, software
85-
distributed under the License is distributed on an "AS IS" BASIS,
86-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
87-
See the License for the specific language governing permissions and
88-
limitations under the License.
89-
39+
#### Bluetooth Browser
9040

41+
The Bluetooth browser searches for all Bluetooth peripherals in the surrounding area.
9142

43+
## Additional information
44+
For more information, please visit [www.silabs.com](https://www.silabs.com).

SiliconLabsApp-Bridging-Header.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@
1010
#import "SILBeacon.h"
1111
#import "SILCentralManager.h"
1212
#import "SILDiscoveredPeripheralDisplayDataViewModel.h"
13-
#import "SILDiscoveredPeripheral.h"
1413
#import "SILBrowserBeaconType.h"
15-
#import "SILRSSIMeasurementTable.h"
1614
#import "UIColor+SILColors.h"
1715
#import "SILApp.h"
1816
#import "WYPopoverController+SILHelpers.h"
@@ -44,6 +42,8 @@
4442
#import "UIImage+SILImages.h"
4543
#import "SILBrowserLogViewController.h"
4644
#import "SILBrowserFilterViewController.h"
45+
#import "SILBrowserFilterViewControllerDelegate.h"
46+
#import "SILBrowserFilterViewModel.h"
4747
#import "SILBrowserConnectionsViewController.h"
4848
#import "SILStoryboard+Constants.h"
4949
#import "SILBrowserBeaconType.h"

0 commit comments

Comments
 (0)