Fix several mispellings of servicable->serviceable.

diff --git a/src/Cockpit/kr_87.cxx b/src/Cockpit/kr_87.cxx
index ea3afd644b56350362102ec63cde16c6c1748a37..34489803ca23cc9a8e7af719bd48aa92ab5a5058 100644 (file)
--- a/src/Cockpit/kr_87.cxx
+++ b/src/Cockpit/kr_87.cxx
@@ -74,7 +74,7 @@ FGKR_87::FGKR_87() :
     lat_node(fgGetNode("/position/latitude-deg", true)),
     alt_node(fgGetNode("/position/altitude-ft", true)),
     bus_power(fgGetNode("/systems/electrical/outputs/adf", true)),
-    servicable(fgGetNode("/instrumentation/adf/servicable", true)),
+    serviceable(fgGetNode("/instrumentation/adf/serviceable", true)),
     need_update(true),
     valid(false),
     inrange(false),
@@ -114,7 +114,7 @@ FGKR_87::~FGKR_87() {
 
 
 void FGKR_87::init () {
-    servicable->setBoolValue( true );
+    serviceable->setBoolValue( true );
     morse.init();
 }
 
@@ -249,7 +249,7 @@ void FGKR_87::update( double dt ) {
     // Radio
     ////////////////////////////////////////////////////////////////////////
 
-    if ( has_power() && servicable->getBoolValue() ) {
+    if ( has_power() && serviceable->getBoolValue() ) {
         // buttons
         if ( adf_btn == 0 ) {
             ant_mode = 1;
@@ -441,7 +441,7 @@ void FGKR_87::update( double dt ) {
     // cout << "flt = " << flight_timer << " et = " << elapsed_timer 
     //      << " needle = " << needle_deg << endl;
 
-    if ( valid && inrange && servicable->getBoolValue() ) {
+    if ( valid && inrange && serviceable->getBoolValue() ) {
        // play station ident via audio system if on + ant mode,
        // otherwise turn it off
        if ( vol_btn >= 0.01 && audio_btn ) {

diff --git a/src/Cockpit/kr_87.hxx b/src/Cockpit/kr_87.hxx
index de90c5447d0eac2ce7b7df50711583aaca9af471..77ec6d4a8ec61df5e33fc2ff002f81c0a09b4d1a 100644 (file)
--- a/src/Cockpit/kr_87.hxx
+++ b/src/Cockpit/kr_87.hxx
@@ -44,7 +44,7 @@ class FGKR_87 : public FGSubsystem
     SGPropertyNode *lat_node;
     SGPropertyNode *alt_node;
     SGPropertyNode *bus_power;
-    SGPropertyNode *servicable;
+    SGPropertyNode *serviceable;
 
     bool need_update;
 

diff --git a/src/Cockpit/kt_70.cxx b/src/Cockpit/kt_70.cxx
index 652eb3c25c621bb1574067e0637cab443cf639ea..627cc3d7e072a4b3640786cf4b979497052578c1 100644 (file)
--- a/src/Cockpit/kt_70.cxx
+++ b/src/Cockpit/kt_70.cxx
@@ -41,6 +41,7 @@ FGKT_70::FGKT_70() :
     lat_node(fgGetNode("/position/latitude-deg", true)),
     alt_node(fgGetNode("/position/altitude-ft", true)),
     bus_power(fgGetNode("/systems/electrical/outputs/transponder", true)),
+    serviceable_node(fgGetNode("/radios/kt-70/inputs/serviceable", true)),
     r_flash_time(0.0),
     ident_mode(false),
     ident_btn(false),
@@ -147,7 +148,7 @@ void FGKT_70::update( double dt ) {
     sby_ann = false;
     reply_ann = false;
 
-    if ( has_power() ) {
+    if ( has_power() && serviceable_node->getBoolValue() ) {
         // sanity checks
         if ( digit1 < 0 ) { digit1 = 0; }
         if ( digit1 > 7 ) { digit1 = 7; }

diff --git a/src/Cockpit/kt_70.hxx b/src/Cockpit/kt_70.hxx
index 343296a0a997dba46369e82405b2bb406344e2c4..8355bdd16de72943e58fe893be2d6c9704724fa9 100644 (file)
--- a/src/Cockpit/kt_70.hxx
+++ b/src/Cockpit/kt_70.hxx
@@ -44,6 +44,7 @@ class FGKT_70 : public FGSubsystem
     SGPropertyNode *lat_node;
     SGPropertyNode *alt_node;
     SGPropertyNode *bus_power;
+    SGPropertyNode *serviceable_node;
 
     // internal values
     double r_flash_time;

diff --git a/src/Cockpit/marker_beacon.cxx b/src/Cockpit/marker_beacon.cxx
index eed3f1a032f83147c7bb337cac87d0136b3e2120..b668f550ec09317f54bf791a843250ddb1062b35 100644 (file)
--- a/src/Cockpit/marker_beacon.cxx
+++ b/src/Cockpit/marker_beacon.cxx
@@ -48,7 +48,7 @@ FGMarkerBeacon::FGMarkerBeacon() :
     bus_power(fgGetNode("/systems/electrical/outputs/navcom[0]", true)),
     power_btn(fgGetNode("/radios/marker-beacon/power-btn", true)),
     audio_btn(fgGetNode("/radios/marker-beacon/audio-btn", true)),
-    servicable(fgGetNode("/instrumentation/marker-beacons/servicable", true)),
+    serviceable(fgGetNode("/instrumentation/marker-beacons/serviceable", true)),
                  
     need_update(true),
     outer_blink(false),
@@ -69,7 +69,7 @@ FGMarkerBeacon::FGMarkerBeacon() :
 
     power_btn->setBoolValue( true );
     audio_btn->setBoolValue( true );
-    servicable->setBoolValue( true );
+    serviceable->setBoolValue( true );
 }
 
 
@@ -121,7 +121,7 @@ FGMarkerBeacon::update(double dt)
 {
     need_update = false;
 
-    if ( has_power() && servicable->getBoolValue() ) {
+    if ( has_power() && serviceable->getBoolValue() ) {
         // marker beacon blinking
         bool light_on = ( outer_blink || middle_blink || inner_blink );
         SGTimeStamp current;
@@ -181,7 +181,7 @@ void FGMarkerBeacon::search()
     outer_marker = middle_marker = inner_marker = false;
 
     if ( beacon_type == FGMkrBeacon::NOBEACON
-         || !has_power() || !servicable->getBoolValue() )
+         || !has_power() || !serviceable->getBoolValue() )
     {
        // cout << "no marker" << endl;
         beacon_type = FGMkrBeacon::NOBEACON;

diff --git a/src/Cockpit/marker_beacon.hxx b/src/Cockpit/marker_beacon.hxx
index 6475cae054096fe5547e9440846d86818bd64dcf..6182f2759c4cd40814b1a7a78d2a77d4a4e31330 100644 (file)
--- a/src/Cockpit/marker_beacon.hxx
+++ b/src/Cockpit/marker_beacon.hxx
@@ -52,7 +52,7 @@ class FGMarkerBeacon : public FGSubsystem
     SGPropertyNode *bus_power;
     SGPropertyNode *power_btn;
     SGPropertyNode *audio_btn;
-    SGPropertyNode *servicable;
+    SGPropertyNode *serviceable;
 
     bool need_update;
 

diff --git a/src/Cockpit/navcom.cxx b/src/Cockpit/navcom.cxx
index fd5b6d6e509e3e06cff15e8e5237b1bda5ff7e10..9fe214a517763a1ca9159cfb389584c79de95798 100644 (file)
--- a/src/Cockpit/navcom.cxx
+++ b/src/Cockpit/navcom.cxx
@@ -102,25 +102,25 @@ FGNavCom::init ()
     fgSetDouble( propname, 60.0 );
     bus_power = fgGetNode( propname, true );
 
-    snprintf(propname, 256, "/instrumentation/comm[%d]/servicable", index);
-    com_servicable = fgGetNode( propname, true );
-    com_servicable->setBoolValue( true );
+    snprintf(propname, 256, "/instrumentation/comm[%d]/serviceable", index);
+    com_serviceable = fgGetNode( propname, true );
+    com_serviceable->setBoolValue( true );
 
-    snprintf(propname, 256, "/instrumentation/nav[%d]/servicable", index);
-    nav_servicable = fgGetNode( propname, true );
-    nav_servicable->setBoolValue( true );
+    snprintf(propname, 256, "/instrumentation/nav[%d]/serviceable", index);
+    nav_serviceable = fgGetNode( propname, true );
+    nav_serviceable->setBoolValue( true );
 
-    snprintf(propname, 256, "/instrumentation/vor[%d]/cdi/servicable", index);
-    cdi_servicable = fgGetNode( propname, true );
-    cdi_servicable->setBoolValue( true );
+    snprintf(propname, 256, "/instrumentation/vor[%d]/cdi/serviceable", index);
+    cdi_serviceable = fgGetNode( propname, true );
+    cdi_serviceable->setBoolValue( true );
 
-    snprintf(propname, 256, "/instrumentation/vor[%d]/gs/servicable", index);
-    gs_servicable = fgGetNode( propname, true );
-    gs_servicable->setBoolValue( true );
+    snprintf(propname, 256, "/instrumentation/vor[%d]/gs/serviceable", index);
+    gs_serviceable = fgGetNode( propname, true );
+    gs_serviceable->setBoolValue( true );
 
-    snprintf(propname, 256, "/instrumentation/vor[%d]/to-from/servicable", index);
-    tofrom_servicable = fgGetNode( propname, true );
-    tofrom_servicable->setBoolValue( true );
+    snprintf(propname, 256, "/instrumentation/vor[%d]/to-from/serviceable", index);
+    tofrom_serviceable = fgGetNode( propname, true );
+    tofrom_serviceable->setBoolValue( true );
 }
 
 void
@@ -342,7 +342,7 @@ FGNavCom::update(double dt)
     ////////////////////////////////////////////////////////////////////////
 
     if ( nav_valid && power_btn && (bus_power->getDoubleValue() > 1.0)
-         && nav_servicable->getBoolValue() )
+         && nav_serviceable->getBoolValue() )
     {
        station = Point3D( nav_x, nav_y, nav_z );
        nav_loc_dist = aircraft.distance3D( station );
@@ -426,7 +426,7 @@ FGNavCom::update(double dt)
        // cout << "not picking up vor. :-(" << endl;
     }
 
-    if ( nav_valid && nav_inrange && nav_servicable->getBoolValue() ) {
+    if ( nav_valid && nav_inrange && nav_serviceable->getBoolValue() ) {
        // play station ident via audio system if on + ident,
        // otherwise turn it off
        if ( power_btn && (bus_power->getDoubleValue() > 1.0)
@@ -643,7 +643,7 @@ double FGNavCom::get_nav_cdi_deflection() const {
     double r;
 
     if ( nav_inrange
-         && nav_servicable->getBoolValue() && cdi_servicable->getBoolValue() )
+         && nav_serviceable->getBoolValue() && cdi_serviceable->getBoolValue() )
     {
         r = nav_radial - nav_target_radial;
        // cout << "Target radial = " << nav_target_radial 
@@ -671,7 +671,7 @@ double FGNavCom::get_nav_cdi_deflection() const {
 // number of degrees we are off the glide slope * 5.0
 double FGNavCom::get_nav_gs_deflection() const {
     if ( nav_inrange && nav_has_gs
-         && nav_servicable->getBoolValue() && gs_servicable->getBoolValue() )
+         && nav_serviceable->getBoolValue() && gs_serviceable->getBoolValue() )
     {
        double x = nav_gs_dist;
        double y = (fgGetDouble("/position/altitude-ft") - nav_elev)
@@ -692,8 +692,8 @@ bool
 FGNavCom::get_nav_to_flag () const
 {
     if ( nav_inrange
-         && nav_servicable->getBoolValue()
-         && tofrom_servicable->getBoolValue() )
+         && nav_serviceable->getBoolValue()
+         && tofrom_serviceable->getBoolValue() )
     {
         double offset = fabs(nav_radial - nav_target_radial);
         if (nav_loc) {
@@ -714,8 +714,8 @@ bool
 FGNavCom::get_nav_from_flag () const
 {
     if ( nav_inrange
-         && nav_servicable->getBoolValue()
-         && tofrom_servicable->getBoolValue() ) {
+         && nav_serviceable->getBoolValue()
+         && tofrom_serviceable->getBoolValue() ) {
         double offset = fabs(nav_radial - nav_target_radial);
         if (nav_loc) {
             return false;

diff --git a/src/Cockpit/navcom.hxx b/src/Cockpit/navcom.hxx
index 35bdf6cba31958342f9fa9ebd278b989908f586f..5e6434aee43294138ed92b5692c690dfe2043f9f 100644 (file)
--- a/src/Cockpit/navcom.hxx
+++ b/src/Cockpit/navcom.hxx
@@ -49,8 +49,8 @@ class FGNavCom : public FGSubsystem
     SGPropertyNode *lat_node;
     SGPropertyNode *alt_node;
     SGPropertyNode *bus_power;
-    SGPropertyNode *com_servicable, *nav_servicable;
-    SGPropertyNode *cdi_servicable, *gs_servicable, *tofrom_servicable;
+    SGPropertyNode *com_serviceable, *nav_serviceable;
+    SGPropertyNode *cdi_serviceable, *gs_serviceable, *tofrom_serviceable;
 
     string last_nav_id;
     bool last_nav_vor;

diff --git a/src/Network/atc610x.cxx b/src/Network/atc610x.cxx
index baebcff887e074c0ce32f46ac4891b7c86e6510d..564d1d75749db8748fb9826e451a22f4cb8ef435 100644 (file)
--- a/src/Network/atc610x.cxx
+++ b/src/Network/atc610x.cxx
@@ -475,6 +475,7 @@ bool FGATC610x::open() {
                   true );
     alt_press = fgGetNode( "/instrumentation/altimeter/setting-inhg", true );
     adf_hdg = fgGetNode( "/radios/kr-87/inputs/rotation-deg", true );
+    hdg_bug = fgGetNode( "/autopilot/settings/heading-bug-deg", true );
 
     elevator_center = fgGetNode( "/input/atc610x/elevator/center", true );
     elevator_min = fgGetNode( "/input/atc610x/elevator/min", true );
@@ -510,23 +511,23 @@ bool FGATC610x::open() {
     nav2vol_min = fgGetNode( "/input/atc610x/nav2vol/min", true );
     nav2vol_max = fgGetNode( "/input/atc610x/nav2vol/max", true );
 
-    comm1_servicable = fgGetNode( "/instrumentation/comm[0]/servicable", true );
-    comm2_servicable = fgGetNode( "/instrumentation/comm[1]/servicable", true );
-    nav1_servicable = fgGetNode( "/instrumentation/nav[0]/servicable", true );
-    nav2_servicable = fgGetNode( "/instrumentation/nav[1]/servicable", true );
-    adf_servicable = fgGetNode( "/instrumentation/adf/servicable", true );
-    xpdr_servicable = fgGetNode( "/instrumentation/transponder/servicable",
+    comm1_serviceable = fgGetNode( "/instrumentation/comm[0]/serviceable", true );
+    comm2_serviceable = fgGetNode( "/instrumentation/comm[1]/serviceable", true );
+    nav1_serviceable = fgGetNode( "/instrumentation/nav[0]/serviceable", true );
+    nav2_serviceable = fgGetNode( "/instrumentation/nav[1]/serviceable", true );
+    adf_serviceable = fgGetNode( "/instrumentation/adf/serviceable", true );
+    xpdr_serviceable = fgGetNode( "/radios/kt-70/inputs/serviceable",
                                  true );
-    dme_servicable = fgGetNode( "/instrumentation/dme/servicable", true );
+    dme_serviceable = fgGetNode( "/instrumentation/dme/serviceable", true );
 
-    // default to having everything servicable
-    comm1_servicable->setBoolValue( true );
-    comm2_servicable->setBoolValue( true );
-    nav1_servicable->setBoolValue( true );
-    nav2_servicable->setBoolValue( true );
-    adf_servicable->setBoolValue( true );
-    xpdr_servicable->setBoolValue( true );
-    dme_servicable->setBoolValue( true );
+    // default to having everything serviceable
+    comm1_serviceable->setBoolValue( true );
+    comm2_serviceable->setBoolValue( true );
+    nav1_serviceable->setBoolValue( true );
+    nav2_serviceable->setBoolValue( true );
+    adf_serviceable->setBoolValue( true );
+    xpdr_serviceable->setBoolValue( true );
+    dme_serviceable->setBoolValue( true );
 
     return true;
 }
@@ -764,12 +765,13 @@ bool FGATC610x::do_analog_in() {
 
     // instrument panel pots
     static bool first = true;
-    static int obs1[3], obs2[3], obs3[3], obs4[3], obs5[3];
+    static int obs1[3], obs2[3], obs3[3], obs4[3], obs5[3], obs6[3];
     static double diff1_ave = 0.0;
     static double diff2_ave = 0.0;
     static double diff3_ave = 0.0;
     static double diff4_ave = 0.0;
     static double diff5_ave = 0.0;
+    static double diff6_ave = 0.0;
 
     if ( first ) {
         first = false;
@@ -778,6 +780,7 @@ bool FGATC610x::do_analog_in() {
         obs3[0] = obs3[1] = obs3[2] = analog_in_data[29];
         obs4[0] = obs4[1] = obs4[2] = analog_in_data[30];
         obs5[0] = obs5[1] = obs5[2] = analog_in_data[31];
+        obs6[0] = obs6[1] = obs6[2] = analog_in_data[14];
     }
 
     int diff1 = tony_magic( analog_in_data[11], obs1 );
@@ -785,12 +788,14 @@ bool FGATC610x::do_analog_in() {
     int diff3 = tony_magic( analog_in_data[29], obs3 );
     int diff4 = tony_magic( analog_in_data[30], obs4 );
     int diff5 = tony_magic( analog_in_data[31], obs5 );
+    int diff6 = tony_magic( analog_in_data[14], obs6 );
 
     diff1_ave = instr_pot_filter( diff1_ave, diff1 );
     diff2_ave = instr_pot_filter( diff2_ave, diff2 );
     diff3_ave = instr_pot_filter( diff3_ave, diff3 );
     diff4_ave = instr_pot_filter( diff4_ave, diff4 );
     diff5_ave = instr_pot_filter( diff5_ave, diff5 );
+    diff6_ave = instr_pot_filter( diff6_ave, diff6 );
 
     tmp = alt_press->getDoubleValue() + (diff1_ave * (0.25/888.0) );
     if ( tmp < 27.9 ) { tmp = 27.9; }
@@ -820,6 +825,12 @@ bool FGATC610x::do_analog_in() {
     // cout << " obs = " << tmp << endl;
     fgSetFloat( "/radios/kr-87/inputs/rotation-deg", tmp );
 
+    tmp = hdg_bug->getDoubleValue() + (diff6_ave * (72.0/888.0) );
+    while ( tmp >= 360.0 ) { tmp -= 360.0; }
+    while ( tmp < 0.0 ) { tmp += 360.0; }
+    // cout << " obs = " << tmp << endl;
+    fgSetFloat( "/autopilot/settings/heading-bug-deg", tmp );
+
     return true;
 }
 
@@ -890,7 +901,7 @@ bool FGATC610x::do_radio_switches() {
     fgSetBool( "/radios/comm[0]/inputs/power-btn",
                radio_switch_data[7] & 0x01 );
 
-    if ( navcom1_has_power() && comm1_servicable->getBoolValue() ) {
+    if ( navcom1_has_power() && comm1_serviceable->getBoolValue() ) {
         // Com1 Swap
         int com1_swap = !((radio_switch_data[7] >> 1) & 0x01);
         static int last_com1_swap;
@@ -907,7 +918,7 @@ bool FGATC610x::do_radio_switches() {
     fgSetBool( "/radios/comm[1]/inputs/power-btn",
                radio_switch_data[15] & 0x01 );
 
-    if ( navcom2_has_power() && comm2_servicable->getBoolValue() ) {
+    if ( navcom2_has_power() && comm2_serviceable->getBoolValue() ) {
         // Com2 Swap
         int com2_swap = !((radio_switch_data[15] >> 1) & 0x01);
         static int last_com2_swap;
@@ -920,7 +931,7 @@ bool FGATC610x::do_radio_switches() {
         last_com2_swap = com2_swap;
     }
 
-    if ( navcom1_has_power() && nav1_servicable->getBoolValue() ) {
+    if ( navcom1_has_power() && nav1_serviceable->getBoolValue() ) {
         // Nav1 Swap
         int nav1_swap = radio_switch_data[11] & 0x01;
         static int last_nav1_swap;
@@ -933,7 +944,7 @@ bool FGATC610x::do_radio_switches() {
         last_nav1_swap = nav1_swap;
     }
 
-    if ( navcom2_has_power() && nav2_servicable->getBoolValue() ) {
+    if ( navcom2_has_power() && nav2_serviceable->getBoolValue() ) {
         // Nav2 Swap
         int nav2_swap = !(radio_switch_data[19] & 0x01);
         static int last_nav2_swap;
@@ -946,7 +957,7 @@ bool FGATC610x::do_radio_switches() {
         last_nav2_swap = nav2_swap;
     }
 
-    if ( navcom1_has_power() && comm1_servicable->getBoolValue() ) {
+    if ( navcom1_has_power() && comm1_serviceable->getBoolValue() ) {
         // Com1 Tuner
         int com1_tuner_fine = ((radio_switch_data[5] >> 4) & 0x0f) - 1;
         int com1_tuner_coarse = (radio_switch_data[5] & 0x0f) - 1;
@@ -998,7 +1009,7 @@ bool FGATC610x::do_radio_switches() {
                     coarse_freq + fine_freq / 40.0 );
     }
 
-    if ( navcom2_has_power() && comm2_servicable->getBoolValue() ) {
+    if ( navcom2_has_power() && comm2_serviceable->getBoolValue() ) {
         // Com2 Tuner
         int com2_tuner_fine = ((radio_switch_data[13] >> 4) & 0x0f) - 1;
         int com2_tuner_coarse = (radio_switch_data[13] & 0x0f) - 1;
@@ -1050,7 +1061,7 @@ bool FGATC610x::do_radio_switches() {
                     coarse_freq + fine_freq / 40.0 );
     }
 
-    if ( navcom1_has_power() && nav1_servicable->getBoolValue() ) {
+    if ( navcom1_has_power() && nav1_serviceable->getBoolValue() ) {
         // Nav1 Tuner
         int nav1_tuner_fine = ((radio_switch_data[9] >> 4) & 0x0f) - 1;
         int nav1_tuner_coarse = (radio_switch_data[9] & 0x0f) - 1;
@@ -1102,7 +1113,7 @@ bool FGATC610x::do_radio_switches() {
                     coarse_freq + fine_freq / 20.0 );
     }
 
-    if ( navcom2_has_power() && nav2_servicable->getBoolValue() ) {
+    if ( navcom2_has_power() && nav2_serviceable->getBoolValue() ) {
         // Nav2 Tuner
         int nav2_tuner_fine = ((radio_switch_data[17] >> 4) & 0x0f) - 1;
         int nav2_tuner_coarse = (radio_switch_data[17] & 0x0f) - 1;
@@ -1161,7 +1172,7 @@ bool FGATC610x::do_radio_switches() {
     static int last_adf_tuner_fine = adf_tuner_fine;
     static int last_adf_tuner_coarse = adf_tuner_coarse;
 
-    if ( adf_has_power() && adf_servicable->getBoolValue() ) {
+    if ( adf_has_power() && adf_serviceable->getBoolValue() ) {
         // cout << "adf_stby_mode = " << adf_stby_mode->getIntValue() << endl;
         if ( adf_count_mode->getIntValue() == 2 ) {
             // tune count down timer
@@ -1267,7 +1278,7 @@ bool FGATC610x::do_radio_switches() {
         }
     }
 
-    if ( xpdr_has_power() && xpdr_servicable->getBoolValue() ) {
+    if ( xpdr_has_power() && xpdr_serviceable->getBoolValue() ) {
         int id_code = xpdr_id_code->getIntValue();
         int digit[4];
         int place = 1000;
@@ -1338,7 +1349,7 @@ bool FGATC610x::do_radio_display() {
     char digits[10];
     int i;
 
-    if ( dme_has_power() && dme_servicable->getBoolValue() ) {
+    if ( dme_has_power() && dme_serviceable->getBoolValue() ) {
         if ( dme_in_range->getBoolValue() ) {
             // DME minutes
             float minutes = dme_min->getFloatValue();
@@ -1393,7 +1404,7 @@ bool FGATC610x::do_radio_display() {
        }
     }
 
-    if ( navcom1_has_power() && comm1_servicable->getBoolValue() ) {
+    if ( navcom1_has_power() && comm1_serviceable->getBoolValue() ) {
         // Com1 standby frequency
         float com1_stby = com1_stby_freq->getFloatValue();
         if ( fabs(com1_stby) > 999.99 ) {
@@ -1430,7 +1441,7 @@ bool FGATC610x::do_radio_display() {
         radio_display_data[11] = 0xff;
     }
 
-    if ( navcom2_has_power() && comm2_servicable->getBoolValue() ) {
+    if ( navcom2_has_power() && comm2_serviceable->getBoolValue() ) {
         // Com2 standby frequency
         float com2_stby = com2_stby_freq->getFloatValue();
         if ( fabs(com2_stby) > 999.99 ) {
@@ -1467,7 +1478,7 @@ bool FGATC610x::do_radio_display() {
         radio_display_data[23] = 0xff;
     }
 
-    if ( navcom1_has_power() && nav1_servicable->getBoolValue() ) {
+    if ( navcom1_has_power() && nav1_serviceable->getBoolValue() ) {
         // Nav1 standby frequency
         float nav1_stby = nav1_stby_freq->getFloatValue();
         if ( fabs(nav1_stby) > 999.99 ) {
@@ -1504,7 +1515,7 @@ bool FGATC610x::do_radio_display() {
         radio_display_data[17] = 0xff;
     }
 
-    if ( navcom2_has_power() && nav2_servicable->getBoolValue() ) {
+    if ( navcom2_has_power() && nav2_serviceable->getBoolValue() ) {
         // Nav2 standby frequency
         float nav2_stby = nav2_stby_freq->getFloatValue();
         if ( fabs(nav2_stby) > 999.99 ) {
@@ -1542,7 +1553,7 @@ bool FGATC610x::do_radio_display() {
     }
 
     // ADF standby frequency / timer
-    if ( adf_has_power() && adf_servicable->getBoolValue() ) {
+    if ( adf_has_power() && adf_serviceable->getBoolValue() ) {
         if ( adf_stby_mode->getIntValue() == 0 ) {
             // frequency
             float adf_stby = adf_stby_freq->getFloatValue();
@@ -1629,7 +1640,7 @@ bool FGATC610x::do_radio_display() {
     }
     
     // Transponder code and flight level
-    if ( xpdr_has_power() && xpdr_servicable->getBoolValue() ) {
+    if ( xpdr_has_power() && xpdr_serviceable->getBoolValue() ) {
         if ( xpdr_func_knob->getIntValue() == 2 ) {
             // test mode
             radio_display_data[36] = 8 << 4 | 8;

diff --git a/src/Network/atc610x.hxx b/src/Network/atc610x.hxx
index beec6f88c2d6f3e1b04764b1c3fa3757d15a93c0..d447cfe08e6f7800e576bb4b6aa80196051a363b 100644 (file)
--- a/src/Network/atc610x.hxx
+++ b/src/Network/atc610x.hxx
@@ -92,7 +92,7 @@ class FGATC610x : public FGProtocol {
     SGPropertyNode *adf_stby_mode, *adf_timer_mode;
     SGPropertyNode *adf_count_mode, *adf_flight_timer, *adf_elapsed_timer;
     SGPropertyNode *adf_ant_ann, *adf_adf_ann, *adf_bfo_ann, *adf_frq_ann;
-    SGPropertyNode *adf_flt_ann, *adf_et_ann, *adf_hdg;
+    SGPropertyNode *adf_flt_ann, *adf_et_ann, *adf_hdg, *hdg_bug;
     SGPropertyNode *inner, *middle, *outer;
     SGPropertyNode *xpdr_ident_btn;
     SGPropertyNode *xpdr_digit1, *xpdr_digit2, *xpdr_digit3, *xpdr_digit4;
@@ -102,9 +102,9 @@ class FGATC610x : public FGProtocol {
     SGPropertyNode *ati_bird, *alt_press;
 
     // Faults
-    SGPropertyNode *comm1_servicable, *comm2_servicable;
-    SGPropertyNode *nav1_servicable, *nav2_servicable;
-    SGPropertyNode *adf_servicable, *xpdr_servicable, *dme_servicable;
+    SGPropertyNode *comm1_serviceable, *comm2_serviceable;
+    SGPropertyNode *nav1_serviceable, *nav2_serviceable;
+    SGPropertyNode *adf_serviceable, *xpdr_serviceable, *dme_serviceable;
 
     // Configuration values
     SGPropertyNode *elevator_center, *elevator_min, *elevator_max;