From 75188851c1d97b054579b2c4f74fb6e466603211 Mon Sep 17 00:00:00 2001
From: richonguzman <richon2001@hotmail.com>
Date: Wed, 15 Mar 2023 20:05:31 -0300
Subject: [PATCH] testing more callsigns

---
 src/Lora_1W_APRS_Tracker.cpp | 26 ++++++++++++++++++++++++++
 src/beacon_config.h          | 24 +++++++++++++++++++++++-
 2 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/src/Lora_1W_APRS_Tracker.cpp b/src/Lora_1W_APRS_Tracker.cpp
index 68cfb02..30054f6 100644
--- a/src/Lora_1W_APRS_Tracker.cpp
+++ b/src/Lora_1W_APRS_Tracker.cpp
@@ -40,6 +40,14 @@ String CALLSIGN_CONFIG_3[10] = {User3_Callsign,User3_Symbol,String(User3_SlowRat
 								String(User3_FastRate),String(User3_FastSpeed),String(User3_MinDistTx),
 								String(User3_MinDeltaBcn),String(User3_TurnMinDeg),String(User3_TurnSlope)};
 
+String CALLSIGN_CONFIG_4[10] = {User4_Callsign,User4_Symbol,String(User4_SlowRate),String(User4_SlowSpeed),
+								String(User4_FastRate),String(User4_FastSpeed),String(User4_MinDistTx),
+								String(User4_MinDeltaBcn),String(User4_TurnMinDeg),String(User4_TurnSlope)};
+
+String CALLSIGN_CONFIG_5[10] = {User5_Callsign,User5_Symbol,String(User5_SlowRate),String(User5_SlowSpeed),
+								String(User5_FastRate),String(User5_FastSpeed),String(User5_MinDistTx),
+								String(User5_MinDeltaBcn),String(User5_TurnMinDeg),String(User5_TurnSlope)};
+
 
 void setup_lora_module() {
 	int state = radio.begin(LoraFreqTx, LoraBandWidth, LoraSpreadingFactor, LoraCodingRate, LoraSyncWord, LoraOutro, LoraPreampbleLenght);
@@ -70,6 +78,14 @@ void setup_first_user() {
 		for (int i = 0; i<10; i++) {
 			CurrentUser[i] = CALLSIGN_CONFIG_3[i];
 		}
+	} else if (FirstUser == 4) {
+		for (int i = 0; i<10; i++) {
+			CurrentUser[i] = CALLSIGN_CONFIG_4[i];
+		}
+	} else if (FirstUser == 5) {
+		for (int i = 0; i<10; i++) {
+			CurrentUser[i] = CALLSIGN_CONFIG_5[i];
+		}
 	}
 	Serial.print("Current User --> ");
 	Serial.println(CurrentUser[0]);
@@ -93,6 +109,16 @@ static void HandleNextBeacon() {
 			CurrentUser[i] = CALLSIGN_CONFIG_3[i];
 		}
 	} else if (CurrentUser[0] == CALLSIGN_CONFIG_3[0]) {
+		Serial.println(CALLSIGN_CONFIG_4[0]);
+		for (int i = 0; i<10; i++) {
+			CurrentUser[i] = CALLSIGN_CONFIG_4[i];
+		}
+	} else if (CurrentUser[0] == CALLSIGN_CONFIG_4[0]) {
+		Serial.println(CALLSIGN_CONFIG_5[0]);
+		for (int i = 0; i<10; i++) {
+			CurrentUser[i] = CALLSIGN_CONFIG_5[i];
+		}
+	} else if (CurrentUser[0] == CALLSIGN_CONFIG_5[0]) {
 		Serial.println(CALLSIGN_CONFIG_1[0]);
 		for (int i = 0; i<10; i++) {
 			CurrentUser[i] = CALLSIGN_CONFIG_1[i];
diff --git a/src/beacon_config.h b/src/beacon_config.h
index e1e290e..51e2972 100644
--- a/src/beacon_config.h
+++ b/src/beacon_config.h
@@ -1,7 +1,7 @@
 #ifndef BEACON_CONFIG_H_
 #define BEACON_CONFIG_H_
 
-#define FirstUser               2           // Select the First User at Tracker Start Up (Example: 1 means User1)
+#define FirstUser               1           // Select the First User at Tracker Start Up (Example: 1 means User1)
 #define AprsPath                "APLT00"    // APRS Destination (could be also "WIDE1-1" or even just "AP")
 #define AprsOverlay             "/"
 #define SendAltitude            true       // "true" adds Altitude to the APRS packet/message, "false" add Course+Speed
@@ -41,6 +41,28 @@
 #define User3_TurnMinDeg        10
 #define User3_TurnSlope         80
 
+#define User4_Callsign          "CD2RXU-4"  // This is my Callsign , so go on and change it to yours!!!
+#define User4_Symbol            "$"         // phone
+#define User4_SlowRate          120
+#define User4_SlowSpeed         10
+#define User4_FastRate          60
+#define User4_FastSpeed         70
+#define User4_MinDistTx         40
+#define User4_MinDeltaBcn       8
+#define User4_TurnMinDeg        10
+#define User4_TurnSlope         80
+
+#define User5_Callsign          "CD2RXU-15"  // This is my Callsign , so go on and change it to yours!!!
+#define User5_Symbol            "-"         // house
+#define User5_SlowRate          120
+#define User5_SlowSpeed         10
+#define User5_FastRate          60
+#define User5_FastSpeed         70
+#define User5_MinDistTx         50
+#define User5_MinDeltaBcn       8
+#define User5_TurnMinDeg        10
+#define User5_TurnSlope         80
+
 uint32_t    txCommentInterval   = 120*60*1000;	// 120 min!!!
 uint32_t 	tx15mInterval      	= 15*60*1000;	// 15 min!
 uint32_t 	tx60mInterval  		= 60*60*1000;	// 60 min!