meshtastic/Meshtastic-Apple
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Apple.git synced 2026-04-20 22:13:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #262 from meshtastic/2.0.7_Working_Changes

Browse source 
Removed unused packages, sync user defaults
This commit is contained in:
Garth Vander Houwen 2022-12-12 12:04:28 -08:00 • committed by GitHub
commit f82bb2fc2d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Meshtastic.xcodeproj/project.pbxproj
View file

@ -647,7 +647,6 @@
packageReferences = (
DD5394FA276993AD00AD86B1 /* XCRemoteSwiftPackageReference "swift-protobuf" */,
C9697FA327933B8C00250207 /* XCRemoteSwiftPackageReference "SQLite.swift" */,
DD457182293C55CD000C49FB /* XCRemoteSwiftPackageReference "IOS-DFU-Library" */,
);
productRefGroup = DDC2E15526CE248E0042C5E4 /* Products */;
projectDirPath = "";
@ -1159,14 +1158,6 @@
minimumVersion = 0.9.2;
};
};
DD457182293C55CD000C49FB /* XCRemoteSwiftPackageReference "IOS-DFU-Library" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/NordicSemiconductor/IOS-DFU-Library";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 4.0.0;
};
};
DD5394FA276993AD00AD86B1 /* XCRemoteSwiftPackageReference "swift-protobuf" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/apple/swift-protobuf.git";

18
Meshtastic.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file

@ -1,14 +1,5 @@
{
"pins" : [
{
"identity" : "ios-dfu-library",
"kind" : "remoteSourceControl",
"location" : "https://github.com/NordicSemiconductor/IOS-DFU-Library",
"state" : {
"revision" : "ec5364755f4fcdf68d62ff4cf796d22e7b935f40",
"version" : "4.13.0"
}
},
{
"identity" : "sqlite.swift",
"kind" : "remoteSourceControl",
@ -26,15 +17,6 @@
"revision" : "e1499bc69b9040b29184f7f2996f7bab467c1639",
"version" : "1.19.0"
}
},
{
"identity" : "zipfoundation",
"kind" : "remoteSourceControl",
"location" : "https://github.com/weichsel/ZIPFoundation",
"state" : {
"revision" : "ec32d62d412578542c0ffb7a6ce34d3e64b43b94",
"version" : "0.9.11"
}
}
],
"version" : 2

1
Meshtastic/Helpers/BLEManager.swift
View file

@ -164,6 +164,7 @@ class BLEManager: NSObject, CBPeripheralDelegate, ObservableObject {
preferredPeripheral = false
print("Trying to connect a non prefered peripheral")
}
UserDefaults.standard.synchronize()
// Invalidate and reset connection timer count
timeoutTimerCount = 0
if timeoutTimer != nil {