From c6f0d87a26b869aeda38e3734f3ef41a63c52183 Mon Sep 17 00:00:00 2001 From: curt Date: Sat, 4 Dec 2004 21:06:57 +0000 Subject: [PATCH] A few more radios -> instrumentation name changes thanks to Melchior for catching these. --- src/Autopilot/xmlauto.cxx | 4 ++-- src/Main/options.cxx | 16 ++++++++-------- src/Network/atc610x.cxx | 30 +++++++++++++++--------------- src/Network/native_gui.cxx | 10 +++++----- 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/Autopilot/xmlauto.cxx b/src/Autopilot/xmlauto.cxx index 3fef7eaa1..61171a08e 100644 --- a/src/Autopilot/xmlauto.cxx +++ b/src/Autopilot/xmlauto.cxx @@ -873,7 +873,7 @@ static void update_helper( double dt ) { // Calculate nav1 target heading error normalized to +/- 180.0 static SGPropertyNode *target_nav1 - = fgGetNode( "/radios/nav[0]/radials/target-auto-hdg-deg", true ); + = fgGetNode( "/instrumentation/nav[0]/radials/target-auto-hdg-deg", true ); static SGPropertyNode *true_nav1 = fgGetNode( "/autopilot/internal/nav1-heading-error-deg", true ); static SGPropertyNode *true_track_nav1 @@ -894,7 +894,7 @@ static void update_helper( double dt ) { static SGPropertyNode *nav1_course_error = fgGetNode( "/autopilot/internal/nav1-course-error", true ); static SGPropertyNode *nav1_selected_course - = fgGetNode( "/radios/nav[0]/radials/selected-deg", true ); + = fgGetNode( "/instrumentation/nav[0]/radials/selected-deg", true ); diff = nav1_selected_course->getDoubleValue() - ind_hdg->getDoubleValue(); // if ( diff < -180.0 ) { diff += 360.0; } diff --git a/src/Main/options.cxx b/src/Main/options.cxx index 722ab57f9..9e9979c95 100644 --- a/src/Main/options.cxx +++ b/src/Main/options.cxx @@ -1089,8 +1089,8 @@ fgOptNAV1( const char * arg ) { double radial, freq; if (parse_colon(arg, &radial, &freq)) - fgSetDouble("/radios/nav[0]/radials/selected-deg", radial); - fgSetDouble("/radios/nav[0]/frequencies/selected-mhz", freq); + fgSetDouble("/instrumentation/nav[0]/radials/selected-deg", radial); + fgSetDouble("/instrumentation/nav[0]/frequencies/selected-mhz", freq); return FG_OPTIONS_OK; } @@ -1099,8 +1099,8 @@ fgOptNAV2( const char * arg ) { double radial, freq; if (parse_colon(arg, &radial, &freq)) - fgSetDouble("/radios/nav[1]/radials/selected-deg", radial); - fgSetDouble("/radios/nav[1]/frequencies/selected-mhz", freq); + fgSetDouble("/instrumentation/nav[1]/radials/selected-deg", radial); + fgSetDouble("/instrumentation/nav[1]/frequencies/selected-mhz", freq); return FG_OPTIONS_OK; } @@ -1121,11 +1121,11 @@ fgOptDME( const char *arg ) if (opt == "nav1") { fgSetInt("/instrumentation/dme/switch-position", 1); fgSetString("/instrumentation/dme/frequencies/source", - "/radios/nav[0]/frequencies/selected-mhz"); + "/instrumentation/nav[0]/frequencies/selected-mhz"); } else if (opt == "nav2") { fgSetInt("/instrumentation/dme/switch-position", 3); fgSetString("/instrumentation/dme/frequencies/source", - "/radios/nav[1]/frequencies/selected-mhz"); + "/instrumentation/nav[1]/frequencies/selected-mhz"); } else { fgSetInt("/instrumentation/dme/switch-position", 2); fgSetString("/instrumentation/dme/frequencies/source", @@ -1327,8 +1327,8 @@ struct OptionDesc { {"config", true, OPTION_FUNC, "", false, "", fgOptConfig }, {"aircraft", true, OPTION_STRING, "/sim/aircraft", false, "", 0 }, {"failure", true, OPTION_FUNC, "", false, "", fgOptFailure }, - {"com1", true, OPTION_DOUBLE, "/radios/comm[0]/frequencies/selected-mhz", false, "", 0 }, - {"com2", true, OPTION_DOUBLE, "/radios/comm[1]/frequencies/selected-mhz", false, "", 0 }, + {"com1", true, OPTION_DOUBLE, "/instrumentation/comm[0]/frequencies/selected-mhz", false, "", 0 }, + {"com2", true, OPTION_DOUBLE, "/instrumentation/comm[1]/frequencies/selected-mhz", false, "", 0 }, {"nav1", true, OPTION_FUNC, "", false, "", fgOptNAV1 }, {"nav2", true, OPTION_FUNC, "", false, "", fgOptNAV2 }, {"adf", true, OPTION_FUNC, "", false, "", fgOptADF }, diff --git a/src/Network/atc610x.cxx b/src/Network/atc610x.cxx index 2587e59b7..b85973d39 100644 --- a/src/Network/atc610x.cxx +++ b/src/Network/atc610x.cxx @@ -366,26 +366,26 @@ bool FGATC610x::open() { xpdr_bus_power = fgGetNode( "/systems/electrical/outputs/transponder", true ); - navcom1_power_btn = fgGetNode( "/radios/comm[0]/inputs/power-btn", true ); - navcom2_power_btn = fgGetNode( "/radios/comm[1]/inputs/power-btn", true ); + navcom1_power_btn = fgGetNode( "/instrumentation/comm[0]/inputs/power-btn", true ); + navcom2_power_btn = fgGetNode( "/instrumentation/comm[1]/inputs/power-btn", true ); - com1_freq = fgGetNode( "/radios/comm[0]/frequencies/selected-mhz", true ); + com1_freq = fgGetNode( "/instrumentation/comm[0]/frequencies/selected-mhz", true ); com1_stby_freq - = fgGetNode( "/radios/comm[0]/frequencies/standby-mhz", true ); + = fgGetNode( "/instrumentation/comm[0]/frequencies/standby-mhz", true ); - com2_freq = fgGetNode( "/radios/comm[1]/frequencies/selected-mhz", true ); + com2_freq = fgGetNode( "/instrumentation/comm[1]/frequencies/selected-mhz", true ); com2_stby_freq - = fgGetNode( "/radios/comm[1]/frequencies/standby-mhz", true ); + = fgGetNode( "/instrumentation/comm[1]/frequencies/standby-mhz", true ); - nav1_freq = fgGetNode( "/radios/nav[0]/frequencies/selected-mhz", true ); + nav1_freq = fgGetNode( "/instrumentation/nav[0]/frequencies/selected-mhz", true ); nav1_stby_freq - = fgGetNode( "/radios/nav[0]/frequencies/standby-mhz", true ); - nav1_obs = fgGetNode( "/radios/nav[0]/radials/selected-deg", true ); + = fgGetNode( "/instrumentation/nav[0]/frequencies/standby-mhz", true ); + nav1_obs = fgGetNode( "/instrumentation/nav[0]/radials/selected-deg", true ); - nav2_freq = fgGetNode( "/radios/nav[1]/frequencies/selected-mhz", true ); + nav2_freq = fgGetNode( "/instrumentation/nav[1]/frequencies/selected-mhz", true ); nav2_stby_freq - = fgGetNode( "/radios/nav[1]/frequencies/standby-mhz", true ); - nav2_obs = fgGetNode( "/radios/nav[1]/radials/selected-deg", true ); + = fgGetNode( "/instrumentation/nav[1]/frequencies/standby-mhz", true ); + nav2_obs = fgGetNode( "/instrumentation/nav[1]/radials/selected-deg", true ); adf_power_btn = fgGetNode( "/instrumentation/kr-87/inputs/power-btn", true ); @@ -410,9 +410,9 @@ bool FGATC610x::open() { adf_flt_ann = fgGetNode( "/instrumentation/kr-87/annunciators/flt", true ); adf_et_ann = fgGetNode( "/instrumentation/kr-87/annunciators/et", true ); - inner = fgGetNode( "/radios/marker-beacon/inner", true ); - middle = fgGetNode( "/radios/marker-beacon/middle", true ); - outer = fgGetNode( "/radios/marker-beacon/outer", true ); + inner = fgGetNode( "/instrumentation/marker-beacon/inner", true ); + middle = fgGetNode( "/instrumentation/marker-beacon/middle", true ); + outer = fgGetNode( "/instrumentation/marker-beacon/outer", true ); xpdr_ident_btn = fgGetNode( "/instrumentation/kt-70/inputs/ident-btn", true ); diff --git a/src/Network/native_gui.cxx b/src/Network/native_gui.cxx index 798499c66..8377cfa55 100644 --- a/src/Network/native_gui.cxx +++ b/src/Network/native_gui.cxx @@ -306,13 +306,13 @@ void FGNetGUI2Props( FGNetGUI *net ) { globals->get_scenery()->set_cur_elev( net->ground_elev ); // Approach - fgSetDouble( "/radios/nav[0]/frequencies/selected-mhz", + fgSetDouble( "/instrumentation/nav[0]/frequencies/selected-mhz", net->tuned_freq ); - fgSetBool( "/radios/nav[0]/in-range", net->in_range ); - fgSetDouble( "/radios/dme/distance-nm", net->dist_nm ); - fgSetDouble( "/radios/nav[0]/heading-needle-deflection", + fgSetBool( "/instrumentation/nav[0]/in-range", net->in_range ); + fgSetDouble( "/instrumentation/dme/distance-nm", net->dist_nm ); + fgSetDouble( "/instrumentation/nav[0]/heading-needle-deflection", net->course_deviation_deg ); - fgSetDouble( "/radios/nav[0]/gs-needle-deflection", + fgSetDouble( "/instrumentation/nav[0]/gs-needle-deflection", net->gs_deviation_deg ); } else { SG_LOG( SG_IO, SG_ALERT,