Merge branch 'durk/ai-atc'

[flightgear.git] / src / Network / ATC-Outputs.cxx

diff --git a/src/Network/ATC-Outputs.cxx b/src/Network/ATC-Outputs.cxx
index b5078a5810cd796ff581e6d53dde5a3e9f6ea24b..97a8df77169a19635f56fcebec117f52d3178f4e 100644 (file)
--- a/src/Network/ATC-Outputs.cxx
+++ b/src/Network/ATC-Outputs.cxx
@@ -173,6 +173,7 @@ static int ATCSetStepper( int fd, unsigned char channel,
 }
 
 
+#ifdef ATCFLIGHTSIM_HAVE_COMPASS
 // Read status of last stepper written to
 static unsigned char ATCReadStepper( int fd ) {
 #if defined( unix ) || defined( __CYGWIN__ )
@@ -195,6 +196,7 @@ static unsigned char ATCReadStepper( int fd ) {
     return 0;
 #endif
 }
+#endif
 
 
 // Turn a lamp on or off
@@ -346,9 +348,7 @@ bool FGATCOutput::open( int lock_fd ) {
 
        ATCRelease( lock_fd );
 
-#if defined( _MSC_VER )
-       ulMilliSecondSleep(33);
-#elif defined (WIN32) && !defined(__CYGWIN__)
+#ifdef _WIN32
         Sleep (33);
 #else
        usleep(33);
@@ -464,22 +464,18 @@ bool FGATCOutput::do_analog_out() {
                 }
                 prop = child->getChild( "value-lo" );
                 if ( prop != NULL ) {
-                    prop = fgGetNode( prop->getStringValue(), true );
                    x0 = prop->getDoubleValue();
                 }
                 prop = child->getChild( "meter-lo" );
                 if ( prop != NULL ) {
-                    prop = fgGetNode( prop->getStringValue(), true );
                    y0 = prop->getDoubleValue();
                 }
                 prop = child->getChild( "value-hi" );
                 if ( prop != NULL ) {
-                    prop = fgGetNode( prop->getStringValue(), true );
                    x1 = prop->getDoubleValue();
                 }
                 prop = child->getChild( "meter-hi" );
                 if ( prop != NULL ) {
-                    prop = fgGetNode( prop->getStringValue(), true );
                    y1 = prop->getDoubleValue();
                 }
                // crunch linear interpolation formula