mirror of
https://github.com/meshtastic/Meshtastic-Apple.git
synced 2026-04-20 22:13:56 +00:00
Merge 436ba7a03a into 047c1c8f5f
This commit is contained in:
Benjamin Faershtein
GitHub
commit
33bcf2e9b4
12 changed files with 501 additions and 19 deletions
3
.gitmodules
vendored
3
.gitmodules
vendored
|
|
@ -1,3 +1,4 @@
|
|||
[submodule "protobufs"]
|
||||
path = protobufs
|
||||
url = https://github.com/meshtastic/protobufs.git
|
||||
url = https://github.com/RCGV1/protobufs-fork.git
|
||||
branch = noise-floor
|
||||
|
|
|
|||
|
|
@ -1124,6 +1124,10 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
"%@ dBm" : {
|
||||
"comment" : "A text view displaying the noise floor of a local stats entry, formatted to one decimal place. The argument is the noise floor value.",
|
||||
"isCommentAutoGenerated" : true
|
||||
},
|
||||
"%@, %@" : {
|
||||
"localizations" : {
|
||||
"da" : {
|
||||
|
|
@ -3047,6 +3051,10 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
"A local stats request has been sent to %@. Responses can some time." : {
|
||||
"comment" : "An alert message explaining that a local stats request has been sent to a specific node. The placeholder inside the parentheses should be replaced with the name of the node.",
|
||||
"isCommentAutoGenerated" : true
|
||||
},
|
||||
"A Meshtastic QR code contains the LoRa config and channel values needed for radios to communicate. You can share a complete channel configuration using the Replace Channels option, if you choose Add Channels your shared channels will be added to the channels on the receiving radio." : {
|
||||
"localizations" : {
|
||||
"da" : {
|
||||
|
|
@ -7182,6 +7190,10 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
"Bad Rx" : {
|
||||
"comment" : "A column in the local stats table that shows the number of received packets that were not valid.",
|
||||
"isCommentAutoGenerated" : true
|
||||
},
|
||||
"Bandwidth" : {
|
||||
"localizations" : {
|
||||
"da" : {
|
||||
|
|
@ -9106,6 +9118,12 @@
|
|||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"Canceled" : {
|
||||
|
||||
},
|
||||
"Canceled: %d" : {
|
||||
|
||||
},
|
||||
"Canned Message module config received: %@" : {
|
||||
"extractionState" : "stale",
|
||||
|
|
@ -14767,6 +14785,10 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
"Delete all local stats?" : {
|
||||
"comment" : "A confirmation dialog title that asks if the user is sure they want to delete all local stats.",
|
||||
"isCommentAutoGenerated" : true
|
||||
},
|
||||
"Delete all pax data?" : {
|
||||
"localizations" : {
|
||||
"da" : {
|
||||
|
|
@ -18435,6 +18457,12 @@
|
|||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"Dupes" : {
|
||||
|
||||
},
|
||||
"Dupes: %d" : {
|
||||
|
||||
},
|
||||
"Easily set up private mesh networks for secure and reliable communication in remote areas." : {
|
||||
"localizations" : {
|
||||
|
|
@ -26688,6 +26716,10 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
"Icky" : {
|
||||
"comment" : "\"Icky\" is a slang term for \"very bad\" or \"horrible\".",
|
||||
"isCommentAutoGenerated" : true
|
||||
},
|
||||
"Icon" : {
|
||||
"localizations" : {
|
||||
"da" : {
|
||||
|
|
@ -29008,6 +29040,20 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
"Local Stats" : {
|
||||
|
||||
},
|
||||
"Local Stats (in %llds)" : {
|
||||
"comment" : "A label that appears in the button while a local stats request is in progress. The number in parentheses is replaced with the remaining time in seconds.",
|
||||
"isCommentAutoGenerated" : true
|
||||
},
|
||||
"Local Stats Log" : {
|
||||
|
||||
},
|
||||
"Local Stats Requested" : {
|
||||
"comment" : "The title of an alert that appears when a user successfully requests a local stats update.",
|
||||
"isCommentAutoGenerated" : true
|
||||
},
|
||||
"Location:" : {
|
||||
"localizations" : {
|
||||
"da" : {
|
||||
|
|
@ -34639,6 +34685,10 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
"No Local Stats" : {
|
||||
"comment" : "A message indicating that there are no local statistics available.",
|
||||
"isCommentAutoGenerated" : true
|
||||
},
|
||||
"No map data files uploaded" : {
|
||||
"comment" : "Message when no files are uploaded",
|
||||
"localizations" : {
|
||||
|
|
@ -34894,6 +34944,9 @@
|
|||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"No Reading" : {
|
||||
|
||||
},
|
||||
"No Response" : {
|
||||
"extractionState" : "stale",
|
||||
|
|
@ -35585,6 +35638,19 @@
|
|||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"Nodes Online" : {
|
||||
"comment" : "A label describing how many nodes are currently online.",
|
||||
"isCommentAutoGenerated" : true
|
||||
},
|
||||
"Noise Floor" : {
|
||||
|
||||
},
|
||||
"Noise Floor %@ dBm" : {
|
||||
|
||||
},
|
||||
"Noise Floor No Reading" : {
|
||||
|
||||
},
|
||||
"None" : {
|
||||
"extractionState" : "stale",
|
||||
|
|
@ -37778,6 +37844,14 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
"Packets Rx" : {
|
||||
"comment" : "A column header for the number of received packets.",
|
||||
"isCommentAutoGenerated" : true
|
||||
},
|
||||
"Packets Tx" : {
|
||||
"comment" : "A column in the local stats table showing the number of packets transmitted.",
|
||||
"isCommentAutoGenerated" : true
|
||||
},
|
||||
"Pairing Mode" : {
|
||||
"localizations" : {
|
||||
"da" : {
|
||||
|
|
@ -42747,6 +42821,9 @@
|
|||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"Relayed" : {
|
||||
|
||||
},
|
||||
"Relayed by %d %@" : {
|
||||
"localizations" : {
|
||||
|
|
@ -42769,6 +42846,9 @@
|
|||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"Relayed: %d" : {
|
||||
|
||||
},
|
||||
"Release Notes" : {
|
||||
"localizations" : {
|
||||
|
|
@ -43344,6 +43424,10 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
"Request Local Stats" : {
|
||||
"comment" : "A button label that requests a local stats request.",
|
||||
"isCommentAutoGenerated" : true
|
||||
},
|
||||
"Request PKI Admin: %@" : {
|
||||
"localizations" : {
|
||||
"da" : {
|
||||
|
|
|
|||
|
|
@ -66,6 +66,7 @@
|
|||
251926852C3BA97800249DF5 /* FavoriteNodeButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 251926842C3BA97800249DF5 /* FavoriteNodeButton.swift */; };
|
||||
251926872C3BAE2200249DF5 /* NodeAlertsButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 251926862C3BAE2200249DF5 /* NodeAlertsButton.swift */; };
|
||||
2519268A2C3BB1B200249DF5 /* ExchangePositionsButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 251926892C3BB1B200249DF5 /* ExchangePositionsButton.swift */; };
|
||||
DD4074692F1233F400BCC22F /* ExchangeUserInfoButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD4074682F1233F400BCC22F /* ExchangeUserInfoButton.swift */; };
|
||||
2519268C2C3BB52000249DF5 /* TraceRouteButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2519268B2C3BB52000249DF5 /* TraceRouteButton.swift */; };
|
||||
251926902C3CB44900249DF5 /* ClientHistoryButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2519268F2C3CB44900249DF5 /* ClientHistoryButton.swift */; };
|
||||
251926922C3CB52300249DF5 /* DeleteNodeButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 251926912C3CB52300249DF5 /* DeleteNodeButton.swift */; };
|
||||
|
|
@ -116,6 +117,8 @@
|
|||
BCB613832C672A2600485544 /* MessageChannelIntent.swift in Sources */ = {isa = PBXBuildFile; fileRef = BCB613822C672A2600485544 /* MessageChannelIntent.swift */; };
|
||||
BCB613852C68703800485544 /* NodePositionIntent.swift in Sources */ = {isa = PBXBuildFile; fileRef = BCB613842C68703800485544 /* NodePositionIntent.swift */; };
|
||||
BCB613872C69A0FB00485544 /* AppIntentErrors.swift in Sources */ = {isa = PBXBuildFile; fileRef = BCB613862C69A0FB00485544 /* AppIntentErrors.swift */; };
|
||||
BCCA0BAB2F1C5C25007648E5 /* LocalStatsLog.swift in Sources */ = {isa = PBXBuildFile; fileRef = BCCA0BAA2F1C5C25007648E5 /* LocalStatsLog.swift */; };
|
||||
BCCA0BAD2F1C5C60007648E5 /* RequestLocalStatsButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = BCCA0BAC2F1C5C60007648E5 /* RequestLocalStatsButton.swift */; };
|
||||
BCD7448D2E0F2FAA00F265A2 /* ContactURLHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = BCD7448C2E0F2FA300F265A2 /* ContactURLHandler.swift */; };
|
||||
BCD93CBA2D9E11A2006C9214 /* DisconnectNodeIntent.swift in Sources */ = {isa = PBXBuildFile; fileRef = BCD93CB92D9E11A2006C9214 /* DisconnectNodeIntent.swift */; };
|
||||
BCDDFA9A2DBB180D0065189C /* ScrollToBottomButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = BCDDFA992DBB180D0065189C /* ScrollToBottomButton.swift */; };
|
||||
|
|
@ -127,7 +130,6 @@
|
|||
D93068D52B812B700066FBC8 /* MessageDestination.swift in Sources */ = {isa = PBXBuildFile; fileRef = D93068D42B812B700066FBC8 /* MessageDestination.swift */; };
|
||||
D93068D72B8146690066FBC8 /* MessageText.swift in Sources */ = {isa = PBXBuildFile; fileRef = D93068D62B8146690066FBC8 /* MessageText.swift */; };
|
||||
D93068D92B81509C0066FBC8 /* TapbackResponses.swift in Sources */ = {isa = PBXBuildFile; fileRef = D93068D82B81509C0066FBC8 /* TapbackResponses.swift */; };
|
||||
D93068DA2B81509D0066FBC8 /* TapbackInputView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D93068D92B81509D0066FBC8 /* TapbackInputView.swift */; };
|
||||
D93068DB2B81C85E0066FBC8 /* PowerConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = D93068DA2B81C85E0066FBC8 /* PowerConfig.swift */; };
|
||||
D93068DD2B81CA820066FBC8 /* ConfigHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = D93068DC2B81CA820066FBC8 /* ConfigHeader.swift */; };
|
||||
D93069082B81DF040066FBC8 /* SaveConfigButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = D93069072B81DF040066FBC8 /* SaveConfigButton.swift */; };
|
||||
|
|
@ -172,7 +174,6 @@
|
|||
DD3CC6C028E7A60700FA9159 /* MessagingEnums.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD3CC6BF28E7A60700FA9159 /* MessagingEnums.swift */; };
|
||||
DD3CC6C228EB9D4900FA9159 /* UpdateCoreData.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD3CC6C128EB9D4900FA9159 /* UpdateCoreData.swift */; };
|
||||
DD3D17E02C3FB67200561584 /* LocalWeatherConditions.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD3D17DF2C3FB67200561584 /* LocalWeatherConditions.swift */; };
|
||||
DD4074692F1233F400BCC22F /* ExchangeUserInfoButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD4074682F1233F400BCC22F /* ExchangeUserInfoButton.swift */; };
|
||||
DD41582628582E9B009B0E59 /* DeviceConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD41582528582E9B009B0E59 /* DeviceConfig.swift */; };
|
||||
DD415828285859C4009B0E59 /* TelemetryConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD415827285859C4009B0E59 /* TelemetryConfig.swift */; };
|
||||
DD41582A28585C32009B0E59 /* RangeTestConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD41582928585C32009B0E59 /* RangeTestConfig.swift */; };
|
||||
|
|
@ -215,6 +216,7 @@
|
|||
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 */; };
|
||||
DD964FC2297272AE007C176F /* WaypointEntityExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD964FC1297272AE007C176F /* WaypointEntityExtension.swift */; };
|
||||
DD964FC62975DBFD007C176F /* QueryCoreData.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD964FC52975DBFD007C176F /* QueryCoreData.swift */; };
|
||||
DD97E96628EFD9820056DDA4 /* MeshtasticLogo.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD97E96528EFD9820056DDA4 /* MeshtasticLogo.swift */; };
|
||||
|
|
@ -228,7 +230,6 @@
|
|||
DD9C70112E916EBD00106227 /* UpdateIntervalPicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD9C70102E916EA200106227 /* UpdateIntervalPicker.swift */; };
|
||||
DDA0B6B2294CDC55001356EC /* Channels.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDA0B6B1294CDC55001356EC /* Channels.swift */; };
|
||||
DDA1C48E28DB49D3009933EC /* ChannelRoles.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDA1C48D28DB49D3009933EC /* ChannelRoles.swift */; };
|
||||
DDA3DFDA2F10B39600D8F103 /* UIKeyboardType.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDA3DFD92F10B39600D8F103 /* UIKeyboardType.swift */; };
|
||||
DDA6B2E928419CF2003E8C16 /* MeshPackets.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDA6B2E828419CF2003E8C16 /* MeshPackets.swift */; };
|
||||
DDA9515A2BC6624100CEA535 /* TelemetryWeather.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDA951592BC6624100CEA535 /* TelemetryWeather.swift */; };
|
||||
DDA9515C2BC6631200CEA535 /* TelemetryEnums.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDA9515B2BC6631200CEA535 /* TelemetryEnums.swift */; };
|
||||
|
|
@ -402,6 +403,7 @@
|
|||
251926842C3BA97800249DF5 /* FavoriteNodeButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FavoriteNodeButton.swift; sourceTree = "<group>"; };
|
||||
251926862C3BAE2200249DF5 /* NodeAlertsButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NodeAlertsButton.swift; sourceTree = "<group>"; };
|
||||
251926892C3BB1B200249DF5 /* ExchangePositionsButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExchangePositionsButton.swift; sourceTree = "<group>"; };
|
||||
DD4074682F1233F400BCC22F /* ExchangeUserInfoButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExchangeUserInfoButton.swift; sourceTree = "<group>"; };
|
||||
2519268B2C3BB52000249DF5 /* TraceRouteButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TraceRouteButton.swift; sourceTree = "<group>"; };
|
||||
2519268F2C3CB44900249DF5 /* ClientHistoryButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClientHistoryButton.swift; sourceTree = "<group>"; };
|
||||
251926912C3CB52300249DF5 /* DeleteNodeButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeleteNodeButton.swift; sourceTree = "<group>"; };
|
||||
|
|
@ -446,6 +448,8 @@
|
|||
BCB613822C672A2600485544 /* MessageChannelIntent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageChannelIntent.swift; sourceTree = "<group>"; };
|
||||
BCB613842C68703800485544 /* NodePositionIntent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NodePositionIntent.swift; sourceTree = "<group>"; };
|
||||
BCB613862C69A0FB00485544 /* AppIntentErrors.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppIntentErrors.swift; sourceTree = "<group>"; };
|
||||
BCCA0BAA2F1C5C25007648E5 /* LocalStatsLog.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalStatsLog.swift; sourceTree = "<group>"; };
|
||||
BCCA0BAC2F1C5C60007648E5 /* RequestLocalStatsButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RequestLocalStatsButton.swift; sourceTree = "<group>"; };
|
||||
BCD7448C2E0F2FA300F265A2 /* ContactURLHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContactURLHandler.swift; sourceTree = "<group>"; };
|
||||
BCD93CB92D9E11A2006C9214 /* DisconnectNodeIntent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DisconnectNodeIntent.swift; sourceTree = "<group>"; };
|
||||
BCDDFA992DBB180D0065189C /* ScrollToBottomButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScrollToBottomButton.swift; sourceTree = "<group>"; };
|
||||
|
|
@ -457,7 +461,6 @@
|
|||
D93068D42B812B700066FBC8 /* MessageDestination.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageDestination.swift; sourceTree = "<group>"; };
|
||||
D93068D62B8146690066FBC8 /* MessageText.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageText.swift; sourceTree = "<group>"; };
|
||||
D93068D82B81509C0066FBC8 /* TapbackResponses.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TapbackResponses.swift; sourceTree = "<group>"; };
|
||||
D93068D92B81509D0066FBC8 /* TapbackInputView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TapbackInputView.swift; sourceTree = "<group>"; };
|
||||
D93068DA2B81C85E0066FBC8 /* PowerConfig.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PowerConfig.swift; sourceTree = "<group>"; };
|
||||
D93068DC2B81CA820066FBC8 /* ConfigHeader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConfigHeader.swift; sourceTree = "<group>"; };
|
||||
D93069062B81D8900066FBC8 /* MeshtasticDataModelV 27.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MeshtasticDataModelV 27.xcdatamodel"; sourceTree = "<group>"; };
|
||||
|
|
@ -521,7 +524,6 @@
|
|||
DD3CC6C128EB9D4900FA9159 /* UpdateCoreData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UpdateCoreData.swift; sourceTree = "<group>"; };
|
||||
DD3D17DC2C3D7B1400561584 /* MeshtasticDataModelV 39.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MeshtasticDataModelV 39.xcdatamodel"; sourceTree = "<group>"; };
|
||||
DD3D17DF2C3FB67200561584 /* LocalWeatherConditions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalWeatherConditions.swift; sourceTree = "<group>"; };
|
||||
DD4074682F1233F400BCC22F /* ExchangeUserInfoButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExchangeUserInfoButton.swift; sourceTree = "<group>"; };
|
||||
DD41582528582E9B009B0E59 /* DeviceConfig.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeviceConfig.swift; sourceTree = "<group>"; };
|
||||
DD415827285859C4009B0E59 /* TelemetryConfig.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TelemetryConfig.swift; sourceTree = "<group>"; };
|
||||
DD41582928585C32009B0E59 /* RangeTestConfig.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RangeTestConfig.swift; sourceTree = "<group>"; };
|
||||
|
|
@ -577,6 +579,7 @@
|
|||
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>"; };
|
||||
DD964FC029724F6D007C176F /* MeshtasticDataModelV6.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = MeshtasticDataModelV6.xcdatamodel; sourceTree = "<group>"; };
|
||||
DD964FC1297272AE007C176F /* WaypointEntityExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WaypointEntityExtension.swift; sourceTree = "<group>"; };
|
||||
DD964FC52975DBFD007C176F /* QueryCoreData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QueryCoreData.swift; sourceTree = "<group>"; };
|
||||
|
|
@ -594,7 +597,6 @@
|
|||
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>"; };
|
||||
DDA28B1B2D32C89200EF726F /* MeshtasticDataModelV 48.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MeshtasticDataModelV 48.xcdatamodel"; sourceTree = "<group>"; };
|
||||
DDA3DFD92F10B39600D8F103 /* UIKeyboardType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIKeyboardType.swift; sourceTree = "<group>"; };
|
||||
DDA6B2E828419CF2003E8C16 /* MeshPackets.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MeshPackets.swift; sourceTree = "<group>"; };
|
||||
DDA951592BC6624100CEA535 /* TelemetryWeather.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TelemetryWeather.swift; sourceTree = "<group>"; };
|
||||
DDA9515B2BC6631200CEA535 /* TelemetryEnums.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TelemetryEnums.swift; sourceTree = "<group>"; };
|
||||
|
|
@ -877,10 +879,11 @@
|
|||
251926882C3BAF2E00249DF5 /* Actions */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
DD4074682F1233F400BCC22F /* ExchangeUserInfoButton.swift */,
|
||||
BCCA0BAC2F1C5C60007648E5 /* RequestLocalStatsButton.swift */,
|
||||
DDDFE73E2D0D48FF0044463C /* IgnoreNodeButton.swift */,
|
||||
251926842C3BA97800249DF5 /* FavoriteNodeButton.swift */,
|
||||
251926892C3BB1B200249DF5 /* ExchangePositionsButton.swift */,
|
||||
DD4074682F1233F400BCC22F /* ExchangeUserInfoButton.swift */,
|
||||
DDF82CBC2D5BC69200DC25EC /* NavigateToButton.swift */,
|
||||
251926862C3BAE2200249DF5 /* NodeAlertsButton.swift */,
|
||||
2519268B2C3BB52000249DF5 /* TraceRouteButton.swift */,
|
||||
|
|
@ -984,6 +987,7 @@
|
|||
DD47E3CA26F0E50300029299 /* Nodes */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
BCCA0BAA2F1C5C25007648E5 /* LocalStatsLog.swift */,
|
||||
DDDB26402AABEF7B003AFCB7 /* Helpers */,
|
||||
DDDB263E2AABEE20003AFCB7 /* NodeList.swift */,
|
||||
DD769E0228D18BF0001A3F05 /* DeviceMetricsLog.swift */,
|
||||
|
|
@ -1304,7 +1308,6 @@
|
|||
D93068D62B8146690066FBC8 /* MessageText.swift */,
|
||||
D93068D22B8129510066FBC8 /* MessageContextMenuItems.swift */,
|
||||
D93068D82B81509C0066FBC8 /* TapbackResponses.swift */,
|
||||
D93068D92B81509D0066FBC8 /* TapbackInputView.swift */,
|
||||
);
|
||||
path = Messages;
|
||||
sourceTree = "<group>";
|
||||
|
|
@ -1346,6 +1349,7 @@
|
|||
DD1BEF492E0292220090CE24 /* KeychainHelper.swift */,
|
||||
DD913638270DFF4C00D7ACF3 /* LocalNotificationManager.swift */,
|
||||
DDA6B2E828419CF2003E8C16 /* MeshPackets.swift */,
|
||||
DD964FBC296E6B01007C176F /* EmojiOnlyTextField.swift */,
|
||||
DD3619142B1EF9F900C41C8C /* LocationsHandler.swift */,
|
||||
6D825E612C34786C008DBEE4 /* CommonRegex.swift */,
|
||||
3D3417B32E2730EC006A988B /* GeoJSONOverlayManager.swift */,
|
||||
|
|
@ -1426,7 +1430,6 @@
|
|||
DDDB444729F8A9C900EE2349 /* String.swift */,
|
||||
DD77093E2AA1B146007A8BF0 /* UIColor.swift */,
|
||||
DDDB444F29F8AC9C00EE2349 /* UIImage.swift */,
|
||||
DDA3DFD92F10B39600D8F103 /* UIKeyboardType.swift */,
|
||||
DDDB443F29F79AB000EE2349 /* UserDefaults.swift */,
|
||||
DDB75A0E2A05920E006ED576 /* FileManager.swift */,
|
||||
DDB75A102A059258006ED576 /* Url.swift */,
|
||||
|
|
@ -1712,6 +1715,7 @@
|
|||
237AEB932E1FE4BA003B7CE3 /* Connection.swift in Sources */,
|
||||
DDD5BB102C285FB3007E03CA /* AppLogFilter.swift in Sources */,
|
||||
237AEB952E1FE516003B7CE3 /* Device.swift in Sources */,
|
||||
BCCA0BAD2F1C5C60007648E5 /* RequestLocalStatsButton.swift in Sources */,
|
||||
2373AE172D0A26620086C749 /* EnvironmentDefaultSeries.swift in Sources */,
|
||||
233E99B82D849C6500CC3A77 /* HumidityCompactWidget.swift in Sources */,
|
||||
DD4640202AFF10F4002A5ECB /* WaypointForm.swift in Sources */,
|
||||
|
|
@ -1726,6 +1730,7 @@
|
|||
DD77093B2AA1ABB8007A8BF0 /* BluetoothTips.swift in Sources */,
|
||||
D9C9839D2B79CFD700BDBE6A /* TextMessageSize.swift in Sources */,
|
||||
DDC94FCE29CF55310082EA6E /* RtttlConfig.swift in Sources */,
|
||||
DD964FBD296E6B01007C176F /* EmojiOnlyTextField.swift in Sources */,
|
||||
DD1BEF4E2E03916A0090CE24 /* ChannelsHelp.swift in Sources */,
|
||||
DD8169FF272476C700F4AB02 /* LogDocument.swift in Sources */,
|
||||
BCD93CBA2D9E11A2006C9214 /* DisconnectNodeIntent.swift in Sources */,
|
||||
|
|
@ -1778,7 +1783,6 @@
|
|||
DDDB444A29F8AA3A00EE2349 /* CLLocationCoordinate2D.swift in Sources */,
|
||||
25C49D902C471AEA0024FBD1 /* Constants.swift in Sources */,
|
||||
ABB99DEB2E2EA1C500CFBD05 /* AppIconPicker.swift in Sources */,
|
||||
DD4074692F1233F400BCC22F /* ExchangeUserInfoButton.swift in Sources */,
|
||||
DD41582628582E9B009B0E59 /* DeviceConfig.swift in Sources */,
|
||||
DDF45C372BC46A5A005ED5F2 /* TimeZone.swift in Sources */,
|
||||
DD007BAE2AA4E91200F5FA12 /* MyInfoEntityExtension.swift in Sources */,
|
||||
|
|
@ -1843,6 +1847,7 @@
|
|||
ABA8E6402E2F2A2300E27791 /* AppIconButton.swift in Sources */,
|
||||
DD1B8F402B35E2F10022AABC /* GPSStatus.swift in Sources */,
|
||||
231B3F212D087A4C0069A07D /* MetricTableColumn.swift in Sources */,
|
||||
BCCA0BAB2F1C5C25007648E5 /* LocalStatsLog.swift in Sources */,
|
||||
231B3F222D087A4C0069A07D /* MetricsColumnList.swift in Sources */,
|
||||
DD8ED9C52898D51F00B3B0AB /* NetworkConfig.swift in Sources */,
|
||||
DDDE5A1029AFE69700490C6C /* MeshActivityAttributes.swift in Sources */,
|
||||
|
|
@ -1859,7 +1864,6 @@
|
|||
DDA6B2E928419CF2003E8C16 /* MeshPackets.swift in Sources */,
|
||||
DDCE4E2C2869F92900BE9F8F /* UserConfig.swift in Sources */,
|
||||
BCB613852C68703800485544 /* NodePositionIntent.swift in Sources */,
|
||||
DDA3DFDA2F10B39600D8F103 /* UIKeyboardType.swift in Sources */,
|
||||
DDB75A212A12B954006ED576 /* LoRaSignalStrength.swift in Sources */,
|
||||
DD6193752862F6E600E59241 /* ExternalNotificationConfig.swift in Sources */,
|
||||
DD268D8E2BCC90E2008073AE /* RouteEnums.swift in Sources */,
|
||||
|
|
@ -1868,11 +1872,11 @@
|
|||
DD4975A52B147BA90026544E /* AmbientLightingConfig.swift in Sources */,
|
||||
3D3417D22E2DC260006A988B /* MapDataManager.swift in Sources */,
|
||||
D93068D92B81509C0066FBC8 /* TapbackResponses.swift in Sources */,
|
||||
D93068DA2B81509D0066FBC8 /* TapbackInputView.swift in Sources */,
|
||||
DDA9F5E82E77FAC100E70DEB /* AnimatedNodePin.swift in Sources */,
|
||||
DDF82CBD2D5BC69200DC25EC /* NavigateToButton.swift in Sources */,
|
||||
8D3F8A3F2D44BB02009EAAA4 /* PowerMetrics.swift in Sources */,
|
||||
2519268A2C3BB1B200249DF5 /* ExchangePositionsButton.swift in Sources */,
|
||||
DD4074692F1233F400BCC22F /* ExchangeUserInfoButton.swift in Sources */,
|
||||
DD86D40A287F04F100BAEB7A /* InvalidVersion.swift in Sources */,
|
||||
233E99BE2D849D3200CC3A77 /* RadiationCompactWidget.swift in Sources */,
|
||||
DDD94A502845C8F5004A87A0 /* DateTimeText.swift in Sources */,
|
||||
|
|
@ -2177,8 +2181,7 @@
|
|||
OTHER_LDFLAGS = (
|
||||
"-weak_framework",
|
||||
SwiftUI,
|
||||
);
|
||||
PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient;
|
||||
); PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
SUPPORTS_MACCATALYST = YES;
|
||||
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
|
||||
|
|
@ -2215,8 +2218,7 @@
|
|||
OTHER_LDFLAGS = (
|
||||
"-weak_framework",
|
||||
SwiftUI,
|
||||
);
|
||||
PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient;
|
||||
); PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
SUPPORTS_MACCATALYST = YES;
|
||||
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
|
||||
|
|
|
|||
|
|
@ -2148,4 +2148,40 @@ extension AccessoryManager {
|
|||
|
||||
return Int64(meshPacket.id)
|
||||
}
|
||||
|
||||
func sendLocalStatsRequest(destNum: Int64, wantResponse: Bool) async throws {
|
||||
guard let fromNodeNum = self.activeConnection?.device.num else {
|
||||
Logger.services.error("Error while sending local stats request. No active device.")
|
||||
throw AccessoryError.ioFailed("No active device")
|
||||
}
|
||||
|
||||
var telemetryPacket = Telemetry()
|
||||
telemetryPacket.localStats = LocalStats()
|
||||
|
||||
var meshPacket = MeshPacket()
|
||||
meshPacket.id = UInt32.random(in: UInt32(UInt8.max)..<UInt32.max)
|
||||
meshPacket.to = UInt32(destNum)
|
||||
meshPacket.from = UInt32(fromNodeNum)
|
||||
meshPacket.wantAck = true
|
||||
meshPacket.decoded.wantResponse = wantResponse
|
||||
|
||||
var dataMessage = DataMessage()
|
||||
if let serializedData: Data = try? telemetryPacket.serializedData() {
|
||||
dataMessage.payload = serializedData
|
||||
dataMessage.portnum = PortNum.telemetryApp
|
||||
dataMessage.wantResponse = wantResponse
|
||||
meshPacket.decoded = dataMessage
|
||||
} else {
|
||||
throw AccessoryError.ioFailed("sendLocalStatsRequest: Unable to serialize telemetry packet")
|
||||
}
|
||||
|
||||
var toRadio: ToRadio!
|
||||
toRadio = ToRadio()
|
||||
toRadio.packet = meshPacket
|
||||
|
||||
let logString = String.localizedStringWithFormat("📊 Sent Local Stats Request from: %@ to: %@".localized, String(fromNodeNum), String(destNum))
|
||||
try await send(toRadio, debugDescription: logString)
|
||||
|
||||
Logger.mesh.info("📊 \(logString, privacy: .public)")
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -65,6 +65,33 @@ func telemetryToCsvFile<S: Sequence>(telemetry: S, metricsType: Int) -> String w
|
|||
csvString += ", "
|
||||
csvString += dm.time?.formattedDate(format: dateFormatString) ?? "Unknown Age".localized
|
||||
}
|
||||
} else if metricsType == 4 {
|
||||
// Create Local Stats Header
|
||||
csvString = "Noise Floor, Uptime, Relayed, Canceled, Dupes, Packets Tx, Packets Rx, Bad Rx, Nodes Online, Total Nodes, \("Timestamp".localized)"
|
||||
for dm in telemetry where dm.metricsType == 4 {
|
||||
csvString += "\n"
|
||||
csvString += dm.noiseFloor?.formatted(.number.grouping(.never)) ?? ""
|
||||
csvString += ", "
|
||||
csvString += dm.uptimeSeconds?.formatted(.number.grouping(.never)) ?? ""
|
||||
csvString += ", "
|
||||
csvString += dm.numTxRelay.formatted(.number.grouping(.never))
|
||||
csvString += ", "
|
||||
csvString += dm.numTxRelayCanceled.formatted(.number.grouping(.never))
|
||||
csvString += ", "
|
||||
csvString += dm.numRxDupe.formatted(.number.grouping(.never))
|
||||
csvString += ", "
|
||||
csvString += dm.numPacketsTx.formatted(.number.grouping(.never))
|
||||
csvString += ", "
|
||||
csvString += dm.numPacketsRx.formatted(.number.grouping(.never))
|
||||
csvString += ", "
|
||||
csvString += dm.numPacketsRxBad.formatted(.number.grouping(.never))
|
||||
csvString += ", "
|
||||
csvString += dm.numOnlineNodes.formatted(.number.grouping(.never))
|
||||
csvString += ", "
|
||||
csvString += dm.numTotalNodes.formatted(.number.grouping(.never))
|
||||
csvString += ", "
|
||||
csvString += dm.time?.formattedDate(format: dateFormatString) ?? "Unknown Age".localized
|
||||
}
|
||||
}
|
||||
return csvString
|
||||
}
|
||||
|
|
|
|||
|
|
@ -841,8 +841,9 @@ actor MeshPackets {
|
|||
telemetry.numTxRelayCanceled = Int32(truncatingIfNeeded: telemetryMessage.localStats.numTxRelayCanceled)
|
||||
telemetry.numOnlineNodes = Int32(truncatingIfNeeded: telemetryMessage.localStats.numOnlineNodes)
|
||||
telemetry.numTotalNodes = Int32(truncatingIfNeeded: telemetryMessage.localStats.numTotalNodes)
|
||||
telemetry.noiseFloor = telemetryMessage.localStats.noiseFloor
|
||||
telemetry.metricsType = 4
|
||||
Logger.statistics.info("📈 [Mesh Statistics] Channel Utilization: \(telemetryMessage.localStats.channelUtilization, privacy: .public) Airtime: \(telemetryMessage.localStats.airUtilTx, privacy: .public) Packets Sent: \(telemetryMessage.localStats.numPacketsTx, privacy: .public) Packets Received: \(telemetryMessage.localStats.numPacketsRx, privacy: .public) Bad Packets Received: \(telemetryMessage.localStats.numPacketsRxBad, privacy: .public) Nodes Online: \(telemetryMessage.localStats.numOnlineNodes, privacy: .public) of \(telemetryMessage.localStats.numTotalNodes, privacy: .public) nodes for Node: \(packet.from.toHex(), privacy: .public)")
|
||||
Logger.statistics.info("📈 [Mesh Statistics] Channel Utilization: \(telemetryMessage.localStats.channelUtilization, privacy: .public) Airtime: \(telemetryMessage.localStats.airUtilTx, privacy: .public) Packets Sent: \(telemetryMessage.localStats.numPacketsTx, privacy: .public) Packets Received: \(telemetryMessage.localStats.numPacketsRx, privacy: .public) Bad Packets Received: \(telemetryMessage.localStats.numPacketsRxBad, privacy: .public) Noise Floor: \(telemetryMessage.localStats.noiseFloor, privacy: .public) Nodes Online: \(telemetryMessage.localStats.numOnlineNodes, privacy: .public) of \(telemetryMessage.localStats.numTotalNodes, privacy: .public) nodes for Node: \(packet.from.toHex(), privacy: .public)")
|
||||
} else if telemetryMessage.variant == Telemetry.OneOf_Variant.powerMetrics(telemetryMessage.powerMetrics) {
|
||||
Logger.data.info("📈 [Telemetry] Power Metrics Received for Node: \(packet.from.toHex(), privacy: .public)")
|
||||
telemetry.powerCh1Voltage = telemetryMessage.powerMetrics.hasCh1Voltage.then(telemetryMessage.powerMetrics.ch1Voltage)
|
||||
|
|
|
|||
|
|
@ -406,6 +406,7 @@
|
|||
<attribute name="irLux" optional="YES" attributeType="Float" defaultValueString="0.0" usesScalarValueType="YES"/>
|
||||
<attribute name="lux" optional="YES" attributeType="Float" defaultValueString="0.0" usesScalarValueType="YES"/>
|
||||
<attribute name="metricsType" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
|
||||
<attribute name="noiseFloor" optional="YES" attributeType="Float" defaultValueString="0.0" usesScalarValueType="YES"/>
|
||||
<attribute name="numOnlineNodes" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
|
||||
<attribute name="numPacketsRx" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
|
||||
<attribute name="numPacketsRxBad" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
|
||||
|
|
|
|||
|
|
@ -44,6 +44,7 @@ public class TelemetryEntity: NSManagedObject, Identifiable {
|
|||
@ManagedAttribute<Float>(attributeName: "windSpeed") public var windSpeed: Float?
|
||||
@ManagedAttribute<Float>(attributeName: "irLux") public var irLux: Float?
|
||||
@ManagedAttribute<Float>(attributeName: "lux") public var lux: Float?
|
||||
@ManagedAttribute<Float>(attributeName: "noiseFloor") public var noiseFloor: Float?
|
||||
@ManagedAttribute<Float>(attributeName: "uvLux") public var uvLux: Float?
|
||||
@ManagedAttribute<Float>(attributeName: "whiteLux") public var whiteLux: Float?
|
||||
@ManagedAttribute<Float>(attributeName: "radiation") public var radiation: Float?
|
||||
|
|
|
|||
|
|
@ -0,0 +1,51 @@
|
|||
import SwiftUI
|
||||
import OSLog
|
||||
|
||||
struct RequestLocalStatsButton: View {
|
||||
@EnvironmentObject var accessoryManager: AccessoryManager
|
||||
|
||||
var node: NodeInfoEntity
|
||||
|
||||
@State
|
||||
private var isPresentingLocalStatsSentAlert: Bool = false
|
||||
|
||||
var body: some View {
|
||||
RateLimitedButton(key: "localstats", rateLimit: 30.0) {
|
||||
Task {
|
||||
do {
|
||||
try await accessoryManager.sendLocalStatsRequest(
|
||||
destNum: node.user?.num ?? 0,
|
||||
wantResponse: true
|
||||
)
|
||||
Task {
|
||||
isPresentingLocalStatsSentAlert = true
|
||||
}
|
||||
} catch {
|
||||
Logger.mesh.warning("Failed to send local stats request: \(error)")
|
||||
}
|
||||
}
|
||||
} label: { completion in
|
||||
if let completion, completion.percentComplete > 0.0 {
|
||||
Label {
|
||||
Text("Local Stats (in \(Int(completion.secondsRemaining))s)")
|
||||
.foregroundStyle(.secondary)
|
||||
} icon: {
|
||||
Image("progress.ring.dashed", variableValue: completion.percentComplete)
|
||||
.foregroundStyle(.secondary)
|
||||
}.disabled(true)
|
||||
} else {
|
||||
Label {
|
||||
Text("Request Local Stats")
|
||||
} icon: {
|
||||
Image(systemName: "chart.bar")
|
||||
.symbolRenderingMode(.hierarchical)
|
||||
}
|
||||
}
|
||||
}
|
||||
.alert("Local Stats Requested", isPresented: $isPresentingLocalStatsSentAlert) {
|
||||
Button("OK", role: .cancel) { }
|
||||
} message: {
|
||||
Text("A local stats request has been sent to \(node.user?.longName ?? "this node"). Responses can some time.")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -424,6 +424,17 @@ struct NodeDetail: View {
|
|||
}
|
||||
}
|
||||
.disabled(!node.hasDetectionSensorMetrics)
|
||||
NavigationLink {
|
||||
LocalStatsLog(node: node)
|
||||
} label: {
|
||||
Label {
|
||||
Text("Local Stats Log")
|
||||
} icon: {
|
||||
Image(systemName: "chart.bar")
|
||||
.symbolRenderingMode(.multicolor)
|
||||
}
|
||||
}
|
||||
.disabled(node.telemetries?.filtered(using: NSPredicate(format: "metricsType == 4")).count ?? 0 == 0)
|
||||
if node.hasPax {
|
||||
NavigationLink {
|
||||
PaxCounterLog(node: node)
|
||||
|
|
@ -464,6 +475,7 @@ struct NodeDetail: View {
|
|||
node: node,
|
||||
connectedNode: connectedNode
|
||||
)
|
||||
RequestLocalStatsButton(node: node)
|
||||
ExchangeUserInfoButton(
|
||||
node: node,
|
||||
connectedNode: connectedNode
|
||||
|
|
|
|||
266
Meshtastic/Views/Nodes/LocalStatsLog.swift
Normal file
266
Meshtastic/Views/Nodes/LocalStatsLog.swift
Normal file
|
|
@ -0,0 +1,266 @@
|
|||
//
|
||||
// LocalStatsLog.swift
|
||||
// Meshtastic
|
||||
//
|
||||
// Copyright(c) Benjamin Faershtein 1/17/26.
|
||||
//
|
||||
import SwiftUI
|
||||
import Charts
|
||||
import OSLog
|
||||
|
||||
struct LocalStatsLog: View {
|
||||
|
||||
@Environment(\.managedObjectContext) var context
|
||||
@EnvironmentObject var accessoryManager: AccessoryManager
|
||||
private var idiom: UIUserInterfaceIdiom { UIDevice.current.userInterfaceIdiom }
|
||||
|
||||
@State private var isPresentingClearLogConfirm: Bool = false
|
||||
@State var isExporting = false
|
||||
@State var exportString = ""
|
||||
|
||||
@ObservedObject var node: NodeInfoEntity
|
||||
@State private var sortOrder = [KeyPathComparator(\TelemetryEntity.time, order: .reverse)]
|
||||
@State private var selection: TelemetryEntity.ID?
|
||||
@State private var chartSelection: Date?
|
||||
|
||||
private var localStats: [TelemetryEntity] {
|
||||
let filtered = node.telemetries?.filtered(using: NSPredicate(format: "metricsType == 4"))
|
||||
return (filtered?.reversed() as? [TelemetryEntity]) ?? []
|
||||
}
|
||||
|
||||
private var hasLocalStats: Bool {
|
||||
!localStats.isEmpty
|
||||
}
|
||||
|
||||
private var chartData: [TelemetryEntity] {
|
||||
let oneWeekAgo = Calendar.current.date(byAdding: .day, value: -7, to: Date())
|
||||
return localStats.filter { $0.time != nil && $0.time! >= oneWeekAgo! }.sorted { $0.time! < $1.time! }
|
||||
}
|
||||
|
||||
private var hasChartData: Bool {
|
||||
!chartData.isEmpty
|
||||
}
|
||||
|
||||
private var dateFormatString: String {
|
||||
let localeDateFormat = DateFormatter.dateFormat(fromTemplate: "yyMdjmma", options: 0, locale: Locale.current)
|
||||
return (localeDateFormat ?? "M/d/YY j:mma").replacingOccurrences(of: ",", with: "")
|
||||
}
|
||||
|
||||
var body: some View {
|
||||
VStack {
|
||||
if hasLocalStats {
|
||||
if hasChartData {
|
||||
chartView
|
||||
}
|
||||
tableView
|
||||
buttonView
|
||||
} else {
|
||||
ContentUnavailableView("No Local Stats", systemImage: "waveform")
|
||||
}
|
||||
}
|
||||
.navigationTitle("Local Stats Log")
|
||||
.navigationBarTitleDisplayMode(.inline)
|
||||
.navigationBarItems(trailing:
|
||||
ZStack {
|
||||
ConnectedDevice(deviceConnected: accessoryManager.isConnected, name: accessoryManager.activeConnection?.device.shortName ?? "?")
|
||||
})
|
||||
.fileExporter(
|
||||
isPresented: $isExporting,
|
||||
document: CsvDocument(emptyCsv: exportString),
|
||||
contentType: .commaSeparatedText,
|
||||
defaultFilename: String("\(node.user?.longName ?? "Node") \("Local Stats Log".localized)"),
|
||||
onCompletion: { result in
|
||||
switch result {
|
||||
case .success:
|
||||
self.isExporting = false
|
||||
Logger.services.info("Local stats log download succeeded.")
|
||||
case .failure(let error):
|
||||
Logger.services.error("Local stats log download failed: \(error.localizedDescription, privacy: .public)")
|
||||
}
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
private var chartView: some View {
|
||||
GroupBox(label: Label("\(localStats.count) Readings Total", systemImage: "waveform")) {
|
||||
Chart(chartData) { point in
|
||||
if let pointTime = point.time, let noiseFloor = point.noiseFloor {
|
||||
LineMark(
|
||||
x: .value("Time", pointTime),
|
||||
y: .value("Noise Floor", noiseFloor)
|
||||
)
|
||||
.foregroundStyle(Color.accentColor)
|
||||
.interpolationMethod(.linear)
|
||||
}
|
||||
RuleMark(y: .value("Icky", -85))
|
||||
.lineStyle(StrokeStyle(lineWidth: 1, dash: [5, 5]))
|
||||
.foregroundStyle(.red)
|
||||
}
|
||||
.chartXAxis(content: {
|
||||
AxisMarks(position: .top)
|
||||
})
|
||||
.chartXSelection(value: $chartSelection)
|
||||
.chartYScale(domain: -130 ... -60)
|
||||
.chartForegroundStyleScale([
|
||||
"Noise Floor": Color.accentColor
|
||||
])
|
||||
.chartLegend(position: .automatic, alignment: .bottom)
|
||||
}
|
||||
.frame(minHeight: 240)
|
||||
}
|
||||
|
||||
@ViewBuilder
|
||||
private var tableView: some View {
|
||||
if idiom == .phone {
|
||||
phoneTableView
|
||||
} else {
|
||||
macTableView
|
||||
}
|
||||
}
|
||||
|
||||
private var phoneTableView: some View {
|
||||
Table(localStats, selection: $selection, sortOrder: $sortOrder) {
|
||||
TableColumn("Local Stats") { ls in
|
||||
HStack {
|
||||
Text(ls.time?.formattedDate(format: dateFormatString) ?? "Unknown Age".localized)
|
||||
.font(.caption)
|
||||
.fontWeight(.semibold)
|
||||
Spacer()
|
||||
}
|
||||
HStack {
|
||||
if let noiseFloor = ls.noiseFloor, noiseFloor != 0 {
|
||||
Text("Noise Floor \(noiseFloor.formatted(.number.precision(.fractionLength(1)))) dBm")
|
||||
.foregroundColor(noiseFloorColor(noiseFloor))
|
||||
} else {
|
||||
Text("Noise Floor No Reading")
|
||||
.foregroundColor(.gray)
|
||||
}
|
||||
Spacer()
|
||||
}
|
||||
HStack {
|
||||
Text("Relayed: \(ls.numTxRelay)")
|
||||
Text("Canceled: \(ls.numTxRelayCanceled)")
|
||||
Text("Dupes: \(ls.numRxDupe)")
|
||||
Spacer()
|
||||
}
|
||||
.font(.caption)
|
||||
}
|
||||
.width(ideal: 200, max: .infinity)
|
||||
}
|
||||
}
|
||||
|
||||
private var macTableView: some View {
|
||||
Table(localStats, selection: $selection, sortOrder: $sortOrder) {
|
||||
TableColumn("Noise Floor") { ls in
|
||||
if let noiseFloor = ls.noiseFloor, noiseFloor != 0 {
|
||||
Text("\(noiseFloor.formatted(.number.precision(.fractionLength(1)))) dBm")
|
||||
.foregroundColor(noiseFloorColor(noiseFloor))
|
||||
} else {
|
||||
Text("No Reading")
|
||||
.foregroundColor(.gray)
|
||||
}
|
||||
}
|
||||
TableColumn("Uptime") { ls in
|
||||
if let uptimeSeconds = ls.uptimeSeconds {
|
||||
let now = Date.now
|
||||
let later = now + TimeInterval(uptimeSeconds)
|
||||
let components = (now..<later).formatted(.components(style: .narrow))
|
||||
Text(components)
|
||||
} else {
|
||||
Text(Constants.nilValueIndicator)
|
||||
}
|
||||
}
|
||||
.width(min: 100)
|
||||
TableColumn("Relayed") { ls in
|
||||
Text("\(ls.numTxRelay)")
|
||||
}
|
||||
.width(min: 80)
|
||||
TableColumn("Canceled") { ls in
|
||||
Text("\(ls.numTxRelayCanceled)")
|
||||
}
|
||||
.width(min: 80)
|
||||
TableColumn("Dupes") { ls in
|
||||
Text("\(ls.numRxDupe)")
|
||||
}
|
||||
.width(min: 80)
|
||||
TableColumn("Packets Tx") { ls in
|
||||
Text("\(ls.numPacketsTx)")
|
||||
}
|
||||
.width(min: 80)
|
||||
TableColumn("Packets Rx") { ls in
|
||||
Text("\(ls.numPacketsRx)")
|
||||
}
|
||||
.width(min: 80)
|
||||
TableColumn("Bad Rx") { ls in
|
||||
Text("\(ls.numPacketsRxBad)")
|
||||
}
|
||||
.width(min: 80)
|
||||
TableColumn("Nodes Online") { ls in
|
||||
Text("\(ls.numOnlineNodes)")
|
||||
}
|
||||
.width(min: 100)
|
||||
TableColumn("Timestamp") { ls in
|
||||
Text(ls.time?.formattedDate(format: dateFormatString) ?? "Unknown Age".localized)
|
||||
}
|
||||
.width(min: 180)
|
||||
}
|
||||
}
|
||||
|
||||
private var buttonView: some View {
|
||||
HStack {
|
||||
Button(role: .destructive) {
|
||||
isPresentingClearLogConfirm = true
|
||||
} label: {
|
||||
Label("Clear Log", systemImage: "trash.fill")
|
||||
}
|
||||
.buttonStyle(.bordered)
|
||||
.buttonBorderShape(.capsule)
|
||||
.controlSize(idiom == .phone ? .regular : .large)
|
||||
.padding(.bottom)
|
||||
.padding(.leading)
|
||||
.confirmationDialog(
|
||||
"Are you sure?",
|
||||
isPresented: $isPresentingClearLogConfirm,
|
||||
titleVisibility: .visible
|
||||
) {
|
||||
Button("Delete all local stats?", role: .destructive) {
|
||||
if clearTelemetry(destNum: node.num, metricsType: 4, context: context) {
|
||||
Logger.data.notice("Cleared Local Stats for \(node.num, privacy: .public)")
|
||||
} else {
|
||||
Logger.data.error("Clear Local Stats Log Failed")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Button {
|
||||
exportString = telemetryToCsvFile(telemetry: localStats, metricsType: 4)
|
||||
isExporting = true
|
||||
} label: {
|
||||
Label("Save", systemImage: "square.and.arrow.down")
|
||||
}
|
||||
.buttonStyle(.bordered)
|
||||
.buttonBorderShape(.capsule)
|
||||
.controlSize(idiom == .phone ? .regular : .large)
|
||||
.padding(.bottom)
|
||||
.padding(.trailing)
|
||||
}
|
||||
.onChange(of: selection) { _, newSelection in
|
||||
guard let metrics = localStats.first(where: { $0.id == newSelection }) else {
|
||||
return
|
||||
}
|
||||
chartSelection = metrics.time
|
||||
}
|
||||
}
|
||||
|
||||
private func noiseFloorColor(_ value: Float) -> Color {
|
||||
if value < -100 {
|
||||
return .green
|
||||
} else if value < -95 {
|
||||
return .green
|
||||
} else if value < -90 {
|
||||
return .orange
|
||||
} else {
|
||||
return .red
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1 +1 @@
|
|||
Subproject commit c8d5047b6351b732c0bccfcea6960a532f7ae49a
|
||||
Subproject commit 1b1dc090ef38f708a276dfb51b17de5ca06b3ade
|
||||
Loading…
Add table
Add a link
Reference in a new issue