X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCockpit%2Fkr_87.cxx;h=9c06f9a491968290c22d87464032793af1e714c6;hb=8cc7b283d54d10150ad0883e96fd05ce020e7ed8;hp=0cc2b4adffdb7efc4d2dee8514c224a4485b623c;hpb=f4e1298a1a2ff16a8cd2cea90214956f273afa2e;p=flightgear.git diff --git a/src/Cockpit/kr_87.cxx b/src/Cockpit/kr_87.cxx index 0cc2b4adf..9c06f9a49 100644 --- a/src/Cockpit/kr_87.cxx +++ b/src/Cockpit/kr_87.cxx @@ -73,6 +73,8 @@ FGKR_87::FGKR_87() : lon_node(fgGetNode("/position/longitude-deg", true)), lat_node(fgGetNode("/position/latitude-deg", true)), alt_node(fgGetNode("/position/altitude-ft", true)), + bus_power(fgGetNode("/systems/electrical/outputs/adf", true)), + servicable(fgGetNode("/instrumentation/adf/servicable", true)), need_update(true), valid(false), inrange(false), @@ -85,7 +87,9 @@ FGKR_87::FGKR_87() : timer_mode(0), count_mode(0), rotation(0), - on_off_vol_btn(0.5), + power_btn(true), + audio_btn(true), + vol_btn(0.5), adf_btn(true), bfo_btn(false), frq_btn(false), @@ -94,7 +98,6 @@ FGKR_87::FGKR_87() : last_flt_et_btn(false), set_rst_btn(false), last_set_rst_btn(false), - ident_btn(false), freq(0.0), stby_freq(0.0), needle_deg(0.0), @@ -102,32 +105,17 @@ FGKR_87::FGKR_87() : elapsed_timer(0.0), tmp_timer(0.0) { - SGPath path( globals->get_fg_root() ); - SGPath term = path; - term.append( "Navaids/range.term" ); - SGPath low = path; - low.append( "Navaids/range.low" ); - SGPath high = path; - high.append( "Navaids/range.high" ); - - term_tbl = new SGInterpTable( term.str() ); - low_tbl = new SGInterpTable( low.str() ); - high_tbl = new SGInterpTable( high.str() ); } // Destructor FGKR_87::~FGKR_87() { - delete term_tbl; - delete low_tbl; - delete high_tbl; } void FGKR_87::init () { + servicable->setBoolValue( true ); morse.init(); - - update(0); // FIXME: use dt } @@ -152,10 +140,18 @@ void FGKR_87::bind () { fgTie("/radios/kr-87/inputs/rotation-deg", this, &FGKR_87::get_rotation, &FGKR_87::set_rotation); fgSetArchivable("/radios/kr-87/inputs/rotation-deg"); - fgTie("/radios/kr-87/inputs/on-off-volume", this, - &FGKR_87::get_on_off_vol_btn, - &FGKR_87::set_on_off_vol_btn); - fgSetArchivable("/radios/kr-87/inputs/on-off-volume"); + fgTie("/radios/kr-87/inputs/power-btn", this, + &FGKR_87::get_power_btn, + &FGKR_87::set_power_btn); + fgSetArchivable("/radios/kr-87/inputs/power-btn"); + fgTie("/radios/kr-87/inputs/audio-btn", this, + &FGKR_87::get_audio_btn, + &FGKR_87::set_audio_btn); + fgSetArchivable("/radios/kr-87/inputs/audio-btn"); + fgTie("/radios/kr-87/inputs/volume", this, + &FGKR_87::get_vol_btn, + &FGKR_87::set_vol_btn); + fgSetArchivable("/radios/kr-87/inputs/volume"); fgTie("/radios/kr-87/inputs/adf-btn", this, &FGKR_87::get_adf_btn, &FGKR_87::set_adf_btn); @@ -171,8 +167,6 @@ void FGKR_87::bind () { fgTie("/radios/kr-87/inputs/set-rst-btn", this, &FGKR_87::get_set_rst_btn, &FGKR_87::set_set_rst_btn); - fgTie("/radios/kr-87/inputs/ident-btn", this, - &FGKR_87::get_ident_btn, &FGKR_87::set_ident_btn); // outputs fgTie("/radios/kr-87/outputs/selected-khz", this, @@ -213,7 +207,8 @@ void FGKR_87::unbind () { // input and buttons fgUntie("/radios/kr-87/inputs/rotation-deg"); - fgUntie("/radios/kr-87/inputs/on-off-volume"); + fgUntie("/radios/kr-87/inputs/power-btn"); + fgUntie("/radios/kr-87/inputs/volume"); fgUntie("/radios/kr-87/inputs/adf-btn"); fgUntie("/radios/kr-87/inputs/bfo-btn"); fgUntie("/radios/kr-87/inputs/frq-btn"); @@ -254,7 +249,7 @@ void FGKR_87::update( double dt ) { // Radio //////////////////////////////////////////////////////////////////////// - if ( on_off_vol_btn >= 0.01 ) { + if ( has_power() && servicable->getBoolValue() ) { // buttons if ( adf_btn == 0 ) { ant_mode = 1; @@ -446,15 +441,18 @@ void FGKR_87::update( double dt ) { // cout << "flt = " << flight_timer << " et = " << elapsed_timer // << " needle = " << needle_deg << endl; -#ifdef ENABLE_AUDIO_SUPPORT - if ( valid && inrange ) { - // play station ident via audio system if on + ident_btn, + if ( valid && inrange && servicable->getBoolValue() ) { + // play station ident via audio system if on + ant mode, // otherwise turn it off - if ( on_off_vol_btn >= 0.01 && ident_btn ) { + if ( vol_btn >= 0.01 && audio_btn ) { FGSimpleSound *sound; sound = globals->get_soundmgr()->find( "adf-ident" ); if ( sound != NULL ) { - sound->set_volume( on_off_vol_btn ); + if ( !adf_btn ) { + sound->set_volume( vol_btn ); + } else { + sound->set_volume( vol_btn / 4.0 ); + } } else { SG_LOG( SG_COCKPIT, SG_ALERT, "Can't find adf-ident sound" ); } @@ -474,7 +472,6 @@ void FGKR_87::update( double dt ) { globals->get_soundmgr()->stop( "adf-ident" ); } } -#endif } @@ -485,35 +482,35 @@ void FGKR_87::search() { double acft_elev = alt_node->getDoubleValue() * SG_FEET_TO_METER; // FIXME: the panel should handle this - FGNav nav; - static string last_ident = ""; //////////////////////////////////////////////////////////////////////// // ADF. //////////////////////////////////////////////////////////////////////// - if ( current_navlist->query( acft_lon, acft_lat, acft_elev, freq, &nav ) ) { + FGNav *nav + = current_navlist->findByFreq(freq, acft_lon, acft_lat, acft_elev); + + if ( nav != NULL ) { char sfreq[128]; snprintf( sfreq, 10, "%.0f", freq ); ident = sfreq; - ident += nav.get_ident(); -// cout << "adf ident = " << ident << endl; + ident += nav->get_ident(); + // cout << "adf ident = " << ident << endl; valid = true; if ( last_ident != ident ) { last_ident = ident; - trans_ident = nav.get_trans_ident(); - stn_lon = nav.get_lon(); - stn_lat = nav.get_lat(); - stn_elev = nav.get_elev(); - range = nav.get_range(); + trans_ident = nav->get_trans_ident(); + stn_lon = nav->get_lon(); + stn_lat = nav->get_lat(); + stn_elev = nav->get_elev(); + range = nav->get_range(); effective_range = kludgeRange(stn_elev, acft_elev, range); - x = nav.get_x(); - y = nav.get_y(); - z = nav.get_z(); + x = nav->get_x(); + y = nav->get_y(); + z = nav->get_z(); -#ifdef ENABLE_AUDIO_SUPPORT if ( globals->get_soundmgr()->exists( "adf-ident" ) ) { globals->get_soundmgr()->remove( "adf-ident" ); } @@ -530,18 +527,15 @@ void FGKR_87::search() { // << play_count << " last_time = " // << last_time << " current time = " // << globals->get_time_params()->get_cur_time() << endl; -#endif // cout << "Found an adf station in range" << endl; - // cout << " id = " << nav.get_ident() << endl; + // cout << " id = " << nav->get_ident() << endl; } } else { valid = false; ident = ""; trans_ident = ""; -#ifdef ENABLE_AUDIO_SUPPORT globals->get_soundmgr()->remove( "adf-ident" ); -#endif last_ident = ""; // cout << "not picking up adf. :-(" << endl; }