From 7ad2bee1a8b3064ea6a3c5b2e684b2d39d3ecf1b Mon Sep 17 00:00:00 2001 From: durk Date: Sat, 31 Jan 2009 08:36:11 +0000 Subject: [PATCH] Brian Schack: Patch to the atlas protocol that allows nav1 &2 frequencies and radials, as well the selected ADF frequency to be transmitted to Atlas DT: Two minor modifications to the adf part to make it work, and some testing. --- src/Network/atlas.cxx | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/src/Network/atlas.cxx b/src/Network/atlas.cxx index e1e7d55bc..f0738a12f 100644 --- a/src/Network/atlas.cxx +++ b/src/Network/atlas.cxx @@ -29,6 +29,8 @@ #include + + #include #include
#include
@@ -69,11 +71,15 @@ bool FGAtlas::gen_message() { // cout << "generating atlas message" << endl; static SGPropertyNode *adf_freq - = fgGetNode("/instrumentation/adf/outputs/selected-khz", true); - static SGPropertyNode *nav_freq + = fgGetNode("/instrumentation/adf/frequencies/selected-khz", true); + static SGPropertyNode *nav1_freq = fgGetNode("/instrumentation/nav/frequencies/selected-mhz", true); - static SGPropertyNode *nav_sel_radial + static SGPropertyNode *nav1_sel_radial = fgGetNode("/instrumentation/nav/radials/selected-deg", true); + static SGPropertyNode *nav2_freq + = fgGetNode("/instrumentation/nav[1]/frequencies/selected-mhz", true); + static SGPropertyNode *nav2_sel_radial + = fgGetNode("/instrumentation/nav[1]/radials/selected-deg", true); char rmc[256], gga[256], patla[256]; char rmc_sum[10], gga_sum[10], patla_sum[10]; @@ -138,10 +144,10 @@ bool FGAtlas::gen_message() { sprintf( gga_sum, "%02X", calc_atlas_cksum(gga) ); sprintf( patla, "PATLA,%.2f,%.1f,%.2f,%.1f,%.0f", - nav_freq->getDoubleValue(), - nav_sel_radial->getDoubleValue(), - nav_freq->getDoubleValue(), - nav_sel_radial->getDoubleValue(), + nav1_freq->getDoubleValue(), + nav1_sel_radial->getDoubleValue(), + nav2_freq->getDoubleValue(), + nav2_sel_radial->getDoubleValue(), adf_freq->getDoubleValue() ); sprintf( patla_sum, "%02X", calc_atlas_cksum(patla) );