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 #555 from meshtastic/2.3.1_Working_Changes

Browse source 
2.3.1 working changes
This commit is contained in:
Garth Vander Houwen 2024-03-17 11:18:20 -07:00 • committed by GitHub
commit 2b9a5e3f81
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
26 changed files with 2448 additions and 414 deletions
Download patch file Download diff file Expand all files Collapse all files

58
Meshtastic.xcodeproj/project.pbxproj
View file

@ -110,6 +110,8 @@
DD8ED9C8289CE4B900B3B0AB /* RoutingError.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD8ED9C7289CE4B900B3B0AB /* RoutingError.swift */; };
DD90860E26F69BAE00DC5189 /* NodeMap.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD90860D26F69BAE00DC5189 /* NodeMap.swift */; };
DD913639270DFF4C00D7ACF3 /* LocalNotificationManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD913638270DFF4C00D7ACF3 /* LocalNotificationManager.swift */; };
DD93800B2BA3F968008BEC06 /* NodeMapContent.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD93800A2BA3F968008BEC06 /* NodeMapContent.swift */; };
DD93800E2BA74D0C008BEC06 /* ChannelForm.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD93800D2BA74D0C008BEC06 /* ChannelForm.swift */; };
DD94B7402ACCE3BE00DCD1D1 /* MapSettingsForm.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD94B73F2ACCE3BE00DCD1D1 /* MapSettingsForm.swift */; };
DD964FBD296E6B01007C176F /* EmojiOnlyTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD964FBC296E6B01007C176F /* EmojiOnlyTextField.swift */; };
DD964FBF296E76EF007C176F /* WaypointFormMapKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD964FBE296E76EF007C176F /* WaypointFormMapKit.swift */; };
@ -360,6 +362,8 @@
DD90860A26F645B700DC5189 /* Meshtastic.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Meshtastic.entitlements; sourceTree = "<group>"; };
DD90860D26F69BAE00DC5189 /* NodeMap.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NodeMap.swift; sourceTree = "<group>"; };
DD913638270DFF4C00D7ACF3 /* LocalNotificationManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalNotificationManager.swift; sourceTree = "<group>"; };
DD93800A2BA3F968008BEC06 /* NodeMapContent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NodeMapContent.swift; sourceTree = "<group>"; };
DD93800D2BA74D0C008BEC06 /* ChannelForm.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChannelForm.swift; sourceTree = "<group>"; };
DD94B73F2ACCE3BE00DCD1D1 /* MapSettingsForm.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapSettingsForm.swift; sourceTree = "<group>"; };
DD964FBC296E6B01007C176F /* EmojiOnlyTextField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmojiOnlyTextField.swift; sourceTree = "<group>"; };
DD964FBE296E76EF007C176F /* WaypointFormMapKit.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WaypointFormMapKit.swift; sourceTree = "<group>"; };
@ -370,6 +374,7 @@
DD97E96528EFD9820056DDA4 /* MeshtasticLogo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MeshtasticLogo.swift; sourceTree = "<group>"; };
DD97E96728EFE9A00056DDA4 /* About.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = About.swift; sourceTree = "<group>"; };
DD994B68295F88B60013760A /* IntervalEnums.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IntervalEnums.swift; sourceTree = "<group>"; };
DD9A1A912BA2D2D3001E602E /* MeshtasticDataModelV 30.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MeshtasticDataModelV 30.xcdatamodel"; sourceTree = "<group>"; };
DDA0B6B1294CDC55001356EC /* Channels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Channels.swift; sourceTree = "<group>"; };
DDA1C48D28DB49D3009933EC /* ChannelRoles.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChannelRoles.swift; sourceTree = "<group>"; };
DDA6B2E828419CF2003E8C16 /* MeshPackets.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MeshPackets.swift; sourceTree = "<group>"; };
@ -449,6 +454,8 @@
DDDB444F29F8AC9C00EE2349 /* UIImage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIImage.swift; sourceTree = "<group>"; };
DDDB445129F8ACF900EE2349 /* Date.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Date.swift; sourceTree = "<group>"; };
DDDB445329F8AD1600EE2349 /* Data.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Data.swift; sourceTree = "<group>"; };
DDDC22312BA76701002C44F1 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Localizable.strings; sourceTree = "<group>"; };
DDDC22322BA76961002C44F1 /* zh-Hant-TW */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant-TW"; path = "zh-Hant-TW.lproj/Localizable.strings"; sourceTree = "<group>"; };
DDDD527729B5B83F0045BC3C /* MeshtasticDataModelV9.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = MeshtasticDataModelV9.xcdatamodel; sourceTree = "<group>"; };
DDDE59F429AF163D00490C6C /* WidgetsExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = WidgetsExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; };
DDDE59F829AF163D00490C6C /* WidgetsBundle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WidgetsBundle.swift; sourceTree = "<group>"; };
@ -557,21 +564,6 @@
path = CoreData;
sourceTree = "<group>";
};
DD2100802B0E676E00F2F116 /* Routes */ = {
isa = PBXGroup;
children = (
DD2100832B0E67AD00F2F116 /* RouteMap */,
);
path = Routes;
sourceTree = "<group>";
};
DD2100832B0E67AD00F2F116 /* RouteMap */ = {
isa = PBXGroup;
children = (
);
path = RouteMap;
sourceTree = "<group>";
};
DD47E3CA26F0E50300029299 /* Nodes */ = {
isa = PBXGroup;
children = (
@ -601,7 +593,7 @@
DD4A911C2708C57100501B7E /* Settings */ = {
isa = PBXGroup;
children = (
DD2100802B0E676E00F2F116 /* Routes */,
DD93800C2BA74CE3008BEC06 /* Channels */,
DD97E96728EFE9A00056DDA4 /* About.swift */,
DD0F791A28713C8A00A6FDAD /* AdminMessageList.swift */,
DD4A911D2708C65400501B7E /* AppSettings.swift */,
@ -744,9 +736,18 @@
name = Frameworks;
sourceTree = "<group>";
};
DD93800C2BA74CE3008BEC06 /* Channels */ = {
isa = PBXGroup;
children = (
DD93800D2BA74D0C008BEC06 /* ChannelForm.swift */,
);
path = Channels;
sourceTree = "<group>";
};
DDAD49EB2AFAE82500B4425D /* Map */ = {
isa = PBXGroup;
children = (
DD93800A2BA3F968008BEC06 /* NodeMapContent.swift */,
DD94B73F2ACCE3BE00DCD1D1 /* MapSettingsForm.swift */,
DDB6CCFA2AAF805100945AF6 /* NodeMapSwiftUI.swift */,
DD13AA482AB73BF400BA0C98 /* PositionPopover.swift */,
@ -1118,6 +1119,8 @@
"zh-Hans",
pl,
he,
fr,
"zh-Hant-TW",
);
mainGroup = DDC2E14B26CE248E0042C5E4;
packageReferences = (
@ -1225,6 +1228,7 @@
DDB75A0F2A05920E006ED576 /* FileManager.swift in Sources */,
DD1933782B084F4200771CD5 /* Measurement.swift in Sources */,
DD4F23CD28779A3C001D37CB /* EnvironmentMetricsLog.swift in Sources */,
DD93800E2BA74D0C008BEC06 /* ChannelForm.swift in Sources */,
DD41A61529AB0035003C5A37 /* NodeWeatherForecast.swift in Sources */,
DDB6ABD628AE742000384BA1 /* BluetoothConfig.swift in Sources */,
DD4640202AFF10F4002A5ECB /* WaypointForm.swift in Sources */,
@ -1364,6 +1368,7 @@
DD5E5205298EE33B00D21B61 /* mesh.pb.swift in Sources */,
DDF6B2482A9AEBF500BA6931 /* StoreForwardConfig.swift in Sources */,
DD8169F9271F1A6100F4AB02 /* MeshLogger.swift in Sources */,
DD93800B2BA3F968008BEC06 /* NodeMapContent.swift in Sources */,
DD41582A28585C32009B0E59 /* RangeTestConfig.swift in Sources */,
DD1925B728CDA5A400720036 /* CannedMessagesConfigEnums.swift in Sources */,
DDDB444429F8A8DD00EE2349 /* Float.swift in Sources */,
@ -1434,6 +1439,8 @@
A65FA974296876BF00A97686 /* zh-Hans */,
DDF6B24B2A9C2FC800BA6931 /* pl */,
DD31EC492B7F18B7006A3995 /* he */,
DDDC22312BA76701002C44F1 /* fr */,
DDDC22322BA76961002C44F1 /* zh-Hant-TW */,
);
name = Localizable.strings;
sourceTree = "<group>";
@ -1572,7 +1579,7 @@
CODE_SIGN_ENTITLEMENTS = Meshtastic/Meshtastic.entitlements;
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 842;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "\"Meshtastic/Preview Content\"";
DEVELOPMENT_TEAM = GCH7VS5Y9R;
ENABLE_PREVIEWS = YES;
@ -1584,7 +1591,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2.3.0;
MARKETING_VERSION = 2.3.1;
PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTS_MACCATALYST = YES;
@ -1606,7 +1613,7 @@
CODE_SIGN_ENTITLEMENTS = Meshtastic/Meshtastic.entitlements;
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 842;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "\"Meshtastic/Preview Content\"";
DEVELOPMENT_TEAM = GCH7VS5Y9R;
ENABLE_PREVIEWS = YES;
@ -1618,7 +1625,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2.3.0;
MARKETING_VERSION = 2.3.1;
PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTS_MACCATALYST = YES;
@ -1728,7 +1735,7 @@
CODE_SIGN_ENTITLEMENTS = Widgets/WidgetsExtension.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 841;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = GCH7VS5Y9R;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = Widgets/Info.plist;
@ -1740,7 +1747,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 2.3.0;
MARKETING_VERSION = 2.3.1;
PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient.Widgets;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
@ -1761,7 +1768,7 @@
CODE_SIGN_ENTITLEMENTS = Widgets/WidgetsExtension.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 841;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = GCH7VS5Y9R;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = Widgets/Info.plist;
@ -1773,7 +1780,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 2.3.0;
MARKETING_VERSION = 2.3.1;
PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient.Widgets;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
@ -1884,6 +1891,7 @@
DD3CC6BA28E366DF00FA9159 /* Meshtastic.xcdatamodeld */ = {
isa = XCVersionGroup;
children = (
DD9A1A912BA2D2D3001E602E /* MeshtasticDataModelV 30.xcdatamodel */,
DD398EBD2B93F640002B4C51 /* MeshtasticDataModelV 29.xcdatamodel */,
DD0E20FF2B892E1300F2D100 /* MeshtasticDataModelV 28.xcdatamodel */,
D93069062B81D8900066FBC8 /* MeshtasticDataModelV 27.xcdatamodel */,
@ -1914,7 +1922,7 @@
DD5D0A9A2931AD6B00F7EA61 /* MeshtasticDataModelV2.xcdatamodel */,
DD3CC6BB28E366DF00FA9159 /* MeshtasticDataModel.xcdatamodel */,
);
currentVersion = DD398EBD2B93F640002B4C51 /* MeshtasticDataModelV 29.xcdatamodel */;
currentVersion = DD9A1A912BA2D2D3001E602E /* MeshtasticDataModelV 30.xcdatamodel */;
name = Meshtastic.xcdatamodeld;
path = Meshtastic/Meshtastic.xcdatamodeld;
sourceTree = "<group>";

42
Meshtastic/Enums/LoraConfigEnums.swift
View file

@ -28,7 +28,47 @@ enum RegionCodes: Int, CaseIterable, Identifiable {
case my_919 = 17
case sg_923 = 18
case lora24 = 13
var topic: String {
switch self {
case .unset:
"UNSET"
case .us:
"US"
case .eu433:
"EU_433"
case .eu868:
"EU_868"
case .cn:
"CN"
case .jp:
"JP"
case .anz:
"ANZ"
case .kr:
"KR"
case .tw:
"TW"
case .ru:
"RU"
case .in:
"IN"
case .nz865:
"NZ_865"
case .th:
"TH"
case .ua433:
"UA_433"
case .ua868:
"UA_868"
case .my_433:
"MY_433"
case .my_919:
"MY_919"
case .sg_923:
"SG_923"
case .lora24:
"LORA_24"
} }
var id: Int { self.rawValue }
var description: String {
switch self {

3
Meshtastic/Helpers/BLEManager.swift
View file

@ -710,12 +710,15 @@ class BLEManager: NSObject, CBPeripheralDelegate, MqttClientProxyManagerDelegate
}
case .paxcounterApp:
paxCounterPacket(packet: decodedInfo.packet, context: context!)
case .mapReportApp:
MeshLogger.log("🕸️ MESH PACKET received for Map Report App UNHANDLED\(try! decodedInfo.packet.jsonString())")
case .UNRECOGNIZED:
MeshLogger.log("🕸️ MESH PACKET received for Other App UNHANDLED \(try! decodedInfo.packet.jsonString())")
case .max:
print("MAX PORT NUM OF 511")
case .atakPlugin:
MeshLogger.log("🕸️ MESH PACKET received for ATAK Plugin App UNHANDLED \((try? decodedInfo.packet.jsonString()) ?? "JSON Decode Failure")")
}
if decodedInfo.configCompleteID != 0 && decodedInfo.configCompleteID == configNonce {

2
Meshtastic/Meshtastic.xcdatamodeld/.xccurrentversion
View file

@ -3,6 +3,6 @@
<plist version="1.0">
<dict>
<key>_XCCurrentVersionName</key>
<string>MeshtasticDataModelV 29.xcdatamodel</string>
<string>MeshtasticDataModelV 30.xcdatamodel</string>
</dict>
</plist>

452
Meshtastic/Meshtastic.xcdatamodeld/MeshtasticDataModelV 30.xcdatamodel/contents Normal file
View file

@ -0,0 +1,452 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="22522" systemVersion="23E5211a" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
<entity name="AmbientLightingConfigEntity" representedClassName="AmbientLightingConfigEntity" syncable="YES" codeGenerationType="class">
<attribute name="blue" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="current" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="green" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="ledState" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
<attribute name="red" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<relationship name="ambientLightingConfigNode" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="NodeInfoEntity" inverseName="ambientLightingConfig" inverseEntity="NodeInfoEntity"/>
</entity>
<entity name="BluetoothConfigEntity" representedClassName="BluetoothConfigEntity" syncable="YES" codeGenerationType="class">
<attribute name="enabled" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
<attribute name="fixedPin" optional="YES" attributeType="Integer 32" defaultValueString="123456" usesScalarValueType="YES"/>
<attribute name="mode" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<relationship name="bluetoothConfigNode" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="NodeInfoEntity" inverseName="bluetoothConfig" inverseEntity="NodeInfoEntity"/>
</entity>
<entity name="CannedMessageConfigEntity" representedClassName="CannedMessageConfigEntity" syncable="YES" codeGenerationType="class">
<attribute name="enabled" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
<attribute name="inputbrokerEventCcw" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="inputbrokerEventCw" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="inputbrokerEventPress" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="inputbrokerPinA" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="inputbrokerPinB" optional="YES" attributeType="Integer 32" usesScalarValueType="YES"/>
<attribute name="inputbrokerPinPress" optional="YES" attributeType="Integer 32" usesScalarValueType="YES"/>
<attribute name="messages" optional="YES" attributeType="String" minValueString="0" maxValueString="198"/>
<attribute name="rotary1Enabled" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
<attribute name="sendBell" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
<attribute name="updown1Enabled" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
<relationship name="cannedMessagesConfigNode" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="NodeInfoEntity" inverseName="cannedMessageConfig" inverseEntity="NodeInfoEntity"/>
</entity>
<entity name="ChannelEntity" representedClassName="ChannelEntity" syncable="YES" codeGenerationType="class">
<attribute name="downlinkEnabled" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
<attribute name="id" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="index" attributeType="Integer 32" minValueString="0" maxValueString="13" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="mute" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
<attribute name="name" optional="YES" attributeType="String"/>
<attribute name="positionPrecision" optional="YES" attributeType="Integer 32" defaultValueString="32" usesScalarValueType="YES"/>
<attribute name="psk" optional="YES" attributeType="Binary"/>
<attribute name="role" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="uplinkEnabled" attributeType="Boolean" usesScalarValueType="YES"/>
<relationship name="myInfoChannel" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="MyInfoEntity" inverseName="channels" inverseEntity="MyInfoEntity"/>
<fetchedProperty name="allPrivateMessages" optional="YES">
<fetchRequest name="fetchedPropertyFetchRequest" entity="MessageEntity" predicateString="channel == $FETCH_SOURCE.index &amp;&amp; toUser == nil AND isEmoji == false"/>
</fetchedProperty>
<uniquenessConstraints>
<uniquenessConstraint>
<constraint value="index"/>
</uniquenessConstraint>
</uniquenessConstraints>
</entity>
<entity name="DetectionSensorConfigEntity" representedClassName="DetectionSensorConfigEntity" syncable="YES" codeGenerationType="class">
<attribute name="detectionTriggeredHigh" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
<attribute name="enabled" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
<attribute name="minimumBroadcastSecs" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="monitorPin" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="name" optional="YES" attributeType="String"/>
<attribute name="sendBell" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
<attribute name="stateBroadcastSecs" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="usePullup" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
<relationship name="detectionSensorConfigNode" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="NodeInfoEntity" inverseName="detectionSensorConfig" inverseEntity="NodeInfoEntity"/>
</entity>
<entity name="DeviceConfigEntity" representedClassName="DeviceConfigEntity" syncable="YES" codeGenerationType="class">
<attribute name="buttonGpio" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="buzzerGpio" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="debugLogEnabled" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
<attribute name="disableTripleClick" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
<attribute name="doubleTapAsButtonPress" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
<attribute name="isManaged" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
<attribute name="nodeInfoBroadcastSecs" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="rebroadcastMode" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="role" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="serialEnabled" optional="YES" attributeType="Boolean" defaultValueString="0" usesScalarValueType="YES"/>
<relationship name="deviceConfigNode" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="NodeInfoEntity" inverseName="deviceConfig" inverseEntity="NodeInfoEntity"/>
</entity>
<entity name="DeviceHardwareEntity" representedClassName="DeviceHardwareEntity" syncable="YES" codeGenerationType="class">
<attribute name="activelySupported" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
<attribute name="architecture" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="displayName" optional="YES" attributeType="String"/>
<attribute name="hwModel" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="hwModelSlug" optional="YES" attributeType="String"/>
<attribute name="platformioTarget" optional="YES" attributeType="String"/>
</entity>
<entity name="DeviceMetadataEntity" representedClassName="DeviceMetadataEntity" syncable="YES" codeGenerationType="class">
<attribute name="canShutdown" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
<attribute name="deviceStateVersion" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="firmwareVersion" optional="YES" attributeType="String"/>
<attribute name="hasBluetooth" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
<attribute name="hasEthernet" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
<attribute name="hasWifi" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
<attribute name="hwModel" optional="YES" attributeType="String"/>
<attribute name="positionFlags" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="role" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<relationship name="metadataNode" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="NodeInfoEntity" inverseName="metadata" inverseEntity="NodeInfoEntity"/>
</entity>
<entity name="DisplayConfigEntity" representedClassName="DisplayConfigEntity" syncable="YES" codeGenerationType="class">
<attribute name="compassNorthTop" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
<attribute name="displayMode" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="flipScreen" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
<attribute name="gpsFormat" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="headingBold" optional="YES" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES"/>
<attribute name="oledType" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="screenCarouselInterval" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="screenOnSeconds" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="units" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="wakeOnTapOrMotion" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
<relationship name="displayConfigNode" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="NodeInfoEntity" inverseName="displayConfig" inverseEntity="NodeInfoEntity"/>
</entity>
<entity name="ExternalNotificationConfigEntity" representedClassName="ExternalNotificationConfigEntity" syncable="YES" codeGenerationType="class">
<attribute name="active" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
<attribute name="alertBell" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
<attribute name="alertBellBuzzer" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
<attribute name="alertBellVibra" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
<attribute name="alertMessage" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
<attribute name="alertMessageBuzzer" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
<attribute name="alertMessageVibra" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
<attribute name="enabled" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
<attribute name="nagTimeout" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="output" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="outputBuzzer" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="outputMilliseconds" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="outputVibra" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="useI2SAsBuzzer" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
<attribute name="usePWM" optional="YES" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES"/>
<relationship name="externalNotificationConfigNode" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="NodeInfoEntity" inverseName="externalNotificationConfig" inverseEntity="NodeInfoEntity"/>
<fetchedProperty name="fetchedProperty" optional="YES">
<fetchRequest name="fetchedPropertyFetchRequest" entity="ExternalNotificationConfigEntity"/>
</fetchedProperty>
</entity>
<entity name="LocationEntity" representedClassName="LocationEntity" syncable="YES" codeGenerationType="class">
<attribute name="altitude" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="heading" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="id" optional="YES" attributeType="Integer 32" usesScalarValueType="YES"/>
<attribute name="latitudeI" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="longitudeI" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="speed" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<relationship name="routeLocation" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="RouteEntity" inverseName="locations" inverseEntity="RouteEntity"/>
</entity>
<entity name="LoRaConfigEntity" representedClassName="LoRaConfigEntity" syncable="YES" codeGenerationType="class">
<attribute name="bandwidth" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="channelNum" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="codingRate" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="frequencyOffset" optional="YES" attributeType="Float" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="hopLimit" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="ignoreMqtt" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
<attribute name="modemPreset" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="overrideDutyCycle" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
<attribute name="overrideFrequency" optional="YES" attributeType="Float" defaultValueString="0.0" usesScalarValueType="YES"/>
<attribute name="regionCode" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="spreadFactor" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="sx126xRxBoostedGain" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
<attribute name="txEnabled" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES"/>
<attribute name="txPower" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="usePreset" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES"/>
<relationship name="loRaConfigNode" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="NodeInfoEntity" inverseName="loRaConfig" inverseEntity="NodeInfoEntity"/>
</entity>
<entity name="MessageEntity" representedClassName="MessageEntity" syncable="YES" codeGenerationType="class">
<attribute name="ackError" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="ackSNR" optional="YES" attributeType="Float" defaultValueString="0.0" usesScalarValueType="YES"/>
<attribute name="ackTimestamp" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="admin" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
<attribute name="adminDescription" optional="YES" attributeType="String"/>
<attribute name="channel" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="isEmoji" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
<attribute name="messageId" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="messagePayload" optional="YES" attributeType="String" defaultValueString=""/>
<attribute name="messagePayloadMarkdown" optional="YES" attributeType="String"/>
<attribute name="messageTimestamp" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="portNum" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="read" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
<attribute name="realACK" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
<attribute name="receivedACK" attributeType="Boolean" usesScalarValueType="YES"/>
<attribute name="receivedTimestamp" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="replyID" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="rssi" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="snr" optional="YES" attributeType="Float" defaultValueString="0.0" usesScalarValueType="YES"/>
<relationship name="fromUser" optional="YES" maxCount="1" deletionRule="Nullify" ordered="YES" destinationEntity="UserEntity" inverseName="sentMessages" inverseEntity="UserEntity"/>
<relationship name="toUser" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="UserEntity" inverseName="receivedMessages" inverseEntity="UserEntity"/>
<fetchedProperty name="tapbacks" optional="YES">
<fetchRequest name="fetchedPropertyFetchRequest" entity="MessageEntity" predicateString="replyID == $FETCH_SOURCE.messageId AND isEmoji == true"/>
</fetchedProperty>
<uniquenessConstraints>
<uniquenessConstraint>
<constraint value="messageId"/>
</uniquenessConstraint>
</uniquenessConstraints>
</entity>
<entity name="MQTTConfigEntity" representedClassName="MQTTConfigEntity" syncable="YES" codeGenerationType="class">
<attribute name="address" optional="YES" attributeType="String" maxValueString="30"/>
<attribute name="enabled" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
<attribute name="encryptionEnabled" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
<attribute name="jsonEnabled" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
<attribute name="password" optional="YES" attributeType="String" maxValueString="30"/>
<attribute name="proxyToClientEnabled" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
<attribute name="root" optional="YES" attributeType="String" defaultValueString="msh"/>
<attribute name="tlsEnabled" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
<attribute name="username" optional="YES" attributeType="String" maxValueString="30"/>
<relationship name="mqttConfigNode" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="NodeInfoEntity" inverseName="mqttConfig" inverseEntity="NodeInfoEntity"/>
</entity>
<entity name="MyInfoEntity" representedClassName="MyInfoEntity" syncable="YES" codeGenerationType="class">
<attribute name="adminIndex" optional="YES" attributeType="Integer 32" defaultValueString="NO" usesScalarValueType="YES"/>
<attribute name="bleName" optional="YES" attributeType="String"/>
<attribute name="minAppVersion" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="myNodeNum" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="peripheralId" optional="YES" attributeType="String"/>
<attribute name="rebootCount" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<relationship name="channels" optional="YES" toMany="YES" deletionRule="Nullify" ordered="YES" destinationEntity="ChannelEntity" inverseName="myInfoChannel" inverseEntity="ChannelEntity"/>
<relationship name="myInfoNode" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="NodeInfoEntity" inverseName="myInfo" inverseEntity="NodeInfoEntity"/>
<fetchedProperty name="allMessages" optional="YES">
<fetchRequest name="fetchedPropertyFetchRequest" entity="MessageEntity" predicateString="toUser == nil"/>
</fetchedProperty>
<uniquenessConstraints>
<uniquenessConstraint>
<constraint value="myNodeNum"/>
</uniquenessConstraint>
</uniquenessConstraints>
</entity>
<entity name="NetworkConfigEntity" representedClassName="NetworkConfigEntity" syncable="YES" codeGenerationType="class">
<attribute name="dns" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="ethEnabled" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
<attribute name="gateway" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="ip" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="ntpServer" optional="YES" attributeType="String"/>
<attribute name="subnet" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="wifiEnabled" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
<attribute name="wifiMode" optional="YES" attributeType="Integer 32" defaultValueString="NO" usesScalarValueType="YES"/>
<attribute name="wifiPsk" optional="YES" attributeType="String" minValueString="0" maxValueString="60"/>
<attribute name="wifiSsid" optional="YES" attributeType="String" minValueString="0" maxValueString="30"/>
<relationship name="networkConfigNode" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="NodeInfoEntity" inverseName="networkConfig" inverseEntity="NodeInfoEntity"/>
</entity>
<entity name="NodeInfoEntity" representedClassName="NodeInfoEntity" syncable="YES" codeGenerationType="class">
<attribute name="bleName" optional="YES" attributeType="String"/>
<attribute name="channel" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="hopsAway" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="id" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="lastHeard" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
<attribute name="num" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="peripheralId" optional="YES" attributeType="String"/>
<attribute name="rssi" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="snr" optional="YES" attributeType="Float" defaultValueString="0.0" usesScalarValueType="YES"/>
<attribute name="viaMqtt" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
<relationship name="ambientLightingConfig" optional="YES" maxCount="1" deletionRule="Cascade" destinationEntity="AmbientLightingConfigEntity" inverseName="ambientLightingConfigNode" inverseEntity="AmbientLightingConfigEntity"/>
<relationship name="bluetoothConfig" optional="YES" maxCount="1" deletionRule="Cascade" destinationEntity="BluetoothConfigEntity" inverseName="bluetoothConfigNode" inverseEntity="BluetoothConfigEntity"/>
<relationship name="cannedMessageConfig" optional="YES" maxCount="1" deletionRule="Cascade" destinationEntity="CannedMessageConfigEntity" inverseName="cannedMessagesConfigNode" inverseEntity="CannedMessageConfigEntity"/>
<relationship name="detectionSensorConfig" optional="YES" maxCount="1" deletionRule="Cascade" destinationEntity="DetectionSensorConfigEntity" inverseName="detectionSensorConfigNode" inverseEntity="DetectionSensorConfigEntity"/>
<relationship name="deviceConfig" optional="YES" maxCount="1" deletionRule="Cascade" destinationEntity="DeviceConfigEntity" inverseName="deviceConfigNode" inverseEntity="DeviceConfigEntity"/>
<relationship name="displayConfig" optional="YES" maxCount="1" deletionRule="Cascade" destinationEntity="DisplayConfigEntity" inverseName="displayConfigNode" inverseEntity="DisplayConfigEntity"/>
<relationship name="externalNotificationConfig" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="ExternalNotificationConfigEntity" inverseName="externalNotificationConfigNode" inverseEntity="ExternalNotificationConfigEntity"/>
<relationship name="loRaConfig" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="LoRaConfigEntity" inverseName="loRaConfigNode" inverseEntity="LoRaConfigEntity"/>
<relationship name="metadata" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="DeviceMetadataEntity" inverseName="metadataNode" inverseEntity="DeviceMetadataEntity"/>
<relationship name="mqttConfig" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="MQTTConfigEntity" inverseName="mqttConfigNode" inverseEntity="MQTTConfigEntity"/>
<relationship name="myInfo" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="MyInfoEntity" inverseName="myInfoNode" inverseEntity="MyInfoEntity"/>
<relationship name="networkConfig" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="NetworkConfigEntity" inverseName="networkConfigNode" inverseEntity="NetworkConfigEntity"/>
<relationship name="pax" optional="YES" toMany="YES" deletionRule="Nullify" ordered="YES" destinationEntity="PaxCounterEntity" inverseName="paxNode" inverseEntity="PaxCounterEntity"/>
<relationship name="paxCounterConfig" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="PaxCounterConfigEntity" inverseName="paxCounterConfigNode" inverseEntity="PaxCounterConfigEntity"/>
<relationship name="positionConfig" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="PositionConfigEntity" inverseName="positionConfigNode" inverseEntity="PositionConfigEntity"/>
<relationship name="positions" optional="YES" toMany="YES" deletionRule="Nullify" ordered="YES" destinationEntity="PositionEntity" inverseName="nodePosition" inverseEntity="PositionEntity"/>
<relationship name="powerConfig" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="PowerConfigEntity" inverseName="powerConfigNode" inverseEntity="PowerConfigEntity"/>
<relationship name="rangeTestConfig" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="RangeTestConfigEntity" inverseName="rangeTestConfigNode" inverseEntity="RangeTestConfigEntity"/>
<relationship name="rtttlConfig" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="RTTTLConfigEntity" inverseName="rtttlConfigNode" inverseEntity="RTTTLConfigEntity"/>
<relationship name="serialConfig" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="SerialConfigEntity" inverseName="serialConfigNode" inverseEntity="SerialConfigEntity"/>
<relationship name="storeForwardConfig" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="StoreForwardConfigEntity" inverseName="storeForwardConfigNode" inverseEntity="StoreForwardConfigEntity"/>
<relationship name="telemetries" optional="YES" toMany="YES" deletionRule="Nullify" ordered="YES" destinationEntity="TelemetryEntity" inverseName="nodeTelemetry" inverseEntity="TelemetryEntity"/>
<relationship name="telemetryConfig" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="TelemetryConfigEntity" inverseName="telemetryConfigNode" inverseEntity="TelemetryConfigEntity"/>
<relationship name="traceRoutes" optional="YES" toMany="YES" deletionRule="Nullify" ordered="YES" destinationEntity="TraceRouteEntity" inverseName="node" inverseEntity="TraceRouteEntity"/>
<relationship name="user" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="UserEntity" inverseName="userNode" inverseEntity="UserEntity"/>
<uniquenessConstraints>
<uniquenessConstraint>
<constraint value="num"/>
</uniquenessConstraint>
</uniquenessConstraints>
</entity>
<entity name="PaxCounterConfigEntity" representedClassName="PaxCounterConfigEntity" syncable="YES" codeGenerationType="class">
<attribute name="enabled" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
<attribute name="paxcounterUpdateInterval" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<relationship name="paxCounterConfigNode" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="NodeInfoEntity" inverseName="paxCounterConfig" inverseEntity="NodeInfoEntity"/>
</entity>
<entity name="PaxCounterEntity" representedClassName="PaxCounterEntity" syncable="YES" codeGenerationType="class">
<attribute name="ble" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="time" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
<attribute name="uptime" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="wifi" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<relationship name="paxNode" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="NodeInfoEntity" inverseName="pax" inverseEntity="NodeInfoEntity"/>
</entity>
<entity name="PositionConfigEntity" representedClassName="PositionConfigEntity" syncable="YES" codeGenerationType="class">
<attribute name="broadcastSmartMinimumDistance" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="broadcastSmartMinimumIntervalSecs" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="deviceGpsEnabled" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
<attribute name="fixedPosition" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
<attribute name="gpsAttemptTime" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="gpsEnGpio" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="gpsMode" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="gpsUpdateInterval" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="positionBroadcastSeconds" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="positionFlags" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="rxGpio" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="smartPositionEnabled" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
<attribute name="txGpio" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<relationship name="positionConfigNode" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="NodeInfoEntity" inverseName="positionConfig" inverseEntity="NodeInfoEntity"/>
</entity>
<entity name="PositionEntity" representedClassName="PositionEntity" syncable="YES" codeGenerationType="class">
<attribute name="altitude" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="heading" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="latest" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
<attribute name="latitudeI" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="longitudeI" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="precisionBits" optional="YES" attributeType="Integer 32" defaultValueString="32" usesScalarValueType="YES"/>
<attribute name="rssi" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="satsInView" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="seqNo" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="snr" optional="YES" attributeType="Float" defaultValueString="0.0" usesScalarValueType="YES"/>
<attribute name="speed" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="time" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
<relationship name="nodePosition" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="NodeInfoEntity" inverseName="positions" inverseEntity="NodeInfoEntity"/>
</entity>
<entity name="PowerConfigEntity" representedClassName="PowerConfigEntity" syncable="YES" codeGenerationType="class">
<attribute name="adcMultiplierOverride" optional="YES" attributeType="Float" usesScalarValueType="YES"/>
<attribute name="deviceBatteryInaAddress" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="isPowerSaving" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
<attribute name="lsSecs" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="minWakeSecs" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="onBatteryShutdownAfterSecs" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="waitBluetoothSecs" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<relationship name="powerConfigNode" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="NodeInfoEntity" inverseName="powerConfig" inverseEntity="NodeInfoEntity"/>
</entity>
<entity name="RangeTestConfigEntity" representedClassName="RangeTestConfigEntity" syncable="YES" codeGenerationType="class">
<attribute name="enabled" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
<attribute name="save" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
<attribute name="sender" optional="YES" attributeType="Integer 32" usesScalarValueType="YES"/>
<relationship name="rangeTestConfigNode" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="NodeInfoEntity" inverseName="rangeTestConfig" inverseEntity="NodeInfoEntity"/>
</entity>
<entity name="RouteEntity" representedClassName="RouteEntity" syncable="YES" codeGenerationType="class">
<attribute name="color" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="date" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
<attribute name="enabled" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
<attribute name="id" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="name" optional="YES" attributeType="String"/>
<attribute name="notes" optional="YES" attributeType="String"/>
<relationship name="locations" optional="YES" toMany="YES" deletionRule="Cascade" ordered="YES" destinationEntity="LocationEntity" inverseName="routeLocation" inverseEntity="LocationEntity"/>
</entity>
<entity name="RTTTLConfigEntity" representedClassName="RTTTLConfigEntity" syncable="YES" codeGenerationType="class">
<attribute name="ringtone" optional="YES" attributeType="String" maxValueString="228" defaultValueString=""/>
<relationship name="rtttlConfigNode" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="NodeInfoEntity" inverseName="rtttlConfig" inverseEntity="NodeInfoEntity"/>
</entity>
<entity name="SerialConfigEntity" representedClassName="SerialConfigEntity" syncable="YES" codeGenerationType="class">
<attribute name="baudRate" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="echo" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
<attribute name="enabled" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
<attribute name="mode" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="overrideConsoleSerialPort" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
<attribute name="rxd" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="timeout" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="txd" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<relationship name="serialConfigNode" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="NodeInfoEntity" inverseName="serialConfig" inverseEntity="NodeInfoEntity"/>
</entity>
<entity name="StoreForwardConfigEntity" representedClassName="StoreForwardConfigEntity" syncable="YES" codeGenerationType="class">
<attribute name="enabled" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
<attribute name="heartbeat" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES"/>
<attribute name="historyReturnMax" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="historyReturnWindow" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="isRouter" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
<attribute name="lastHeartbeat" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
<attribute name="lastRequest" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="records" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<relationship name="storeForwardConfigNode" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="NodeInfoEntity" inverseName="storeForwardConfig" inverseEntity="NodeInfoEntity"/>
</entity>
<entity name="TelemetryConfigEntity" representedClassName="TelemetryConfigEntity" syncable="YES" codeGenerationType="class">
<attribute name="deviceUpdateInterval" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="environmentDisplayFahrenheit" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
<attribute name="environmentMeasurementEnabled" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
<attribute name="environmentScreenEnabled" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
<attribute name="environmentUpdateInterval" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="powerMeasurementEnabled" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
<attribute name="powerScreenEnabled" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
<attribute name="powerUpdateInterval" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<relationship name="telemetryConfigNode" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="NodeInfoEntity" inverseName="telemetryConfig" inverseEntity="NodeInfoEntity"/>
</entity>
<entity name="TelemetryEntity" representedClassName="TelemetryEntity" syncable="YES" codeGenerationType="class">
<attribute name="airUtilTx" optional="YES" attributeType="Float" defaultValueString="0.0" usesScalarValueType="YES"/>
<attribute name="barometricPressure" optional="YES" attributeType="Float" defaultValueString="0.0" usesScalarValueType="YES"/>
<attribute name="batteryLevel" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="channelUtilization" optional="YES" attributeType="Float" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="current" optional="YES" attributeType="Float" defaultValueString="0.0" usesScalarValueType="YES"/>
<attribute name="gasResistance" optional="YES" attributeType="Float" defaultValueString="0.0" usesScalarValueType="YES"/>
<attribute name="metricsType" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="relativeHumidity" optional="YES" attributeType="Float" defaultValueString="0.0" usesScalarValueType="YES"/>
<attribute name="rssi" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="snr" optional="YES" attributeType="Float" defaultValueString="0.0" usesScalarValueType="YES"/>
<attribute name="temperature" optional="YES" attributeType="Float" defaultValueString="0.0" usesScalarValueType="YES"/>
<attribute name="time" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
<attribute name="voltage" optional="YES" attributeType="Float" defaultValueString="0.0" usesScalarValueType="YES"/>
<relationship name="nodeTelemetry" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="NodeInfoEntity" inverseName="telemetries" inverseEntity="NodeInfoEntity"/>
</entity>
<entity name="TraceRouteEntity" representedClassName="TraceRouteEntity" syncable="YES" codeGenerationType="class">
<attribute name="altitude" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="hasPositions" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
<attribute name="id" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="latitudeI" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="longitudeI" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="num" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="response" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
<attribute name="route" optional="YES" attributeType="Transformable" customClassName="[UInt32]"/>
<attribute name="routeText" optional="YES" attributeType="String"/>
<attribute name="time" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
<relationship name="hops" optional="YES" toMany="YES" deletionRule="Nullify" ordered="YES" destinationEntity="TraceRouteHopEntity" inverseName="traceRoute" inverseEntity="TraceRouteHopEntity"/>
<relationship name="node" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="NodeInfoEntity" inverseName="traceRoutes" inverseEntity="NodeInfoEntity"/>
</entity>
<entity name="TraceRouteHopEntity" representedClassName="TraceRouteHopEntity" syncable="YES" codeGenerationType="class">
<attribute name="altitude" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="latitudeI" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="longitudeI" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="name" optional="YES" attributeType="String"/>
<attribute name="num" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="time" attributeType="Date" usesScalarValueType="NO"/>
<relationship name="traceRoute" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="TraceRouteEntity" inverseName="hops" inverseEntity="TraceRouteEntity"/>
</entity>
<entity name="UserEntity" representedClassName="UserEntity" syncable="YES" codeGenerationType="class">
<attribute name="hwModel" attributeType="String"/>
<attribute name="isLicensed" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
<attribute name="lastMessage" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
<attribute name="longName" attributeType="String"/>
<attribute name="mute" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
<attribute name="num" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="role" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="shortName" attributeType="String"/>
<attribute name="userId" attributeType="String"/>
<attribute name="vip" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
<relationship name="receivedMessages" optional="YES" toMany="YES" deletionRule="Nullify" ordered="YES" destinationEntity="MessageEntity" inverseName="toUser" inverseEntity="MessageEntity"/>
<relationship name="sentMessages" optional="YES" toMany="YES" deletionRule="Nullify" ordered="YES" destinationEntity="MessageEntity" inverseName="fromUser" inverseEntity="MessageEntity"/>
<relationship name="userNode" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="NodeInfoEntity" inverseName="user" inverseEntity="NodeInfoEntity"/>
<fetchedProperty name="adminMessages" optional="YES">
<fetchRequest name="fetchedPropertyFetchRequest" entity="MessageEntity" predicateString="(fromUser.num == $FETCH_SOURCE.num) AND isEmoji == false AND admin = true"/>
</fetchedProperty>
<fetchedProperty name="allMessages" optional="YES">
<fetchRequest name="fetchedPropertyFetchRequest" entity="MessageEntity" predicateString="((toUser.num == $FETCH_SOURCE.num) OR (fromUser.num == $FETCH_SOURCE.num)) AND toUser != nil AND fromUser != nil AND isEmoji == false AND admin = false AND portNum != 10 "/>
</fetchedProperty>
<fetchedProperty name="detectionSensorMessages" optional="YES">
<fetchRequest name="fetchedPropertyFetchRequest" entity="MessageEntity" predicateString="(fromUser.num == $FETCH_SOURCE.num) AND portNum = 10"/>
</fetchedProperty>
</entity>
<entity name="WaypointEntity" representedClassName="WaypointEntity" syncable="YES" codeGenerationType="class">
<attribute name="created" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
<attribute name="expire" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
<attribute name="icon" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="id" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="lastUpdated" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
<attribute name="latitudeI" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="locked" attributeType="Integer 64" defaultValueString="NO" usesScalarValueType="YES"/>
<attribute name="longDescription" optional="YES" attributeType="String" maxValueString="100"/>
<attribute name="longitudeI" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="name" attributeType="String" minValueString="1" maxValueString="30"/>
</entity>
</model>

15
Meshtastic/Persistence/UpdateCoreData.swift
View file

@ -144,9 +144,10 @@ func upsertNodeInfoPacket (packet: MeshPacket, context: NSManagedObjectContext)
newNode.snr = packet.rxSnr
newNode.rssi = packet.rxRssi
newNode.viaMqtt = packet.viaMqtt
newNode.channel = Int32(packet.channel)
if packet.to == 4294967295 || packet.to == UserDefaults.preferredPeripheralNum {
newNode.channel = Int32(packet.channel)
}
if let nodeInfoMessage = try? NodeInfo(serializedData: packet.decoded.payload) {
newNode.channel = Int32(nodeInfoMessage.channel)
newNode.hopsAway = Int32(truncatingIfNeeded: nodeInfoMessage.hopsAway)
}
if let newUserMessage = try? User(serializedData: packet.decoded.payload) {
@ -212,7 +213,9 @@ func upsertNodeInfoPacket (packet: MeshPacket, context: NSManagedObjectContext)
fetchedNode[0].snr = packet.rxSnr
fetchedNode[0].rssi = packet.rxRssi
fetchedNode[0].viaMqtt = packet.viaMqtt
fetchedNode[0].channel = Int32(packet.channel)
if packet.to == 4294967295 || packet.to == UserDefaults.preferredPeripheralNum {
fetchedNode[0].channel = Int32(packet.channel)
}
if let nodeInfoMessage = try? NodeInfo(serializedData: packet.decoded.payload) {
fetchedNode[0].channel = Int32(nodeInfoMessage.channel)
@ -1317,6 +1320,9 @@ func upsertTelemetryModuleConfigPacket(config: Meshtastic.ModuleConfig.Telemetry
newTelemetryConfig.environmentMeasurementEnabled = config.environmentMeasurementEnabled
newTelemetryConfig.environmentScreenEnabled = config.environmentScreenEnabled
newTelemetryConfig.environmentDisplayFahrenheit = config.environmentDisplayFahrenheit
newTelemetryConfig.powerMeasurementEnabled = config.powerMeasurementEnabled
newTelemetryConfig.powerUpdateInterval = Int32(config.powerUpdateInterval)
newTelemetryConfig.powerScreenEnabled = config.powerScreenEnabled
fetchedNode[0].telemetryConfig = newTelemetryConfig
} else {
@ -1325,6 +1331,9 @@ func upsertTelemetryModuleConfigPacket(config: Meshtastic.ModuleConfig.Telemetry
fetchedNode[0].telemetryConfig?.environmentMeasurementEnabled = config.environmentMeasurementEnabled
fetchedNode[0].telemetryConfig?.environmentScreenEnabled = config.environmentScreenEnabled
fetchedNode[0].telemetryConfig?.environmentDisplayFahrenheit = config.environmentDisplayFahrenheit
fetchedNode[0].telemetryConfig?.powerMeasurementEnabled = config.powerMeasurementEnabled
fetchedNode[0].telemetryConfig?.powerUpdateInterval = Int32(config.powerUpdateInterval)
fetchedNode[0].telemetryConfig?.powerScreenEnabled = config.powerScreenEnabled
}
do {

1
Meshtastic/Protobufs/meshtastic/deviceonly.pb.swift
View file

@ -140,6 +140,7 @@ struct DeviceState {
///
/// Used only during development.
/// Indicates developer is testing and changes should never be saved to flash.
/// Deprecated in 2.3.1
var noSave: Bool {
get {return _storage._noSave}
set {_uniqueStorage()._noSave = newValue}

68
Meshtastic/Protobufs/meshtastic/mesh.pb.swift
View file

@ -2388,6 +2388,16 @@ struct ToRadio {
set {payloadVariant = .mqttClientProxyMessage(newValue)}
}
///
/// Heartbeat message (used to keep the device connection awake on serial)
var heartbeat: Heartbeat {
get {
if case .heartbeat(let v)? = payloadVariant {return v}
return Heartbeat()
}
set {payloadVariant = .heartbeat(newValue)}
}
var unknownFields = SwiftProtobuf.UnknownStorage()
///
@ -2415,6 +2425,9 @@ struct ToRadio {
///
/// MQTT Client Proxy Message (for client / phone subscribed to MQTT sending to device)
case mqttClientProxyMessage(MqttClientProxyMessage)
///
/// Heartbeat message (used to keep the device connection awake on serial)
case heartbeat(Heartbeat)
#if !swift(>=4.1)
static func ==(lhs: ToRadio.OneOf_PayloadVariant, rhs: ToRadio.OneOf_PayloadVariant) -> Bool {
@ -2442,6 +2455,10 @@ struct ToRadio {
guard case .mqttClientProxyMessage(let l) = lhs, case .mqttClientProxyMessage(let r) = rhs else { preconditionFailure() }
return l == r
}()
case (.heartbeat, .heartbeat): return {
guard case .heartbeat(let l) = lhs, case .heartbeat(let r) = rhs else { preconditionFailure() }
return l == r
}()
default: return false
}
}
@ -2581,6 +2598,19 @@ struct DeviceMetadata {
init() {}
}
///
/// A heartbeat message is sent to the node from the client to keep the connection alive.
/// This is currently only needed to keep serial connections alive, but can be used by any PhoneAPI.
struct Heartbeat {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
var unknownFields = SwiftProtobuf.UnknownStorage()
init() {}
}
#if swift(>=5.5) && canImport(_Concurrency)
extension HardwareModel: @unchecked Sendable {}
extension Constants: @unchecked Sendable {}
@ -2614,6 +2644,7 @@ extension Compressed: @unchecked Sendable {}
extension NeighborInfo: @unchecked Sendable {}
extension Neighbor: @unchecked Sendable {}
extension DeviceMetadata: @unchecked Sendable {}
extension Heartbeat: @unchecked Sendable {}
#endif // swift(>=5.5) && canImport(_Concurrency)
// MARK: - Code below here is support for the SwiftProtobuf runtime.
@ -4198,6 +4229,7 @@ extension ToRadio: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBa
4: .same(proto: "disconnect"),
5: .same(proto: "xmodemPacket"),
6: .same(proto: "mqttClientProxyMessage"),
7: .same(proto: "heartbeat"),
]
mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
@ -4261,6 +4293,19 @@ extension ToRadio: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBa
self.payloadVariant = .mqttClientProxyMessage(v)
}
}()
case 7: try {
var v: Heartbeat?
var hadOneofValue = false
if let current = self.payloadVariant {
hadOneofValue = true
if case .heartbeat(let m) = current {v = m}
}
try decoder.decodeSingularMessageField(value: &v)
if let v = v {
if hadOneofValue {try decoder.handleConflictingOneOf()}
self.payloadVariant = .heartbeat(v)
}
}()
default: break
}
}
@ -4292,6 +4337,10 @@ extension ToRadio: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBa
guard case .mqttClientProxyMessage(let v)? = self.payloadVariant else { preconditionFailure() }
try visitor.visitSingularMessageField(value: v, fieldNumber: 6)
}()
case .heartbeat?: try {
guard case .heartbeat(let v)? = self.payloadVariant else { preconditionFailure() }
try visitor.visitSingularMessageField(value: v, fieldNumber: 7)
}()
case nil: break
}
try unknownFields.traverse(visitor: &visitor)
@ -4527,3 +4576,22 @@ extension DeviceMetadata: SwiftProtobuf.Message, SwiftProtobuf._MessageImplement
return true
}
}
extension Heartbeat: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
static let protoMessageName: String = _protobuf_package + ".Heartbeat"
static let _protobuf_nameMap = SwiftProtobuf._NameMap()
mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
while let _ = try decoder.nextFieldNumber() {
}
}
func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
try unknownFields.traverse(visitor: &visitor)
}
static func ==(lhs: Heartbeat, rhs: Heartbeat) -> Bool {
if lhs.unknownFields != rhs.unknownFields {return false}
return true
}
}

92
Meshtastic/Protobufs/meshtastic/module_config.pb.swift
View file

@ -376,6 +376,43 @@ struct ModuleConfig {
/// If true, we can use the connected phone / client to proxy messages to MQTT instead of a direct connection
var proxyToClientEnabled: Bool = false
///
/// If true, we will periodically report unencrypted information about our node to a map via MQTT
var mapReportingEnabled: Bool = false
///
/// Settings for reporting information about our node to a map via MQTT
var mapReportSettings: ModuleConfig.MapReportSettings {
get {return _mapReportSettings ?? ModuleConfig.MapReportSettings()}
set {_mapReportSettings = newValue}
}
/// Returns true if `mapReportSettings` has been explicitly set.
var hasMapReportSettings: Bool {return self._mapReportSettings != nil}
/// Clears the value of `mapReportSettings`. Subsequent reads from it will return its default value.
mutating func clearMapReportSettings() {self._mapReportSettings = nil}
var unknownFields = SwiftProtobuf.UnknownStorage()
init() {}
fileprivate var _mapReportSettings: ModuleConfig.MapReportSettings? = nil
}
///
/// Settings for reporting unencrypted information about our node to a map via MQTT
struct MapReportSettings {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
///
/// How often we should report our info to the map (in seconds)
var publishIntervalSecs: UInt32 = 0
///
/// Bits of precision for the location sent (default of 32 is full precision).
var positionPrecision: UInt32 = 0
var unknownFields = SwiftProtobuf.UnknownStorage()
init() {}
@ -1207,6 +1244,7 @@ extension RemoteHardwarePinType: @unchecked Sendable {}
extension ModuleConfig: @unchecked Sendable {}
extension ModuleConfig.OneOf_PayloadVariant: @unchecked Sendable {}
extension ModuleConfig.MQTTConfig: @unchecked Sendable {}
extension ModuleConfig.MapReportSettings: @unchecked Sendable {}
extension ModuleConfig.RemoteHardwareConfig: @unchecked Sendable {}
extension ModuleConfig.NeighborInfoConfig: @unchecked Sendable {}
extension ModuleConfig.DetectionSensorConfig: @unchecked Sendable {}
@ -1518,6 +1556,8 @@ extension ModuleConfig.MQTTConfig: SwiftProtobuf.Message, SwiftProtobuf._Message
7: .standard(proto: "tls_enabled"),
8: .same(proto: "root"),
9: .standard(proto: "proxy_to_client_enabled"),
10: .standard(proto: "map_reporting_enabled"),
11: .standard(proto: "map_report_settings"),
]
mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
@ -1535,12 +1575,18 @@ extension ModuleConfig.MQTTConfig: SwiftProtobuf.Message, SwiftProtobuf._Message
case 7: try { try decoder.decodeSingularBoolField(value: &self.tlsEnabled) }()
case 8: try { try decoder.decodeSingularStringField(value: &self.root) }()
case 9: try { try decoder.decodeSingularBoolField(value: &self.proxyToClientEnabled) }()
case 10: try { try decoder.decodeSingularBoolField(value: &self.mapReportingEnabled) }()
case 11: try { try decoder.decodeSingularMessageField(value: &self._mapReportSettings) }()
default: break
}
}
}
func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
// The use of inline closures is to circumvent an issue where the compiler
// allocates stack space for every if/case branch local when no optimizations
// are enabled. https://github.com/apple/swift-protobuf/issues/1034 and
// https://github.com/apple/swift-protobuf/issues/1182
if self.enabled != false {
try visitor.visitSingularBoolField(value: self.enabled, fieldNumber: 1)
}
@ -1568,6 +1614,12 @@ extension ModuleConfig.MQTTConfig: SwiftProtobuf.Message, SwiftProtobuf._Message
if self.proxyToClientEnabled != false {
try visitor.visitSingularBoolField(value: self.proxyToClientEnabled, fieldNumber: 9)
}
if self.mapReportingEnabled != false {
try visitor.visitSingularBoolField(value: self.mapReportingEnabled, fieldNumber: 10)
}
try { if let v = self._mapReportSettings {
try visitor.visitSingularMessageField(value: v, fieldNumber: 11)
} }()
try unknownFields.traverse(visitor: &visitor)
}
@ -1581,6 +1633,46 @@ extension ModuleConfig.MQTTConfig: SwiftProtobuf.Message, SwiftProtobuf._Message
if lhs.tlsEnabled != rhs.tlsEnabled {return false}
if lhs.root != rhs.root {return false}
if lhs.proxyToClientEnabled != rhs.proxyToClientEnabled {return false}
if lhs.mapReportingEnabled != rhs.mapReportingEnabled {return false}
if lhs._mapReportSettings != rhs._mapReportSettings {return false}
if lhs.unknownFields != rhs.unknownFields {return false}
return true
}
}
extension ModuleConfig.MapReportSettings: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
static let protoMessageName: String = ModuleConfig.protoMessageName + ".MapReportSettings"
static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
1: .standard(proto: "publish_interval_secs"),
2: .standard(proto: "position_precision"),
]
mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
while let fieldNumber = try decoder.nextFieldNumber() {
// The use of inline closures is to circumvent an issue where the compiler
// allocates stack space for every case branch when no optimizations are
// enabled. https://github.com/apple/swift-protobuf/issues/1034
switch fieldNumber {
case 1: try { try decoder.decodeSingularUInt32Field(value: &self.publishIntervalSecs) }()
case 2: try { try decoder.decodeSingularUInt32Field(value: &self.positionPrecision) }()
default: break
}
}
}
func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
if self.publishIntervalSecs != 0 {
try visitor.visitSingularUInt32Field(value: self.publishIntervalSecs, fieldNumber: 1)
}
if self.positionPrecision != 0 {
try visitor.visitSingularUInt32Field(value: self.positionPrecision, fieldNumber: 2)
}
try unknownFields.traverse(visitor: &visitor)
}
static func ==(lhs: ModuleConfig.MapReportSettings, rhs: ModuleConfig.MapReportSettings) -> Bool {
if lhs.publishIntervalSecs != rhs.publishIntervalSecs {return false}
if lhs.positionPrecision != rhs.positionPrecision {return false}
if lhs.unknownFields != rhs.unknownFields {return false}
return true
}

