From 231a160c1e6a34f74d98ce4c3aa84bd28226bcac Mon Sep 17 00:00:00 2001
From: Garth Vander Houwen <garthvh@yahoo.com>
Date: Thu, 15 Feb 2024 20:09:33 -0800
Subject: [PATCH] Let duty cycle restricted messages be retried

---
 Meshtastic/Protobufs/meshtastic/mesh.pb.swift      | 10 +++++-----
 Meshtastic/Views/Messages/ChannelMessageList.swift |  2 +-
 Meshtastic/Views/Messages/UserMessageList.swift    |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Meshtastic/Protobufs/meshtastic/mesh.pb.swift b/Meshtastic/Protobufs/meshtastic/mesh.pb.swift
index 080d9bfb..018be11c 100644
--- a/Meshtastic/Protobufs/meshtastic/mesh.pb.swift
+++ b/Meshtastic/Protobufs/meshtastic/mesh.pb.swift
@@ -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"),
diff --git a/Meshtastic/Views/Messages/ChannelMessageList.swift b/Meshtastic/Views/Messages/ChannelMessageList.swift
index 8b0aa8ab..8c311d7c 100644
--- a/Meshtastic/Views/Messages/ChannelMessageList.swift
+++ b/Meshtastic/Views/Messages/ChannelMessageList.swift
@@ -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)
 								}
 
diff --git a/Meshtastic/Views/Messages/UserMessageList.swift b/Meshtastic/Views/Messages/UserMessageList.swift
index 022d4ec0..b595576f 100644
--- a/Meshtastic/Views/Messages/UserMessageList.swift
+++ b/Meshtastic/Views/Messages/UserMessageList.swift
@@ -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)
 									}