From 5bd208bca161a741b3fa08c08e20878ebd360ff6 Mon Sep 17 00:00:00 2001
From: "Lucas C. Villa Real" <lucasvr@users.noreply.github.com>
Date: Sun, 26 Jan 2025 17:39:38 -0300
Subject: [PATCH] APRS: add frequency settings for Brazil (#2494)

* Add frequency settings for Brazil, named 'BR' that tunes to 145.570 MHz.
* Also added: Japan: 144.640 MHz (JAP), Thailand: 144.900 MHz (THA), Philippines: 144.740 MHz (PHI)
* Reordered list by increasing frequency
Co-authored-by: gullradriel <3157857+gullradriel@users.noreply.github.com>
---
 firmware/application/apps/ui_aprs_rx.cpp | 20 ++++++++++++++------
 firmware/application/apps/ui_aprs_rx.hpp | 12 ++++++++----
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/firmware/application/apps/ui_aprs_rx.cpp b/firmware/application/apps/ui_aprs_rx.cpp
index d5ff4f238..5a4ad63ca 100644
--- a/firmware/application/apps/ui_aprs_rx.cpp
+++ b/firmware/application/apps/ui_aprs_rx.cpp
@@ -99,13 +99,21 @@ APRSRxView::APRSRxView(NavigationView& nav, Rect parent_rect)
             field_frequency.set_value(aprs_rx_freq);
         } else if (i == 1) {  // NA - North America - is also the default
             field_frequency.set_value(144390000);
-        } else if (i == 2) {  // EUR
-            field_frequency.set_value(144800000);
-        } else if (i == 3) {  // AUS
-            field_frequency.set_value(145175000);
-        } else if (i == 4) {  // NZ
+        } else if (i == 2) {  // NZ
             field_frequency.set_value(144575000);
-        } else if (i == 5) {  // ISS
+        } else if (i == 3) {  // JAP
+            field_frequency.set_value(144640000);
+        } else if (i == 4) {  // PHI
+            field_frequency.set_value(144740000);
+        } else if (i == 5) {  // EUR
+            field_frequency.set_value(144800000);
+        } else if (i == 6) {  // THA
+            field_frequency.set_value(144900000);
+        } else if (i == 7) {  // AUS
+            field_frequency.set_value(145175000);
+        } else if (i == 8) {  // BR
+            field_frequency.set_value(145570000);
+        } else if (i == 9) {  // ISS
             field_frequency.set_value(145825000);
         }
         options_region_id = i;
diff --git a/firmware/application/apps/ui_aprs_rx.hpp b/firmware/application/apps/ui_aprs_rx.hpp
index 6761842d9..84b41da9d 100644
--- a/firmware/application/apps/ui_aprs_rx.hpp
+++ b/firmware/application/apps/ui_aprs_rx.hpp
@@ -227,10 +227,14 @@ class APRSRxView : public View {
         3,
         {{"MAN", 0},
          {"NA ", 1},
-         {"EUR", 2},
-         {"AUS", 3},
-         {"NZ ", 4},
-         {"ISS", 5}}};
+         {"NZ ", 2},
+         {"JAP", 3},
+         {"PHI", 4},
+         {"EUR", 5},
+         {"THA", 6},
+         {"AUS", 7},
+         {"BR ", 8},
+         {"ISS", 9}}};
 
     FrequencyField field_frequency{
         {3 * 8, 0 * 16}};