Added static port system and a new altimeter model connected to it.

[flightgear.git] / src / Network / atlas.cxx

diff --git a/src/Network/atlas.cxx b/src/Network/atlas.cxx
index ea75d22b19e7225a04d63d519859c847b8841351..6e7b63de08bff39df470081030df27783272ffee 100644 (file)
--- a/src/Network/atlas.cxx
+++ b/src/Network/atlas.cxx
@@ -63,6 +63,9 @@ static char calc_atlas_cksum(char *sentence) {
 bool FGAtlas::gen_message() {
     // cout << "generating atlas message" << endl;
 
+    static SGPropertyNode *adf_freq
+        = fgGetNode("/radios/kr-87/outputs/selected-khz", true);
+
     char rmc[256], gga[256], patla[256];
     char rmc_sum[10], gga_sum[10], patla_sum[10];
     char dir;
@@ -126,11 +129,11 @@ bool FGAtlas::gen_message() {
     sprintf( gga_sum, "%02X", calc_atlas_cksum(gga) );
 
     sprintf( patla, "PATLA,%.2f,%.1f,%.2f,%.1f,%.0f",
-            current_radiostack->get_nav1_freq(),
-            current_radiostack->get_nav1_sel_radial(),
-            current_radiostack->get_nav2_freq(),
-            current_radiostack->get_nav2_sel_radial(),
-            current_radiostack->get_adf_freq() );
+            current_radiostack->get_navcom1()->get_nav_freq(),
+            current_radiostack->get_navcom1()->get_nav_sel_radial(),
+            current_radiostack->get_navcom1()->get_nav_freq(),
+            current_radiostack->get_navcom1()->get_nav_sel_radial(),
+            adf_freq->getDoubleValue() );
     sprintf( patla_sum, "%02X", calc_atlas_cksum(patla) );
 
     SG_LOG( SG_IO, SG_DEBUG, rmc );
@@ -443,7 +446,7 @@ bool FGAtlas::parse_message() {
            string alt_units = msg.substr(begin, end - begin);
            begin = end + 1;
 
-           if ( alt_units != "F" ) {
+           if ( alt_units != (string)"F" ) {
                altitude *= SG_METER_TO_FEET;
            }