Merge branch 'LiveTrack24FARM' of https://github.com/ToninoTarsi/LK8000

LK8000 · Dec 2, 2016 · a78de03 · a78de03
2 parents 739dbde + e90dbe1
commit a78de03
Show file tree

Hide file tree

Showing 19 changed files with 3,145 additions and 708 deletions.
diff --git a/Common/Data/Dialogs/dlgConfigPilot_L.xml b/Common/Data/Dialogs/dlgConfigPilot_L.xml
@@ -7,6 +7,9 @@
       <WndProperty Name="prpLiveTrackerInterval" Caption="_@M1779_" X="2" Y="70" Width="-1" Height="22" CaptionWidth="150" Font="2" Help="_@H1258_">
         <DataField Name="" DataType="double" DisplayFormat="%.0f %s" EditFormat="%.0f" Min="0.0" Max="60.0" Step="1.0" />
       </WndProperty>
+      <WndProperty Name="prpLiveTrackerRadar_config" Caption="_@M2322_" X="2" Y="-1" Width="-1" Height="22" CaptionWidth="150" Font="2" Help="_@H1295_">
+        <DataField Name="" DataType="boolean"/>
+      </WndProperty>
       <WndButton Name="cmdLiveTrackersrv" Caption="_@M1782_" X="2" Y="-1" Width="200"  Height="25" Font="2" />
       <WndButton Name="cmdLiveTrackerport" Caption="Port" X="202" Y="-999" Width="-1"  Height="25" Font="2" />
       <WndButton Name="cmdLiveTrackerusr" Caption="_@M1780_" X="2" Y="-1" Width="117"  Height="25" Font="2" />

diff --git a/Common/Data/Dialogs/dlgConfigPilot_P.xml b/Common/Data/Dialogs/dlgConfigPilot_P.xml
@@ -8,8 +8,11 @@
     <WndProperty Name="prpLiveTrackerInterval" Caption="_@M1779_" X="2" Y="70" Width="235" Height="25" CaptionWidth="150" Font="2" Help="_@H1258_">
       <DataField Name="" DataType="double" DisplayFormat="%.0f %s" EditFormat="%.0f" Min="0.0" Max="60.0" Step="1.0" />
     </WndProperty>
+    <WndProperty Name="prpLiveTrackerRadar_config" Caption="_@M2322_" X="-1" Y="-1" Width="-1" Height="22" CaptionWidth="150" Font="2" Help="_@H1294_">
+      <DataField Name="" DataType="boolean"/>
+    </WndProperty>
     <WndButton Name="cmdLiveTrackersrv" Caption="_@M1782_" X="2" Y="-1" Width="200"  Height="25" Font="2" />
-	<WndButton Name="cmdLiveTrackerport" Caption="Port" X="202" Y="-999" Width="35"  Height="25" Font="2" />
+    <WndButton Name="cmdLiveTrackerport" Caption="Port" X="202" Y="-999" Width="35"  Height="25" Font="2" />
     <WndButton Name="cmdLiveTrackerusr" Caption="_@M1780_" X="2" Y="-1" Width="117"  Height="25" Font="2" />
     <WndButton Name="cmdLiveTrackerpwd" Caption="_@M1781_" X="120" Y="-999" Width="117"  Height="25" Font="2" />
   </WndForm>

diff --git a/Common/Data/Language/ENG_HELP.TXT b/Common/Data/Language/ENG_HELP.TXT
@@ -1866,5 +1866,9 @@ The first three overlays on top cannot be changed, only disabled.
 [Aircraft symbol]
 Choose the symbol you want to see on the main map
 
+@1295
+[LiveTrack24 Radar]
+If enabled the FLARM system will be feed with data from LiveTrack24.com server
+
 @9999
 No help available on this item!
diff --git a/Common/Data/Language/ENG_MSG.TXT b/Common/Data/Language/ENG_MSG.TXT
@@ -2212,4 +2212,4 @@ _@M2318_ "Paraglider"
 _@M2319_ "Hangglider"
 _@M2320_ "Glider"
 _@M2321_ "Aircraft"
-
+_@M2322_ "Enable Radar"
diff --git a/Common/Data/Language/ToDo.TXT b/Common/Data/Language/ToDo.TXT
@@ -400,7 +400,7 @@ _@M2318_ "Paraglider"
 _@M2319_ "Hangglider"
 _@M2320_ "Glider"
 _@M2321_ "Aircraft"
-
+_@M2322_ "Enable Radar"
 
 HELP FILE
 

diff --git a/Common/Header/Globals.h b/Common/Header/Globals.h
@@ -736,6 +736,7 @@ GEXTERN int TeamFlarmIdTarget;    // FlarmId of the glider to track
 
 GEXTERN bool DisableAutoLogger;
 GEXTERN int LiveTrackerInterval;
+GEXTERN bool LiveTrackerRadar_config;  // feed FLARM with Livetrack24 livedata only in PG/HG mode
 
 // Interface Globals
 GEXTERN StatusMessageSTRUCT StatusMessageData[MAXSTATUSMESSAGECACHE];

diff --git a/Common/Header/LKProfiles.h b/Common/Header/LKProfiles.h
@@ -188,6 +188,7 @@ char szRegistryDeviceA[]= "DeviceA";
 char szRegistryDeviceB[]= "DeviceB";
 char szRegistryDisableAutoLogger[] = "DisableAutoLogger";
 char szRegistryLiveTrackerInterval[] = "LiveTrackerInterval";
+char szRegistryLiveTrackerRadar_config[] = "LiveTrackerRadar_config";
 char szRegistryDisplayText[] = "DisplayText2";
 char szRegistryDisplayUpValue[] = "DisplayUp";
 char szRegistryDistanceUnitsValue[] = "DistanceUnits";
@@ -505,6 +506,7 @@ extern const char szRegistryDeviceA[];
 extern const char szRegistryDeviceB[];
 extern const char szRegistryDisableAutoLogger[];
 extern const char szRegistryLiveTrackerInterval[];
+extern const char szRegistryLiveTrackerRadar_config[];
 extern const char szRegistryDisplayText[];
 extern const char szRegistryDisplayUpValue[];
 extern const char szRegistryDistanceUnitsValue[];

diff --git a/Common/Header/LiveTrack24APIKey.h b/Common/Header/LiveTrack24APIKey.h
@@ -0,0 +1,13 @@
+/*
+   LK8000 Tactical Flight Computer -  WWW.LK8000.IT
+   Released under GNU/GPL License v.2
+   See CREDITS.TXT file for authors and copyrights
+*/
+
+#ifndef LIVETRACKER24APIKEY_H
+#define LIVETRACKER24APIKEY_H
+
+const char appKey[] = "o42Sc";
+const char appSecret[] = "fasf45gvldTGgdD6h7563HndydhhmsNJsdmhsn4KKSsF45hGS5ggdgdHhhsd67";
+
+#endif // LIVETRACKER24APIKEY_H