#include <Network/atlas.hxx>
#include <Network/AV400.hxx>
#include <Network/AV400Sim.hxx>
+#include <Network/AV400WSim.hxx>
#include <Network/garmin.hxx>
#include <Network/httpd.hxx>
#ifdef FG_JPEG_SERVER
#include <Network/rul.hxx>
#include <Network/generic.hxx>
#include <Network/multiplay.hxx>
+#ifdef FG_HAVE_HLA
+#include <Network/HLA/hla.hxx>
+#endif
#include "globals.hxx"
#include "fg_io.hxx"
} else if ( protocol == "AV400Sim" ) {
FGAV400Sim *av400sim = new FGAV400Sim;
io = av400sim;
- } else if ( protocol == "garmin" ) {
+ } else if ( protocol == "AV400WSimA" ) {
+ FGAV400WSimA *av400wsima = new FGAV400WSimA;
+ io = av400wsima;
+ } else if ( protocol == "AV400WSimB" ) {
+ FGAV400WSimB *av400wsimb = new FGAV400WSimB;
+ io = av400wsimb;
+ } else if ( protocol == "garmin" ) {
FGGarmin *garmin = new FGGarmin;
io = garmin;
} else if ( protocol == "httpd" ) {
string host = tokens[3];
string port = tokens[4];
return new FGMultiplay(dir, atoi(rate.c_str()), host, atoi(port.c_str()));
+#ifdef FG_HAVE_HLA
+ } else if ( protocol == "hla" ) {
+ return new FGHLA(tokens);
+#endif
} else {
return NULL;
}
delete io;
return 0;
}
-
+
if (tokens.size() < 3) {
SG_LOG( SG_IO, SG_ALERT, "Incompatible number of network arguments.");
return NULL;
string baud = tokens[5];
SG_LOG( SG_IO, SG_INFO, " baud = " << baud );
-
+
SGSerial *ch = new SGSerial( device, baud );
io->set_io_channel( ch );
+
+ if ( protocol == "AV400WSimB" ) {
+ if ( tokens.size() < 7 ) {
+ SG_LOG( SG_IO, SG_ALERT, "Missing second hz for AV400WSimB.");
+ return NULL;
+ }
+ FGAV400WSimB *fgavb = static_cast<FGAV400WSimB*>(io);
+ string hz2_str = tokens[6];
+ double hz2 = atof(hz2_str.c_str());
+ fgavb->set_hz2(hz2);
+ }
} else if ( medium == "file" ) {
// file name
if ( tokens.size() < 4) {
SG_LOG( SG_IO, SG_ALERT, "Incompatible number of arguments for file I/O.");
return NULL;
}
-
+
string file = tokens[4];
SG_LOG( SG_IO, SG_INFO, " file name = " << file );
int repeat = 1;
// SG_LOG( SG_IO, SG_INFO, "I/O Channel initialization, " <<
// globals->get_channel_options_list()->size() << " requests." );
+ _realDeltaTime = fgGetNode("/sim/time/delta-realtime-sec");
+
FGProtocol *p;
// we could almost do this in a single step except pushing a valid
// process any IO channel work
void
-FGIO::update( double delta_time_sec )
+FGIO::update( double /* delta_time_sec */ )
{
- // cout << "processing I/O channels" << endl;
- // cout << " Elapsed time = " << delta_time_sec << endl;
+ // use wall-clock, not simulation, delta time, so that network
+ // protocols update when the simulation is paused
+ // see http://code.google.com/p/flightgear-bugs/issues/detail?id=125
+ double delta_time_sec = _realDeltaTime->getDoubleValue();
ProtocolVec::iterator i = io_channels.begin();
ProtocolVec::iterator end = io_channels.end();
for (; i != end; ++i ) {
- FGProtocol* p = *i;
-
- if ( p->is_enabled() ) {
+ FGProtocol* p = *i;
+ if (!p->is_enabled()) {
+ continue;
+ }
+
p->dec_count_down( delta_time_sec );
double dt = 1 / p->get_hz();
if ( p->get_count_down() < 0.33 * dt ) {
p->process();
p->inc_count();
while ( p->get_count_down() < 0.33 * dt ) {
- p->inc_count_down( dt );
+ p->inc_count_down( dt );
}
- // double ave = elapsed_time / p->get_count();
- // cout << " ave rate = " << ave << endl;
- }
- }
- }
+ } // of channel processing
+ } // of io_channels iteration
}
void