From 68591a740e93da5709abd62662394113b6a06b38 Mon Sep 17 00:00:00 2001
From: Dan Smith <dsmith@danplanet.com>
Date: Sun, 1 Sep 2024 14:06:53 -0700
Subject: [PATCH 1/2] ga510: Add airband for SenhaiX 8800

Fixes #11516
---
 chirp/chirp_common.py  |  8 ++++++++
 chirp/drivers/ga510.py | 28 ++++++++++++++++++++++++++++
 chirp/drivers/tdh8.py  | 20 +++++++-------------
 chirp/locale/bg_BG.po  | 12 ++++++++----
 chirp/locale/de.po     | 12 ++++++++----
 chirp/locale/el.po     | 12 ++++++++----
 chirp/locale/en_US.po  | 12 ++++++++----
 chirp/locale/es.po     | 12 ++++++++----
 chirp/locale/fr.po     | 12 ++++++++----
 chirp/locale/hu.po     | 12 ++++++++----
 chirp/locale/it.po     | 12 ++++++++----
 chirp/locale/ja_JP.po  | 12 ++++++++----
 chirp/locale/nl.po     | 12 ++++++++----
 chirp/locale/pl.po     | 12 ++++++++----
 chirp/locale/pt_BR.po  | 12 ++++++++----
 chirp/locale/ru.po     | 12 ++++++++----
 chirp/locale/tr_TR.po  | 12 ++++++++----
 chirp/locale/uk_UA.po  | 12 ++++++++----
 chirp/locale/zh_CN.po  | 12 ++++++++----
 19 files changed, 171 insertions(+), 77 deletions(-)

diff --git a/chirp/chirp_common.py b/chirp/chirp_common.py
index 65a99b05..3ec4f371 100644
--- a/chirp/chirp_common.py
+++ b/chirp/chirp_common.py
@@ -2063,3 +2063,11 @@ def mem_to_text(mem):
         elif mode == 'DTCS':
             pieces.append('D%03i' % tone)
     return '[%s]' % '/'.join(pieces)
+
+
+def in_range(freq, ranges):
+    """Check if freq is in any of the provided ranges"""
+    for lo, hi in ranges:
+        if lo <= freq <= hi:
+            return True
+    return False
diff --git a/chirp/drivers/ga510.py b/chirp/drivers/ga510.py
index e16385d8..9e10102e 100644
--- a/chirp/drivers/ga510.py
+++ b/chirp/drivers/ga510.py
@@ -35,6 +35,7 @@
 DTCS_CODES = tuple(sorted(chirp_common.DTCS_CODES + (645,)))
 
 DTMFCHARS = '0123456789ABCD*#'
+AIRBAND = (108000000, 136000000)
 
 
 def reset(radio):
@@ -1046,6 +1047,33 @@ class Senhaix8800Radio(RadioddityGA510Radio):
     _mem_format = MODEL_SHX8800_FORMAT
     _magic = b'PROGROMSHXU'
 
+    def get_features(self):
+        rf = super().get_features()
+        rf.valid_bands = rf.valid_bands + [AIRBAND]
+        rf.valid_modes = rf.valid_modes + ['AM']
+        return rf
+
+    def get_memory(self, number):
+        m = super().get_memory(number)
+        if chirp_common.in_range(m.freq, [AIRBAND]):
+            m.mode = 'AM'
+        return m
+
+    def validate_memory(self, mem):
+        msgs = []
+        if chirp_common.in_range(mem.freq, [AIRBAND]):
+            if not mem.mode == 'AM':
+                msgs.append(chirp_common.ValidationWarning(
+                    _('Frequency in this range requires AM mode')))
+            if mem.duplex or mem.tmode:
+                msgs.append(chirp_common.ValidationError(
+                    _('AM mode does not allow duplex or tone')))
+        elif not chirp_common.in_range(
+                mem.freq, [AIRBAND]) and mem.mode == 'AM':
+            msgs.append(chirp_common.ValidationWarning(
+                _('Frequency in this range must not be AM mode')))
+        return msgs + super().validate_memory(mem)
+
 
 @directory.register
 class RadioddityGS5BRadio(Senhaix8800Radio):
