From be2182b23d12e09ed732b142cdf00114478c11cd Mon Sep 17 00:00:00 2001
From: Bob Larkin <bob@janbob.com>
Date: Sun, 13 Nov 2022 23:32:48 -0800
Subject: [PATCH] Added distance to station.

---
 examples/FT8Receive/FT8Receive.ino    | 10 ++++++++--
 examples/FT8Receive/Process_DSP_R.ino | 19 +++++++++----------
 examples/FT8Receive/decode_ft8R.ino   |  8 +++++++-
 examples/FT8Receive/locatorR.ino      |  7 ++-----
 4 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/examples/FT8Receive/FT8Receive.ino b/examples/FT8Receive/FT8Receive.ino
index 4315709..7cfe373 100644
--- a/examples/FT8Receive/FT8Receive.ino
+++ b/examples/FT8Receive/FT8Receive.ino
@@ -129,6 +129,8 @@ int Target_Flag = 0;
 char Target_Call[7]; //six character call sign + /0
 char Target_Locator[5]; // four character locator  + /0
 int Target_RSL; // four character RSL  + /0
+float32_t Station_Latitude, Station_Longitude;
+float32_t Target_Latitude, Target_Longitude;
 
 // Define FT8 symbol counts
 int ND = 58;
@@ -158,10 +160,14 @@ uint8_t secLast = 0;
 const int ledPin = 13;
 bool showPower = false;
 uint32_t tp = 0;
- uint32_t tu;
- uint32_t ct=0;
+uint32_t tu;
+uint32_t ct=0;
 
 void setup(void) {
+   strcpy(Station_Call, "W7PUA");
+   strcpy(home_Locator, "CN84");
+   Station_Latitude = mh2latf(home_Locator);
+   Station_Longitude = mh2lonf(home_Locator);
    // set the Time library to use Teensy 4.x's RTC to keep time
    setSyncProvider(getTeensy3Time);
    AudioMemory_F32(50, audio_settings);
diff --git a/examples/FT8Receive/Process_DSP_R.ino b/examples/FT8Receive/Process_DSP_R.ino
index 1461ad3..aad8129 100644
--- a/examples/FT8Receive/Process_DSP_R.ino
+++ b/examples/FT8Receive/Process_DSP_R.ino
@@ -48,21 +48,20 @@ float  fftOutput[2048];
 float   window[2048];  // Change to 1024 by symmetry  <<<<<<<<<<<<<<<<<<<
 arm_rfft_fast_instance_f32 Sfft;
 
-
-   float32_t powerSum = 0.0f;    // Use these for snr estimate
-   float32_t runningSum = 0.0f;
-   float32_t powerMax = 0.0f;
-   float32_t runningMax = 0.0f;
-   float32_t noiseBuffer[8];     // Circular storage
-   uint16_t  noiseBufferWrite = 0;   // Array index
-   bool      noiseMeasured = false;     // <<<<<<GLOBAL
-   uint8_t   noisePower8 = 0;         // half dB per noise estimate GLOBAL
+float32_t powerSum = 0.0f;    // Use these for snr estimate
+float32_t runningSum = 0.0f;
+float32_t powerMax = 0.0f;
+float32_t runningMax = 0.0f;
+float32_t noiseBuffer[8];     // Circular storage
+uint16_t  noiseBufferWrite = 0;   // Array index
+bool      noiseMeasured = false;     // <<<<<<GLOBAL
+uint8_t   noisePower8 = 0;         // half dB per noise estimate GLOBAL
 
 void init_DSP(void) {
    arm_rfft_fast_init_f32(&Sfft, 2048);
    for (int i = 0; i < FFT_SIZE; ++i)
       window[i] = ft_blackman_i(i, FFT_SIZE);
-   offset_step = 1472;    // (int) HIGH_FREQ_INDEX*4;             /// 1472
+   offset_step = 1472;    // (int) HIGH_FREQ_INDEX*4;
    }
 
 float ft_blackman_i(int i, int N) {
diff --git a/examples/FT8Receive/decode_ft8R.ino b/examples/FT8Receive/decode_ft8R.ino
index e6b7be4..b43b56c 100644
--- a/examples/FT8Receive/decode_ft8R.ino
+++ b/examples/FT8Receive/decode_ft8R.ino
@@ -251,7 +251,13 @@ void printFT8Received(void)  {
         Serial.print(message2);
         Serial.print(" dt="); Serial.print(new_decoded[kk].dTime); // secs
         Serial.print(" freq="); Serial.print(new_decoded[kk].freq_hz);
-        Serial.print(" snr="); Serial.println(new_decoded[kk].snr);
+        Serial.print(" snr="); Serial.print(new_decoded[kk].snr);
+		if(new_decoded[kk].distance > 0)
+		   {
+		   Serial.print(" km="); Serial.println(new_decoded[kk].distance);
+		   }
+	    else
+		   Serial.println("");
         }
 	Serial.println("");
 	}
diff --git a/examples/FT8Receive/locatorR.ino b/examples/FT8Receive/locatorR.ino
index 1efda87..1d0c03d 100644
--- a/examples/FT8Receive/locatorR.ino
+++ b/examples/FT8Receive/locatorR.ino
@@ -9,8 +9,6 @@
 
 const float32_t EARTH_RAD = 6371.0f;  //radius in km
 float32_t Latitude, Longitude;
-float32_t Station_Latitude, Station_Longitude;
-float32_t Target_Latitude, Target_Longitude;
 
 void set_Station_Coordinates(char station[]){
 	process_locator(station);
@@ -63,7 +61,6 @@ float32_t distancef(float32_t lat1, float32_t lon1, float32_t lat2, float32_t lo
 }
 
 // convert degrees to radians (i.e., * PI/180)
-float32_t deg2radf(float32_t deg)
-{
-    return deg * 0.017453292f;
+float32_t deg2radf(float32_t deg)                    {
+    return deg*0.017453292f;
 }