#include <vector>
#include "opengc.hxx"
-#include <FDM/flight.hxx>
+#include <FDM/flightProperties.hxx>
#include <Main/globals.hxx>
#include <Main/fg_props.hxx>
wind_dir_node(fgGetNode("/environment/wind-from-heading-deg[0]", true)),
wind_speed_node(fgGetNode("/environment/wind-speed-kt[0]", true)),
magvar_node(fgGetNode("/environment/magnetic-variation-deg[0]", true)),
- p_left_aileron(fgGetNode("surface-positions/left-aileron-pos-norm", true)),
- p_right_aileron(fgGetNode("surface-positions/right-aileron-pos-norm", true)),
- p_elevator(fgGetNode("surface-positions/elevator-pos-norm", true)),
- p_elevator_trim(fgGetNode("surface-positions/elevator_trim-pos-norm", true)),
- p_rudder(fgGetNode("surface-positions/rudder-pos-norm", true)),
- p_flaps(fgGetNode("surface-positions/flap-pos-norm", true)),
- p_flaps_cmd(fgGetNode("/controls/flight/flaps", true)),
- p_alphadot(fgGetNode("/fdm/jsbsim/aero/alphadot-rad_sec[0]", true)),
- p_betadot(fgGetNode("/fdm/jsbsim/aero/betadot-rad_sec[0]", true)),
p_latitude(fgGetNode("/position/latitude-deg", true)),
p_longitude(fgGetNode("/position/longitude-deg", true)),
p_elev_node(fgGetNode("/position/altitude-ft", true)),
p_altitude_agl(fgGetNode("/position/altitude-agl-ft", true)),
+ p_pitch(fgGetNode("/orientation/pitch-deg[0]", true)),
+ p_bank(fgGetNode("/orientation/roll-deg[0]", true)),
+ p_heading(fgGetNode("/orientation/heading-magnetic-deg[0]", true)),
+ p_yaw(fgGetNode("/fdm/jsbsim/aero/beta-rad[0]", true)),
+ p_yaw_rate(fgGetNode("/fdm/jsbsim/aero/betadot-rad_sec[0]", true)),
vel_kcas(fgGetNode("/velocities/airspeed-kt[0]", true)),
p_vvi(fgGetNode("/velocities/vertical-speed-fps[0]", true )),
p_mach(fgGetNode("/velocities/mach[0]", true )),
+ p_left_aileron(fgGetNode("surface-positions/left-aileron-pos-norm", true)),
+ p_right_aileron(fgGetNode("surface-positions/right-aileron-pos-norm", true)),
+ p_elevator(fgGetNode("surface-positions/elevator-pos-norm", true)),
+ p_elevator_trim(fgGetNode("surface-positions/elevator_trim-pos-norm", true)),
+ p_rudder(fgGetNode("surface-positions/rudder-pos-norm", true)),
+ p_flaps(fgGetNode("surface-positions/flap-pos-norm", true)),
+ p_flaps_cmd(fgGetNode("/controls/flight/flaps", true)),
+ p_park_brake(fgGetNode("/controls/gear/brake-parking", true)),
egt0_node(fgGetNode("/engines/engine/EGT_degC[0]", true)),
egt1_node(fgGetNode("/engines/engine[1]/EGT_degC[0]", true)),
egt2_node(fgGetNode("/engines/engine[2]/EGT_degC[0]", true)),
tank5_node(fgGetNode("/consumables/fuel/tank[5]/level-lb[0]", true)),
tank6_node(fgGetNode("/consumables/fuel/tank[6]/level-lb[0]", true)),
tank7_node(fgGetNode("/consumables/fuel/tank[7]/level-lb[0]", true)),
- p_park_brake(fgGetNode("/controls/gear/brake-parking", true)),
- p_pitch(fgGetNode("/orientation/pitch-deg[0]", true)),
- p_bank(fgGetNode("/orientation/roll-deg[0]", true)),
- p_heading(fgGetNode("/orientation/heading-magnetic-deg[0]", true)),
- p_yaw(fgGetNode("/fdm/jsbsim/aero/beta-rad[0]", true)),
- p_yaw_rate(fgGetNode("/fdm/jsbsim/aero/betadot-rad_sec[0]", true))
-
+ p_alphadot(fgGetNode("/fdm/jsbsim/aero/alphadot-rad_sec[0]", true)),
+ p_betadot(fgGetNode("/fdm/jsbsim/aero/betadot-rad_sec[0]", true))
{
+ fdm = new FlightProperties;
}
FGOpenGC::~FGOpenGC() {
+ delete fdm;
}
// open hailing frequencies
}
//static void collect_data( const FGInterface *fdm, ogcFGData *data ) {
-void FGOpenGC::collect_data( const FGInterface *fdm, ogcFGData *data ) {
+void FGOpenGC::collect_data(ogcFGData *data ) {
data->version_id = OGC_VERSION;
data->vvi = p_vvi->getDoubleValue();
data->mach = p_mach->getDoubleValue();
- data->groundspeed = cur_fdm_state->get_V_ground_speed();
- data->v_keas = cur_fdm_state->get_V_equiv_kts();
+ data->groundspeed = fdm->get_V_ground_speed();
+ data->v_keas = fdm->get_V_equiv_kts();
data->v_kcas = vel_kcas->getDoubleValue();
- data->phi_dot = cur_fdm_state->get_Phi_dot();
- data->theta_dot = cur_fdm_state->get_Theta_dot();
- data->psi_dot = cur_fdm_state->get_Psi_dot();
+ data->phi_dot = fdm->get_Phi_dot();
+ data->theta_dot = fdm->get_Theta_dot();
+ data->psi_dot = fdm->get_Psi_dot();
- data->alpha = cur_fdm_state->get_Alpha();
+ data->alpha = fdm->get_Alpha();
data->beta = p_yaw->getDoubleValue();
data->alpha_dot = p_alphadot->getDoubleValue();
data->beta_dot = p_yaw_rate->getDoubleValue();
data->x_feed_valve[2] = x_feed2_node->getBoolValue();
data->x_feed_valve[3] = x_feed3_node->getBoolValue();
**********/
- data->total_temperature = cur_fdm_state->get_Total_temperature();
- data->total_pressure = cur_fdm_state->get_Total_pressure();
- data->dynamic_pressure = cur_fdm_state->get_Dynamic_pressure();
+ data->total_temperature = fdm->get_Total_temperature();
+ data->total_pressure = fdm->get_Total_pressure();
+ data->dynamic_pressure = fdm->get_Dynamic_pressure();
data->static_pressure = press_node->getDoubleValue();
data->static_temperature = temp_node->getDoubleValue();
data->sea_level_pressure = fgGetDouble("/environment/sea-level-pressure-inhg");
}
-static void distribute_data( const ogcFGData *data, FGInterface *chunk ) {
+static void distribute_data( const ogcFGData *data ) {
// just a place holder until the CDU is developed
}
int length = sizeof(buf);
if ( get_direction() == SG_IO_OUT ) {
- collect_data( cur_fdm_state, &buf );
+ collect_data( &buf );
//collect_data( &buf );
if ( ! io->write( (char *)(& buf), length ) ) {
SG_LOG( SG_IO, SG_ALERT, "Error writing data." );
if ( io->get_type() == sgFileType ) {
if ( io->read( (char *)(& buf), length ) == length ) {
SG_LOG( SG_IO, SG_DEBUG, "Success reading data." );
- distribute_data( &buf, cur_fdm_state );
+ distribute_data( &buf );
}
} else {
while ( io->read( (char *)(& buf), length ) == length ) {
SG_LOG( SG_IO, SG_DEBUG, "Success reading data." );
- distribute_data( &buf, cur_fdm_state );
+ distribute_data( &buf );
}
}
}
projects / flightgear.git / blobdiff