diff --git a/chirp/drivers/tdh8.py b/chirp/drivers/tdh8.py
index 53a6af07..2dd48677 100644
--- a/chirp/drivers/tdh8.py
+++ b/chirp/drivers/tdh8.py
@@ -811,13 +811,6 @@
 RT_730 = b"\x50\x47\x4F\x4A\x48\xC3\x44"
 
 
-def in_range(freq, ranges):
-    for lo, hi in ranges:
-        if lo <= freq <= hi:
-            return True
-    return False
-
-
 def _do_status(radio, block):
     status = chirp_common.Status()
     status.msg = "Cloning"
@@ -1259,9 +1252,9 @@ def get_memory(self, number):
                     FREQHOP_VALUES, FREQHOP_VALUES[_mem.freqhop]))
             mem.extra.append(rs)
 
-        if in_range(mem.freq, self._rxbands):
+        if chirp_common.in_range(mem.freq, self._rxbands):
             mem.duplex = 'off'
-        if in_range(mem.freq, [AIRBAND]):
+        if chirp_common.in_range(mem.freq, [AIRBAND]):
             mem.mode = 'AM'
 
         return mem
@@ -1328,7 +1321,7 @@ def set_memory(self, mem):
         else:
             _mem.txfreq = mem.freq / 10
 
-        if in_range(mem.freq, self._rxbands):
+        if chirp_common.in_range(mem.freq, self._rxbands):
             _mem.txfreq.fill_raw(b'\xFF')
 
         _mem.rxfreq = mem.freq / 10
@@ -2463,13 +2456,14 @@ def _set_fm_preset(self, settings):
 
     def validate_memory(self, mem):
         msgs = []
-        if in_range(mem.freq, [AIRBAND]) and not mem.mode == 'AM':
+        if chirp_common.in_range(mem.freq, [AIRBAND]) and not mem.mode == 'AM':
             msgs.append(chirp_common.ValidationWarning(
                 _('Frequency in this range requires AM mode')))
-        if not in_range(mem.freq, [AIRBAND]) and mem.mode == 'AM':
+        if not chirp_common.in_range(mem.freq, [AIRBAND]) and mem.mode == 'AM':
             msgs.append(chirp_common.ValidationWarning(
                 _('Frequency in this range must not be AM mode')))
-        if not in_range(mem.freq, self._txbands) and mem.duplex != 'off':
+        if (not chirp_common.in_range(mem.freq, self._txbands) and
+                mem.duplex != 'off'):
             msgs.append(chirp_common.ValidationWarning(
                 _('Frequency outside TX bands must be duplex=off')))
         return msgs + super().validate_memory(mem)
diff --git a/chirp/locale/bg_BG.po b/chirp/locale/bg_BG.po
index 1628fe20..4db641ef 100644
--- a/chirp/locale/bg_BG.po
+++ b/chirp/locale/bg_BG.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CHIRP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-08-31 08:35-0700\n"
+"POT-Creation-Date: 2024-09-01 16:01-0700\n"
 "PO-Revision-Date: 2024-07-05 10:00+0300\n"
 "Last-Translator: Стоян <stoyanster от гмаил>\n"
 "Language-Team: \n"
@@ -651,6 +651,10 @@ msgid ""
 "possible to download it!"
 msgstr ""
 
+#: ../drivers/ga510.py:1070
+msgid "AM mode does not allow duplex or tone"
+msgstr ""
+
 #: ../wxui/main.py:924
 msgid "About"
 msgstr "Относно"
@@ -1365,15 +1369,15 @@ msgstr "Честотата %s е извън поддържания обхват"
 msgid "Frequency granularity in kHz"
 msgstr "Стъпка на честотата в кХз"
 
-#: ../drivers/tdh8.py:2471
+#: ../drivers/ga510.py:1074 ../drivers/tdh8.py:2464
 msgid "Frequency in this range must not be AM mode"
 msgstr ""
 
-#: ../drivers/tdh8.py:2468
+#: ../drivers/ga510.py:1067 ../drivers/tdh8.py:2461
 msgid "Frequency in this range requires AM mode"
 msgstr ""
 
-#: ../drivers/tdh8.py:2474
+#: ../drivers/tdh8.py:2468
 msgid "Frequency outside TX bands must be duplex=off"
 msgstr ""
 