171
Meshtastic/Protobufs/meshtastic/mqtt.pb.swift
View file

@ -55,8 +55,75 @@ struct ServiceEnvelope {
fileprivate var _packet: MeshPacket? = nil
}
///
/// Information about a node intended to be reported unencrypted to a map using MQTT.
struct MapReport {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
///
/// A full name for this user, i.e. "Kevin Hester"
var longName: String = String()
///
/// A VERY short name, ideally two characters.
/// Suitable for a tiny OLED screen
var shortName: String = String()
///
/// Role of the node that applies specific settings for a particular use-case
var role: Config.DeviceConfig.Role = .client
///
/// Hardware model of the node, i.e. T-Beam, Heltec V3, etc...
var hwModel: HardwareModel = .unset
///
/// Device firmware version string
var firmwareVersion: String = String()
///
/// The region code for the radio (US, CN, EU433, etc...)
var region: Config.LoRaConfig.RegionCode = .unset
///
/// Modem preset used by the radio (LongFast, MediumSlow, etc...)
var modemPreset: Config.LoRaConfig.ModemPreset = .longFast
///
/// Whether the node has a channel with default PSK and name (LongFast, MediumSlow, etc...)
/// and it uses the default frequency slot given the region and modem preset.
var hasDefaultChannel_p: Bool = false
///
/// Latitude: multiply by 1e-7 to get degrees in floating point
var latitudeI: Int32 = 0
///
/// Longitude: multiply by 1e-7 to get degrees in floating point
var longitudeI: Int32 = 0
///
/// Altitude in meters above MSL
var altitude: Int32 = 0
///
/// Indicates the bits of precision for latitude and longitude set by the sending node
var positionPrecision: UInt32 = 0
///
/// Number of online nodes (heard in the last 2 hours) this node has in its list that were received locally (not via MQTT)
var numOnlineLocalNodes: UInt32 = 0
var unknownFields = SwiftProtobuf.UnknownStorage()
init() {}
}
#if swift(>=5.5) && canImport(_Concurrency)
extension ServiceEnvelope: @unchecked Sendable {}
extension MapReport: @unchecked Sendable {}
#endif // swift(>=5.5) && canImport(_Concurrency)
// MARK: - Code below here is support for the SwiftProtobuf runtime.
@ -110,3 +177,107 @@ extension ServiceEnvelope: SwiftProtobuf.Message, SwiftProtobuf._MessageImplemen
return true
}
}
extension MapReport: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
static let protoMessageName: String = _protobuf_package + ".MapReport"
static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
1: .standard(proto: "long_name"),
2: .standard(proto: "short_name"),
3: .same(proto: "role"),
4: .standard(proto: "hw_model"),
5: .standard(proto: "firmware_version"),
6: .same(proto: "region"),
7: .standard(proto: "modem_preset"),
8: .standard(proto: "has_default_channel"),
9: .standard(proto: "latitude_i"),
10: .standard(proto: "longitude_i"),
11: .same(proto: "altitude"),
12: .standard(proto: "position_precision"),
13: .standard(proto: "num_online_local_nodes"),
]
mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
while let fieldNumber = try decoder.nextFieldNumber() {
// The use of inline closures is to circumvent an issue where the compiler
// allocates stack space for every case branch when no optimizations are
// enabled. https://github.com/apple/swift-protobuf/issues/1034
switch fieldNumber {
case 1: try { try decoder.decodeSingularStringField(value: &self.longName) }()
case 2: try { try decoder.decodeSingularStringField(value: &self.shortName) }()
case 3: try { try decoder.decodeSingularEnumField(value: &self.role) }()
case 4: try { try decoder.decodeSingularEnumField(value: &self.hwModel) }()
case 5: try { try decoder.decodeSingularStringField(value: &self.firmwareVersion) }()
case 6: try { try decoder.decodeSingularEnumField(value: &self.region) }()
case 7: try { try decoder.decodeSingularEnumField(value: &self.modemPreset) }()
case 8: try { try decoder.decodeSingularBoolField(value: &self.hasDefaultChannel_p) }()
case 9: try { try decoder.decodeSingularSFixed32Field(value: &self.latitudeI) }()
case 10: try { try decoder.decodeSingularSFixed32Field(value: &self.longitudeI) }()
case 11: try { try decoder.decodeSingularInt32Field(value: &self.altitude) }()
case 12: try { try decoder.decodeSingularUInt32Field(value: &self.positionPrecision) }()
case 13: try { try decoder.decodeSingularUInt32Field(value: &self.numOnlineLocalNodes) }()
default: break
}
}
}
func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
if !self.longName.isEmpty {
try visitor.visitSingularStringField(value: self.longName, fieldNumber: 1)
}
if !self.shortName.isEmpty {
try visitor.visitSingularStringField(value: self.shortName, fieldNumber: 2)
}
if self.role != .client {
try visitor.visitSingularEnumField(value: self.role, fieldNumber: 3)
}
if self.hwModel != .unset {
try visitor.visitSingularEnumField(value: self.hwModel, fieldNumber: 4)
}
if !self.firmwareVersion.isEmpty {
try visitor.visitSingularStringField(value: self.firmwareVersion, fieldNumber: 5)
}
if self.region != .unset {
try visitor.visitSingularEnumField(value: self.region, fieldNumber: 6)
}
if self.modemPreset != .longFast {
try visitor.visitSingularEnumField(value: self.modemPreset, fieldNumber: 7)
}
if self.hasDefaultChannel_p != false {
try visitor.visitSingularBoolField(value: self.hasDefaultChannel_p, fieldNumber: 8)
}
if self.latitudeI != 0 {
try visitor.visitSingularSFixed32Field(value: self.latitudeI, fieldNumber: 9)
}
if self.longitudeI != 0 {
try visitor.visitSingularSFixed32Field(value: self.longitudeI, fieldNumber: 10)
}
if self.altitude != 0 {
try visitor.visitSingularInt32Field(value: self.altitude, fieldNumber: 11)
}
if self.positionPrecision != 0 {
try visitor.visitSingularUInt32Field(value: self.positionPrecision, fieldNumber: 12)
}
if self.numOnlineLocalNodes != 0 {
try visitor.visitSingularUInt32Field(value: self.numOnlineLocalNodes, fieldNumber: 13)
}
try unknownFields.traverse(visitor: &visitor)
}
static func ==(lhs: MapReport, rhs: MapReport) -> Bool {
if lhs.longName != rhs.longName {return false}
if lhs.shortName != rhs.shortName {return false}
if lhs.role != rhs.role {return false}
if lhs.hwModel != rhs.hwModel {return false}
if lhs.firmwareVersion != rhs.firmwareVersion {return false}
if lhs.region != rhs.region {return false}
if lhs.modemPreset != rhs.modemPreset {return false}
if lhs.hasDefaultChannel_p != rhs.hasDefaultChannel_p {return false}
if lhs.latitudeI != rhs.latitudeI {return false}
if lhs.longitudeI != rhs.longitudeI {return false}
if lhs.altitude != rhs.altitude {return false}
if lhs.positionPrecision != rhs.positionPrecision {return false}
if lhs.numOnlineLocalNodes != rhs.numOnlineLocalNodes {return false}
if lhs.unknownFields != rhs.unknownFields {return false}
return true
}
}

