From 70deafa419596288a74ed39a5d0ea535ffd701ac Mon Sep 17 00:00:00 2001 From: richonguzman Date: Mon, 30 Jan 2023 00:25:21 -0300 Subject: [PATCH] finally Turn Slope --- extra/turn_slope_calculations.xlsx | Bin 14894 -> 14910 bytes src/Lora_1W_APRS_Tracker.cpp | 9 +++++++-- src/beacon_config.h | 26 +++++++++++++------------- 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/extra/turn_slope_calculations.xlsx b/extra/turn_slope_calculations.xlsx index c8c2b1626d665c3f3e9628a5a7c7abefb8ece610..86fd55613a2addb1ef82313a44d3af1f0dc9fa6d 100644 GIT binary patch delta 7859 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 diff --git a/src/Lora_1W_APRS_Tracker.cpp b/src/Lora_1W_APRS_Tracker.cpp index 935114a..48b8ee0 100644 --- a/src/Lora_1W_APRS_Tracker.cpp +++ b/src/Lora_1W_APRS_Tracker.cpp @@ -152,7 +152,8 @@ void loop() { int MinimumDistanceTx = CurrentUser[6].toInt(); int MinimumTimeDeltaBeacon = CurrentUser[7].toInt(); int TurnMinDegrees = CurrentUser[8].toInt(); - int TurnSlope = CurrentUser[9].toInt(); + int TurnSlope = CurrentUser[9].toInt(); + int TurnMinAngle; currentHeading = gps.course.deg(); lastTxDistance = TinyGPSPlus::distanceBetween(gps.location.lat(), gps.location.lng(), lastTxLatitude, lastTxLongitude); @@ -165,7 +166,11 @@ void loop() { if (!send_update) { double headingDelta = abs(previousHeading - currentHeading); if (lastTx > MinimumTimeDeltaBeacon * 1000) { - int TurnMinAngle = TurnMinDegrees + (TurnSlope/CurrentSpeed); + if (CurrentSpeed == 0) { + TurnMinAngle = TurnMinDegrees + (TurnSlope/(CurrentSpeed + 1)); + } else { + TurnMinAngle = TurnMinDegrees + (TurnSlope/CurrentSpeed); + } if (headingDelta > TurnMinAngle && lastTxDistance > MinimumDistanceTx) { send_update = true; mensaje_test = "C:" + String(headingDelta) + " D:" + String(lastTxDistance) + " I:" + String(txInterval); diff --git a/src/beacon_config.h b/src/beacon_config.h index 50c557b..09149d4 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 3 // 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 "AP" // APRS Destination (could be also "WIDE1-1") #define AprsOverlay "/" #define SendAltitude true // "true" adds Altitude to the APRS packet/message, "false" add Course+Speed @@ -10,14 +10,14 @@ #define User1_Callsign "CD2RXU-7" #define User1_Symbol "[" // Runner -#define User1_SlowRate 120 -#define User1_SlowSpeed 3 -#define User1_FastRate 60 -#define User1_FastSpeed 15 -#define User1_MinDistTx 5 // debe ser 50 pero esta 5 por pruebas -#define User1_MinDeltaBcn 20 -#define User1_TurnMinDeg 3 -#define User1_TurnSlope 70 +#define User1_SlowRate 120 // seg +#define User1_SlowSpeed 3 // km/h +#define User1_FastRate 60 // seg +#define User1_FastSpeed 15 // km/h +#define User1_MinDistTx 5 // debe ser 100 pero esta 5 por pruebas +#define User1_MinDeltaBcn 20 // seg between beacon update +#define User1_TurnMinDeg 3 // degrees +#define User1_TurnSlope 40 // constant #define User2_Callsign "CD2RXU-8" #define User2_Symbol "b" // Bicycle @@ -25,10 +25,10 @@ #define User2_SlowSpeed 5 #define User2_FastRate 60 #define User2_FastSpeed 40 -#define User2_MinDistTx 70 +#define User2_MinDistTx 100 #define User2_MinDeltaBcn 12 -#define User2_TurnMinDeg 15 -#define User2_TurnSlope 70 +#define User2_TurnMinDeg 12 +#define User2_TurnSlope 60 #define User3_Callsign "CD2RXU-9" #define User3_Symbol ">" // Car @@ -38,7 +38,7 @@ #define User3_FastSpeed 70 #define User3_MinDistTx 100 #define User3_MinDeltaBcn 8 -#define User3_TurnMinDeg 12 +#define User3_TurnMinDeg 10 #define User3_TurnSlope 80 #endif \ No newline at end of file