#346 related: missing status message for property server

[flightgear.git] / src / Network / rul.cxx

diff --git a/src/Network/rul.cxx b/src/Network/rul.cxx
index d8b1bf20662f4e69e8e078a487a94f020eb3d7b6..9945163069f0d684248d70a64a91aad455e2a951 100644 (file)
--- a/src/Network/rul.cxx
+++ b/src/Network/rul.cxx
@@ -3,7 +3,7 @@
 //
 // Written by Curtis Olson, started November 1999.
 //
-// Copyright (C) 1999  Curtis L. Olson - curt@flightgear.org
+// Copyright (C) 1999  Curtis L. Olson - http://www.flightgear.org/~curt
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License as
@@ -17,18 +17,22 @@
 //
 // 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$
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
 
-#include <simgear/logstream.hxx>
-#include <simgear/fg_geodesy.hxx>
+#include <stdio.h>             // sprintf()
 
-#include <FDM/flight.hxx>
-#include <Time/fg_time.hxx>
+#include <simgear/constants.h>
+#include <simgear/debug/logstream.hxx>
+#include <simgear/io/iochannel.hxx>
+
+#include <FDM/flightProperties.hxx>
 
-#include "iochannel.hxx"
 #include "rul.hxx"
 
 
@@ -57,10 +61,10 @@ FGRUL::~FGRUL() {
 
 bool FGRUL::gen_message() {
     // cout << "generating rul message" << endl;
-    FGInterface *f = cur_fdm_state;
+    FlightProperties f;
 
     // get roll and pitch, convert to degrees
-    double roll_deg = f->get_Phi() * RAD_TO_DEG;
+    double roll_deg = f.get_Phi() * SGD_RADIANS_TO_DEGREES;
     while ( roll_deg < -180.0 ) {
        roll_deg += 360.0;
     }
@@ -68,7 +72,7 @@ bool FGRUL::gen_message() {
        roll_deg -= 360.0;
     }
 
-    double pitch_deg = f->get_Theta() * RAD_TO_DEG;
+    double pitch_deg = f.get_Theta() * SGD_RADIANS_TO_DEGREES;
     while ( pitch_deg < -180.0 ) {
        pitch_deg += 360.0;
     }
@@ -85,7 +89,7 @@ bool FGRUL::gen_message() {
     sprintf( buf, "p%c%c\n", roll, pitch);
     length = 4;
 
-    FG_LOG( FG_IO, FG_INFO, "p " << roll << " " << pitch );
+    SG_LOG( SG_IO, SG_INFO, "p " << roll << " " << pitch );
 
     return true;
 }
@@ -93,7 +97,7 @@ bool FGRUL::gen_message() {
 
 // parse RUL message
 bool FGRUL::parse_message() {
-    FG_LOG( FG_IO, FG_ALERT, "RUL input not supported" );
+    SG_LOG( SG_IO, SG_ALERT, "RUL input not supported" );
 
     return false;
 }
@@ -101,16 +105,16 @@ bool FGRUL::parse_message() {
 
 // process work for this port
 bool FGRUL::process() {
-    FGIOChannel *io = get_io_channel();
+    SGIOChannel *io = get_io_channel();
 
-    if ( get_direction() == out ) {
+    if ( get_direction() == SG_IO_OUT ) {
        gen_message();
        if ( ! io->write( buf, length ) ) {
-           FG_LOG( FG_IO, FG_ALERT, "Error writing data." );
+           SG_LOG( SG_IO, SG_ALERT, "Error writing data." );
            return false;
        }
-    } else if ( get_direction() == in ) {
-       FG_LOG( FG_IO, FG_ALERT, "in direction not supported for RUL." );
+    } else if ( get_direction() == SG_IO_IN ) {
+       SG_LOG( SG_IO, SG_ALERT, "in direction not supported for RUL." );
        return false;
     }