fly/flightgear
1
0
Fork 0
Code Activity

Return to original property names.

Browse source
This commit is contained in:
curt 2004-03-23 02:44:24 +00:00
parent 22d8f5a72c
commit 2b721e8443
2 changed files with 13 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/Instrumentation/gps.cxx
View file

@ -70,7 +70,7 @@ GPS::init ()
_wp_name_node = _wp_name_node =
fgGetNode("/instrumentation/gps/wp-name", true); fgGetNode("/instrumentation/gps/wp-name", true);
_wp_course_node = _wp_course_node =
fgGetNode("/instrumentation/gps/course-deg", true); fgGetNode("/instrumentation/gps/indicated-course-deg", true);
_get_nearest_airport_node = _get_nearest_airport_node =
fgGetNode("/instrumentation/gps/get-nearest-airport", true); fgGetNode("/instrumentation/gps/get-nearest-airport", true);
_waypoint_type_node = _waypoint_type_node =
@ -78,25 +78,23 @@ GPS::init ()
_raim_node = fgGetNode("/instrumentation/gps/raim", true); _raim_node = fgGetNode("/instrumentation/gps/raim", true);
_indicated_longitude_node = _indicated_longitude_node =
fgGetNode("/instrumentation/gps/longitude-deg", true); fgGetNode("/instrumentation/gps/indicated-longitude-deg", true);
_indicated_latitude_node = _indicated_latitude_node =
fgGetNode("/instrumentation/gps/latitude-deg", true); fgGetNode("/instrumentation/gps/indicated-latitude-deg", true);
_indicated_altitude_node = _indicated_altitude_node =
fgGetNode("/instrumentation/gps/altitude-ft", true); fgGetNode("/instrumentation/gps/indicated-altitude-ft", true);
_true_track_node = _true_track_node =
fgGetNode("/instrumentation/gps/track-true-deg", true); fgGetNode("/instrumentation/gps/indicated-track-true-deg", true);
_magnetic_track_node = _magnetic_track_node =
fgGetNode("/instrumentation/gps/track-magnetic-deg", true); fgGetNode("/instrumentation/gps/indicated-track-magnetic-deg", true);
_speed_node = _speed_node =
fgGetNode("/instrumentation/gps/ground-speed-kt", true); fgGetNode("/instrumentation/gps/indicated-ground-speed-kt", true);
_wp_distance_node = _wp_distance_node =
fgGetNode("/instrumentation/gps/wp-distance-nm", true); fgGetNode("/instrumentation/gps/wp-distance-nm", true);
_wp_ttw_node = _wp_ttw_node =
fgGetNode("/instrumentation/gps/TTW",true); fgGetNode("/instrumentation/gps/TTW",true);
_wp_bearing_node = _wp_bearing_node =
fgGetNode("/instrumentation/gps/wp-bearing-deg", true); fgGetNode("/instrumentation/gps/wp-bearing-deg", true);
_wp_actual_radial_node =
fgGetNode("/instrumentation/gps/radials/actual-deg", true);
_wp_course_deviation_node = _wp_course_deviation_node =
fgGetNode("/instrumentation/gps/course-deviation-deg", true); fgGetNode("/instrumentation/gps/course-deviation-deg", true);
_wp_course_error_nm_node = _wp_course_error_nm_node =
@ -129,7 +127,6 @@ GPS::update (double delta_time_sec)
_speed_node->setDoubleValue(0); _speed_node->setDoubleValue(0);
_wp_distance_node->setDoubleValue(0); _wp_distance_node->setDoubleValue(0);
_wp_bearing_node->setDoubleValue(0); _wp_bearing_node->setDoubleValue(0);
_wp_actual_radial_node->setDoubleValue(0);
_wp_longitude_node->setDoubleValue(0); _wp_longitude_node->setDoubleValue(0);
_wp_latitude_node->setDoubleValue(0); _wp_latitude_node->setDoubleValue(0);
_wp_course_node->setDoubleValue(0); _wp_course_node->setDoubleValue(0);
@ -271,24 +268,6 @@ GPS::update (double delta_time_sec)
else else
_wp_ttw_node->setStringValue("--:--:--"); _wp_ttw_node->setStringValue("--:--:--");
/*
// We are on the radial 180 degrees from the bearing to the waypoint.
wp_actual_radial_deg = wp_bearing - 180.0;
while (wp_actual_radial_deg < 0.0) {
wp_actual_radial_deg += 360.0; }
while (wp_actual_radial_deg >= 360.0) {
wp_actual_radial_deg -= 360.0; }
_wp_actual_radial_node->setDoubleValue(wp_actual_radial_deg);
// We want to be on the radial 180 degrees from the desired course.
wp_course_deg -= 180.0;
while (wp_course_deg < 0.0) {
wp_course_deg += 360.0; }
while (wp_course_deg >= 360.0) {
wp_course_deg -= 360.0;
}
*/
// Course deviation is the diffenrence between the bearing // Course deviation is the diffenrence between the bearing
// and the course. // and the course.
wp_course_deviation_deg = wp_bearing_deg - wp_course_deviation_deg = wp_bearing_deg -

14
src/Instrumentation/gps.hxx
View file

@ -37,17 +37,16 @@
* *
* Output properties: * Output properties:
* *
* /instrumentation/gps/longitude-deg * /instrumentation/gps/indicated-longitude-deg
* /instrumentation/gps/latitude-deg * /instrumentation/gps/indicated-latitude-deg
* /instrumentation/gps/altitude-ft * /instrumentation/gps/indicated-altitude-ft
* /instrumentation/gps/track-true-deg * /instrumentation/gps/indicated-track-true-deg
* /instrumentation/gps/track-magnetic-deg * /instrumentation/gps/indicated-track-magnetic-deg
* /instrumentation/gps/ground-speed-kt * /instrumentation/gps/indicated-ground-speed-kt
* *
* /instrumentation/gps/wp-distance-m * /instrumentation/gps/wp-distance-m
* /instrumentation/gps/wp-bearing-deg * /instrumentation/gps/wp-bearing-deg
* /instrumentation/gps/TTW * /instrumentation/gps/TTW
* /instrumentation/gps/wp-bearing-deg
* /instrumentation/gps/radials/actual-deg * /instrumentation/gps/radials/actual-deg
* /instrumentation/gps/course-deviation-deg * /instrumentation/gps/course-deviation-deg
* /instrumentation/gps/course-error-nm * /instrumentation/gps/course-error-nm
@ -95,7 +94,6 @@ private:
SGPropertyNode_ptr _wp_distance_node; SGPropertyNode_ptr _wp_distance_node;
SGPropertyNode_ptr _wp_ttw_node; SGPropertyNode_ptr _wp_ttw_node;
SGPropertyNode_ptr _wp_bearing_node; SGPropertyNode_ptr _wp_bearing_node;
SGPropertyNode_ptr _wp_actual_radial_node;
SGPropertyNode_ptr _wp_course_deviation_node; SGPropertyNode_ptr _wp_course_deviation_node;
SGPropertyNode_ptr _wp_course_error_nm_node; SGPropertyNode_ptr _wp_course_error_nm_node;
SGPropertyNode_ptr _wp_to_flag_node; SGPropertyNode_ptr _wp_to_flag_node;