Renamed fg_types.hxx -> sg_types.hxx

Started work on an interactive property manager traverser/setter.

diff --git a/src/Cockpit/steam.cxx b/src/Cockpit/steam.cxx
index 23c1bc1e8716d676452f7bb497c9edbc248ad3cf..31551c35425c953457d6006a430c914b12a2a855 100644 (file)
--- a/src/Cockpit/steam.cxx
+++ b/src/Cockpit/steam.cxx
@@ -30,8 +30,8 @@
 #endif
 
 #include <simgear/constants.h>
+#include <simgear/math/sg_types.hxx>
 #include <simgear/misc/props.hxx>
-#include <simgear/math/fg_types.hxx>
 #include <Aircraft/aircraft.hxx>
 #include <Main/options.hxx>
 #include <Main/bfi.hxx>

diff --git a/src/FDM/LaRCsim.cxx b/src/FDM/LaRCsim.cxx
index 309840807544802c02a8ca98ade5451fa9243ec6..b799988862fadaf29e929d06d21a386406ed923f 100644 (file)
--- a/src/FDM/LaRCsim.cxx
+++ b/src/FDM/LaRCsim.cxx
@@ -31,11 +31,11 @@
 #include <FDM/LaRCsim/ls_generic.h>
 #include <FDM/LaRCsim/ls_interface.h>
 
-#include "10520d.hxx"
+#include "IO360.hxx"
 #include "LaRCsim.hxx"
 
 
-// #define USE_NEW_ENGINE_CODE 1
+#define USE_NEW_ENGINE_CODE 1
 FGEngine eng;
 
 