diff --git a/chirp/locale/de.po b/chirp/locale/de.po
index 81cfc7f9..add08549 100644
--- a/chirp/locale/de.po
+++ b/chirp/locale/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CHIRP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-08-31 08:35-0700\n"
+"POT-Creation-Date: 2024-09-01 16:01-0700\n"
 "PO-Revision-Date: 2012-10-02 22:11+0100\n"
 "Last-Translator: Benjamin, HB9EUK <hb9euk@hb9d.org>\n"
 "Language-Team: German\n"
@@ -647,6 +647,10 @@ msgid ""
 "possible to download it!"
 msgstr ""
 
+#: ../drivers/ga510.py:1070
+msgid "AM mode does not allow duplex or tone"
+msgstr ""
+
 #: ../wxui/main.py:924
 msgid "About"
 msgstr ""
@@ -1385,15 +1389,15 @@ msgstr ""
 msgid "Frequency granularity in kHz"
 msgstr ""
 
-#: ../drivers/tdh8.py:2471
+#: ../drivers/ga510.py:1074 ../drivers/tdh8.py:2464
 msgid "Frequency in this range must not be AM mode"
 msgstr ""
 
-#: ../drivers/tdh8.py:2468
+#: ../drivers/ga510.py:1067 ../drivers/tdh8.py:2461
 msgid "Frequency in this range requires AM mode"
 msgstr ""
 
-#: ../drivers/tdh8.py:2474
+#: ../drivers/tdh8.py:2468
 msgid "Frequency outside TX bands must be duplex=off"
 msgstr ""
 
diff --git a/chirp/locale/el.po b/chirp/locale/el.po
index 9638c665..37e36ea8 100644
--- a/chirp/locale/el.po
+++ b/chirp/locale/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CHIRP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-08-31 08:35-0700\n"
+"POT-Creation-Date: 2024-09-01 16:01-0700\n"
 "PO-Revision-Date: 2023-02-11 15:12+0200\n"
 "Last-Translator: Sokratis Alichanidis <sv2hzs@posteo.net>\n"
 "Language-Team: Greek\n"
@@ -651,6 +651,10 @@ msgstr ""
 "Μία νέα έκδοση του CHIRP είναι διαθέσιμη. Παρακαλούμε επισκεφθείτε την "
 "ιστοσελίδα το συντομότερο δυνατό για να την κατεβάσετε!"
 
+#: ../drivers/ga510.py:1070
+msgid "AM mode does not allow duplex or tone"
+msgstr ""
+
 #: ../wxui/main.py:924
 msgid "About"
 msgstr "Σχετικά"
@@ -1381,15 +1385,15 @@ msgstr ""
 msgid "Frequency granularity in kHz"
 msgstr ""
 
-#: ../drivers/tdh8.py:2471
+#: ../drivers/ga510.py:1074 ../drivers/tdh8.py:2464
 msgid "Frequency in this range must not be AM mode"
 msgstr ""
 
-#: ../drivers/tdh8.py:2468
+#: ../drivers/ga510.py:1067 ../drivers/tdh8.py:2461
 msgid "Frequency in this range requires AM mode"
 msgstr ""
 
-#: ../drivers/tdh8.py:2474
+#: ../drivers/tdh8.py:2468
 msgid "Frequency outside TX bands must be duplex=off"
 msgstr ""
 
diff --git a/chirp/locale/en_US.po b/chirp/locale/en_US.po
index 9cb264c0..9fa06854 100644
--- a/chirp/locale/en_US.po
+++ b/chirp/locale/en_US.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CHIRP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-08-31 08:35-0700\n"
+"POT-Creation-Date: 2024-09-01 16:01-0700\n"
 "PO-Revision-Date: 2011-11-29 16:07-0800\n"
 "Last-Translator: Dan Smith <dan@theine>\n"
 "Language-Team: English\n"
@@ -645,6 +645,10 @@ msgid ""
 "possible to download it!"
 msgstr ""
 
+#: ../drivers/ga510.py:1070
+msgid "AM mode does not allow duplex or tone"
+msgstr ""
+
 #: ../wxui/main.py:924
 msgid "About"
 msgstr ""
@@ -1371,15 +1375,15 @@ msgstr ""
 msgid "Frequency granularity in kHz"
 msgstr ""
 
-#: ../drivers/tdh8.py:2471
+#: ../drivers/ga510.py:1074 ../drivers/tdh8.py:2464
 msgid "Frequency in this range must not be AM mode"
 msgstr ""
 
