X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FInstrumentation%2Ftacan.hxx;h=2056eb78889d803062c8e2a4778603b80783c66a;hb=5c101b8021a14ac1e5d60b77b76140b1365460dc;hp=8c119abb3d374e616bed25e1837beab88ad4adcb;hpb=d452ad97f193b56c590c218fd12731986decdbe5;p=flightgear.git diff --git a/src/Instrumentation/tacan.hxx b/src/Instrumentation/tacan.hxx index 8c119abb3..2056eb788 100755 --- a/src/Instrumentation/tacan.hxx +++ b/src/Instrumentation/tacan.hxx @@ -68,6 +68,9 @@ private: SGPropertyNode_ptr _x_shift_node; SGPropertyNode_ptr _y_shift_node; SGPropertyNode_ptr _rotation_node; + /*SGPropertyNode_ptr _x_shift_calibration_node; + SGPropertyNode_ptr _y_shift_calibration_node; + SGPropertyNode_ptr _distance_calibration_node;*/ SGPropertyNode_ptr _in_range_node; SGPropertyNode_ptr _distance_node; @@ -81,36 +84,30 @@ private: SGPropertyNode_ptr _channel_node; SGPropertyNode_ptr _tanker_callsign_node; + SGPropertyNode_ptr _mp_callsign_node; double _last_distance_nm; double _last_frequency_mhz; double _time_before_search_sec; - bool _carrier_valid; - bool _tanker_valid; + bool _mobile_valid; bool _transmitter_valid; - Point3D _transmitter; - double _transmitter_lat, _transmitter_lon; - double _transmitter_elevation_ft; + SGVec3d _transmitter; + SGGeod _transmitter_pos; double _transmitter_range_nm; double _transmitter_bearing_deg; double _transmitter_bias; string _transmitter_name; - - double _carrier_lat, _carrier_lon; - double _carrier_elevation_ft; - double _carrier_range_nm; - double _carrier_bearing_deg; - double _carrier_bias; - string _carrier_name; - - double _tanker_lat, _tanker_lon; - double _tanker_elevation_ft; - double _tanker_range_nm; - double _tanker_bearing_deg; - double _tanker_bias; - string _tanker_name; + string _transmitter_ident; + + double _mobile_lat, _mobile_lon; + double _mobile_elevation_ft; + double _mobile_range_nm; + double _mobile_bearing_deg; + double _mobile_bias; + string _mobile_name; + string _mobile_ident; string name; int num;