//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
//
// $Id$
#include <simgear/io/iochannel.hxx>
#include <simgear/timing/sg_time.hxx>
-#include <Cockpit/radiostack.hxx>
-#include <FDM/flight.hxx>
#include <Time/tmp.hxx>
#include <Main/fg_props.hxx>
#include <Main/globals.hxx>
#include <Scenery/scenery.hxx>
+#include <FDM/flightProperties.hxx>
#include "native_gui.hxx"
// FreeBSD works better with this included last ... (?)
-#if defined(WIN32) && !defined(__CYGWIN__)
+#if defined( _MSC_VER )
# include <windows.h>
+#elif defined( __MINGW32__ )
+# include <winsock2.h>
#else
# include <netinet/in.h> // htonl() ntohl()
#endif
set_enabled( true );
- cur_fdm_state->_set_Sea_level_radius( SG_EQUATORIAL_RADIUS_FT );
+ fgSetDouble("/position/sea-level-radius-ft", SG_EQUATORIAL_RADIUS_FT);
return true;
}
void FGProps2NetGUI( FGNetGUI *net ) {
- int i;
+ static SGPropertyNode *nav_freq
+ = fgGetNode("/instrumentation/nav/frequencies/selected-mhz", true);
+ static SGPropertyNode *nav_target_radial
+ = fgGetNode("/instrumentation/nav/radials/target-radial-deg", true);
+ static SGPropertyNode *nav_inrange
+ = fgGetNode("/instrumentation/nav/in-range", true);
+ static SGPropertyNode *nav_loc
+ = fgGetNode("/instrumentation/nav/nav-loc", true);
+ static SGPropertyNode *nav_gs_dist_signed
+ = fgGetNode("/instrumentation/nav/gs-distance", true);
+ static SGPropertyNode *nav_loc_dist
+ = fgGetNode("/instrumentation/nav/nav-distance", true);
+ static SGPropertyNode *nav_reciprocal_radial
+ = fgGetNode("/instrumentation/nav/radials/reciprocal-radial-deg", true);
+ static SGPropertyNode *nav_gs_deflection
+ = fgGetNode("/instrumentation/nav/gs-needle-deflection", true);
+ unsigned int i;
+
+ static FlightProperties* fdm_state = new FlightProperties;
// Version sanity checking
net->version = FG_NET_GUI_VERSION;
// Aero parameters
- net->longitude = cur_fdm_state->get_Longitude();
- net->latitude = cur_fdm_state->get_Latitude();
- net->altitude = cur_fdm_state->get_Altitude() * SG_FEET_TO_METER;
- net->phi = cur_fdm_state->get_Phi();
- net->theta = cur_fdm_state->get_Theta();
- net->psi = cur_fdm_state->get_Psi();
+ net->longitude = fdm_state->get_Longitude();
+ net->latitude = fdm_state->get_Latitude();
+ net->altitude = fdm_state->get_Altitude() * SG_FEET_TO_METER;
+ net->phi = fdm_state->get_Phi();
+ net->theta = fdm_state->get_Theta();
+ net->psi = fdm_state->get_Psi();
// Velocities
- net->vcas = cur_fdm_state->get_V_calibrated_kts();
- net->climb_rate = cur_fdm_state->get_Climb_Rate();
+ net->vcas = fdm_state->get_V_calibrated_kts();
+ net->climb_rate = fdm_state->get_Climb_Rate();
// Consumables
net->num_tanks = FGNetGUI::FG_MAX_TANKS;
// Environment
net->cur_time = globals->get_time_params()->get_cur_time();
net->warp = globals->get_warp();
- net->ground_elev = globals->get_scenery()->get_cur_elev();
+ net->ground_elev = fdm_state->get_Runway_altitude_m();
// Approach
- net->tuned_freq = current_radiostack->get_navcom1()->get_nav_freq();
- net->nav_radial = current_radiostack->get_navcom1()->get_nav_target_radial();
- net->in_range = current_radiostack->get_navcom1()->get_nav_inrange();
+ net->tuned_freq = nav_freq->getDoubleValue();
+ net->nav_radial = nav_target_radial->getDoubleValue();
+ net->in_range = nav_inrange->getBoolValue();
- if ( current_radiostack->get_navcom1()->get_nav_loc() ) {
+ if ( nav_loc->getBoolValue() ) {
// is an ILS
net->dist_nm
- = current_radiostack->get_navcom1()->get_nav_gs_dist_signed()
+ = nav_gs_dist_signed->getDoubleValue()
* SG_METER_TO_NM;
} else {
// is a VOR
- net->dist_nm = current_radiostack->get_navcom1()->get_nav_loc_dist()
+ net->dist_nm = nav_loc_dist->getDoubleValue()
* SG_METER_TO_NM;
}
net->course_deviation_deg
- = current_radiostack->get_navcom1()->get_nav_reciprocal_radial()
- - current_radiostack->get_navcom1()->get_nav_target_radial();
+ = nav_reciprocal_radial->getDoubleValue()
+ - nav_target_radial->getDoubleValue();
+
if ( net->course_deviation_deg < -1000.0
|| net->course_deviation_deg > 1000.0 )
{
? -net->course_deviation_deg - 180.0
: -net->course_deviation_deg + 180.0 );
- if ( current_radiostack->get_navcom1()->get_nav_loc() ) {
+ if ( nav_loc->getBoolValue() ) {
// is an ILS
net->gs_deviation_deg
- = current_radiostack->get_navcom1()->get_nav_gs_deflection()
+ = nav_gs_deflection->getDoubleValue()
/ 5.0;
} else {
// is an ILS
htonf(net->tuned_freq);
htonf(net->nav_radial);
- net->in_range = htonl(net->in_range);
+ net->in_range = htonl( net->in_range );
htonf(net->dist_nm);
htonf(net->course_deviation_deg);
htonf(net->gs_deviation_deg);
void FGNetGUI2Props( FGNetGUI *net ) {
- int i;
+ unsigned int i;
#if defined( FG_USE_NETWORK_BYTE_ORDER )
// Convert to the net buffer from network format
net->ground_elev = htonl( net->ground_elev );
htonf(net->tuned_freq);
- net->in_range = htonl(net->in_range);
+ htonf(net->nav_radial);
+ net->in_range = htonl( net->in_range );
htonf(net->dist_nm);
htonf(net->course_deviation_deg);
htonf(net->gs_deviation_deg);
#endif
if ( net->version == FG_NET_GUI_VERSION ) {
+ FlightProperties fdm_state;
+
// cout << "pos = " << net->longitude << " " << net->latitude << endl;
- // cout << "sea level rad = " << cur_fdm_state->get_Sea_level_radius()
+ // cout << "sea level rad = " << fdm_state->get_Sea_level_radius()
// << endl;
- cur_fdm_state->_updateGeodeticPosition( net->latitude,
- net->longitude,
- net->altitude
- * SG_METER_TO_FEET );
- cur_fdm_state->_set_Euler_Angles( net->phi,
+
+ fdm_state.set_Latitude(net->latitude);
+ fdm_state.set_Longitude(net->longitude);
+ fdm_state.set_Altitude(net->altitude * SG_METER_TO_FEET);
+
+ fdm_state.set_Euler_Angles( net->phi,
net->theta,
net->psi );
- cur_fdm_state->_set_V_calibrated_kts( net->vcas );
- cur_fdm_state->_set_Climb_Rate( net->climb_rate );
+ fdm_state.set_V_calibrated_kts( net->vcas );
+ fdm_state.set_Climb_Rate( net->climb_rate );
for (i = 0; i < net->num_tanks; ++i ) {
SGPropertyNode * node
}
globals->set_warp( net->warp );
- globals->get_scenery()->set_cur_elev( net->ground_elev );
// Approach
- fgSetDouble( "/radios/nav[0]/frequencies/selected-mhz",
+ fgSetDouble( "/instrumentation/nav[0]/frequencies/selected-mhz",
net->tuned_freq );
- fgSetBool( "/radios/nav[0]/in-range", net->in_range );
- fgSetDouble( "/radios/dme/distance-nm", net->dist_nm );
- fgSetDouble( "/radios/nav[0]/heading-needle-deflection",
+ fgSetBool( "/instrumentation/nav[0]/in-range", net->in_range );
+ fgSetDouble( "/instrumentation/dme/indicated-distance-nm", net->dist_nm );
+ fgSetDouble( "/instrumentation/nav[0]/heading-needle-deflection",
net->course_deviation_deg );
- fgSetDouble( "/radios/nav[0]/gs-needle-deflection",
+ fgSetDouble( "/instrumentation/nav[0]/gs-needle-deflection",
net->gs_deviation_deg );
} else {
SG_LOG( SG_IO, SG_ALERT,
int length = sizeof(buf);
if ( get_direction() == SG_IO_OUT ) {
- // cout << "size of cur_fdm_state = " << length << endl;
+ // cout << "size of fdm_state = " << length << endl;
FGProps2NetGUI( &buf );
if ( ! io->write( (char *)(& buf), length ) ) {
SG_LOG( SG_IO, SG_ALERT, "Error writing data." );
projects / flightgear.git / blobdiff