-#: ../drivers/tdh8.py:2468
+#: ../drivers/ga510.py:1067 ../drivers/tdh8.py:2461
 msgid "Frequency in this range requires AM mode"
 msgstr ""
 
-#: ../drivers/tdh8.py:2474
+#: ../drivers/tdh8.py:2468
 msgid "Frequency outside TX bands must be duplex=off"
 msgstr ""
 
diff --git a/chirp/locale/es.po b/chirp/locale/es.po
index b7c5996b..06a02f1e 100644
--- a/chirp/locale/es.po
+++ b/chirp/locale/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CHIRP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-08-31 08:35-0700\n"
+"POT-Creation-Date: 2024-09-01 16:01-0700\n"
 "PO-Revision-Date: 2024-08-25 00:38-0400\n"
 "Last-Translator: MELERIX\n"
 "Language-Team: \n"
@@ -1022,6 +1022,10 @@ msgstr ""
 "Una nueva versión de CHIRP está disponible, ¡Por favor visita el sitio web "
 "tan pronto como sea posible para descargarla!"
 
+#: ../drivers/ga510.py:1070
+msgid "AM mode does not allow duplex or tone"
+msgstr ""
+
 #: ../wxui/main.py:924
 msgid "About"
 msgstr "Acerca de"
@@ -1858,15 +1862,15 @@ msgstr "La frecuencia %s está fuera del rango soportado"
 msgid "Frequency granularity in kHz"
 msgstr "Granularidad de frecuencia en kHz"
 
-#: ../drivers/tdh8.py:2471
+#: ../drivers/ga510.py:1074 ../drivers/tdh8.py:2464
 msgid "Frequency in this range must not be AM mode"
 msgstr ""
 
-#: ../drivers/tdh8.py:2468
+#: ../drivers/ga510.py:1067 ../drivers/tdh8.py:2461
 msgid "Frequency in this range requires AM mode"
 msgstr ""
 
-#: ../drivers/tdh8.py:2474
+#: ../drivers/tdh8.py:2468
 msgid "Frequency outside TX bands must be duplex=off"
 msgstr ""
 
diff --git a/chirp/locale/fr.po b/chirp/locale/fr.po
index 0583347d..90f56224 100644
--- a/chirp/locale/fr.po
+++ b/chirp/locale/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CHIRP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-08-31 08:35-0700\n"
+"POT-Creation-Date: 2024-09-01 16:01-0700\n"
 "PO-Revision-Date: 2024-05-22 16:39-0400\n"
 "Last-Translator: Alexandre J. Raymond <alexandre.j.raymond@gmail.com>\n"
 "Language-Team: French\n"
@@ -1020,6 +1020,10 @@ msgstr ""
 "Une nouvelle version de CHIRP est disponible. Visitez le site internet dès "
 "que possible pour la télécharger!"
 
+#: ../drivers/ga510.py:1070
+msgid "AM mode does not allow duplex or tone"
+msgstr ""
+
 #: ../wxui/main.py:924
 msgid "About"
 msgstr "À propos"
@@ -1858,15 +1862,15 @@ msgstr ""
 msgid "Frequency granularity in kHz"
 msgstr "Granularité fréquence en kHz"
 
-#: ../drivers/tdh8.py:2471
+#: ../drivers/ga510.py:1074 ../drivers/tdh8.py:2464
 msgid "Frequency in this range must not be AM mode"
 msgstr ""
 
-#: ../drivers/tdh8.py:2468
+#: ../drivers/ga510.py:1067 ../drivers/tdh8.py:2461
 msgid "Frequency in this range requires AM mode"
 msgstr ""
 
-#: ../drivers/tdh8.py:2474
+#: ../drivers/tdh8.py:2468
 msgid "Frequency outside TX bands must be duplex=off"
 msgstr ""
 
diff --git a/chirp/locale/hu.po b/chirp/locale/hu.po
index 1afe82a9..405aeeb3 100644
--- a/chirp/locale/hu.po
+++ b/chirp/locale/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CHIRP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-08-31 08:35-0700\n"
+"POT-Creation-Date: 2024-09-01 16:01-0700\n"
 "PO-Revision-Date: 2015-01-28 13:47+0100\n"
 "Last-Translator: Attila Joubert <joubert.attila@gmail.com>\n"
 "Language-Team: English\n"
