Edited cvs log messages in source files ... bad bad bad!

[flightgear.git] / Joystick / joystick.c

diff --git a/Joystick/joystick.c b/Joystick/joystick.c
index 6de1d98b6d2620d661ea5a95daaf3ec6cf67ddcc..f5da076a09b30473884860aa2c255915de615bac 100644 (file)
--- a/Joystick/joystick.c
+++ b/Joystick/joystick.c
@@ -33,6 +33,8 @@
 
 #endif
 
+#include <Debug/fg_debug.h>
+
 static joy_x_min=0, joy_x_ctr=0, joy_x_max=0;
 static joy_y_min=0, joy_y_ctr=0, joy_y_max=0;
 static joy_x_dead_min=1000, joy_x_dead_max=-1000;
@@ -41,8 +43,10 @@ static joy_y_dead_min=1000, joy_y_dead_max=-1000;
 
 static int joystick_fd;
 
-int fgJoystickInit( int joy_num )
-{
+int fgJoystickInit( int joy_num ) {
+
+    fgPrintf( FG_INPUT, FG_INFO, "Initializing joystick\n");
+
 #ifdef HAVE_JOYSTICK
        int status;
        char *fname;
@@ -68,7 +72,8 @@ int fgJoystickInit( int joy_num )
                return( 1 );
        }
        
-       printf( "\nMove joystick around dead spot and press any joystick button.\n" );
+       fgPrintf( FG_INPUT,FG_ALERT,
+                 "\nMove joystick around dead spot and press any joystick button.\n" );
        status = read(joystick_fd, &js, JS_RETURN);
        if (status != JS_RETURN) {
                perror("js");
@@ -91,8 +96,9 @@ int fgJoystickInit( int joy_num )
                if( js.y < joy_y_dead_min )
                        joy_y_dead_min = js.y;
                
-               // printf( "Xmin %d Xmax %d Ymin %d Ymax %d", joy_x_dead_min, joy_x_dead_max, \
-               //              joy_y_dead_min, joy_y_dead_max );
+               /* printf( "Xmin %d Xmax %d Ymin %d Ymax %d", 
+                          joy_x_dead_min, joy_x_dead_max,
+                          joy_y_dead_min, joy_y_dead_max ); */
        }
        status = read(joystick_fd, &js, JS_RETURN);
        if (status != JS_RETURN) {
@@ -100,12 +106,17 @@ int fgJoystickInit( int joy_num )
                return( 1 );
        }
        
-       printf("\nJoystick calibration: X_dead_min = %d, X_dead_max = %d\n", joy_x_dead_min, joy_x_dead_max );
-       printf("                      Y_dead_min = %d, Y_dead_max = %d\n", joy_y_dead_min, joy_y_dead_max );
+       fgPrintf( FG_INPUT, FG_DEBUG, 
+                 "\nJoystick calibration: X_dead_min = %d, X_dead_max = %d\n", 
+                 joy_x_dead_min, joy_x_dead_max );
+       fgPrintf( FG_INPUT, FG_DEBUG,
+                 "                      Y_dead_min = %d, Y_dead_max = %d\n", 
+                 joy_y_dead_min, joy_y_dead_max );
        
        sleep( 1 );
        
-       printf( "\nCenter joystick and press any joystick button.\n" );
+       fgPrintf( FG_INPUT, FG_DEBUG,
+                 "\nCenter joystick and press any joystick button.\n" );
        status = read(joystick_fd, &js, JS_RETURN);
        if (status != JS_RETURN) {
                perror("js");
@@ -128,11 +139,14 @@ int fgJoystickInit( int joy_num )
        joy_x_ctr = js.x;
        joy_y_ctr = js.y;
        
-       printf("Joystick calibration: X_ctr = %d, Y_ctr = %d\n", joy_x_ctr, joy_y_ctr );
+       fgPrintf( FG_INPUT, FG_DEBUG,
+                 "Joystick calibration: X_ctr = %d, Y_ctr = %d\n", 
+                 joy_x_ctr, joy_y_ctr );
        
        sleep( 1 );
        
-       printf( "\nMove joystick to upper left and press any joystick button.\n" );
+       fgPrintf( FG_INPUT, FG_DEBUG,
+                 "\nMove joystick to upper left and press any joystick button.\n" );
        status = read(joystick_fd, &js, JS_RETURN);
        if (status != JS_RETURN) {
                perror("js");
@@ -154,11 +168,14 @@ int fgJoystickInit( int joy_num )
        }
        joy_x_min = js.x;
        joy_y_min = js.y;
-       printf("Joystick calibration: X_min = %d, Y_min = %d\n", joy_x_min, joy_y_min );
+               fgPrintf( FG_INPUT, FG_DEBUG,
+                 "Joystick calibration: X_min = %d, Y_min = %d\n", 
+                 joy_x_min, joy_y_min );
        
        sleep( 1 );
        
-       printf( "\nMove joystick to lower right and press any joystick button.\n" );
+       fgPrintf( FG_INPUT, FG_DEBUG,
+                 "\nMove joystick to lower right and press any joystick button.\n" );
        status = read(joystick_fd, &js, JS_RETURN);
        if (status != JS_RETURN) {
                perror("js");
@@ -181,13 +198,17 @@ int fgJoystickInit( int joy_num )
        joy_x_max = js.x;
        joy_y_max = js.y;
        
-       printf("Joystick calibration: X_max = %d, Y_max = %d\n", joy_x_max, joy_y_max );
+       fgPrintf( FG_INPUT, FG_DEBUG,
+                 "Joystick calibration: X_max = %d, Y_max = %d\n", 
+                 joy_x_max, joy_y_max );
        
        // joy_x_ctr = (joy_x_max-joy_x_min)/2;
        // joy_y_ctr = (joy_y_max-joy_y_min)/2;
        // printf("Joystick calibration: X_ctr = %d, Y_ctr = %d\n", joy_x_ctr, joy_y_ctr );
        
        return( joystick_fd );
+#else
+       return( 1 );
 #endif
 }
 
@@ -229,13 +250,36 @@ int fgJoystickRead( double *joy_x, double *joy_y, int *joy_b1, int *joy_b2 )
        *joy_b1 = js.buttons & 1;
        *joy_b2 = js.buttons & 2;
 
-       return( 0 );
 #endif
+       return( 0 );
 }
 
 
 /* $Log$
-/* Revision 1.1  1997/08/29 18:06:54  curt
-/* Initial revision.
+/* Revision 1.7  1998/04/25 22:06:29  curt
+/* Edited cvs log messages in source files ... bad bad bad!
 /*
+ * Revision 1.6  1998/04/18 04:14:05  curt
+ * Moved fg_debug.c to it's own library.
+ *
+ * Revision 1.5  1998/02/12 21:59:44  curt
+ * Incorporated code changes contributed by Charlie Hotchkiss
+ * <chotchkiss@namg.us.anritsu.com>
+ *
+ * Revision 1.4  1998/02/03 23:20:20  curt
+ * Lots of little tweaks to fix various consistency problems discovered by
+ * Solaris' CC.  Fixed a bug in fg_debug.c with how the fgPrintf() wrapper
+ * passed arguments along to the real printf().  Also incorporated HUD changes
+ * by Michele America.
+ *
+ * Revision 1.3  1998/01/27 00:47:54  curt
+ * Incorporated Paul Bleisch's <pbleisch@acm.org> new debug message
+ * system and commandline/config file processing code.
+ *
+ * Revision 1.2  1997/12/30 20:47:40  curt
+ * Integrated new event manager with subsystem initializations.
+ *
+ * Revision 1.1  1997/08/29 18:06:54  curt
+ * Initial revision.
+ *
  */