External wind via $LXWP0 added

LK8000 · Mar 21, 2019 · cc462c5 · cc462c5
1 parent 991c781
commit cc462c5
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 15 deletions.
diff --git a/Common/Source/Devices/devLX16xx.cpp b/Common/Source/Devices/devLX16xx.cpp
@@ -356,12 +356,12 @@ bool DevLX16xx::LXWP0(PDeviceDescriptor_t d, const TCHAR* sentence, NMEA_INFO* i
     info->VarioAvailable = FALSE;
 
 
-
- /*
   if (ParToDouble(sentence, 10, &info->ExternalWindDirection) &&
       ParToDouble(sentence, 11, &info->ExternalWindSpeed))
+  {
+    info->ExternalWindSpeed /= TOKPH;  /* convert to m/s */
     info->ExternalWindAvailable = TRUE;
-*/
+  }
   TriggerVarioUpdate();
 
   return(true);

diff --git a/Common/Source/Devices/devLXV7.cpp b/Common/Source/Devices/devLXV7.cpp
@@ -342,12 +342,10 @@ BOOL DevLXV7::ParseNMEA(PDeviceDescriptor_t d, TCHAR* sentence, NMEA_INFO* info)
                 else
                     if (_tcsncmp(_T("$LXWP2"), sentence, 6) == 0)
                         return LXWP2(d, sentence + 7, info);
-
-
-                    #ifdef OLD_LX_SENTENCES
 	            else
                         if (_tcsncmp(_T("$LXWP0"), sentence, 6) == 0)
-                            return LXWP0(d, sentence + 7, info);
+                          return LXWP0(d, sentence + 7, info);
+#ifdef OLD_LX_SENTENCES
                         else
                             if (_tcsncmp(_T("$LXWP1"), sentence, 6) == 0)
                                 return LXWP1(d, sentence + 7, info);
@@ -391,11 +389,14 @@ bool DevLXV7::LXWP0(PDeviceDescriptor_t d, const TCHAR* sentence, NMEA_INFO* inf
 
 
 
- /*
+
   if (ParToDouble(sentence, 10, &info->ExternalWindDirection) &&
       ParToDouble(sentence, 11, &info->ExternalWindSpeed))
+  {
+    info->ExternalWindSpeed /=  TOKPH;
     info->ExternalWindAvailable = TRUE;
-*/
+  }
+
 //  TriggerVarioUpdate();
 
   return(false);

diff --git a/Common/Source/Devices/devLXV7_EXP.cpp b/Common/Source/Devices/devLXV7_EXP.cpp
@@ -547,11 +547,10 @@ else
       else
         if (_tcsncmp(_T("$LXWP1"), sentence, 6) == 0)
           return LXWP1(d, sentence + 7, info);
-
-#ifdef OLD_LX_SENTENCES
 	else
-      if (_tcsncmp(_T("$LXWP0"), sentence, 6) == 0)
-        return LXWP0(d, sentence + 7, info);
+	  if (_tcsncmp(_T("$LXWP0"), sentence, 6) == 0)
+	    return LXWP0(d, sentence + 7, info);
+#ifdef OLD_LX_SENTENCES
       else
         if (_tcsncmp(_T("$LXWP1"), sentence, 6) == 0)
           return LXWP1(d, sentence + 7, info);
@@ -594,11 +593,14 @@ bool DevLXV7_EXP::LXWP0(PDeviceDescriptor_t d, const TCHAR* sentence, NMEA_INFO*
 
 
 
- /*
+
   if (ParToDouble(sentence, 10, &info->ExternalWindDirection) &&
       ParToDouble(sentence, 11, &info->ExternalWindSpeed))
+  {
+    info->ExternalWindSpeed /=  TOKPH;
     info->ExternalWindAvailable = TRUE;
-*/
+  }
+
 //  TriggerVarioUpdate();
 
   return(false);