@@ -646,6 +646,10 @@ msgid ""
 "possible to download it!"
 msgstr ""
 
+#: ../drivers/ga510.py:1070
+msgid "AM mode does not allow duplex or tone"
+msgstr ""
+
 #: ../wxui/main.py:924
 msgid "About"
 msgstr ""
@@ -1385,15 +1389,15 @@ msgstr ""
 msgid "Frequency granularity in kHz"
 msgstr ""
 
-#: ../drivers/tdh8.py:2471
+#: ../drivers/ga510.py:1074 ../drivers/tdh8.py:2464
 msgid "Frequency in this range must not be AM mode"
 msgstr ""
 
-#: ../drivers/tdh8.py:2468
+#: ../drivers/ga510.py:1067 ../drivers/tdh8.py:2461
 msgid "Frequency in this range requires AM mode"
 msgstr ""
 
-#: ../drivers/tdh8.py:2474
+#: ../drivers/tdh8.py:2468
 msgid "Frequency outside TX bands must be duplex=off"
 msgstr ""
 
diff --git a/chirp/locale/it.po b/chirp/locale/it.po
index 4fb8f512..fc306e0a 100644
--- a/chirp/locale/it.po
+++ b/chirp/locale/it.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CHIRP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-08-31 08:35-0700\n"
+"POT-Creation-Date: 2024-09-01 16:01-0700\n"
 "PO-Revision-Date: 2024-06-27 19:05+0200\n"
 "Last-Translator: Giovanni Scafora IK5TWZ <scafora.giovanni@gmail.com>\n"
 "Language-Team: CHIRP Italian Translation\n"
@@ -1029,6 +1029,10 @@ msgid ""
 msgstr ""
 "È disponibile una nuova versione di CHIRP. Visita il sito per scaricarla!"
 
+#: ../drivers/ga510.py:1070
+msgid "AM mode does not allow duplex or tone"
+msgstr ""
+
 #: ../wxui/main.py:924
 msgid "About"
 msgstr "Informazioni"
@@ -1866,15 +1870,15 @@ msgstr "La frequenza %s non rientra nel range supportato"
 msgid "Frequency granularity in kHz"
 msgstr "Granularità della frequenza in kHz"
 
-#: ../drivers/tdh8.py:2471
+#: ../drivers/ga510.py:1074 ../drivers/tdh8.py:2464
 msgid "Frequency in this range must not be AM mode"
 msgstr ""
 
-#: ../drivers/tdh8.py:2468
+#: ../drivers/ga510.py:1067 ../drivers/tdh8.py:2461
 msgid "Frequency in this range requires AM mode"
 msgstr ""
 
-#: ../drivers/tdh8.py:2474
+#: ../drivers/tdh8.py:2468
 msgid "Frequency outside TX bands must be duplex=off"
 msgstr ""
 
diff --git a/chirp/locale/ja_JP.po b/chirp/locale/ja_JP.po
index 1971940a..52302ad7 100644
--- a/chirp/locale/ja_JP.po
+++ b/chirp/locale/ja_JP.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CHIRP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-08-31 08:35-0700\n"
+"POT-Creation-Date: 2024-09-01 16:01-0700\n"
 "PO-Revision-Date: 2023-12-03 11:04+0900\n"
 "Last-Translator: weboo <weboo@users.noreply.github.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -659,6 +659,10 @@ msgstr ""
 "新しいバージョンのCHIRPが利用可能です。できるだけ早く更新されることをお勧めし"
 "ます。今すぐ更新しますか？"
 
+#: ../drivers/ga510.py:1070
+msgid "AM mode does not allow duplex or tone"
+msgstr ""
+
 #: ../wxui/main.py:924
 msgid "About"
 msgstr "このアプリについて"
@@ -1373,15 +1377,15 @@ msgstr ""
 msgid "Frequency granularity in kHz"
 msgstr ""
 
-#: ../drivers/tdh8.py:2471
+#: ../drivers/ga510.py:1074 ../drivers/tdh8.py:2464
 msgid "Frequency in this range must not be AM mode"
 msgstr ""
 
-#: ../drivers/tdh8.py:2468
+#: ../drivers/ga510.py:1067 ../drivers/tdh8.py:2461
 msgid "Frequency in this range requires AM mode"
 msgstr ""
 
