X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FNetwork%2Frul.cxx;h=9040a8c4f850ecdebe43bea79aa7f962ffdf776d;hb=948d2bfca6196a42ec6a76e590764289cfb8816c;hp=47eb238e97de77f925d3b8acc5f2ee1e5d0c1372;hpb=24caa82715fa069adeee910ed26ff27ee38daf96;p=flightgear.git

diff --git a/src/Network/rul.cxx b/src/Network/rul.cxx
index 47eb238e9..9040a8c4f 100644
--- a/src/Network/rul.cxx
+++ b/src/Network/rul.cxx
@@ -22,12 +22,14 @@
 // $Id$
 
 
-#include <Debug/logstream.hxx>
+#include <stdio.h>		// sprintf()
+
+#include <simgear/constants.h>
+#include <simgear/debug/logstream.hxx>
+#include <simgear/io/iochannel.hxx>
+
 #include <FDM/flight.hxx>
-#include <Math/fg_geodesy.hxx>
-#include <Time/fg_time.hxx>
 
-#include "iochannel.hxx"
 #include "rul.hxx"
 
 
@@ -59,7 +61,7 @@ bool FGRUL::gen_message() {
     FGInterface *f = cur_fdm_state;
 
     // 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;
     }
@@ -67,7 +69,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;
     }
@@ -84,7 +86,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;
 }
@@ -92,7 +94,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;
 }
@@ -100,16 +102,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;
     }