Skip to content

Commit 552348e

Browse files
committed
Release-v3.1.2 package
1 parent e6a1024 commit 552348e

File tree

5 files changed

+13
-14
lines changed

5 files changed

+13
-14
lines changed

SiliconLabsApp/Models/SILOTAFirmwareUpdateManager.m

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -146,17 +146,16 @@ - (void)cycleDeviceWithInitiationByteSequence:(BOOL)initiatingByteSequence
146146
NSLog(@"Series 3 == ++++++++++++%d", [self.peripheral hasOTADataCharacteristic]);
147147
progress(SILDFUStatusWaiting);
148148
progress(SILDFUStatusWaiting);
149-
// progress(SILDFUStatusWaiting);
150149
self.peripheral.delegate = self;
151150
[self.peripheral discoverServices:nil];
152-
// [self disconnectConnectedPeripheral];
153-
// progress(SILDFUStatusRebooting);
154-
// dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
155-
// progress(SILDFUStatusWaiting);
151+
152+
// dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
156153
// progress(SILDFUStatusWaiting);
157-
// //progress(SILDFUStatusWaiting);
158-
// [self reconnectToOTADevice];
154+
// self.peripheral.delegate = self;
155+
// [self.peripheral discoverServices:nil];
159156
// });
157+
158+
160159
}else{
161160
if (initiatingByteSequence && ![self.peripheral hasOTADataCharacteristic]) {
162161
[self writeSingleByteValue:kSILInitiateDFUData toCharacteristic:[self.peripheral otaControlCharacteristic]];

SiliconLabsApp/ViewControllers/IOP Test App/TestScenario/Test_5/TestCases/SILOTAAckTestCase.swift

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,9 @@ class SILOTAAckTestCase: SILTestCase {
196196
self.testResult.value = SILTestResult(testID: self.testID, testName: self.testName, testStatus: .unknown(reason: "Unsupported board."))
197197
IOPLog().iopLogSwiftFunction(message: "Unsupported board.")
198198
}
199-
200-
self.otaUpdateManager.startTest(for: boardID, firmwareVersion: firmwareInfo!.originalVersion)
199+
DispatchQueue.main.asyncAfter(deadline: .now() + 2) {
200+
self.otaUpdateManager.startTest(for: boardID, firmwareVersion: self.firmwareInfo!.originalVersion)
201+
}
201202
}
202203

203204
@objc private func scanIntervalTimerFired() {

SiliconLabsApp/ViewControllers/IOP Test App/TestScenario/Test_6/TestCases/SILOTANonAckTestCase.swift

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,9 @@ class SILOTANonAckTestCase: SILTestCase {
124124
self.invalidateObservableTokens()
125125
self.testResult.value = SILTestResult(testID: self.testID, testName: self.testName, testStatus: .unknown(reason: "Unsupported board."))
126126
}
127-
128-
self.otaUpdateManager.startTest(for: boardID, firmwareVersion: firmwareInfo!.originalVersion)
127+
DispatchQueue.main.asyncAfter(deadline: .now() + 15) {
128+
self.otaUpdateManager.startTest(for: boardID, firmwareVersion: self.firmwareInfo!.originalVersion)
129+
}
129130
}
130131

131132
private func reconnectToDevice(passed: Bool, description: String? = nil) {

SiliconLabsApp/ViewControllers/IOP Test App/ViewModel/SILIOPTesterViewModel.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,6 @@ class SILIOPTesterViewModel: NSObject, ObservableObject {
174174
observableTokens.append(iopTest[i].testResults.observe({ testResults in
175175
if testResults.isEmpty { return }
176176
guard let weakSelf = weakSelf else { return }
177-
print("SOVAN TEST: \(self.iopTest[i])")
178-
print("SOVAN TEST RESULT: \(testResults)")
179177
print(i)
180178
weakSelf.printTestResultInfo(testResults)
181179
let newTestCaseStatuses: [SILTestStatus] = testResults.map { testResult in

SiliconLabsApp/ViewModels/SILDeviceSelectionViewModel.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ - (NSString *)selectDeviceInfoString {
115115
case SILAppTypeWifiCommissioning:
116116
return @"A circuit board (SoC) and the evaluation board (EVK) must be connected and running proper firmwares. See the documentation, tutorial and GitHub for more information.";
117117
case SILAppTypeConnectedLighting:
118-
return @"A circuit board (SoC) must be connected and running \"Bluetooth RAIL DMP - SoC Light Standard\" or \"Connect Bluetooth DMP - SoC Light\" firmware.";
118+
return @"A circuit board (SoC) must be connected and running \"Bluetooth RAIL DMP - SoC Light\" or \"Connect Bluetooth DMP - SoC Light\" firmware.";
119119
case SILAppTypeRangeTest:
120120
return @"A circuit board (SoC) must be connected and running \"RAIL Bluetooth DMP - SoC Range Test\" firmware.";
121121
case SILAppTypeMotion:

0 commit comments

Comments
 (0)