-#: ../drivers/tdh8.py:2474
+#: ../drivers/tdh8.py:2468
 msgid "Frequency outside TX bands must be duplex=off"
 msgstr ""
 
diff --git a/chirp/locale/nl.po b/chirp/locale/nl.po
index 9597f70d..fc767ceb 100644
--- a/chirp/locale/nl.po
+++ b/chirp/locale/nl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CHIRP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-08-31 08:35-0700\n"
+"POT-Creation-Date: 2024-09-01 16:01-0700\n"
 "PO-Revision-Date: 2012-03-18 12:01+0100\n"
 "Last-Translator: Michael Tel <m.tel@xs4all.nl>\n"
 "Language-Team: Dutch\n"
@@ -646,6 +646,10 @@ msgid ""
 "possible to download it!"
 msgstr ""
 
+#: ../drivers/ga510.py:1070
+msgid "AM mode does not allow duplex or tone"
+msgstr ""
+
 #: ../wxui/main.py:924
 msgid "About"
 msgstr ""
@@ -1378,15 +1382,15 @@ msgstr ""
 msgid "Frequency granularity in kHz"
 msgstr ""
 
-#: ../drivers/tdh8.py:2471
+#: ../drivers/ga510.py:1074 ../drivers/tdh8.py:2464
 msgid "Frequency in this range must not be AM mode"
 msgstr ""
 
-#: ../drivers/tdh8.py:2468
+#: ../drivers/ga510.py:1067 ../drivers/tdh8.py:2461
 msgid "Frequency in this range requires AM mode"
 msgstr ""
 
-#: ../drivers/tdh8.py:2474
+#: ../drivers/tdh8.py:2468
 msgid "Frequency outside TX bands must be duplex=off"
 msgstr ""
 
diff --git a/chirp/locale/pl.po b/chirp/locale/pl.po
index a09332b0..c1fa7d06 100644
--- a/chirp/locale/pl.po
+++ b/chirp/locale/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CHIRP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-08-31 08:35-0700\n"
+"POT-Creation-Date: 2024-09-01 16:01-0700\n"
 "PO-Revision-Date: 2023-07-12 21:21+0200\n"
 "Last-Translator: szporwolik\n"
 "Language-Team: Polish\n"
@@ -664,6 +664,10 @@ msgstr ""
 "Nowa wersja programu CHIRP jest dostępna. Odwiedź stronę internetową "
 "projektu i pobierz ją!"
 
+#: ../drivers/ga510.py:1070
+msgid "AM mode does not allow duplex or tone"
+msgstr ""
+
 #: ../wxui/main.py:924
 msgid "About"
 msgstr "O programie"
@@ -1401,15 +1405,15 @@ msgstr ""
 msgid "Frequency granularity in kHz"
 msgstr ""
 
-#: ../drivers/tdh8.py:2471
+#: ../drivers/ga510.py:1074 ../drivers/tdh8.py:2464
 msgid "Frequency in this range must not be AM mode"
 msgstr ""
 
-#: ../drivers/tdh8.py:2468
+#: ../drivers/ga510.py:1067 ../drivers/tdh8.py:2461
 msgid "Frequency in this range requires AM mode"
 msgstr ""
 
-#: ../drivers/tdh8.py:2474
+#: ../drivers/tdh8.py:2468
 msgid "Frequency outside TX bands must be duplex=off"
 msgstr ""
 
diff --git a/chirp/locale/pt_BR.po b/chirp/locale/pt_BR.po
index 3334efcd..4a15921a 100644
--- a/chirp/locale/pt_BR.po
+++ b/chirp/locale/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CHIRP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-08-31 08:35-0700\n"
+"POT-Creation-Date: 2024-09-01 16:01-0700\n"
 "PO-Revision-Date: 2013-03-30 22:04-0300\n"
 "Last-Translator: Crezivando <crezivando@gmail.com>\n"
 "Language-Team: Language pt-BR\n"
@@ -645,6 +645,10 @@ msgid ""
 "possible to download it!"
 msgstr ""
 
+#: ../drivers/ga510.py:1070
+msgid "AM mode does not allow duplex or tone"
+msgstr ""
+
 #: ../wxui/main.py:924
 msgid "About"
 msgstr ""
@@ -1377,15 +1381,15 @@ msgstr ""
 msgid "Frequency granularity in kHz"
 msgstr ""
 