@@ -89,12 +89,24 @@ int FGLaRCsim::update( int multiloop ) {
     // update simple engine model
     eng.set_IAS( V_calibrated_kts );
     eng.set_Throttle_Lever_Pos( controls.get_throttle( 0 ) * 100.0 );
-    eng.set_Propeller_Lever_Pos( 95 );
-    eng.set_Mixture_Lever_Pos( 100 );
+    eng.set_Propeller_Lever_Pos( 100 );
+    eng.set_Mixture_Lever_Pos( 80 );
     eng.update();
-    cout << "  Thrust = " << eng.get_FGProp1_Thrust() << endl;
-    F_X_engine = eng.get_FGProp1_Thrust() * 1.5;
-#endif
+
+#if 0
+    cout << "Throttle = " << controls.get_throttle( 0 ) * 100.0;
+    cout << " Mixture = " << 80;
+    cout << " RPM = " << eng.get_RPM();
+    cout << " MP = " << eng.get_Manifold_Pressure();
+    cout << " HP = " << ( eng.get_MaxHP() * eng.get_Percentage_Power()
+                         / 100.0 );
+    cout << " EGT = " << eng.get_EGT();
+    cout << " Thrust (N) " << eng.get_prop_thrust_SI();        // Thrust in Newtons
+    cout << '\n';
+#endif // 0
+    
+    F_X_engine = eng.get_prop_thrust_SI() * 0.07;
+#endif // USE_NEW_ENGINE_CODE
 
     double save_alt = 0.0;
     double time_step = (1.0 / current_options.get_model_hz()) * multiloop;

diff --git a/src/FDM/Makefile.am b/src/FDM/Makefile.am
index d10e3ac81d0967963207e81e02c77c2d20c00200..edf8ef6d71af28018264db76dbc40ccac890bd3c 100644 (file)
--- a/src/FDM/Makefile.am
+++ b/src/FDM/Makefile.am
@@ -3,10 +3,10 @@ SUBDIRS       = Balloon JSBSim LaRCsim UIUCModel
 noinst_LIBRARIES = libFlight.a
 
 libFlight_a_SOURCES = \
-       10520d.cxx 10520d.hxx \
        Balloon.cxx Balloon.h \
        External.cxx External.hxx \
        flight.cxx flight.hxx \
+       IO360.cxx IO360.hxx \
        JSBSim.cxx JSBSim.hxx \
        LaRCsim.cxx LaRCsim.hxx \
        MagicCarpet.cxx MagicCarpet.hxx

diff --git a/src/Main/bfi.cxx b/src/Main/bfi.cxx
index 989b0769f4c731a9e6636a3f961dda21bc7062c5..7a492938e185b86c506e99b2e0f687e6c4a38fc4 100644 (file)
--- a/src/Main/bfi.cxx
+++ b/src/Main/bfi.cxx
@@ -34,7 +34,7 @@
 #include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>
 #include <simgear/ephemeris/ephemeris.hxx>
-#include <simgear/math/fg_types.hxx>
+#include <simgear/math/sg_types.hxx>
 #include <simgear/misc/props.hxx>
 #include <simgear/timing/sg_time.hxx>
 

diff --git a/src/Main/fg_io.cxx b/src/Main/fg_io.cxx
index 24383e7a1b20d5dfacab786d3d1153398108dff2..71687c7790388ca93f43cd7f9752411eb5788a47 100644 (file)
--- a/src/Main/fg_io.cxx
+++ b/src/Main/fg_io.cxx
@@ -30,8 +30,7 @@
 #include <simgear/io/sg_file.hxx>
 #include <simgear/io/sg_serial.hxx>
 #include <simgear/io/sg_socket.hxx>
-
-#include <simgear/math/fg_types.hxx>
+#include <simgear/math/sg_types.hxx>
 
 #include <Main/options.hxx>
 

diff --git a/src/Main/options.hxx b/src/Main/options.hxx
index 3f931baf6b4e95188c465792052aac719c5ba6c0..569a1f231245e77c01ffc5d0cf161a844194ef03 100644 (file)
--- a/src/Main/options.hxx
+++ b/src/Main/options.hxx
@@ -46,7 +46,7 @@
 extern bool global_fullscreen;
 #endif
 
-#include <simgear/math/fg_types.hxx>
+#include <simgear/math/sg_types.hxx>
 #include <simgear/timing/sg_time.hxx>
 
 #include STL_STRING

diff --git a/src/Main/save.hxx b/src/Main/save.hxx
index 72f7e9e8e2fe5e220215e798e4e230727271b921..56626d4a434f01646f581652e21391f4d488f308 100644 (file)
--- a/src/Main/save.hxx
+++ b/src/Main/save.hxx
@@ -31,7 +31,7 @@
 #  include <config.h>
 #endif
 
-#include <simgear/math/fg_types.hxx>
+#include <simgear/math/sg_types.hxx>
 #include <iostream>
 
 FG_USING_NAMESPACE(std);

diff --git a/src/Network/Makefile.am b/src/Network/Makefile.am
index 7a049e9b3a8625ab98b90b9c029864b2c8aa8876..ce310af3654e48e1e930a886f2b1b57843a9c9eb 100644 (file)
--- a/src/Network/Makefile.am
+++ b/src/Network/Makefile.am
@@ -5,6 +5,7 @@ libNetwork_a_SOURCES = \
        native.cxx native.hxx \
        garmin.cxx garmin.hxx \
        nmea.cxx nmea.hxx \
+       props.cxx props.hxx \
        pve.cxx pve.hxx \
        ray.cxx ray.hxx \
        rul.cxx rul.hxx \

diff --git a/src/NetworkOLK/features.cxx b/src/NetworkOLK/features.cxx
index 3d202f9ba3e6ab45584fcb5df50338da9e4b9834..1901a298b183b4e2b166a708b7319c490ad71364 100644 (file)
--- a/src/NetworkOLK/features.cxx
+++ b/src/NetworkOLK/features.cxx
@@ -29,7 +29,7 @@
 #  include <iostream>
 #endif
 
-#include <simgear/math/fg_types.hxx>
+#include <simgear/math/sg_types.hxx>
 
 FG_USING_NAMESPACE(std);