httpd: don't spam the console with debug messages

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

diff --git a/src/Network/pve.cxx b/src/Network/pve.cxx
index 6ccc9300a84aaa83ab384b9b87acb09bf34c5144..c78422eb627536298e6a955ac0a636b496e3ac89 100644 (file)
--- a/src/Network/pve.cxx
+++ b/src/Network/pve.cxx
@@ -2,7 +2,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
@@ -16,10 +16,13 @@
 //
 // 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 <stdio.h>             // sprintf()
 
@@ -27,7 +30,7 @@
 #include <simgear/debug/logstream.hxx>
 #include <simgear/io/iochannel.hxx>
 
-#include <FDM/flight.hxx>
+#include <FDM/flightProperties.hxx>
 
 #include "pve.hxx"
 
@@ -52,10 +55,10 @@ FGPVE::~FGPVE() {
 
 bool FGPVE::gen_message() {
     // cout << "generating pve message" << endl;
-    FGInterface *f = cur_fdm_state;
+    FlightProperties f;
 
     // get roll and pitch, convert to degrees
-    double roll_deg = f->get_Phi() * SGD_RADIANS_TO_DEGREES;
+    double roll_deg = f.get_Phi() * SGD_RADIANS_TO_DEGREES;
     while ( roll_deg <= -180.0 ) {
        roll_deg += 360.0;
     }
@@ -63,7 +66,7 @@ bool FGPVE::gen_message() {
        roll_deg -= 360.0;
     }
 
-    double pitch_deg = f->get_Theta() * SGD_RADIANS_TO_DEGREES;
+    double pitch_deg = f.get_Theta() * SGD_RADIANS_TO_DEGREES;
     while ( pitch_deg <= -180.0 ) {
        pitch_deg += 360.0;
     }
@@ -71,7 +74,7 @@ bool FGPVE::gen_message() {
        pitch_deg -= 360.0;
     }
 
-    short int heave = (int)(f->get_W_body() * 128.0);
+    short int heave = (int)(f.get_wBody() * 128.0);
 
     // scale roll and pitch to output format (1 - 255)
     // straight && level == (128, 128)
@@ -94,7 +97,7 @@ bool FGPVE::gen_message() {
     // printf( "p [ %u %u ]  [ %u %u ]  [ %u %u ]\n", 
     //         roll_b1, roll_b2, pitch_b1, pitch_b2, heave_b1, heave_b2 );
 
-    FG_LOG( FG_IO, FG_INFO, "roll=" << roll << " pitch=" << pitch <<
+    SG_LOG( SG_IO, SG_INFO, "roll=" << roll << " pitch=" << pitch <<
            " heave=" << heave );
 
     return true;
@@ -103,7 +106,7 @@ bool FGPVE::gen_message() {
 
 // parse RUL message
 bool FGPVE::parse_message() {
-    FG_LOG( FG_IO, FG_ALERT, "PVE input not supported" );
+    SG_LOG( SG_IO, SG_ALERT, "PVE input not supported" );
 
     return false;
 }
@@ -116,11 +119,11 @@ bool FGPVE::process() {
     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() == SG_IO_IN ) {
-       FG_LOG( FG_IO, FG_ALERT, "in direction not supported for RUL." );
+       SG_LOG( SG_IO, SG_ALERT, "in direction not supported for RUL." );
        return false;
     }