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

Let duty cycle restricted messages be retried

Browse source
This commit is contained in:
Garth Vander Houwen 2024-02-15 20:09:33 -08:00
parent 36f7ae16c6
commit 231a160c1e
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -203,7 +203,7 @@ enum HardwareModel: SwiftProtobuf.Enum {
///
/// Heltec Wireless Tracker with ESP32-S3 CPU, built-in GPS, and TFT
/// Newer V1.1, version is written on the PCB near the display.
case heltecWirelessTrackerV11 // = 48
case heltecWirelessTracker // = 48
///
/// Heltec Wireless Paper with ESP32-S3 CPU and E-Ink display
@ -307,7 +307,7 @@ enum HardwareModel: SwiftProtobuf.Enum {
case 45: self = .betafpv2400Tx
case 46: self = .betafpv900NanoTx
case 47: self = .rpiPico
case 48: self = .heltecWirelessTrackerV11
case 48: self = .heltecWirelessTracker
case 49: self = .heltecWirelessPaper
case 50: self = .tDeck
case 51: self = .tWatchS3
@ -367,7 +367,7 @@ enum HardwareModel: SwiftProtobuf.Enum {
case .betafpv2400Tx: return 45
case .betafpv900NanoTx: return 46
case .rpiPico: return 47
case .heltecWirelessTrackerV11: return 48
case .heltecWirelessTracker: return 48
case .heltecWirelessPaper: return 49
case .tDeck: return 50
case .tWatchS3: return 51
@ -432,7 +432,7 @@ extension HardwareModel: CaseIterable {
.betafpv2400Tx,
.betafpv900NanoTx,
.rpiPico,
.heltecWirelessTrackerV11,
.heltecWirelessTracker,
.heltecWirelessPaper,
.tDeck,
.tWatchS3,
@ -2622,7 +2622,7 @@ extension HardwareModel: SwiftProtobuf._ProtoNameProviding {
45: .same(proto: "BETAFPV_2400_TX"),
46: .same(proto: "BETAFPV_900_NANO_TX"),
47: .same(proto: "RPI_PICO"),
48: .same(proto: "HELTEC_WIRELESS_TRACKER_V1_1"),
48: .same(proto: "HELTEC_WIRELESS_TRACKER"),
49: .same(proto: "HELTEC_WIRELESS_PAPER"),
50: .same(proto: "T_DECK"),
51: .same(proto: "T_WATCH_S3"),

2
Meshtastic/Views/Messages/ChannelMessageList.swift
View file

@ -225,7 +225,7 @@ struct ChannelMessageList: View {
.padding(.bottom)
.id(channel.allPrivateMessages.firstIndex(of: message))
if currentUser && (message.ackError == 5 || message.ackError == 3) {
if currentUser && (message.ackError == 9 || message.ackError == 5 || message.ackError == 3) {
RetryButton(message: message)
}

2
Meshtastic/Views/Messages/UserMessageList.swift
View file

@ -203,7 +203,7 @@ struct UserMessageList: View {
.padding(.bottom)
.id(user.messageList.firstIndex(of: message))
if currentUser && (message.ackError == 5 || message.ackError == 3) || (message.receivedACK && !message.realACK) {
if currentUser && (message.ackError == 9 || message.ackError == 5 || message.ackError == 3) || (message.receivedACK && !message.realACK) {
RetryButton(message: message)
}