-#: ../drivers/tdh8.py:2471
+#: ../drivers/ga510.py:1074 ../drivers/tdh8.py:2464
 msgid "Frequency in this range must not be AM mode"
 msgstr ""
 
-#: ../drivers/tdh8.py:2468
+#: ../drivers/ga510.py:1067 ../drivers/tdh8.py:2461
 msgid "Frequency in this range requires AM mode"
 msgstr ""
 
-#: ../drivers/tdh8.py:2474
+#: ../drivers/tdh8.py:2468
 msgid "Frequency outside TX bands must be duplex=off"
 msgstr ""
 
diff --git a/chirp/locale/ru.po b/chirp/locale/ru.po
index bac395d2..c3499ca8 100644
--- a/chirp/locale/ru.po
+++ b/chirp/locale/ru.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CHIRP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-08-31 08:35-0700\n"
+"POT-Creation-Date: 2024-09-01 16:01-0700\n"
 "PO-Revision-Date: 2023-10-11 16:47+0300\n"
 "Last-Translator: Olesya Gerasimenko <translation-team@basealt.ru>\n"
 "Language-Team: Basealt Translation Team\n"
@@ -993,6 +993,10 @@ msgstr ""
 "Доступная новая версия программы CHIRP. Как можно скорее загрузите её на веб-"
 "сайте!"
 
+#: ../drivers/ga510.py:1070
+msgid "AM mode does not allow duplex or tone"
+msgstr ""
+
 #: ../wxui/main.py:924
 msgid "About"
 msgstr "О программе"
@@ -1831,15 +1835,15 @@ msgstr ""
 msgid "Frequency granularity in kHz"
 msgstr ""
 
-#: ../drivers/tdh8.py:2471
+#: ../drivers/ga510.py:1074 ../drivers/tdh8.py:2464
 msgid "Frequency in this range must not be AM mode"
 msgstr ""
 
-#: ../drivers/tdh8.py:2468
+#: ../drivers/ga510.py:1067 ../drivers/tdh8.py:2461
 msgid "Frequency in this range requires AM mode"
 msgstr ""
 
-#: ../drivers/tdh8.py:2474
+#: ../drivers/tdh8.py:2468
 msgid "Frequency outside TX bands must be duplex=off"
 msgstr ""
 
diff --git a/chirp/locale/tr_TR.po b/chirp/locale/tr_TR.po
index 8a62b55b..992f71df 100644
--- a/chirp/locale/tr_TR.po
+++ b/chirp/locale/tr_TR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CHIRP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-08-31 08:35-0700\n"
+"POT-Creation-Date: 2024-09-01 16:01-0700\n"
 "PO-Revision-Date: 2024-08-30 00:06+0300\n"
 "Last-Translator: Abdullah YILMAZ (TA1AUB) <h.abdullahyilmaz@hotmail.com>\n"
 "Language-Team: TURKISH\n"
@@ -990,6 +990,10 @@ msgstr ""
 "Yeni bir CHIRP sürümü mevcut. İndirmek için lütfen en kısa zamanda web "
 "sitesini ziyaret edin!"
 
+#: ../drivers/ga510.py:1070
+msgid "AM mode does not allow duplex or tone"
+msgstr ""
+
 #: ../wxui/main.py:924
 msgid "About"
 msgstr "Hakkında"
@@ -1816,15 +1820,15 @@ msgstr "Frekans %s desteklenen aralığın dışında"
 msgid "Frequency granularity in kHz"
 msgstr "kHz cinsinden frekans ayrıntı düzeyi"
 
-#: ../drivers/tdh8.py:2471
+#: ../drivers/ga510.py:1074 ../drivers/tdh8.py:2464
 msgid "Frequency in this range must not be AM mode"
 msgstr "Bu aralıktaki frekans AM modu olmamalıdır"
 
-#: ../drivers/tdh8.py:2468
+#: ../drivers/ga510.py:1067 ../drivers/tdh8.py:2461
 msgid "Frequency in this range requires AM mode"
 msgstr "Bu aralıktaki frekans AM modunu gerektirir"
 
-#: ../drivers/tdh8.py:2474
+#: ../drivers/tdh8.py:2468
 msgid "Frequency outside TX bands must be duplex=off"
 msgstr "TX bantları dışındaki frekanslar dupleks=kapalı olmalıdır"
 
