fly/flightgear
1
0
Fork 0
Code Activity

Re-structure the nav-radio code, in preparation for cleaner GPS-slave separation. No functionality changes (hopefully).

Browse source
This commit is contained in:
jmt 2009-09-02 17:01:30 +00:00 • committed by Tim Moore
parent 5a01c55335
commit 80a6317ab6
2 changed files with 497 additions and 629 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1093
src/Instrumentation/navradio.cxx
View file

File diff suppressed because it is too large Load diff

33
src/Instrumentation/navradio.hxx
View file

@ -26,14 +26,17 @@
#include <Main/fg_props.hxx> #include <Main/fg_props.hxx>
#include "Sound/morse.hxx"
#include <simgear/compiler.h> #include <simgear/compiler.h>
#include <simgear/structure/subsystem_mgr.hxx> #include <simgear/structure/subsystem_mgr.hxx>
#include <simgear/math/interpolater.hxx>
#include <simgear/timing/timestamp.hxx> #include <simgear/timing/timestamp.hxx>
#include <Navaids/navlist.hxx> // forward decls
#include <Sound/morse.hxx> class SGInterpTable;
class FGNavRecord;
typedef SGSharedPtr<FGNavRecord> FGNavRecordPtr;
class FGNavRadio : public SGSubsystem class FGNavRadio : public SGSubsystem
{ {
@ -110,32 +113,20 @@ class FGNavRadio : public SGSubsystem
// internal (private) values // internal (private) values
string last_nav_id;
bool last_nav_vor;
int play_count; int play_count;
time_t last_time; time_t last_time;
FGNavRecordPtr _navaid;
int index; // used for property binding FGNavRecordPtr _gs;
string nav_fx_name; string nav_fx_name;
string dme_fx_name; string dme_fx_name;
string trans_ident;
bool is_valid;
bool has_dme; bool has_dme;
double radial;
double target_radial; double target_radial;
double loc_lon;
double loc_lat;
SGVec3d nav_xyz;
double gs_lon;
double gs_lat;
double nav_elev; // use gs elev if available
SGVec3d gs_xyz;
SGVec3d gs_base_vec; SGVec3d gs_base_vec;
double gs_dist_signed; double gs_dist_signed;
SGTimeStamp prev_time; SGTimeStamp prev_time;
SGTimeStamp curr_time; SGTimeStamp curr_time;
double range;
double effective_range; double effective_range;
double target_gs; double target_gs;
double twist; double twist;
@ -150,6 +141,8 @@ class FGNavRadio : public SGSubsystem
// internal periodic station search timer // internal periodic station search timer
double _time_before_search_sec; double _time_before_search_sec;
bool updateWithPower(double aDt);
// model standard VOR/DME/TACAN service volumes as per AIM 1-1-8 // model standard VOR/DME/TACAN service volumes as per AIM 1-1-8
double adjustNavRange( double stationElev, double aircraftElev, double adjustNavRange( double stationElev, double aircraftElev,
double nominalRange ); double nominalRange );
@ -158,6 +151,10 @@ class FGNavRadio : public SGSubsystem
double adjustILSRange( double stationElev, double aircraftElev, double adjustILSRange( double stationElev, double aircraftElev,
double offsetDegrees, double distance ); double offsetDegrees, double distance );
void updateAudio(bool aInRange);
void audioNavidChanged();
FGNavRecord* findPrimaryNavaid(const SGGeod& aPos, double aFreqMHz);
public: public:
FGNavRadio(SGPropertyNode *node); FGNavRadio(SGPropertyNode *node);