fly/flightgear
1
0
Fork 0
Code Activity

A few more radios -> instrumentation name changes thanks to Melchior for

Browse source 
catching these.
This commit is contained in:
curt 2004-12-04 21:06:57 +00:00
parent a775631226
commit c6f0d87a26
4 changed files with 30 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Autopilot/xmlauto.cxx
View file

@ -873,7 +873,7 @@ static void update_helper( double dt ) {
// Calculate nav1 target heading error normalized to +/- 180.0 // Calculate nav1 target heading error normalized to +/- 180.0
static SGPropertyNode *target_nav1 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 static SGPropertyNode *true_nav1
= fgGetNode( "/autopilot/internal/nav1-heading-error-deg", true ); = fgGetNode( "/autopilot/internal/nav1-heading-error-deg", true );
static SGPropertyNode *true_track_nav1 static SGPropertyNode *true_track_nav1
@ -894,7 +894,7 @@ static void update_helper( double dt ) {
static SGPropertyNode *nav1_course_error static SGPropertyNode *nav1_course_error
= fgGetNode( "/autopilot/internal/nav1-course-error", true ); = fgGetNode( "/autopilot/internal/nav1-course-error", true );
static SGPropertyNode *nav1_selected_course 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(); diff = nav1_selected_course->getDoubleValue() - ind_hdg->getDoubleValue();
// if ( diff < -180.0 ) { diff += 360.0; } // if ( diff < -180.0 ) { diff += 360.0; }

16
src/Main/options.cxx
View file

@ -1089,8 +1089,8 @@ fgOptNAV1( const char * arg )
{ {
double radial, freq; double radial, freq;
if (parse_colon(arg, &radial, &freq)) if (parse_colon(arg, &radial, &freq))
fgSetDouble("/radios/nav[0]/radials/selected-deg", radial); fgSetDouble("/instrumentation/nav[0]/radials/selected-deg", radial);
fgSetDouble("/radios/nav[0]/frequencies/selected-mhz", freq); fgSetDouble("/instrumentation/nav[0]/frequencies/selected-mhz", freq);
return FG_OPTIONS_OK; return FG_OPTIONS_OK;
} }
@ -1099,8 +1099,8 @@ fgOptNAV2( const char * arg )
{ {
double radial, freq; double radial, freq;
if (parse_colon(arg, &radial, &freq)) if (parse_colon(arg, &radial, &freq))
fgSetDouble("/radios/nav[1]/radials/selected-deg", radial); fgSetDouble("/instrumentation/nav[1]/radials/selected-deg", radial);
fgSetDouble("/radios/nav[1]/frequencies/selected-mhz", freq); fgSetDouble("/instrumentation/nav[1]/frequencies/selected-mhz", freq);
return FG_OPTIONS_OK; return FG_OPTIONS_OK;
} }
@ -1121,11 +1121,11 @@ fgOptDME( const char *arg )
if (opt == "nav1") { if (opt == "nav1") {
fgSetInt("/instrumentation/dme/switch-position", 1); fgSetInt("/instrumentation/dme/switch-position", 1);
fgSetString("/instrumentation/dme/frequencies/source", fgSetString("/instrumentation/dme/frequencies/source",
"/radios/nav[0]/frequencies/selected-mhz"); "/instrumentation/nav[0]/frequencies/selected-mhz");
} else if (opt == "nav2") { } else if (opt == "nav2") {
fgSetInt("/instrumentation/dme/switch-position", 3); fgSetInt("/instrumentation/dme/switch-position", 3);
fgSetString("/instrumentation/dme/frequencies/source", fgSetString("/instrumentation/dme/frequencies/source",
"/radios/nav[1]/frequencies/selected-mhz"); "/instrumentation/nav[1]/frequencies/selected-mhz");
} else { } else {
fgSetInt("/instrumentation/dme/switch-position", 2); fgSetInt("/instrumentation/dme/switch-position", 2);
fgSetString("/instrumentation/dme/frequencies/source", fgSetString("/instrumentation/dme/frequencies/source",
@ -1327,8 +1327,8 @@ struct OptionDesc {
{"config", true, OPTION_FUNC, "", false, "", fgOptConfig }, {"config", true, OPTION_FUNC, "", false, "", fgOptConfig },
{"aircraft", true, OPTION_STRING, "/sim/aircraft", false, "", 0 }, {"aircraft", true, OPTION_STRING, "/sim/aircraft", false, "", 0 },
{"failure", true, OPTION_FUNC, "", false, "", fgOptFailure }, {"failure", true, OPTION_FUNC, "", false, "", fgOptFailure },
{"com1", true, OPTION_DOUBLE, "/radios/comm[0]/frequencies/selected-mhz", false, "", 0 }, {"com1", true, OPTION_DOUBLE, "/instrumentation/comm[0]/frequencies/selected-mhz", false, "", 0 },
{"com2", true, OPTION_DOUBLE, "/radios/comm[1]/frequencies/selected-mhz", false, "", 0 }, {"com2", true, OPTION_DOUBLE, "/instrumentation/comm[1]/frequencies/selected-mhz", false, "", 0 },
{"nav1", true, OPTION_FUNC, "", false, "", fgOptNAV1 }, {"nav1", true, OPTION_FUNC, "", false, "", fgOptNAV1 },
{"nav2", true, OPTION_FUNC, "", false, "", fgOptNAV2 }, {"nav2", true, OPTION_FUNC, "", false, "", fgOptNAV2 },
{"adf", true, OPTION_FUNC, "", false, "", fgOptADF }, {"adf", true, OPTION_FUNC, "", false, "", fgOptADF },

30
src/Network/atc610x.cxx
View file

@ -366,26 +366,26 @@ bool FGATC610x::open() {
xpdr_bus_power = fgGetNode( "/systems/electrical/outputs/transponder", xpdr_bus_power = fgGetNode( "/systems/electrical/outputs/transponder",
true ); true );
navcom1_power_btn = fgGetNode( "/radios/comm[0]/inputs/power-btn", true ); navcom1_power_btn = fgGetNode( "/instrumentation/comm[0]/inputs/power-btn", true );
navcom2_power_btn = fgGetNode( "/radios/comm[1]/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 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 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 nav1_stby_freq
= fgGetNode( "/radios/nav[0]/frequencies/standby-mhz", true ); = fgGetNode( "/instrumentation/nav[0]/frequencies/standby-mhz", true );
nav1_obs = fgGetNode( "/radios/nav[0]/radials/selected-deg", 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 nav2_stby_freq
= fgGetNode( "/radios/nav[1]/frequencies/standby-mhz", true ); = fgGetNode( "/instrumentation/nav[1]/frequencies/standby-mhz", true );
nav2_obs = fgGetNode( "/radios/nav[1]/radials/selected-deg", true ); nav2_obs = fgGetNode( "/instrumentation/nav[1]/radials/selected-deg", true );
adf_power_btn adf_power_btn
= fgGetNode( "/instrumentation/kr-87/inputs/power-btn", true ); = 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_flt_ann = fgGetNode( "/instrumentation/kr-87/annunciators/flt", true );
adf_et_ann = fgGetNode( "/instrumentation/kr-87/annunciators/et", true ); adf_et_ann = fgGetNode( "/instrumentation/kr-87/annunciators/et", true );
inner = fgGetNode( "/radios/marker-beacon/inner", true ); inner = fgGetNode( "/instrumentation/marker-beacon/inner", true );
middle = fgGetNode( "/radios/marker-beacon/middle", true ); middle = fgGetNode( "/instrumentation/marker-beacon/middle", true );
outer = fgGetNode( "/radios/marker-beacon/outer", true ); outer = fgGetNode( "/instrumentation/marker-beacon/outer", true );
xpdr_ident_btn xpdr_ident_btn
= fgGetNode( "/instrumentation/kt-70/inputs/ident-btn", true ); = fgGetNode( "/instrumentation/kt-70/inputs/ident-btn", true );

10
src/Network/native_gui.cxx
View file

@ -306,13 +306,13 @@ void FGNetGUI2Props( FGNetGUI *net ) {
globals->get_scenery()->set_cur_elev( net->ground_elev ); globals->get_scenery()->set_cur_elev( net->ground_elev );
// Approach // Approach
fgSetDouble( "/radios/nav[0]/frequencies/selected-mhz", fgSetDouble( "/instrumentation/nav[0]/frequencies/selected-mhz",
net->tuned_freq ); net->tuned_freq );
fgSetBool( "/radios/nav[0]/in-range", net->in_range ); fgSetBool( "/instrumentation/nav[0]/in-range", net->in_range );
fgSetDouble( "/radios/dme/distance-nm", net->dist_nm ); fgSetDouble( "/instrumentation/dme/distance-nm", net->dist_nm );
fgSetDouble( "/radios/nav[0]/heading-needle-deflection", fgSetDouble( "/instrumentation/nav[0]/heading-needle-deflection",
net->course_deviation_deg ); net->course_deviation_deg );
fgSetDouble( "/radios/nav[0]/gs-needle-deflection", fgSetDouble( "/instrumentation/nav[0]/gs-needle-deflection",
net->gs_deviation_deg ); net->gs_deviation_deg );
} else { } else {
SG_LOG( SG_IO, SG_ALERT, SG_LOG( SG_IO, SG_ALERT,