diff --git a/chirp/locale/uk_UA.po b/chirp/locale/uk_UA.po
index 4fd0c6b2..fb566187 100644
--- a/chirp/locale/uk_UA.po
+++ b/chirp/locale/uk_UA.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CHIRP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-08-31 08:35-0700\n"
+"POT-Creation-Date: 2024-09-01 16:01-0700\n"
 "PO-Revision-Date: 2015-11-30 10:36+0200\n"
 "Last-Translator: laser <student.laser@gmail.com>\n"
 "Language-Team: laser <student.laser@gmail.com>\n"
@@ -645,6 +645,10 @@ msgid ""
 "possible to download it!"
 msgstr ""
 
+#: ../drivers/ga510.py:1070
+msgid "AM mode does not allow duplex or tone"
+msgstr ""
+
 #: ../wxui/main.py:924
 msgid "About"
 msgstr ""
@@ -1381,15 +1385,15 @@ msgstr ""
 msgid "Frequency granularity in kHz"
 msgstr ""
 
-#: ../drivers/tdh8.py:2471
+#: ../drivers/ga510.py:1074 ../drivers/tdh8.py:2464
 msgid "Frequency in this range must not be AM mode"
 msgstr ""
 
-#: ../drivers/tdh8.py:2468
+#: ../drivers/ga510.py:1067 ../drivers/tdh8.py:2461
 msgid "Frequency in this range requires AM mode"
 msgstr ""
 
-#: ../drivers/tdh8.py:2474
+#: ../drivers/tdh8.py:2468
 msgid "Frequency outside TX bands must be duplex=off"
 msgstr ""
 
diff --git a/chirp/locale/zh_CN.po b/chirp/locale/zh_CN.po
index 0f748c4b..866b22ca 100644
--- a/chirp/locale/zh_CN.po
+++ b/chirp/locale/zh_CN.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CHIRP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-08-31 08:35-0700\n"
+"POT-Creation-Date: 2024-09-01 16:01-0700\n"
 "PO-Revision-Date: 2024-01-26 13:30+0800\n"
 "Last-Translator: DuckSoft, BH2UEP <realducksoft@gmail.com>\n"
 "Language-Team: \n"
@@ -654,6 +654,10 @@ msgid ""
 "possible to download it!"
 msgstr "新的 CHIRP 版本已经推出。请尽快访问网站下载！"
 
+#: ../drivers/ga510.py:1070
+msgid "AM mode does not allow duplex or tone"
+msgstr ""
+
 #: ../wxui/main.py:924
 msgid "About"
 msgstr ""
@@ -1403,15 +1407,15 @@ msgstr ""
 msgid "Frequency granularity in kHz"
 msgstr ""
 
-#: ../drivers/tdh8.py:2471
+#: ../drivers/ga510.py:1074 ../drivers/tdh8.py:2464
 msgid "Frequency in this range must not be AM mode"
 msgstr ""
 
-#: ../drivers/tdh8.py:2468
+#: ../drivers/ga510.py:1067 ../drivers/tdh8.py:2461
 msgid "Frequency in this range requires AM mode"
 msgstr ""
 
-#: ../drivers/tdh8.py:2474
+#: ../drivers/tdh8.py:2468
 msgid "Frequency outside TX bands must be duplex=off"
 msgstr ""
 

From 965f461660d68c98820f9c7ab601052a5a78a36c Mon Sep 17 00:00:00 2001
From: Dan Smith <dsmith@danplanet.com>
Date: Sun, 1 Sep 2024 14:50:52 -0700
Subject: [PATCH 2/2] Add Retevis RB626

Fixes #11515
---
 chirp/drivers/retevis_rt21.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/chirp/drivers/retevis_rt21.py b/chirp/drivers/retevis_rt21.py
index f9466172..083b4e7c 100644
--- a/chirp/drivers/retevis_rt21.py
+++ b/chirp/drivers/retevis_rt21.py
@@ -1927,6 +1927,12 @@ def process_mmap(self):
         self._memobj = bitwise.parse(MEM_FORMAT_RB26, self._mmap)
 
 
+@directory.register
+class RB626(RB26Radio):
+    MODEL = 'RB626'
+    _gmrs = False
+
+
 @directory.register
 class RT76Radio(RT21Radio):
     """RETEVIS RT76"""