I forgot a linker dependency. It really si time to figure out why these are all needed.

[flightgear.git] / src / FDM / LaRCsim / uiuc_aero.c

diff --git a/src/FDM/LaRCsim/uiuc_aero.c b/src/FDM/LaRCsim/uiuc_aero.c
index e7453734535510125a5e9248c6850b067a0fa878..bd7d3358f39ee527a3662d2a488e8e0044dd5dd8 100644 (file)
--- a/src/FDM/LaRCsim/uiuc_aero.c
+++ b/src/FDM/LaRCsim/uiuc_aero.c
@@ -20,7 +20,7 @@
                
   CODED BY:            Bipin Sehgal
                
-  MAINTAINED BY:       Bipin Sehgal
+  MAINTAINED BY:       Rob Deters and Glen Dimock
 
 ----------------------------------------------------------------------------
 
@@ -30,6 +30,10 @@
   3/17/00   Initial test release  
   3/09/01   Added callout to UIUC gear function.   (DPM)
   6/18/01   Added call out to UIUC record routine (RD)
+  11/12/01  Changed from uiuc_init_aeromodel() to uiuc_initial_init(). (RD)
+  2/24/02   Added uiuc_network_routine() (GD)
+  12/11/02  Divided uiuc_network_routine into uiuc_network_recv_routine and
+            uiuc_network_send_routine (RD)
 
 ----------------------------------------------------------------------------
 
@@ -58,32 +62,62 @@
 #include <FDM/UIUCModel/uiuc_wrapper.h>
 
 
-void uiuc_aero( SCALAR dt, int Initialize ) 
+void uiuc_init_2_wrapper()
 {
     static int init = 0;
 
-    if (init==0)
-    {
-      init = -1; 
-      uiuc_init_aeromodel();
+    // On first time through initialize UIUC aircraft model
+    if (init==0) {
+        init=-1;
+       uiuc_defaults_inits();
+        uiuc_init_aeromodel();
     }
 
+    // Re-initialize velocities and euler angles since LaRCsim tends
+    // to change them
+    uiuc_initial_init();
+}
+
+void uiuc_local_vel_init()
+{
+  uiuc_vel_init();
+}
+
+void uiuc_aero_2_wrapper( SCALAR dt, int Initialize ) 
+{
     uiuc_force_moment(dt);
 }
 
 
-void uiuc_engine( SCALAR dt, int Initialize ) 
+void uiuc_wind_2_wrapper( SCALAR dt, int Initialize ) 
+{
+  if (Initialize == 0)
+    uiuc_wind_routine(dt);
+}
+
+void uiuc_engine_2_wrapper( SCALAR dt, int Initialize ) 
 {
+
     uiuc_engine_routine();
 }
 
 
-void uiuc_gear ()
+void uiuc_gear_2_wrapper ()
 {
     uiuc_gear_routine();
 }
 
-void uiuc_record(SCALAR dt)
+void uiuc_record_2_wrapper(SCALAR dt)
 {
   uiuc_record_routine(dt);
 }
+
+void uiuc_network_recv_2_wrapper()
+{
+  uiuc_network_recv_routine();
+}
+
+void uiuc_network_send_2_wrapper()
+{
+  uiuc_network_send_routine();
+}