8
Meshtastic/Protobufs/meshtastic/portnums.pb.swift
View file

@ -181,6 +181,10 @@ enum PortNum: SwiftProtobuf.Enum {
/// Portnum for payloads from the official Meshtastic ATAK plugin
case atakPlugin // = 72
///
/// Provides unencrypted information about a node for consumption by a map via MQTT
case mapReportApp // = 73
///
/// Private applications should use portnums >= 256.
/// To simplify initial development and testing you can use "PRIVATE_APP"
@ -226,6 +230,7 @@ enum PortNum: SwiftProtobuf.Enum {
case 70: self = .tracerouteApp
case 71: self = .neighborinfoApp
case 72: self = .atakPlugin
case 73: self = .mapReportApp
case 256: self = .privateApp
case 257: self = .atakForwarder
case 511: self = .max
@ -258,6 +263,7 @@ enum PortNum: SwiftProtobuf.Enum {
case .tracerouteApp: return 70
case .neighborinfoApp: return 71
case .atakPlugin: return 72
case .mapReportApp: return 73
case .privateApp: return 256
case .atakForwarder: return 257
case .max: return 511
@ -295,6 +301,7 @@ extension PortNum: CaseIterable {
.tracerouteApp,
.neighborinfoApp,
.atakPlugin,
.mapReportApp,
.privateApp,
.atakForwarder,
.max,
@ -334,6 +341,7 @@ extension PortNum: SwiftProtobuf._ProtoNameProviding {
70: .same(proto: "TRACEROUTE_APP"),
71: .same(proto: "NEIGHBORINFO_APP"),
72: .same(proto: "ATAK_PLUGIN"),
73: .same(proto: "MAP_REPORT_APP"),
256: .same(proto: "PRIVATE_APP"),
257: .same(proto: "ATAK_FORWARDER"),
511: .same(proto: "MAX"),

2
Meshtastic/Views/Bluetooth/Connect.swift
View file

@ -209,7 +209,7 @@ struct Connect: View {
}.padding([.bottom, .top])
}
}
.confirmationDialog("Connecting to a new radio will clear all local app data on the phone and will reset all app settings.", isPresented: $presentingSwitchPreferredPeripheral, titleVisibility: .visible) {
.confirmationDialog("Connecting to a new radio will clear all local app data on the phone and will reset all app specific settings.", isPresented: $presentingSwitchPreferredPeripheral, titleVisibility: .visible) {
Button("Connect to new radio?", role: .destructive) {
UserDefaults.preferredPeripheralId = selectedPeripherialId

4
Meshtastic/Views/Nodes/DeviceMetricsLog.swift
View file

@ -43,13 +43,14 @@ struct DeviceMetricsLog: View {
.accessibilityLabel("Line Series")
.accessibilityValue("X: \(point.time!), Y: \(point.batteryLevel)")
.foregroundStyle(batteryChartColor)
.interpolationMethod(.cardinal)
.interpolationMethod(.linear)
Plot {
PointMark(
x: .value("x", point.time!),
y: .value("y", point.channelUtilization)
)
.symbolSize(25)
}
.accessibilityLabel("Line Series")
.accessibilityValue("X: \(point.time!), Y: \(point.channelUtilization)")
@ -64,6 +65,7 @@ struct DeviceMetricsLog: View {
x: .value("x", point.time!),
y: .value("y", point.airUtilTx)
)
.symbolSize(25)
}
.accessibilityLabel("Line Series")
.accessibilityValue("X: \(point.time!), Y: \(point.airUtilTx)")

166
Meshtastic/Views/Nodes/Helpers/Map/NodeMapContent.swift Normal file
View file

@ -0,0 +1,166 @@
//
// RouteLines.swift
// Meshtastic
//
// Created by Garth Vander Houwen on 3/14/24.
//
import SwiftUI
import MapKit
@available(iOS 17.0, macOS 14.0, *)
struct NodeMapContent: MapContent {
@ObservedObject var node: NodeInfoEntity
@State var showUserLocation: Bool = false
@State var positions: [PositionEntity] = []
/// Map State User Defaults
@AppStorage("meshMapShowNodeHistory") private var showNodeHistory = false
@AppStorage("meshMapShowRouteLines") private var showRouteLines = false
@AppStorage("enableMapConvexHull") private var showConvexHull = false
@AppStorage("enableMapTraffic") private var showTraffic: Bool = false
@AppStorage("enableMapPointsOfInterest") private var showPointsOfInterest: Bool = false
@AppStorage("mapLayer") private var selectedMapLayer: MapLayer = .hybrid
// Map Configuration
@Namespace var mapScope
@State var mapStyle: MapStyle = MapStyle.hybrid(elevation: .realistic, pointsOfInterest: .all, showsTraffic: true)
@State var position = MapCameraPosition.automatic
@State var scene: MKLookAroundScene?
@State var isLookingAround = false
@State var isShowingAltitude = false
@State var isEditingSettings = false
@State var selectedPosition: PositionEntity?
@State var showWaypoints = false
@State var selectedWaypoint: WaypointEntity?
@State var isMeshMap = false
//let region: MKCoordinateRegion
@MapContentBuilder
var nodeMap: some MapContent {
let positionArray = node.positions?.array as? [PositionEntity] ?? []
let lineCoords = positionArray.compactMap({(position) -> CLLocationCoordinate2D in
return position.nodeCoordinate ?? LocationsHandler.DefaultLocation
})
/// Node Color from node.num
let nodeColor = UIColor(hex: UInt32(node.num))
/// Node Annotations
ForEach(positionArray, id: \.id) { position in
let pf = PositionFlags(rawValue: Int(position.nodePosition?.metadata?.positionFlags ?? 771))
let headingDegrees = Angle.degrees(Double(position.heading))
/// Reduced Precision Map Circle
if position.latest && 11...16 ~= position.precisionBits {
let pp = PositionPrecision(rawValue: Int(position.precisionBits))
let radius : CLLocationDistance = pp?.precisionMeters ?? 0
if radius > 0.0 {
MapCircle(center: position.coordinate, radius: radius)
.foregroundStyle(Color(nodeColor).opacity(0.25))
.stroke(.white, lineWidth: 2)
}
}
if showConvexHull {
if lineCoords.count > 0 {
let hull = lineCoords.getConvexHull()
MapPolygon(coordinates: hull)
.stroke(Color(nodeColor.darker()), lineWidth: 3)
.foregroundStyle(Color(nodeColor).opacity(0.4))
}
}
/// Route Lines
if showRouteLines {
let gradient = LinearGradient(
colors: [Color(nodeColor.lighter().lighter().lighter()), Color(nodeColor.lighter()), Color(nodeColor)],
startPoint: .leading, endPoint: .trailing
)
let dashed = StrokeStyle(
lineWidth: 3,
lineCap: .round, lineJoin: .round, dash: [10, 10]
)
MapPolyline(coordinates: lineCoords)
.stroke(gradient, style: dashed)
}
/// Node Annotations
ForEach(positionArray, id: \.id) { position in
Annotation(position.latest ? node.user?.shortName ?? "?": "", coordinate: position.coordinate) {
LazyVStack {
if position.latest {
ZStack {
Circle()
.fill(Color(nodeColor.lighter()).opacity(0.4).shadow(.drop(color: Color(nodeColor).isLight() ? .black : .white, radius: 5)))
.foregroundStyle(Color(nodeColor.lighter()).opacity(0.3))
.frame(width: 50, height: 50)
if pf.contains(.Heading) {
Image(systemName: pf.contains(.Speed) && position.speed > 1 ? "location.north" : "octagon")
.symbolEffect(.pulse.byLayer)
.padding(5)
.foregroundStyle(Color(nodeColor).isLight() ? .black : .white)
.background(Color(nodeColor.darker()))
.clipShape(Circle())
.rotationEffect(headingDegrees)
.onTapGesture {
selectedPosition = (selectedPosition == position ? nil : position)
}
.popover(item: $selectedPosition) { selection in
PositionPopover(position: selection)
.padding()
.opacity(0.8)
.presentationCompactAdaptation(.popover)
}
} else {
Image(systemName: "flipphone")
.symbolEffect(.pulse.byLayer)
.padding(5)
.foregroundStyle(Color(nodeColor).isLight() ? .black : .white)
.background(Color(UIColor(hex: UInt32(node.num)).darker()))
.clipShape(Circle())
.onTapGesture {
selectedPosition = (selectedPosition == position ? nil : position)
}
.popover(item: $selectedPosition) { selection in
PositionPopover(position: selection)
.padding()
.opacity(0.8)
.presentationCompactAdaptation(.popover)
}
}
}
} else {
if showNodeHistory {
if pf.contains(.Heading) {
Image(systemName: "location.north.circle")
.resizable()
.scaledToFit()
.foregroundStyle(Color(UIColor(hex: UInt32(node.num))).isLight() ? .black : .white)
.background(Color(UIColor(hex: UInt32(node.num))))
.clipShape(Circle())
.rotationEffect(headingDegrees)
.frame(width: 16, height: 16)
} else {
Circle()
.fill(Color(UIColor(hex: UInt32(node.num))))
.strokeBorder(Color(UIColor(hex: UInt32(node.num))).isLight() ? .black : .white ,lineWidth: 2)
.frame(width: 12, height: 12)
}
}
}
}
}
.tag(position.time)
.annotationTitles(.automatic)
.annotationSubtitles(.automatic)
}
}
}
@MapContentBuilder
var body: some MapContent {
if node.positions?.count ?? 0 > 0 {
nodeMap
}
}
}

136
Meshtastic/Views/Nodes/Helpers/Map/NodeMapSwiftUI.swift
View file

@ -10,7 +10,6 @@ import CoreLocation
#if canImport(MapKit)
import MapKit
#endif
import WeatherKit
@available(iOS 17.0, macOS 14.0, *)
struct NodeMapSwiftUI: View {
@ -40,6 +39,8 @@ struct NodeMapSwiftUI: View {
@State var selectedWaypoint: WaypointEntity?
@State var isMeshMap = false
@State private var mapRegion = MKCoordinateRegion.init()
@FetchRequest(sortDescriptors: [NSSortDescriptor(key: "name", ascending: false)],
predicate: NSPredicate(
format: "expire == nil || expire >= %@", Date() as NSDate
@ -47,140 +48,13 @@ struct NodeMapSwiftUI: View {
private var waypoints: FetchedResults<WaypointEntity>
var body: some View {
let positionArray = node.positions?.array as? [PositionEntity] ?? []
var mostRecent = node.positions?.lastObject as? PositionEntity
let lineCoords = positionArray.compactMap({(position) -> CLLocationCoordinate2D in
return position.nodeCoordinate ?? LocationsHandler.DefaultLocation
})
if node.hasPositions {
ZStack {
MapReader { reader in
Map(position: $position, bounds: MapCameraBounds(minimumDistance: 1, maximumDistance: .infinity), scope: mapScope) {
/// Node Color from node.num
let nodeColor = UIColor(hex: UInt32(node.num))
/// Route Lines
if showRouteLines {
let gradient = LinearGradient(
colors: [Color(nodeColor.lighter().lighter().lighter()), Color(nodeColor.lighter()), Color(nodeColor)],
startPoint: .leading, endPoint: .trailing
)
let dashed = StrokeStyle(
lineWidth: 3,
lineCap: .round, lineJoin: .round, dash: [10, 10]
)
MapPolyline(coordinates: lineCoords)
.stroke(gradient, style: dashed)
}
/// Convex Hull
if showConvexHull {
if lineCoords.count > 0 {
let hull = lineCoords.getConvexHull()
MapPolygon(coordinates: hull)
.stroke(Color(nodeColor.darker()), lineWidth: 3)
.foregroundStyle(Color(nodeColor).opacity(0.4))
}
}
/// Waypoint Annotations
if waypoints.count > 0 && showWaypoints {
ForEach(Array(waypoints), id: \.id) { waypoint in
Annotation(waypoint.name ?? "?", coordinate: waypoint.coordinate) {
LazyVStack {
CircleText(text: String(UnicodeScalar(Int(waypoint.icon)) ?? "📍"), color: Color.orange, circleSize: 35)
.onTapGesture(coordinateSpace: .named("nodemap")) { location in
selectedWaypoint = (selectedWaypoint == waypoint ? nil : waypoint)
}
}
}
}
}
/// Node Annotations
ForEach(positionArray, id: \.id) { position in
let pf = PositionFlags(rawValue: Int(position.nodePosition?.metadata?.positionFlags ?? 771))
let headingDegrees = Angle.degrees(Double(position.heading))
/// Reduced Precision Map Circle
if position.latest && 11...16 ~= position.precisionBits {
let pp = PositionPrecision(rawValue: Int(position.precisionBits))
let radius : CLLocationDistance = pp?.precisionMeters ?? 0
if radius > 0.0 {
MapCircle(center: position.coordinate, radius: radius)
.foregroundStyle(Color(nodeColor).opacity(0.25))
.stroke(.white, lineWidth: 2)
}
}
Annotation(position.latest ? node.user?.shortName ?? "?": "", coordinate: position.coordinate) {
LazyVStack {
if position.latest {
ZStack {
Circle()
.fill(Color(nodeColor.lighter()).opacity(0.4).shadow(.drop(color: Color(nodeColor).isLight() ? .black : .white, radius: 5)))
.foregroundStyle(Color(nodeColor.lighter()).opacity(0.3))
.frame(width: 50, height: 50)
if pf.contains(.Heading) {
Image(systemName: pf.contains(.Speed) && position.speed > 1 ? "location.north" : "octagon")
.symbolEffect(.pulse.byLayer)
.padding(5)
.foregroundStyle(Color(nodeColor).isLight() ? .black : .white)
.background(Color(nodeColor.darker()))
.clipShape(Circle())
.rotationEffect(headingDegrees)
.onTapGesture {
selectedPosition = (selectedPosition == position ? nil : position)
}
.popover(item: $selectedPosition) { selection in
PositionPopover(position: selection)
.padding()
.opacity(0.8)
.presentationCompactAdaptation(.popover)
}
} else {
Image(systemName: "flipphone")
.symbolEffect(.pulse.byLayer)
.padding(5)
.foregroundStyle(Color(nodeColor).isLight() ? .black : .white)
.background(Color(UIColor(hex: UInt32(node.num)).darker()))
.clipShape(Circle())
.onTapGesture {
selectedPosition = (selectedPosition == position ? nil : position)
}
.popover(item: $selectedPosition) { selection in
PositionPopover(position: selection)
.padding()
.opacity(0.8)
.presentationCompactAdaptation(.popover)
}
}
}
} else {
if showNodeHistory {
if pf.contains(.Heading) {
Image(systemName: "location.north.circle")
.resizable()
.scaledToFit()
.foregroundStyle(Color(UIColor(hex: UInt32(node.num))).isLight() ? .black : .white)
.background(Color(UIColor(hex: UInt32(node.num))))
.clipShape(Circle())
.rotationEffect(headingDegrees)
.frame(width: 16, height: 16)
} else {
Circle()
.fill(Color(UIColor(hex: UInt32(node.num))))
.strokeBorder(Color(UIColor(hex: UInt32(node.num))).isLight() ? .black : .white ,lineWidth: 2)
.frame(width: 12, height: 12)
}
}
}
}
}
.tag(position.time)
.annotationTitles(.automatic)
.annotationSubtitles(.automatic)
}
NodeMapContent(node: node)
}
.mapScope(mapScope)
.mapStyle(mapStyle)
@ -242,7 +116,7 @@ struct NodeMapSwiftUI: View {
if node.positions?.count ?? 0 > 1 {
position = .automatic
} else {
position = .camera(MapCamera(centerCoordinate: mostRecent!.coordinate, distance: 150, heading: 0, pitch: 60))
position = .camera(MapCamera(centerCoordinate: mostRecent!.coordinate, distance: 8000, heading: 0, pitch: 60))
}
if let mostRecent {
Task {
@ -266,7 +140,7 @@ struct NodeMapSwiftUI: View {
if node.positions?.count ?? 0 > 1 {
position = .automatic
} else {
position = .camera(MapCamera(centerCoordinate: mostRecent!.coordinate, distance: 5000, heading: 0, pitch: 60))
position = .camera(MapCamera(centerCoordinate: mostRecent!.coordinate, distance: 8000, heading: 0, pitch: 60))
}
if self.scene == nil {
Task {

3
Meshtastic/Views/Nodes/Helpers/NodeListItem.swift
View file

@ -202,6 +202,7 @@ struct NodeListItem: View {
}
}
}
.padding([.top, .bottom])
.padding(.top, 4)
.padding(.bottom, 4)
}
}

243
Meshtastic/Views/Settings/Channels.swift
View file

@ -31,7 +31,6 @@ struct Channels: View {
@State var hasChanges = false
@State var hasValidKey = true
@State private var isPresentingEditView = false
@State private var isPresentingSaveConfirm: Bool = false
@State private var channelIndex: Int32 = 0
@State private var channelName = ""
@ -40,18 +39,16 @@ struct Channels: View {
@State private var channelRole = 0
@State private var uplink = false
@State private var downlink = false
@State private var positionPrecision = 32.0
@State private var preciseLocation = true
@State private var positionsEnabled = true
@State private var supportedVersion = true
@State var selectedChannel: ChannelEntity?
/// Minimum Version for granular position configuration
@State var minimumVersion = "2.2.24"
var body: some View {
let supportedVersion = bleManager.connectedVersion == "0.0.0" || self.minimumVersion.compare(bleManager.connectedVersion, options: .numeric) == .orderedAscending || minimumVersion.compare(bleManager.connectedVersion, options: .numeric) == .orderedSame
VStack {
List {
@ -80,7 +77,7 @@ struct Channels: View {
channelName = channel.name ?? ""
uplink = channel.uplinkEnabled
downlink = channel.downlinkEnabled
hasChanges = false
positionPrecision = Double(channel.positionPrecision)
if !supportedVersion && channelRole == 1 {
positionPrecision = 32
preciseLocation = true
@ -91,21 +88,20 @@ struct Channels: View {
preciseLocation = false
positionsEnabled = false
} else {
positionPrecision = Double(channel.positionPrecision)
if positionPrecision == 32 {
preciseLocation = true
positionsEnabled = true
} else {
preciseLocation = false
}
if positionPrecision == 0 {
positionsEnabled = false
} else {
positionsEnabled = true
}
}
isPresentingEditView = true
hasChanges = false
selectedChannel = channel
}) {
VStack(alignment: .leading) {
HStack {
@ -131,231 +127,15 @@ struct Channels: View {
}
}
}
.sheet(isPresented: $isPresentingEditView) {
.sheet(item: $selectedChannel) { selection in
#if targetEnvironment(macCatalyst)
Text("channel")
.font(.largeTitle)
.padding()
#endif
Form {
Section(header: Text("channel details")) {
HStack {
Text("name")
Spacer()
TextField(
"Channel Name",
text: $channelName
)
.disableAutocorrection(true)
.keyboardType(.alphabet)
.foregroundColor(Color.gray)
.onChange(of: channelName, perform: { _ in
channelName = channelName.replacing(" ", with: "")
let totalBytes = channelName.utf8.count
// Only mess with the value if it is too big
if totalBytes > 11 {
let firstNBytes = Data(channelName.utf8.prefix(11))
if let maxBytesString = String(data: firstNBytes, encoding: String.Encoding.utf8) {
// Set the channelName back to the last place where it was the right size
channelName = maxBytesString
}
}
hasChanges = true
})
}
HStack {
Picker("Key Size", selection: $channelKeySize) {
Text("Empty").tag(0)
Text("Default").tag(-1)
Text("1 byte").tag(1)
Text("128 bit").tag(16)
Text("192 bit").tag(24)
Text("256 bit").tag(32)
}
.pickerStyle(DefaultPickerStyle())
Spacer()
Button {
if channelKeySize == -1 {
channelKey = "AQ=="
} else {
let key = generateChannelKey(size: channelKeySize)
channelKey = key
}
} label: {
Image(systemName: "lock.rotation")
.font(.title)
}
.buttonStyle(.bordered)
.buttonBorderShape(.capsule)
.controlSize(.small)
}
HStack(alignment: .center) {
Text("Key")
Spacer()
TextField(
"Key",
text: $channelKey,
axis: .vertical
)
.padding(6)
.disableAutocorrection(true)
.keyboardType(.alphabet)
.foregroundColor(Color.gray)
.textSelection(.enabled)
.background(
RoundedRectangle(cornerRadius: 10.0)
.stroke(
hasValidKey ?
Color.clear :
Color.red
, lineWidth: 2.0)
)
.onChange(of: channelKey, perform: { _ in
let tempKey = Data(base64Encoded: channelKey) ?? Data()
if tempKey.count == channelKeySize || channelKeySize == -1{
hasValidKey = true
}
else {
hasValidKey = false
}
hasChanges = true
})
.disabled(channelKeySize <= 0)
}
HStack {
if channelRole == 1 {
Picker("Channel Role", selection: $channelRole) {
Text("Primary").tag(1)
}
.pickerStyle(.automatic)
.disabled(true)
} else {
Text("Channel Role")
Spacer()
Picker("Channel Role", selection: $channelRole) {
Text("Disabled").tag(0)
Text("Secondary").tag(2)
}
.pickerStyle(.segmented)
}
}
}
Section(header: Text("position")) {
VStack(alignment: .leading) {
Toggle(isOn: $positionsEnabled) {
Label(channelRole == 1 ? "Positions Enabled" : "Allow Position Requests", systemImage: positionsEnabled ? "mappin" : "mappin.slash")
}
.toggleStyle(SwitchToggleStyle(tint: .accentColor))
.disabled(!supportedVersion)
}
if positionsEnabled {
VStack(alignment: .leading) {
Toggle(isOn: $preciseLocation) {
Label("Precise Location", systemImage: "scope")
}
.toggleStyle(SwitchToggleStyle(tint: .accentColor))
.disabled(!supportedVersion)
.listRowSeparator(.visible)
.onChange(of: preciseLocation) { pl in
if pl == false {
positionPrecision = 13
}
}
}
if !preciseLocation {
VStack(alignment: .leading) {
Label("Approximate Location", systemImage: "location.slash.circle.fill")
Slider(
value: $positionPrecision,
in: 11...16,
step: 1
)
{
} minimumValueLabel: {
Image(systemName: "minus")
} maximumValueLabel: {
Image(systemName: "plus")
}
Text(PositionPrecision(rawValue: Int(positionPrecision))?.description ?? "")
.foregroundColor(.gray)
.font(.callout)
}
}
}
}
Section(header: Text("mqtt")) {
Toggle(isOn: $uplink) {
Label("Uplink Enabled", systemImage: "arrowshape.up")
}
.toggleStyle(SwitchToggleStyle(tint: .accentColor))
.listRowSeparator(.visible)
Toggle(isOn: $downlink) {
Label("Downlink Enabled", systemImage: "arrowshape.down")
}
.toggleStyle(SwitchToggleStyle(tint: .accentColor))
.listRowSeparator(.visible)
}
}
ChannelForm(channelIndex: $channelIndex, channelName: $channelName, channelKeySize: $channelKeySize, channelKey: $channelKey, channelRole: $channelRole, uplink: $uplink, downlink: $downlink, positionPrecision: $positionPrecision, preciseLocation: $preciseLocation, positionsEnabled: $positionsEnabled, hasChanges: $hasChanges, hasValidKey: $hasValidKey, supportedVersion: $supportedVersion)
.onAppear {
let tempKey = Data(base64Encoded: channelKey) ?? Data()
if tempKey.count == channelKeySize || channelKeySize == -1 {
hasValidKey = true
}
else {
hasValidKey = false
}
}
.onChange(of: channelName) { _ in
hasChanges = true
}
.onChange(of: channelKeySize) { _ in
if channelKeySize == -1 {
channelKey = "AQ=="
} else {
let key = generateChannelKey(size: channelKeySize)
channelKey = key
}
hasChanges = true
}
.onChange(of: channelKey) { _ in
hasChanges = true
}
.onChange(of: channelRole) { _ in
hasChanges = true
}
.onChange(of: preciseLocation) { loc in
if loc {
positionPrecision = 32
} else {
positionPrecision = 14
}
hasChanges = true
}
.onChange(of: positionPrecision) { _ in
hasChanges = true
}
.onChange(of: positionsEnabled) { pe in
if pe {
if positionPrecision == 0 {
positionPrecision = 32
}
} else {
positionPrecision = 0
}
hasChanges = true
}
.onChange(of: uplink) { _ in
hasChanges = true
}
.onChange(of: downlink) { _ in
hasChanges = true
supportedVersion = bleManager.connectedVersion == "0.0.0" || self.minimumVersion.compare(bleManager.connectedVersion, options: .numeric) == .orderedAscending || minimumVersion.compare(bleManager.connectedVersion, options: .numeric) == .orderedSame
}
HStack {
Button {
@ -422,11 +202,10 @@ struct Channels: View {
let adminMessageId = bleManager.saveChannel(channel: channel, fromUser: node!.user!, toUser: node!.user!)
if adminMessageId > 0 {
self.isPresentingEditView = false
selectedChannel = nil
channelName = ""
channelRole = 2
hasChanges = false
//_ = bleManager.getChannel(channel: channel, fromUser: node!.user!, toUser: node!.user!)
}
} label: {
Label("save", systemImage: "square.and.arrow.down")
@ -438,7 +217,7 @@ struct Channels: View {
.padding(.bottom)
#if targetEnvironment(macCatalyst)
Button {
isPresentingEditView = false
goBack()
} label: {
Label("close", systemImage: "xmark")
}
@ -470,7 +249,7 @@ struct Channels: View {
uplink = false
downlink = false
hasChanges = true
isPresentingEditView = true
selectedChannel = ChannelEntity(context: context)
} label: {
Label("Add Channel", systemImage: "plus.square")

251
Meshtastic/Views/Settings/Channels/ChannelForm.swift Normal file
View file

@ -0,0 +1,251 @@
//
// ChannelForm.swift
// Meshtastic
//
// Copyright(c) Garth Vander Houwen 3/17/24.
//
import SwiftUI
#if canImport(MapKit)
import MapKit
#endif
struct ChannelForm: View {
@Binding var channelIndex: Int32
@Binding var channelName: String
@Binding var channelKeySize: Int
@Binding var channelKey: String
@Binding var channelRole: Int
@Binding var uplink: Bool
@Binding var downlink: Bool
@Binding var positionPrecision: Double
@Binding var preciseLocation: Bool
@Binding var positionsEnabled: Bool
@Binding var hasChanges: Bool
@Binding var hasValidKey: Bool
@Binding var supportedVersion: Bool
var body: some View {
NavigationStack {
Form {
Section(header: Text("channel details")) {
HStack {
Text("name")
Spacer()
TextField(
"Channel Name",
text: $channelName
)
.disableAutocorrection(true)
.keyboardType(.alphabet)
.foregroundColor(Color.gray)
.onChange(of: channelName, perform: { _ in
channelName = channelName.replacing(" ", with: "")
let totalBytes = channelName.utf8.count
// Only mess with the value if it is too big
if totalBytes > 11 {
let firstNBytes = Data(channelName.utf8.prefix(11))
if let maxBytesString = String(data: firstNBytes, encoding: String.Encoding.utf8) {
// Set the channelName back to the last place where it was the right size
channelName = maxBytesString
}
}
hasChanges = true
})
}
HStack {
Picker("Key Size", selection: $channelKeySize) {
Text("Empty").tag(0)
Text("Default").tag(-1)
Text("1 byte").tag(1)
Text("128 bit").tag(16)
Text("192 bit").tag(24)
Text("256 bit").tag(32)
}
.pickerStyle(DefaultPickerStyle())
Spacer()
Button {
if channelKeySize == -1 {
channelKey = "AQ=="
} else {
let key = generateChannelKey(size: channelKeySize)
channelKey = key
}
} label: {
Image(systemName: "lock.rotation")
.font(.title)
}
.buttonStyle(.bordered)
.buttonBorderShape(.capsule)
.controlSize(.small)
}
HStack(alignment: .center) {
Text("Key")
Spacer()
TextField(
"Key",
text: $channelKey,
axis: .vertical
)
.padding(6)
.disableAutocorrection(true)
.keyboardType(.alphabet)
.foregroundColor(Color.gray)
.textSelection(.enabled)
.background(
RoundedRectangle(cornerRadius: 10.0)
.stroke(
hasValidKey ?
Color.clear :
Color.red
, lineWidth: 2.0)
)
.onChange(of: channelKey, perform: { _ in
let tempKey = Data(base64Encoded: channelKey) ?? Data()
if tempKey.count == channelKeySize || channelKeySize == -1{
hasValidKey = true
}
else {
hasValidKey = false
}
hasChanges = true
})
.disabled(channelKeySize <= 0)
}
HStack {
if channelRole == 1 {
Picker("Channel Role", selection: $channelRole) {
Text("Primary").tag(1)
}
.pickerStyle(.automatic)
.disabled(true)
} else {
Text("Channel Role")
Spacer()
Picker("Channel Role", selection: $channelRole) {
Text("Disabled").tag(0)
Text("Secondary").tag(2)
}
.pickerStyle(.segmented)
}
}
}
Section(header: Text("position")) {
VStack(alignment: .leading) {
Toggle(isOn: $positionsEnabled) {
Label(channelRole == 1 ? "Positions Enabled" : "Allow Position Requests", systemImage: positionsEnabled ? "mappin" : "mappin.slash")
}
.toggleStyle(SwitchToggleStyle(tint: .accentColor))
.disabled(!supportedVersion)
}
if positionsEnabled {
VStack(alignment: .leading) {
Toggle(isOn: $preciseLocation) {
Label("Precise Location", systemImage: "scope")
}
.toggleStyle(SwitchToggleStyle(tint: .accentColor))
.disabled(!supportedVersion)
.listRowSeparator(.visible)
.onChange(of: preciseLocation) { pl in
if pl == false {
positionPrecision = 13
}
}
}
if !preciseLocation {
VStack(alignment: .leading) {
Label("Approximate Location", systemImage: "location.slash.circle.fill")
Slider(value: $positionPrecision, in: 11...16, step: 1) {
} minimumValueLabel: {
Image(systemName: "minus")
} maximumValueLabel: {
Image(systemName: "plus")
}
Text(PositionPrecision(rawValue: Int(positionPrecision))?.description ?? "")
.foregroundColor(.gray)
.font(.callout)
}
}
}
}
Section(header: Text("mqtt")) {
Toggle(isOn: $uplink) {
Label("Uplink Enabled", systemImage: "arrowshape.up")
}
.toggleStyle(SwitchToggleStyle(tint: .accentColor))
.listRowSeparator(.visible)
Toggle(isOn: $downlink) {
Label("Downlink Enabled", systemImage: "arrowshape.down")
}
.toggleStyle(SwitchToggleStyle(tint: .accentColor))
.listRowSeparator(.visible)
}
}
.onChange(of: channelName) { _ in
hasChanges = true
}
.onChange(of: channelKeySize) { _ in
if channelKeySize == -1 {
channelKey = "AQ=="
} else {
let key = generateChannelKey(size: channelKeySize)
channelKey = key
}
hasChanges = true
}
.onChange(of: channelKey) { _ in
hasChanges = true
}
.onChange(of: channelRole) { _ in
hasChanges = true
}
.onChange(of: preciseLocation) { loc in
if loc == true {
positionPrecision = 32
} else {
positionPrecision = 14
}
hasChanges = true
}
.onChange(of: positionPrecision) { _ in
hasChanges = true
}
.onChange(of: positionsEnabled) { pe in
if pe {
if positionPrecision == 0 {
positionPrecision = 32
}
} else {
positionPrecision = 0
}
hasChanges = true
}
.onChange(of: uplink) { _ in
hasChanges = true
}
.onChange(of: downlink) { _ in
hasChanges = true
}
.onAppear {
let tempKey = Data(base64Encoded: channelKey) ?? Data()
if tempKey.count == channelKeySize || channelKeySize == -1 {
hasValidKey = true
}
else {
hasValidKey = false
}
}
}
.presentationDetents([.fraction(0.45), .fraction(0.65)])
.presentationDragIndicator(.visible)
}
}

5
Meshtastic/Views/Settings/Config/DeviceConfig.swift
View file

@ -23,7 +23,7 @@ struct DeviceConfig: View {
@State var serialEnabled = true
@State var debugLogEnabled = false
@State var rebroadcastMode = 0
@State var nodeInfoBroadcastSecs = 900
@State var nodeInfoBroadcastSecs = 10800
@State var doubleTapAsButtonPress = false
@State var isManaged = false
@ -268,6 +268,9 @@ struct DeviceConfig: View {
self.buzzerGPIO = Int(node?.deviceConfig?.buzzerGpio ?? 0)
self.rebroadcastMode = Int(node?.deviceConfig?.rebroadcastMode ?? 0)
self.nodeInfoBroadcastSecs = Int(node?.deviceConfig?.nodeInfoBroadcastSecs ?? 900)
if nodeInfoBroadcastSecs < 3600 {
nodeInfoBroadcastSecs = 3600
}
self.doubleTapAsButtonPress = node?.deviceConfig?.doubleTapAsButtonPress ?? false
self.isManaged = node?.deviceConfig?.isManaged ?? false
self.hasChanges = false

8
Meshtastic/Views/Settings/Config/LoRaConfig.swift
View file

@ -130,12 +130,12 @@ struct LoRaConfig: View {
}
VStack(alignment: .leading) {
Picker("Number of hops", selection: $hopLimit) {
ForEach(1..<8) {
ForEach(0..<8) {
Text("\($0)")
.tag($0 == 0 ? 3 : $0)
.tag($0)
}
}
Text("Sets the maximum number of hops, default is 3. Increasing hops also increases congestion and should be used carefully.")
Text("Sets the maximum number of hops, default is 3. Increasing hops also increases congestion and should be used carefully. O hop broadcast messages will not get ACKs.")
.foregroundColor(.gray)
.font(.callout)
}
@ -181,7 +181,7 @@ struct LoRaConfig: View {
HStack {
Image(systemName: "antenna.radiowaves.left.and.right")
.foregroundColor(.accentColor)
Stepper("\(txPower)db Transmit Power", value: $txPower, in: 1...30, step: 1)
Stepper("\(txPower)dBm Transmit Power", value: $txPower, in: 1...30, step: 1)
.padding(5)
}
}

87
Meshtastic/Views/Settings/Config/Module/MQTTConfig.swift
View file

@ -5,6 +5,7 @@
// Copyright (c) Garth Vander Houwen 9/4/22.
//
import SwiftUI
import CoreLocation
struct MQTTConfig: View {
@ -23,9 +24,11 @@ struct MQTTConfig: View {
@State var jsonEnabled = false
@State var tlsEnabled = true
@State var root = "msh"
@State var selectedTopic = ""
@State var mqttConnected: Bool = false
@State var defaultTopic = "msh/US"
@State var nearbyTopics = [String]()
let locale = Locale.current
var body: some View {
VStack {
@ -51,7 +54,7 @@ struct MQTTConfig: View {
Toggle(isOn: $proxyToClientEnabled) {
Label("mqtt.clientproxy", systemImage: "iphone.radiowaves.left.and.right")
Text("If both MQTT and the client proxy are enabled your mobile device will utilize an available network connection to connect to the specified MQTT server.")
Text("Utilizes the network connection on your phone to connect to MQTT.")
}
.toggleStyle(SwitchToggleStyle(tint: .accentColor))
@ -69,7 +72,7 @@ struct MQTTConfig: View {
Toggle(isOn: $jsonEnabled) {
Label("JSON Enabled", systemImage: "ellipsis.curlybraces")
Text("JSON mode is a limited, unencrypted MQTT output that can crash your node it should not be enabled unless you are locally integrating with home assistant")
Text("JSON mode is a limited, unencrypted MQTT output for locally integrating with home assistant")
}
.toggleStyle(SwitchToggleStyle(tint: .accentColor))
@ -80,7 +83,7 @@ struct MQTTConfig: View {
.toggleStyle(SwitchToggleStyle(tint: .accentColor))
}
Section(header: Text("Custom Server")) {
Section(header: Text("Server")) {
HStack {
Label("Address", systemImage: "server.rack")
TextField("Server Address", text: $address)
@ -157,6 +160,7 @@ struct MQTTConfig: View {
}
.keyboardType(.default)
.scrollDismissesKeyboard(.interactively)
.listRowSeparator(/*@START_MENU_TOKEN@*/.visible/*@END_MENU_TOKEN@*/)
HStack {
Label("Root Topic", systemImage: "tree")
TextField("Root Topic", text: $root)
@ -164,8 +168,8 @@ struct MQTTConfig: View {
.onChange(of: root, perform: { _ in
let totalBytes = root.utf8.count
// Only mess with the value if it is too big
if totalBytes > 14 {
let firstNBytes = Data(root.utf8.prefix(14))
if totalBytes > 30 {
let firstNBytes = Data(root.utf8.prefix(30))
if let maxBytesString = String(data: firstNBytes, encoding: String.Encoding.utf8) {
// Set the shortName back to the last place where it was the right size
root = maxBytesString
@ -177,9 +181,23 @@ struct MQTTConfig: View {
.keyboardType(.asciiCapable)
.scrollDismissesKeyboard(.interactively)
.disableAutocorrection(true)
Text("The root topic to use for MQTT messages. Default is \"msh\". This is useful if you want to use a single MQTT server for multiple meshtastic networks and separate them via ACLs")
.listRowSeparator(.hidden)
Text("The root topic to use for MQTT.")
.foregroundColor(.gray)
.font(.callout)
if nearbyTopics.count > 0 {
Picker("Nearby Topics", selection: $selectedTopic ) {
ForEach(nearbyTopics, id: \.self) { nt in
Text(nt)
}
}
.pickerStyle(InlinePickerStyle())
.listRowSeparator(.hidden)
Text("If the default region topic is too busy you can choose a more local topic.")
.foregroundColor(.gray)
.font(.callout)
}
}
Text("You can set uplink and downlink for each channel.")
.font(.callout)
@ -249,6 +267,9 @@ struct MQTTConfig: View {
if newRoot != node!.mqttConfig!.root { hasChanges = true }
}
}
.onChange(of: selectedTopic) { newSelectedTopic in
root = newSelectedTopic
}
.onChange(of: enabled) { newEnabled in
if node != nil && node?.mqttConfig != nil {
if newEnabled != node!.mqttConfig!.enabled { hasChanges = true }
@ -290,6 +311,56 @@ struct MQTTConfig: View {
}
}
func setMqttValues() {
if #available(iOS 17.0, macOS 14.0, *) {
nearbyTopics = []
let geocoder = CLGeocoder()
if LocationsHandler.shared.locationsArray.count > 0 {
let region = RegionCodes(rawValue: Int(node?.loRaConfig?.regionCode ?? 0))?.topic
defaultTopic = "msh/" + (region ?? "UNSET")
geocoder.reverseGeocodeLocation(LocationsHandler.shared.locationsArray.first!, completionHandler: {(placemarks, error) -> Void in
if error != nil {
print("Failed to reverse geocode location")
return
}
if let placemarks = placemarks, let placemark = placemarks.first {
let cc = locale.region?.identifier ?? "UNK"
/// Country Topic unless you are US
if placemark.isoCountryCode ?? "unknown" != cc {
let countryTopic = defaultTopic + "/" + (placemark.isoCountryCode ?? "")
if !countryTopic.isEmpty {
nearbyTopics.append(countryTopic)
}
}
let stateTopic = defaultTopic + "/" + (placemark.administrativeArea ?? "")
if !stateTopic.isEmpty {
nearbyTopics.append(stateTopic)
}
let countyTopic = defaultTopic + "/" + (placemark.subAdministrativeArea?.lowercased().replacingOccurrences(of: " ", with: "") ?? "")
if !countyTopic.isEmpty {
nearbyTopics.append(countyTopic)
}
let cityTopic = defaultTopic + "/" + (placemark.locality?.lowercased().replacingOccurrences(of: " ", with: "") ?? "")
if !cityTopic.isEmpty {
nearbyTopics.append(cityTopic)
}
let neightborhoodTopic = defaultTopic + "/" + (placemark.subLocality?.lowercased()
.replacingOccurrences(of: " ", with: "")
.replacingOccurrences(of: "'", with: "") ?? "")
if !neightborhoodTopic.isEmpty {
nearbyTopics.append(neightborhoodTopic)
}
}
else
{
print("No Location")
}
})
}
}
self.enabled = (node?.mqttConfig?.enabled ?? false)
self.proxyToClientEnabled = (node?.mqttConfig?.proxyToClientEnabled ?? false)
self.address = node?.mqttConfig?.address ?? ""

61
Meshtastic/Views/Settings/Config/Module/TelemetryConfig.swift
View file

@ -21,6 +21,10 @@ struct TelemetryConfig: View {
@State var environmentMeasurementEnabled = false
@State var environmentScreenEnabled = false
@State var environmentDisplayFahrenheit = false
@State var powerMeasurementEnabled = false
@State var powerUpdateInterval = 0
@State var powerScreenEnabled = false
var body: some View {
VStack {
@ -30,7 +34,9 @@ struct TelemetryConfig: View {
Section(header: Text("update.interval")) {
Picker("Device Metrics", selection: $deviceUpdateInterval ) {
ForEach(UpdateIntervals.allCases) { ui in
Text(ui.description)
if ui.rawValue >= 900 {
Text(ui.description)
}
}
}
.pickerStyle(DefaultPickerStyle())
@ -41,7 +47,9 @@ struct TelemetryConfig: View {
.listRowSeparator(.visible)
Picker("Sensor Metrics", selection: $environmentUpdateInterval ) {
ForEach(UpdateIntervals.allCases) { ui in
Text(ui.description)
if ui.rawValue >= 900 {
Text(ui.description)
}
}
}
.pickerStyle(DefaultPickerStyle())
@ -67,6 +75,30 @@ struct TelemetryConfig: View {
}
.toggleStyle(SwitchToggleStyle(tint: .accentColor))
}
Section(header: Text("Power Options")) {
Toggle(isOn: $powerMeasurementEnabled) {
Label("enabled", systemImage: "bolt")
}
.toggleStyle(SwitchToggleStyle(tint: .accentColor))
.listRowSeparator(.visible)
Picker("Power Metrics", selection: $powerUpdateInterval ) {
ForEach(UpdateIntervals.allCases) { ui in
if ui.rawValue >= 900 {
Text(ui.description)
}
}
}
.pickerStyle(DefaultPickerStyle())
.listRowSeparator(.hidden)
Text("How often power metrics are sent out over the mesh. Default is 15 minutes.")
.foregroundColor(.gray)
.font(.callout)
.listRowSeparator(.visible)
Toggle(isOn: $powerScreenEnabled) {
Label("Power Screen", systemImage: "tv")
}
.toggleStyle(SwitchToggleStyle(tint: .accentColor))
}
}
.disabled(self.bleManager.connectedPeripheral == nil || node?.telemetryConfig == nil)
@ -79,6 +111,9 @@ struct TelemetryConfig: View {
tc.environmentMeasurementEnabled = environmentMeasurementEnabled
tc.environmentScreenEnabled = environmentScreenEnabled
tc.environmentDisplayFahrenheit = environmentDisplayFahrenheit
tc.powerMeasurementEnabled = powerMeasurementEnabled
tc.powerUpdateInterval = UInt32(powerUpdateInterval)
tc.powerScreenEnabled = powerScreenEnabled
let adminMessageId = bleManager.saveTelemetryModuleConfig(config: tc, fromUser: connectedNode!.user!, toUser: node!.user!, adminIndex: connectedNode?.myInfo?.adminIndex ?? 0)
if adminMessageId > 0 {
// Should show a saved successfully alert once I know that to be true
@ -132,14 +167,32 @@ struct TelemetryConfig: View {
if newEnvDisplayF != node!.telemetryConfig!.environmentDisplayFahrenheit { hasChanges = true }
}
}
.onChange(of: powerMeasurementEnabled) { newPowerMeasurementEnabled in
if node != nil && node?.telemetryConfig != nil {
if newPowerMeasurementEnabled != node!.telemetryConfig!.powerMeasurementEnabled { hasChanges = true }
}
}
.onChange(of: powerUpdateInterval) { newPowerUpdateInterval in
if node != nil && node?.telemetryConfig != nil {
if newPowerUpdateInterval != node!.telemetryConfig!.powerUpdateInterval { hasChanges = true }
}
}
.onChange(of: powerScreenEnabled) { newPowerScreenEnabled in
if node != nil && node?.telemetryConfig != nil {
if newPowerScreenEnabled != node!.telemetryConfig!.powerScreenEnabled { hasChanges = true }
}
}
}
}
func setTelemetryValues() {
self.deviceUpdateInterval = Int(node?.telemetryConfig?.deviceUpdateInterval ?? 0)
self.environmentUpdateInterval = Int(node?.telemetryConfig?.environmentUpdateInterval ?? 0)
self.deviceUpdateInterval = Int(node?.telemetryConfig?.deviceUpdateInterval ?? 900)
self.environmentUpdateInterval = Int(node?.telemetryConfig?.environmentUpdateInterval ?? 900)
self.environmentMeasurementEnabled = node?.telemetryConfig?.environmentMeasurementEnabled ?? false
self.environmentScreenEnabled = node?.telemetryConfig?.environmentScreenEnabled ?? false
self.environmentDisplayFahrenheit = node?.telemetryConfig?.environmentDisplayFahrenheit ?? false
self.powerMeasurementEnabled = node?.telemetryConfig?.powerMeasurementEnabled ?? false
self.powerUpdateInterval = Int(node?.telemetryConfig?.powerUpdateInterval ?? 900)
self.powerScreenEnabled = node?.telemetryConfig?.powerScreenEnabled ?? false
self.hasChanges = false
}
}

316
fr.lproj/Localizable.strings Normal file
View file

@ -0,0 +1,316 @@
/*
Localizable.strings
Meshtastic
Copyright(c) Garth Vander Houwen on 12/12/22.
*/
"about"="À propos";
"about.meshtastic"="À propos de Meshtastic";
"admin"="Administrateur";
"admin.log"="Journal des messages d'administration";
"ago"="auparavant";
"airtime"="Temps d'émission";
"always.on"="En permanence";
"ambient.lighting"="Lumière ambiante";
"ambient.lighting.config"="Configuration de la lumière ambiante";
"appsettings"="Réglages de l'application";
"appsettings.provide.location"="Partager la position";
"appsettings.smartposition"="Position intelligente";
"are.you.sure"="Êtes-vous sûr ?";
"ascii.capable"="ASCII Compatible";
"available.radios"="Radios disponibles";
"automatic.detection"="Détection automatique";
"battery.level"="Niveau de batterie";
"ble.name"="Nom du BLE";
"ble.connection.timeout %d %@"="Connexion impossible après %d essais avec %@. Allez dans Réglages > Bluetooth et essayez de faire de faire > Oublier cet appareil.";
"ble.errorcode.6 %@"="%@ L'application se reconnectera automatiquement à la radio en favori dès qu'elle sera à nouveau disponible.";
"ble.errorcode.14 %@"="%@ Cette erreur ne peut généralement pas être corrigée sans aller dans Réglages > Bluetooth et faire > Oublier cet appareil, puis reconnecter la radio.";
"ble.errorcode.pin %@"="%@ Merci d'essayer à nouveau en vérifiant bien le code PIN.";
"bluetooth"="Bluetooth";
"bluetooth.off"="Le Bluetooth est arrêté";
"bluetooth.config"="Configuration Bluetooth";
"bluetooth.mode.randompin"="Code PIN aléatoire";
"bluetooth.mode.fixedpin"="Code PIN fixe";
"bluetooth.mode.nopin"="Sans code PIN (connexion directe)";
"bluetooth.pairingmode"="Mode d'appairage";
"bluetooth.pin.validation"="Le code pin BLE doit avoir 6 chiffres.";
"bytes"="Octets";
"cancel"="Annuler";
"canned.messages"="Messages préformatés";
"canned.messages.config"="Configuration des messages préformatés";
"canned.messages.preset.manual"="Configuration manuelle";
"canned.messages.preset.rakrotary"="Module d'encodage rotatif RAK";
"canned.messages.preset.cardkb"="Clavier M5 Stack Card KB / RAK";
"channel"="Canal";
"channel.role.disabled"="Désactivé";
"channel.role.primary"="Principal";
"channel.role.secondary"="Secondaire";
"channel.utilization"="Utilisation du canal";
"channels"="Canaux";
"clear.app.data"="Effacer les données de l'application";
"clear.log"="Effacer";
"close"="Fermer";
"config.save.confirm"="Une fois la configuration sauvegardée, le noeud redémarrera.";
"communicating"="Communication avec l'appareil en cours. .";
"connected.radio"="Radio connectée";
"connected"="Bluetooth connecté";
"connecting"="Connexion . .";
"contacts"="Contacts";
"contacts %@"="Contacts (%@)";
"copy"="Copier";
"current"="Actuel";
"default"="Par défaut";
"delete"="Effacer";
"detection.sensor"="Capteur de détection";
"detection.sensor.config"="Configuration du capteur de détection";
"detection.sensor.log"="Journal du capteur de détection";
"device"="Appareil";
"device.config"="Configuration de l'appareil";
"device.metrics.delete"="Effacer toutes les mesures de l’appareil?";
"device.metrics.log"="Journal des mesures de l'appareil";
"device.role.client"="Application connectée ou appareil de messagerie autonome.";
"device.role.clientmute"="Appareil ne transmettant pas les paquets provenant d'autres appareils.";
"device.role.clienthidden"="Appareil ne diffusant que si nécessaire pour la discrétion et l'économie d'énergie.";
"device.role.tracker"="Transmet les paquets de positions GPS en priorité.";
"device.role.lostandfound"="Transmet régulièrement la position par message dans le canal par défaut pour vous aider à retrouver l'appareil.";
"device.role.sensor"="Transmet les paquets de télémétrie en priorité.";
"device.role.tak"="Optimisé pour le système de communication ATAK, diminue les émissions de routine.";
"device.role.repeater"="Noeud d'infrastructure qui étend la couverture du réseau en relayant les messages avec un minimum de surcharge. Invisible dans la liste des noeuds.";
"device.role.router"="Noeud d'infrastructure qui étend la couverture du réseau en relayant les messages. Visible dans la liste des noeuds.";
"device.role.routerclient"="Combinaison des modes ROUTER et CLIENT. Pas pour les appareils mobiles.";
"direct.messages"="Messages directs";
"dismiss.keyboard"="Annuler";
"display"="Écran";
"display.config"="Configuration de l'écran";
"distance"="Distance";
"disconnect"="Déconnecter";
"echo"="Écho";
"email.address"="Adresse mail";
"enabled"="Activé";
"encrypted"="Encrypté";
"external.notification"="Notification extérieure";
"external.notification.config"="Configuration de la notification extérieure";
"finish"="Terminer";
"firmware.version"="Version du firmware";
"firmware.version.unsupported"="Version non supportée du firmware détectée, impossible de se connecter à l'appareil.";
"gas"="Gaz";
"gas.resistance"="Résistence du gaz";
"generate.qr.code"="Générer un QR Code";
"gpsformat.dec"="Format décimal pour les degrés";
"gpsformat.dms"="Degrés Minutes Secondes";
"gpsformat.utm"="Projection Mercator Transverse Universelle";
"gpsformat.mgrs"="Military Grid Reference System";
"gpsformat.olc"="Open Location Code (alias Plus Codes)";
"gpsformat.osgr"="Ordnance Survey Grid Reference";
"gpsmode.disabled"="Désactivé";
"gpsmode.enabled"="Activé";
"gpsmode.notPresent"="Absent";
"heard"="Capté";
"heard.last"="Capté pour la dernière fois";
"hybrid"="Hybride";
"hybrid.flyover"="Flyover hybride";
"include"="Inclure";
"inputevent.none"="Aucun";
"inputevent.up"="Haut";
"inputevent.down"="Bas";
"inputevent.left"="Gauche";
"inputevent.right"="Droite";
"inputevent.select"="Sélectionner";
"inputevent.back"="Retour";
"inputevent.cancel"="Annuler";
"interval.one.second"="Une seconde";
"interval.two.seconds"="Deux secondes";
"interval.three.seconds"="Trois secondes";
"interval.four.seconds"="Quatre secondes";
"interval.five.seconds"="Cinq secondes";
"interval.ten.seconds"="Dix secondes";
"interval.fifteen.seconds"="Quinze secondes";
"interval.twenty.seconds"="Vingt secondes";
"interval.twentyfive.seconds"="Vingt cinq secondes";
"interval.thirty.seconds"="Trente secondes";
"interval.fortyfive.seconds"="Quarante cinq secondes";
"interval.one.minute"="Une minute";
"interval.two.minutes"="Deux minutes";
"interval.five.minutes"="Cinq minutes";
"interval.ten.minutes"="Dix minutes";
"interval.fifteen.minutes"="Quinze minutes";
"interval.thirty.minutes"="Trente minutes";
"interval.one.hour"="Une heure";
"interval.two.hours"="Deux heures";
"interval.three.hours"="Trois heures";
"interval.four.hours"="Quatre heures";
"interval.five.hours"="Cinq heures";
"interval.six.hours"="Six heures";
"interval.twelve.hours"="Douze heures";
"interval.eighteen.hours"="Dix huit heures";
"interval.twentyfour.hours"="Vingt quatre heures";
"interval.thirtysix.hours"="Trente six heures";
"interval.fortyeight.hours"="Quarante huit heures";
"interval.seventytwo.hours"="Soixante douze heures";
"keyboard.type"="Type de clavier";
"logging"="Enregistrement";
"lora"="LoRa";
"lora.config"="Configuration LoRa";
"map"="Carte de maillage";
"map.type"="Type par défaut";
"map.centering"="Mode centré";
"map.tiles.delete"="Supprimer toutes les tuiles de carte";
"map.recentering"="Recentrage automatique";
"map.use.legacy"="Utiliser l'ancienne génération de carte de maillage";
"map.usertrackingmode"="Mode suivre l'utilisateur";
"map.usertrackingmode.follow"="Suivre";
"map.usertrackingmode.followwithheading"="Suivre avec le cap";
"map.usertrackingmode.none"="Aucun";
"mesh.live.activity"="Activité en direct du maillage";
"mesh.log"="Journal du maillage";
"mesh.log.ambientlighting.config %@"="Configuration du module lumière ambiante reçue : %@";
"mesh.log.bluetooth.config %@"="Configuration Bluetooth reçue : %@";
"mesh.log.cannedmessage.config %@"="Configuration du module messages préformatés reçue : %@";
"mesh.log.cannedmessages.messages.get %@"="Messages du module messages préformatés demandés pour le noeud : %@";
"mesh.log.cannedmessages.messages.received %@"="Messages préformatés reçus pour : %@";
"mesh.log.channel.sent %@ %d"="Canal envoyé pour : %@ Canal index %d";
"mesh.log.channel.received %d %@"="Canal %d reçu de : %@";
"mesh.log.device.config %@"="Configuration de l'appareil reçue : %@";
"mesh.log.display.config %@"="Configuration de l'écran reçue : %@";
"mesh.log.devicemetadata %@"="Demande des metadatas de l'appareil à %@";
"mesh.log.device.metadata.received %@"="Metadatas de l'appareil reçues de : %@";
"mesh.log.detectionsensor.config %@"="Configuration du module capteur de détection reçue : %@";
"mesh.log.externalnotification.config %@"="Configuration du module notification extérieure reçue : %@";
"mesh.log.lora.config %@"="Configuration LoRa reçue : %@";
"mesh.log.lora.config.sent %@"="Configuration LoRa envoyée à : %@";
"mesh.log.mqtt.config %@"="Configuration du module MQTT reçue : %@";
"mesh.log.myinfo %@"="MesInfos reçues : %@";
"mesh.log.network.config %@"="Configuration du réseau reçue : %@";
"mesh.log.nodeinfo.received %@"="Information du noeud reçue pour : %@";
"mesh.log.position.config %@"="Configuration de la position reçue : %@";
"mesh.log.position.received %@"="Paquet de la position reçu du noeud : %@";
"mesh.log.rangetest.config %@"="Configuration du module test deportée reçue : %@";
"mesh.log.ringtone.config %@"="Configuration de la sonnerie RTTTL reçue : %@";
"mesh.log.routing.message %@ %@"="Routage reçu pour la demande numéro : %@ Status de l'accusé de réception : %@";
"mesh.log.serial.config %@"="Configuration du module série reçue : %@";
"mesh.log.sharelocation %@"="Paquet envoyé avec la position GPS de l'appareil Apple vers le noeud : %@";
"mesh.log.storeforward.config %@"="Configuration du module Stocker et Transmettre reçue : %@";
"mesh.log.telemetry.config %@"="Configuration du module télémetrie reçue : %@";
"mesh.log.telemetry.received %@"="Télémetrie reçue pour : %@";
"mesh.log.textmessage.received"="Message reçu depuis l'application de messagerie texte.";
"mesh.log.textmessage.send.failed %@"="Erreur d'envoi du message, mauvaise connexion à %@";
"mesh.log.textmessage.sent %@ %@ %@"="Envoi du message %@ de %@ à %@";
"mesh.log.traceroute.received.direct %@"="La demande de Trace Route envoyée au noeud : %@ a été directement reçue.";
"mesh.log.traceroute.received.route %@"="La demande de Trace Route est revenue : %@";
"mesh.log.traceroute.sent %@"="Envoi d'une demande de Trace Route au noeud : %@";
"mesh.log.wantconfig %@"="Envoi d'un Want Config à %@";
"mesh.log.waypoint.sent %@"="Paquet Waypoint envoyé depuis : %@";
"mesh.log.waypoint.received %@"="Paquet Waypoint reçu du noeud : %@";
"message"="Message";
"message.details"="Détails du message";
"messages"="Messages";
"mode"="Mode";
"module.configuration"="Configuration du module";
"mqtt"="MQTT";
"mqtt.connect"="Connecter à MQTT";
"mqtt.config"="Configuration MQTT";
"mqtt.clientproxy"="Proxy client MQTT";
"mqtt.disconnect"="Déconnecter le MQTT";
"mqtt.username"="Nom d'utilisateur";
"name"="Nom";
"network"="Réseau";
"network.config"="Configuration du réseau";
"nodes"="Noeuds";
"nodes %@"="Noeuds (%@)";
"no.nodes"="Aucun noeud Meshtastic trouvé";
"not.connected"="Aucun appareil connecté";
"numbers.punctuation"="Nombres and Ponctuation";
"off"="Éteint";
"offline"="Hors ligne";
"on.boot"="Uniquement au démarrage";
"options"="Options";
"password"="Mot de passe";
"pause"="Pause";
"phone.gps"="GPS du téléphone";
"phone.gps.interval.description"="La fréquence à laquelle votre téléphone envoie votre position à l'appareil, les mises à jour de la position vers le maillage sont gérées par l'appareil.";
"position"="Position";
"position.config"="Configuration de la position";
"preferred.radio"="Radio favorie";
"radio.configuration"="Configuration de la radio";
"range.test"="Test de portée";
"range.test.blocked"="Test de portée bloqué";
"range.test.config"="Configuration du test de portée";
"reply"="Répondre";
"reboot"="Redémarrer";
"reboot.node"="Redémarrer le noeud ?";
"received.ack"="Accusé de réception reçu";
"received.ack.real"="Accusé de réception du destinataire";
"resume"="Reprendre";
"ringtone"="Sonnerie";
"ringtone.config"="Configuration de la sonnerie";
"route.recorder"="Enregistreur de route";
"routes"="Routes";
"routing.acknowledged"="Confirmé";
"routing.noroute"="Pas de route";
"routing.gotnak"="Accusé de réception négatif reçu";
"routing.timeout"="Délai d'expiration";
"routing.nointerface"="Pas d'interface";
"routing.maxretransmit"="Nombre maximum de retransmissions atteint";
"routing.nochannel"="Pas de canal";
"routing.toolarge"="Le paquet est trop grand";
"routing.noresponse"="Pas de réponse";
"routing.dutycyclelimit"="Limite du cycle de service régional atteinte";
"routing.badRequest"="Requête incorrecte";
"routing.notauthorized"="Non autorisé";
"satellite"="Satellite";
"satellite.flyover"="Flyover par satellite";
"save"="Sauvegarder";
"save.config %@"="Sauvegarder la configuration pour %@";
"serial"="Série";
"serial.config"="Configuration série";
"serial.mode.default"="Défaut";
"serial.mode.simple"="Simple";
"serial.mode.proto"="Protobufs";
"serial.mode.txtmsg"="Message texte";
"serial.mode.nmea"="Positions NMEA";
"settings"="Réglages";
"share.channels"="Partager le QR Code";
"share.position"="Partager la position";
"subscribed"="Abonné au maillage";
"select.contact"="Sélectioner un contact";
"select.node"="Sélectioner un noeud";
"select.menu.item"="Sélectioner un item du menu";
"set.region"="Définir la région LoRa";
"standard"="Standard";
"standard.muted"="Standard en sourdine";
"start"="Démarrer";
"storeforward"="Stocker et Transmettre";
"storeforward.config"="Configuration de Stocker et Transmettre";
"storeforward.heartbeat"="Envoyer une impulsion";
"ssid"="SSID";
"tapback"="Réponse de Tapback";
"tapback.heart"="Coeur";
"tapback.thumbsup"="Pouce levé";
"tapback.thumbsdown"="Pouce baissé";
"tapback.haha"="HaHa";
"tapback.exclamation"="Point d'exclamation";
"tapback.question"="Point d'interrogation";
"tapback.poop"="Caca";
"telemetry"="Télémetrie (Capteurs)";
"telemetry.config"="Configuration de télémetrie";
"timeout"="Délai d'expiration";
"timestamp"="Horodatage";
"tip.bluetooth.connect.title"="Radio connectée";
"tip.bluetooth.connect.message"="Affiche les informations de la radio Lora connectée via le bluetooth. Vous pouvez faire un glissé vers la gauche pour déconnecter la radio et un appui long pour voir les statistiques ou démarrer l'activité en direct.";
"tip.channels.create.title"="Gérer les canaux";
"tip.channels.create.message"="La pluspart des données de votre maillage sont envoyées sur le canal principal. Vous pouvez définir des canaux secondaires pour créer des groupes de messagerie additionnelle sécurisés avec leur propre clé. [Conseils de configuration du canal](https://meshtastic.org/docs/configuration/tips/)";
"tip.channels.share.title"="Partage des canaux Meshtastic";
"tip.channels.share.message"="Un code QR Meshtastic contient la configuration LoRa et les valeurs de canal nécessaires pour communiquer. La plupart des activités du maillage ont lieu sur le canal principal requis. Si vous ne partagez pas votre canal principal, votre premier canal partagé devient le canal principal de l’autre réseau. Les autres canaux sont pour les groupes privés, chacun avec sa propre clé.";
"tip.messages.title"="Messages";
"tip.messages.message"="Vous pouvez envoyer et recevoir des canaux (chats de groupe) et des messages directs. Depuis n’importe quel message, vous pouvez faire un appui long pour voir les actions possibles comme copier, répondre, tapback et supprimer ainsi que les détails de l'envoi.";
"twitter"="Twitter";
"unknown"="Inconnu";
"unknown.age"="Age inconnu";
"unset"="Désactivé";
"update.firmware"="Mettre à jour votre Firmware";
"update.interval"="Intervale de mise à jour";
"user"="Utilisateur";
"user.details"="Détails de l'utilisateur";
"voltage"="Tension";
"waiting"="En attente . . .";

2
protobufs

@ -1 +1 @@
Subproject commit 5a97acb17543a10e114675a205e3274a83e721af
Subproject commit 556e49ba619e2f4d8fa3c2dee2a94129a43d5f08

333
zh-Hant-TW.lproj/Localizable.strings Normal file
View file

@ -0,0 +1,333 @@
/*
Localizable.strings
Meshtastic
Created by BM6HIP on 2024/3/2
*/
"about"="關於";
"about.meshtastic"="關於 Meshtastic";
"admin"="管理員";
"admin.log"="管理員消息紀錄檔";
"ago"="ago";
"airtime"="廣播時間";
"always.on"="常亮";
"ambient.lighting"="Ambient Lighting";
"ambient.lighting.config"="Ambient Lighting Config";
"appsettings"="設定";
"appsettings.provide.location"="提供定位到 Mesh 網路";
"appsettings.smartposition"="Smart Position";
"are.you.sure"="是否確定？";
"ascii.capable"="ASCII Capable";
"available.radios"="可以連接的設備";
"automatic.detection"="自動識別";
"battery.level"="電池電量";
"ble.name"="藍芽名稱";
"ble.connection.timeout %d %@"="嘗試連接%@失敗，你可能需要在系统設定的藍芽選項中忽略該電台。";
"ble.errorcode.6 %@"="%@ 如果在首選電台的旁邊，App 將會自動重連。";
"ble.errorcode.14 %@"="%@ 這個錯誤通常無法自動修復，你需要在系統設定的藍芽選項中忽略該電台並重新配對。";
"ble.errorcode.pin %@"="%@ 請再次嘗試連接並仔細檢查 PIN 碼。";
"bluetooth"="藍芽";
"bluetooth.off"="藍芽已關閉";
"bluetooth.config"="藍芽設置";
"bluetooth.mode.randompin"="隨機 PIN 碼";
"bluetooth.mode.fixedpin"="固定 PIN 碼";
"bluetooth.mode.nopin"="不使用 PIN 碼（直接配對）";
"bluetooth.pairingmode"="配對模式";
"bluetooth.pin.validation"="藍芽 PIN 碼必須是 6 位數字。";
"bytes"="字節";
"cancel"="取消";
"canned.messages"="通知";
"canned.messages.config"="通知設定";
"canned.messages.preset.manual"="手動設定";
"canned.messages.preset.rakrotary"="RAK 旋轉編碼器";
"canned.messages.preset.cardkb"="M5Stack 卡片鍵盤 / RAK 鍵盤";
"channel"="頻道";
"channel.role.disabled"="關閉";
"channel.role.primary"="主要";
"channel.role.secondary"="次要";
"channel.utilization"="頻道利用率";
"channels"="頻道";
"clear.app.data"="清除 App 資料";
"clear.log"="清除紀錄檔";
"close"="關閉";
"config.power.settings"="電源";
"config.power.title"="電源設定";
"config.power.section.battery"="電池";
"config.power.section.sleep"="休眠";
"config.power.adc.override"="ADC Override";
"config.power.adc.multiplier"="Multiplier";
"config.power.ls.secs"="Light Sleep Interval";
"config.power.min.wake.secs"="最小的喚醒間隔時間";
"config.power.saving"="省電模式";
"config.power.saving.description"="Will sleep everything as much as possible, for the tracker and sensor role this will also include the lora radio. Don't use this setting if you want to use your device with the phone apps or are using a device without a user button.";
"config.power.shutdown.on.power.loss"="失去電源後關機";
"config.power.shutdown.after.secs"="之後";
"config.power.wait.bluetooth.secs"="等待藍芽";
"config.ringtone"="RTTTL Ringtone";
"config.ringtone.title"="鈴聲";
"config.ringtone.label"="Ringtone Transfer Language";
"config.ringtone.description"="Ringtone Transfer Language(RTTTL) Ringtone String used by supported buzzers in external notifications.";
"config.module.paxcounter.settings"="PAX Counter";
"config.module.paxcounter.title"="PAX Counter Config";
"config.module.paxcounter.enabled.description"="When enabled the PAX Counter module counts the number of people passing by using WiFi and Bluetooth. Both WiFI and Bluetooth must be enabled for PAX counter to work.";
"config.module.paxcounter.updateinterval"="Update Interval";
"config.module.paxcounter.updateinterval.description"="How often we can send a message to the mesh when people are detected.";
"config.save.confirm"="電台將會在設定儲存後重啟。";
"connected.radio"="已連接的電台";
"communicating"="與電台進行通訊中...";
"connected"="已連接";
"connecting"="連接中...";
"contacts"="聯絡人";
"contacts %@"="聯絡人 (%@)";
"copy"="複製";
"current"="目前";
"default"="預設";
"delete"="刪除";
"detection.sensor"="檢測感測器";
"device"="設備";
"device.config"="電台設定";
"device.configuration"="設備設定";
"device.metrics.delete"="刪除所有電台指標？?";
"device.metrics.log"="電台指標紀錄檔";
"device.role.client"="標準模式 - App 可以連接到電台進行收發操作，並且會自動轉發 Mesh 網路中其他中繼點的消息。";
"device.role.clientmute"="靜音模式 - 與標準模式類似，App 可以連接到電台進行收發操作，但不會轉發 Mesh 網路中其他中繼點的消息。";
"device.role.clienthidden"=" Used for nodes that \"only speak when spoken to\" Turns all of the routine broadcasts but allows for ad-hoc communication. Still rebroadcasts, but with local only rebroadcast mode (known meshes only). Can be used for private operation or to dramatically reduce airtime / power consumption.";
"device.role.lostandfound"="Used to automatically send a text message to the mesh with the current position of the device on a frequent interval: \"I'm lost! Position: lat / long\"";
"device.role.router"="纯路由模式 - 自動轉發 Mesh 網路中其他中繼點的消息，中繼模式下螢幕會熄滅，Wi-Fi 和藍芽將會進入睡眠模式，App 將無法連接到電台進行收發操作。";
"device.role.routerclient"="路由客户端模式 - 優先轉發 Mesh 網路中其他中繼點的消息，App 也可以連接到電台進行收發操作。";
"device.role.repeater"="中繼模式 - Mesh 網路數據包將優先通過此中繼點路由。此模式可消除不必要的開銷，如 NodeInfo、DeviceTelemetry 和任何其他 Mesh 數據包，從而使設備不顯示為 Mesh 網路的一部分。有關此角色的其他特定設置，請參閱轉播模式。";
"device.role.tracker"="追蹤模式 - 用於作為 GPS 追蹤器。從該設備發送的定位數據包優先級較高，每兩分鐘廣播一次。智能位置廣播預設為關閉。";
"direct.messages"="聊天";
"dismiss.keyboard"="隱藏鍵盤";
"display"="螢幕（電台螢幕）";
"display.config"="螢幕設定";
"distance"="距離";
"disconnect"="斷開連接";
"echo"="echo";
"email.address"="電子信箱";
"enabled"="啟用";
"encrypted"="加密";
"external.notification"="外部通知";
"external.notification.config"="外部通知設定";
"finish"="完成";
"firmware.version"="韌體版本";
"firmware.version.unsupported"="檢測到不支援的韌體版本，無法連接到電台。";
"gas"="Gas";
"gas.resistance"="Gas Resistance";
"generate.qr.code"="生成QRcode";
"gpsformat.dec"="十進制";
"gpsformat.dms"="度分秒";
"gpsformat.utm"="通用橫軸墨卡托投影";
"gpsformat.mgrs"="軍事網格系統";
"gpsformat.olc"="開放的位置代碼（又稱加碼）";
"gpsformat.osgr"="英國國土測量局網格";
"heard"="收到";
"heard.last"="最後收到";
"hybrid"="混合";
"hybrid.flyover"="混合視圖";
"include"="包含";
"inputevent.none"="無";
"inputevent.up"="上";
"inputevent.down"="下";
"inputevent.left"="左";
"inputevent.right"="右";
"inputevent.select"="選擇";
"inputevent.back"="返回";
"inputevent.cancel"="取消";
"interval.one.second"="一秒";
"interval.two.seconds"="兩秒";
"interval.three.seconds"="三秒";
"interval.four.seconds"="四秒";
"interval.five.seconds"="五秒";
"interval.ten.seconds"="十秒";
"interval.fifteen.seconds"="十五秒";
"interval.twenty.seconds"="二十秒";
"interval.twentyfive.seconds"="二十五秒";
"interval.thirty.seconds"="三十秒";
"interval.fortyfive.seconds"="四十五秒";
"interval.one.minute"="一分鐘";
"interval.two.minutes"="兩分鐘";
"interval.five.minutes"="五分鐘";
"interval.ten.minutes"="十分鐘";
"interval.fifteen.minutes"="十五分鐘";
"interval.thirty.minutes"="三十分鐘";
"interval.one.hour"="一小時";
"interval.two.hours"="兩小時";
"interval.three.hours"="三小時";
"interval.four.hours"="四小時";
"interval.five.hours"="五小時";
"interval.six.hours"="六小時";
"interval.twelve.hours"="十二小時";
"interval.eighteen.hours"="十八小時";
"interval.twentyfour.hours"="二十四小時";
"interval.thirtysix.hours"="三十六小時";
"interval.tyeight.hours"="四十八小时小時";
"interval.eventytwo.hours"="七十二小時";
"keyboard.type"="鍵盤類型";
"logging"="加載中";
"lora"="LoRa";
"lora.config"="LoRa 設定";
"map"="Mesh 地圖";
"map.centering"="居中";
"map.tiles.delete"="刪除已緩存的地圖區塊";
"map.recentering"="自動重新居中";
"map.use.legacy"="Use Legacy Mesh Map";
"map.type"="地圖類型";
"map.usertrackingmode"="使用者跟隨模式";
"map.usertrackingmode.none"="無";
"map.usertrackingmode.follow"="跟隨";
"map.usertrackingmode.followwithheading"="Follow with heading";
"mesh.live.activity"="Mesh 即時活動";
"mesh.log"="Mesh 紀錄檔";
"mesh.log.ambientlighting.config %@"="Ambient Lighting module config received: %@";
"mesh.log.bluetooth.config %@"="Bluetooth config received: %@";
"mesh.log.cannedmessage.config %@"="Canned Message module config received: %@";
"mesh.log.cannedmessages.messages.get %@"="Requested Canned Messages Module Messages for node: %@";
"mesh.log.cannedmessages.messages.received %@"="Canned Messages Messages Received For: %@";
"mesh.log.channel.sent %@ %d"="Sent a Channel for: %@ Channel Index %d";
"mesh.log.channel.received %d %@"="Channel %d received from: %@";
"mesh.log.device.config %@"="收到裝置設定: %@";
"mesh.log.display.config %@"="收到顯示模組設定: %@";
"mesh.log.devicemetadata %@"="Requesting Device Metadata for %@";
"mesh.log.device.metadata.received %@"="Device Metadata admin message received from: %@";
"mesh.log.detectionsensor.config %@"="Detection Sensor module config received: %@";
"mesh.log.externalnotification.config %@"="External Notification module config received: %@";
"mesh.log.lora.config %@"="收到LoRa設定: %@";
"mesh.log.lora.config.sent %@"="Sent a LoRa.Config for: %@";
"mesh.log.mqtt.config %@"="MQTT module config received: %@";
"mesh.log.myinfo %@"="MyInfo received: %@";
"mesh.log.network.config %@"="收到網路設定: %@";
"mesh.log.nodeinfo.received %@"="收到中繼點訊息: %@";
"mesh.log.paxcounter %@"="PAX Counter message received for: %@";
"mesh.log.position.config %@"="Positon config received: %@";
"mesh.log.position.received %@"="從中繼點接收到定位封包: %@";
"mesh.log.rangetest.config %@"="收到拉距測試模組設定: %@";
"mesh.log.ringtone.config %@"="RTTTL Ringtone config received: %@";
"mesh.log.routing.message %@ %@"="Routing received for RequestID: %@ Ack Status: %@";
"mesh.log.serial.config %@"="Serial module config received: %@";
"mesh.log.sharelocation %@"="傳送iOS裝置的GPS定位封包到中繼點上: %@";
"mesh.log.storeforward.config %@"="Store & Forward module config received: %@";
"mesh.log.telemetry.config %@"="收到遠測模組設定: %@";
"mesh.log.telemetry.received %@"="收到遠測資料: %@";
"mesh.log.textmessage.received"="Message received from the text message app.";
"mesh.log.textmessage.send.failed %@"="訊息傳送失敗, 沒有正確連接到 %@";
"mesh.log.textmessage.sent %@ %@ %@"="傳送訊息 %@ 從 %@ 到 %@";
"mesh.log.traceroute.received.direct %@"="Trace Route request sent to node: %@ was recieived directly.";
"mesh.log.traceroute.received.route %@"="Trace Route request returned: %@";
"mesh.log.traceroute.sent %@"="Sent a Trace Route Request to node: %@";
"mesh.log.wantconfig %@"="Issuing Want Config to %@";
"mesh.log.waypoint.sent %@"="Sent a Waypoint Packet from: %@";
"mesh.log.waypoint.received %@"="Waypoint Packet received from node: %@";
"message"="訊息";
"message.details"="詳細訊息";
"messages"="訊息";
"mode"="模式";
"module.configuration"="模塊設定";
"mqtt"="MQTT";
"mqtt.connect"="Connect to MQTT";
"mqtt.config"="MQTT 設定";
"mqtt.clientproxy"="MQTT 客户端代理";
"mqtt.disconnect"="Disconnect from MQTT";
"mqtt.username"="用戶名稱";
"name"="名稱";
"network"="網路";
"network.config"="網路設定";
"nodes"="中繼點";
"nodes %@"="中繼點 (%@)";
"no.nodes"="未找到 Meshtastic 中繼點";
"not.connected"="未連接到電台";
"numbers.punctuation"="數字和標點符號";
"off"="關閉";
"offline"="離線";
"on.boot"="只在啟動時";
"options"="選項";
"password"="密碼";
"pause"="暫停";
"phone.gps"="手機 GPS";
"phone.gps.interval.description"="電台通過手機獲得定位的時間間隔，但是向 Mesh 網路中更新定位的時間間隔由電台控制。";
"position"="定位";
"position.config"="定位設定";
"preferred.radio"="首選電台";
"radio.configuration"="電台設定";
"range.test"="拉距測試";
"range.test.blocked"="區塊範圍測試";
"range.test.config"="拉距測試設定";
"reply"="回復";
"reboot"="重新啟動";
"reboot.node"="重啟中繼點";
"received.ack"="收到確認";
"received.ack.real"="收件人確認";
"resume"="恢復";
"ringtone"="鈴聲";
"ringtone.config"="鈴聲設定";
"route.recorder"="路線錄製";
"routes"="路線";
"routing.acknowledged"="確認";
"routing.noroute"="找不到目標";
"routing.gotnak"="收到否認";
"routing.timeout"="逾時";
"routing.nointerface"="無連接";
"routing.maxretransmit"="已達到最大重試次數";
"routing.nochannel"="没有頻道";
"routing.toolarge"="數據包過大";
"routing.noresponse"="無回應";
"routing.dutycyclelimit"="已達到物錢區域循環週期發射上限";
"routing.badRequest"="錯誤請求";
"routing.notauthorized"="未授權";
"satellite"="衛星";
"satellite.flyover"="衛星識圖";
"save"="儲存";
"save.config %@"="儲存%@的設定";
"serial"="串口";
"serial.config"="串口設定";
"serial.mode.default"="預設";
"serial.mode.simple"="簡單";
"serial.mode.proto"="Protobufs";
"serial.mode.txtmsg"="文本訊息";
"serial.mode.nmea"="NMEA 位置";
"settings"="設定";
"share.channels"="分享頻道QRcode";
"share.position"="分享位置";
"subscribed"="連接到 Mesh 網路";
"select.contact"="選擇聯絡人";
"select.node"="選擇中繼點";
"select.menu.item"="從菜單選擇項目";
"set.region"="設定 LoRa 區域";
"standard"="標準";
"standard.muted"="標準靜音";
"start"="開始";
"ssid"="SSID";
"storeforward"="儲存 & 轉發";
"storeforward.config"="儲存 & 轉發設定";
"storeforward.heartbeat"="發送心跳包";
"tapback"="響應";
"tapback.heart"="心";
"tapback.thumbsup"="豎大拇指";
"tapback.thumbsdown"="倒大拇指";
"tapback.haha"="哈哈";
"tapback.exclamation"="驚嘆號";
"tapback.question"="問號";
"tapback.poop"="便便";
"telemetry"="遠測（傳感器）";
"telemetry.config"="遠側設定";
"timeout"="超時";
"timestamp"="時間戳記";
"tip.bluetooth.connect.title"="連接到 LoRa 電台";
"tip.bluetooth.connect.message"="顯示目前通過藍芽連接的 Lora 電台的信息。您可以向左滑動斷開電台，長按查看統計訊息或開始即時活動。";
"tip.channels.create.title"="管理頻道";
"tip.channels.create.message"="現在 Mesh 上的資料會通過主通道發送。您可以設定輔助通道來建立由自己的金鑰保護的其他訊息組 [頻道設定提示](https://meshtastic.org/docs/configuration/radio/channels/)";
"tip.channels.share.title"="共享 Meshtastic 頻道";
"tip.channels.share.message"="在 Meshtastic 網路中最多有 8 個頻道。第一個頻道是主頻道，大多數活動都發生在這裡，也是必需的。如果您不共享主頻道，您的第一個共享頻道就會成為其他網路的主頻道。它會在其主頻道和您的輔助頻道上對話。名稱為 admin 的頻道可遠端控制中繼點。其他頻道用於私人群组，每個群組都有自己的密鑰。";
"tip.messages.title"="消息";
"tip.messages.message"="您可以發送和接收1對1聊天和群聊。在任何訊息中，您都可以長按查看可用的操作，如複製、回復、拍一拍、刪除以及詳情。";
"twitter"="Twitter";
"unknown"="未知";
"unknown.age"="未知時間";
"unset"="未設置";
"update.firmware"="更新韌體";
"update.interval"="更新間隔";
"user"="使用者";
"user.details"="使用者資料";
"voltage"="電壓";
"waiting"="等待中...";

333
zh-TW.lproj/Localizable.strings Normal file
View file

@ -0,0 +1,333 @@
/*
Localizable.strings
Meshtastic
Created by BM6HIP on 2024/3/2
*/
"about"="關於";
"about.meshtastic"="關於 Meshtastic";
"admin"="管理員";
"admin.log"="管理員消息紀錄檔";
"ago"="ago";
"airtime"="廣播時間";
"always.on"="常亮";
"ambient.lighting"="Ambient Lighting";
"ambient.lighting.config"="Ambient Lighting Config";
"appsettings"="設定";
"appsettings.provide.location"="提供定位到 Mesh 網路";
"appsettings.smartposition"="Smart Position";
"are.you.sure"="是否確定？";
"ascii.capable"="ASCII Capable";
"available.radios"="可以連接的設備";
"automatic.detection"="自動識別";
"battery.level"="電池電量";
"ble.name"="藍芽名稱";
"ble.connection.timeout %d %@"="嘗試連接%@失敗，你可能需要在系统設定的藍芽選項中忽略該電台。";
"ble.errorcode.6 %@"="%@ 如果在首選電台的旁邊，App 將會自動重連。";
"ble.errorcode.14 %@"="%@ 這個錯誤通常無法自動修復，你需要在系統設定的藍芽選項中忽略該電台並重新配對。";
"ble.errorcode.pin %@"="%@ 請再次嘗試連接並仔細檢查 PIN 碼。";
"bluetooth"="藍芽";
"bluetooth.off"="藍芽已關閉";
"bluetooth.config"="藍芽設置";
"bluetooth.mode.randompin"="隨機 PIN 碼";
"bluetooth.mode.fixedpin"="固定 PIN 碼";
"bluetooth.mode.nopin"="不使用 PIN 碼（直接配對）";
"bluetooth.pairingmode"="配對模式";
"bluetooth.pin.validation"="藍芽 PIN 碼必須是 6 位數字。";
"bytes"="字節";
"cancel"="取消";
"canned.messages"="通知";
"canned.messages.config"="通知設定";
"canned.messages.preset.manual"="手動設定";
"canned.messages.preset.rakrotary"="RAK 旋轉編碼器";
"canned.messages.preset.cardkb"="M5Stack 卡片鍵盤 / RAK 鍵盤";
"channel"="頻道";
"channel.role.disabled"="關閉";
"channel.role.primary"="主要";
"channel.role.secondary"="次要";
"channel.utilization"="頻道利用率";
"channels"="頻道";
"clear.app.data"="清除 App 資料";
"clear.log"="清除紀錄檔";
"close"="關閉";
"config.power.settings"="電源";
"config.power.title"="電源設定";
"config.power.section.battery"="電池";
"config.power.section.sleep"="休眠";
"config.power.adc.override"="ADC Override";
"config.power.adc.multiplier"="Multiplier";
"config.power.ls.secs"="Light Sleep Interval";
"config.power.min.wake.secs"="最小的喚醒間隔時間";
"config.power.saving"="省電模式";
"config.power.saving.description"="Will sleep everything as much as possible, for the tracker and sensor role this will also include the lora radio. Don't use this setting if you want to use your device with the phone apps or are using a device without a user button.";
"config.power.shutdown.on.power.loss"="失去電源後關機";
"config.power.shutdown.after.secs"="之後";
"config.power.wait.bluetooth.secs"="等待藍芽";
"config.ringtone"="RTTTL Ringtone";
"config.ringtone.title"="鈴聲";
"config.ringtone.label"="Ringtone Transfer Language";
"config.ringtone.description"="Ringtone Transfer Language(RTTTL) Ringtone String used by supported buzzers in external notifications.";
"config.module.paxcounter.settings"="PAX Counter";
"config.module.paxcounter.title"="PAX Counter Config";
"config.module.paxcounter.enabled.description"="When enabled the PAX Counter module counts the number of people passing by using WiFi and Bluetooth. Both WiFI and Bluetooth must be enabled for PAX counter to work.";
"config.module.paxcounter.updateinterval"="Update Interval";
"config.module.paxcounter.updateinterval.description"="How often we can send a message to the mesh when people are detected.";
"config.save.confirm"="電台將會在設定儲存後重啟。";
"connected.radio"="已連接的電台";
"communicating"="與電台進行通訊中...";
"connected"="已連接";
"connecting"="連接中...";
"contacts"="聯絡人";
"contacts %@"="聯絡人 (%@)";
"copy"="複製";
"current"="目前";
"default"="預設";
"delete"="刪除";
"detection.sensor"="檢測感測器";
"device"="設備";
"device.config"="電台設定";
"device.configuration"="設備設定";
"device.metrics.delete"="刪除所有電台指標？?";
"device.metrics.log"="電台指標紀錄檔";
"device.role.client"="標準模式 - App 可以連接到電台進行收發操作，並且會自動轉發 Mesh 網路中其他中繼點的消息。";
"device.role.clientmute"="靜音模式 - 與標準模式類似，App 可以連接到電台進行收發操作，但不會轉發 Mesh 網路中其他中繼點的消息。";
"device.role.clienthidden"=" Used for nodes that \"only speak when spoken to\" Turns all of the routine broadcasts but allows for ad-hoc communication. Still rebroadcasts, but with local only rebroadcast mode (known meshes only). Can be used for private operation or to dramatically reduce airtime / power consumption.";
"device.role.lostandfound"="Used to automatically send a text message to the mesh with the current position of the device on a frequent interval: \"I'm lost! Position: lat / long\"";
"device.role.router"="纯路由模式 - 自動轉發 Mesh 網路中其他中繼點的消息，中繼模式下螢幕會熄滅，Wi-Fi 和藍芽將會進入睡眠模式，App 將無法連接到電台進行收發操作。";
"device.role.routerclient"="路由客户端模式 - 優先轉發 Mesh 網路中其他中繼點的消息，App 也可以連接到電台進行收發操作。";
"device.role.repeater"="中繼模式 - Mesh 網路數據包將優先通過此中繼點路由。此模式可消除不必要的開銷，如 NodeInfo、DeviceTelemetry 和任何其他 Mesh 數據包，從而使設備不顯示為 Mesh 網路的一部分。有關此角色的其他特定設置，請參閱轉播模式。";
"device.role.tracker"="追蹤模式 - 用於作為 GPS 追蹤器。從該設備發送的定位數據包優先級較高，每兩分鐘廣播一次。智能位置廣播預設為關閉。";
"direct.messages"="聊天";
"dismiss.keyboard"="隱藏鍵盤";
"display"="螢幕（電台螢幕）";
"display.config"="螢幕設定";
"distance"="距離";
"disconnect"="斷開連接";
"echo"="echo";
"email.address"="電子信箱";
"enabled"="啟用";
"encrypted"="加密";
"external.notification"="外部通知";
"external.notification.config"="外部通知設定";
"finish"="完成";
"firmware.version"="韌體版本";
"firmware.version.unsupported"="檢測到不支援的韌體版本，無法連接到電台。";
"gas"="Gas";
"gas.resistance"="Gas Resistance";
"generate.qr.code"="生成QRcode";
"gpsformat.dec"="十進制";
"gpsformat.dms"="度分秒";
"gpsformat.utm"="通用橫軸墨卡托投影";
"gpsformat.mgrs"="軍事網格系統";
"gpsformat.olc"="開放的位置代碼（又稱加碼）";
"gpsformat.osgr"="英國國土測量局網格";
"heard"="收到";
"heard.last"="最後收到";
"hybrid"="混合";
"hybrid.flyover"="混合視圖";
"include"="包含";
"inputevent.none"="無";
"inputevent.up"="上";
"inputevent.down"="下";
"inputevent.left"="左";
"inputevent.right"="右";
"inputevent.select"="選擇";
"inputevent.back"="返回";
"inputevent.cancel"="取消";
"interval.one.second"="一秒";
"interval.two.seconds"="兩秒";
"interval.three.seconds"="三秒";
"interval.four.seconds"="四秒";
"interval.five.seconds"="五秒";
"interval.ten.seconds"="十秒";
"interval.fifteen.seconds"="十五秒";
"interval.twenty.seconds"="二十秒";
"interval.twentyfive.seconds"="二十五秒";
"interval.thirty.seconds"="三十秒";
"interval.fortyfive.seconds"="四十五秒";
"interval.one.minute"="一分鐘";
"interval.two.minutes"="兩分鐘";
"interval.five.minutes"="五分鐘";
"interval.ten.minutes"="十分鐘";
"interval.fifteen.minutes"="十五分鐘";
"interval.thirty.minutes"="三十分鐘";
"interval.one.hour"="一小時";
"interval.two.hours"="兩小時";
"interval.three.hours"="三小時";
"interval.four.hours"="四小時";
"interval.five.hours"="五小時";
"interval.six.hours"="六小時";
"interval.twelve.hours"="十二小時";
"interval.eighteen.hours"="十八小時";
"interval.twentyfour.hours"="二十四小時";
"interval.thirtysix.hours"="三十六小時";
"interval.tyeight.hours"="四十八小时小時";
"interval.eventytwo.hours"="七十二小時";
"keyboard.type"="鍵盤類型";
"logging"="加載中";
"lora"="LoRa";
"lora.config"="LoRa 設定";
"map"="Mesh 地圖";
"map.centering"="居中";
"map.tiles.delete"="刪除已緩存的地圖區塊";
"map.recentering"="自動重新居中";
"map.use.legacy"="Use Legacy Mesh Map";
"map.type"="地圖類型";
"map.usertrackingmode"="使用者跟隨模式";
"map.usertrackingmode.none"="無";
"map.usertrackingmode.follow"="跟隨";
"map.usertrackingmode.followwithheading"="Follow with heading";
"mesh.live.activity"="Mesh 即時活動";
"mesh.log"="Mesh 紀錄檔";
"mesh.log.ambientlighting.config %@"="Ambient Lighting module config received: %@";
"mesh.log.bluetooth.config %@"="Bluetooth config received: %@";
"mesh.log.cannedmessage.config %@"="Canned Message module config received: %@";
"mesh.log.cannedmessages.messages.get %@"="Requested Canned Messages Module Messages for node: %@";
"mesh.log.cannedmessages.messages.received %@"="Canned Messages Messages Received For: %@";
"mesh.log.channel.sent %@ %d"="Sent a Channel for: %@ Channel Index %d";
"mesh.log.channel.received %d %@"="Channel %d received from: %@";
"mesh.log.device.config %@"="收到裝置設定: %@";
"mesh.log.display.config %@"="收到顯示模組設定: %@";
"mesh.log.devicemetadata %@"="Requesting Device Metadata for %@";
"mesh.log.device.metadata.received %@"="Device Metadata admin message received from: %@";
"mesh.log.detectionsensor.config %@"="Detection Sensor module config received: %@";
"mesh.log.externalnotification.config %@"="External Notification module config received: %@";
"mesh.log.lora.config %@"="收到LoRa設定: %@";
"mesh.log.lora.config.sent %@"="Sent a LoRa.Config for: %@";
"mesh.log.mqtt.config %@"="MQTT module config received: %@";
"mesh.log.myinfo %@"="MyInfo received: %@";
"mesh.log.network.config %@"="收到網路設定: %@";
"mesh.log.nodeinfo.received %@"="收到中繼點訊息: %@";
"mesh.log.paxcounter %@"="PAX Counter message received for: %@";
"mesh.log.position.config %@"="Positon config received: %@";
"mesh.log.position.received %@"="從中繼點接收到定位封包: %@";
"mesh.log.rangetest.config %@"="收到拉距測試模組設定: %@";
"mesh.log.ringtone.config %@"="RTTTL Ringtone config received: %@";
"mesh.log.routing.message %@ %@"="Routing received for RequestID: %@ Ack Status: %@";
"mesh.log.serial.config %@"="Serial module config received: %@";
"mesh.log.sharelocation %@"="傳送iOS裝置的GPS定位封包到中繼點上: %@";
"mesh.log.storeforward.config %@"="Store & Forward module config received: %@";
"mesh.log.telemetry.config %@"="收到遠測模組設定: %@";
"mesh.log.telemetry.received %@"="收到遠測資料: %@";
"mesh.log.textmessage.received"="Message received from the text message app.";
"mesh.log.textmessage.send.failed %@"="訊息傳送失敗, 沒有正確連接到 %@";
"mesh.log.textmessage.sent %@ %@ %@"="傳送訊息 %@ 從 %@ 到 %@";
"mesh.log.traceroute.received.direct %@"="Trace Route request sent to node: %@ was recieived directly.";
"mesh.log.traceroute.received.route %@"="Trace Route request returned: %@";
"mesh.log.traceroute.sent %@"="Sent a Trace Route Request to node: %@";
"mesh.log.wantconfig %@"="Issuing Want Config to %@";
"mesh.log.waypoint.sent %@"="Sent a Waypoint Packet from: %@";
"mesh.log.waypoint.received %@"="Waypoint Packet received from node: %@";
"message"="訊息";
"message.details"="詳細訊息";
"messages"="訊息";
"mode"="模式";
"module.configuration"="模塊設定";
"mqtt"="MQTT";
"mqtt.connect"="Connect to MQTT";
"mqtt.config"="MQTT 設定";
"mqtt.clientproxy"="MQTT 客户端代理";
"mqtt.disconnect"="Disconnect from MQTT";
"mqtt.username"="用戶名稱";
"name"="名稱";
"network"="網路";
"network.config"="網路設定";
"nodes"="中繼點";
"nodes %@"="中繼點 (%@)";
"no.nodes"="未找到 Meshtastic 中繼點";
"not.connected"="未連接到電台";
"numbers.punctuation"="數字和標點符號";
"off"="關閉";
"offline"="離線";
"on.boot"="只在啟動時";
"options"="選項";
"password"="密碼";
"pause"="暫停";
"phone.gps"="手機 GPS";
"phone.gps.interval.description"="電台通過手機獲得定位的時間間隔，但是向 Mesh 網路中更新定位的時間間隔由電台控制。";
"position"="定位";
"position.config"="定位設定";
"preferred.radio"="首選電台";
"radio.configuration"="電台設定";
"range.test"="拉距測試";
"range.test.blocked"="區塊範圍測試";
"range.test.config"="拉距測試設定";
"reply"="回復";
"reboot"="重新啟動";
"reboot.node"="重啟中繼點";
"received.ack"="收到確認";
"received.ack.real"="收件人確認";
"resume"="恢復";
"ringtone"="鈴聲";
"ringtone.config"="鈴聲設定";
"route.recorder"="路線錄製";
"routes"="路線";
"routing.acknowledged"="確認";
"routing.noroute"="找不到目標";
"routing.gotnak"="收到否認";
"routing.timeout"="逾時";
"routing.nointerface"="無連接";
"routing.maxretransmit"="已達到最大重試次數";
"routing.nochannel"="没有頻道";
"routing.toolarge"="數據包過大";
"routing.noresponse"="無回應";
"routing.dutycyclelimit"="已達到物錢區域循環週期發射上限";
"routing.badRequest"="錯誤請求";
"routing.notauthorized"="未授權";
"satellite"="衛星";
"satellite.flyover"="衛星識圖";
"save"="儲存";
"save.config %@"="儲存%@的設定";
"serial"="串口";
"serial.config"="串口設定";
"serial.mode.default"="預設";
"serial.mode.simple"="簡單";
"serial.mode.proto"="Protobufs";
"serial.mode.txtmsg"="文本訊息";
"serial.mode.nmea"="NMEA 位置";
"settings"="設定";
"share.channels"="分享頻道QRcode";
"share.position"="分享位置";
"subscribed"="連接到 Mesh 網路";
"select.contact"="選擇聯絡人";
"select.node"="選擇中繼點";
"select.menu.item"="從菜單選擇項目";
"set.region"="設定 LoRa 區域";
"standard"="標準";
"standard.muted"="標準靜音";
"start"="開始";
"ssid"="SSID";
"storeforward"="儲存 & 轉發";
"storeforward.config"="儲存 & 轉發設定";
"storeforward.heartbeat"="發送心跳包";
"tapback"="響應";
"tapback.heart"="心";
"tapback.thumbsup"="豎大拇指";
"tapback.thumbsdown"="倒大拇指";
"tapback.haha"="哈哈";
"tapback.exclamation"="驚嘆號";
"tapback.question"="問號";
"tapback.poop"="便便";
"telemetry"="遠測（傳感器）";
"telemetry.config"="遠側設定";
"timeout"="超時";
"timestamp"="時間戳記";
"tip.bluetooth.connect.title"="連接到 LoRa 電台";
"tip.bluetooth.connect.message"="顯示目前通過藍芽連接的 Lora 電台的信息。您可以向左滑動斷開電台，長按查看統計訊息或開始即時活動。";
"tip.channels.create.title"="管理頻道";
"tip.channels.create.message"="現在 Mesh 上的資料會通過主通道發送。您可以設定輔助通道來建立由自己的金鑰保護的其他訊息組 [頻道設定提示](https://meshtastic.org/docs/configuration/radio/channels/)";
"tip.channels.share.title"="共享 Meshtastic 頻道";
"tip.channels.share.message"="在 Meshtastic 網路中最多有 8 個頻道。第一個頻道是主頻道，大多數活動都發生在這裡，也是必需的。如果您不共享主頻道，您的第一個共享頻道就會成為其他網路的主頻道。它會在其主頻道和您的輔助頻道上對話。名稱為 admin 的頻道可遠端控制中繼點。其他頻道用於私人群组，每個群組都有自己的密鑰。";
"tip.messages.title"="消息";
"tip.messages.message"="您可以發送和接收1對1聊天和群聊。在任何訊息中，您都可以長按查看可用的操作，如複製、回復、拍一拍、刪除以及詳情。";
"twitter"="Twitter";
"unknown"="未知";
"unknown.age"="未知時間";
"unset"="未設置";
"update.firmware"="更新韌體";
"update.interval"="更新間隔";
"user"="使用者";
"user.details"="使用者資料";
"voltage"="電壓";
"waiting"="等待中...";