Updated to work with current property naming convention.

diff --git a/src/Input/Makefile.am b/src/Input/Makefile.am
index 49b2bcbd278add94ac33d9e28059dc7b93fbc11c..1c5a25cdb15cc1f0cefd7a561815879efeb28082 100644 (file)
--- a/src/Input/Makefile.am
+++ b/src/Input/Makefile.am
@@ -2,15 +2,14 @@ noinst_LIBRARIES = libInput.a
 
 libInput_a_SOURCES = input.cxx input.hxx
 
-# bin_PROGRAMS = js_demo fgjs
-bin_PROGRAMS = js_demo
+bin_PROGRAMS = js_demo fgjs
 
 js_demo_SOURCES = js_demo.cxx
 
 js_demo_LDADD = $(audio_LIBS)
 
-# fgjs_SOURCES = fgjs.cxx jsinput.cxx jsinput.h jssuper.cxx jssuper.h
+fgjs_SOURCES = fgjs.cxx jsinput.cxx jsinput.h jssuper.cxx jssuper.h
 
-# fgjs_LDADD = $(audio_LIBS)
+fgjs_LDADD = $(audio_LIBS)
 
 INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src

diff --git a/src/Input/fgjs.cxx b/src/Input/fgjs.cxx
index 80cfc97ad503e4859abdbdde5fbbfc4dbcdb68be..618a08a681ec5cf922cd41a25e21f28e9700f667 100644 (file)
--- a/src/Input/fgjs.cxx
+++ b/src/Input/fgjs.cxx
@@ -89,15 +89,16 @@ void waitForButton(jsSuper *jss, int wait_ms) {
 
 void writeAxisProperties(fstream &fs, int control,int joystick, int axis) {
      
-     char jsDesc[40];
-     snprintf(jsDesc,40,"--prop:/input/joysticks/js[%d]/axis[%d]",joystick,axis);
-     fs << jsDesc  << "/control=" << axes_propnames[control] << endl; 
+     char jsDesc[80];
+     snprintf(jsDesc,80,"--prop:/input/joysticks/js[%d]/axis[%d]/binding",joystick,axis);
+     fs << jsDesc  << "/command=property-scale" << endl; 
+     fs << jsDesc  << "/property=" << axes_propnames[control] << endl; 
      
      fs << jsDesc << "/dead-band=0.02"  << endl; 
      
      if( half_range[control] == true) {
        fs << jsDesc << "/offset=-1.0" << endl; 
-       fs << jsDesc << "/factor=0.5" << endl;
+       fs << jsDesc << "/factor=-0.5" << endl;
      } else {
        fs << jsDesc << "/offset=0.0" << endl; 
        fs << jsDesc << "/factor=1.0" << endl;
@@ -107,13 +108,13 @@ void writeAxisProperties(fstream &fs, int control,int joystick, int axis) {
 
 void writeButtonProperties(fstream &fs, int property,int joystick, int button) {
      
-     char jsDesc[40];
-     snprintf(jsDesc,40,"--prop:/input/joysticks/js[%d]/button[%d]",joystick,button);
+     char jsDesc[80];
+     snprintf(jsDesc,80,"--prop:/input/joysticks/js[%d]/button[%d]/binding",joystick,button);
      
-     fs << jsDesc << "/action=adjust" << endl; 
-     fs << jsDesc << "/control=" << button_propnames[property] << endl;
-     fs << jsDesc << "/step=" << button_step[property] << endl; 
      fs << jsDesc << "/repeatable=" << button_repeat[property] << endl;
+     fs << jsDesc << "/command=property-adjust" << endl; 
+     fs << jsDesc << "/property=" << button_propnames[property] << endl;
+     fs << jsDesc << "/step=" << button_step[property] << endl; 
      fs << endl; 
 }    
 

diff --git a/src/Input/jsinput.cxx b/src/Input/jsinput.cxx
index 5bf12a4c5ab0d3fb343648f946efc7e8d34e9114..c7ea809e83d22664ae736b1f1d43ff8747693001 100644 (file)
--- a/src/Input/jsinput.cxx
+++ b/src/Input/jsinput.cxx
@@ -22,7 +22,7 @@
 
 jsInput::jsInput(jsSuper *j) {
   jss=j;
-  pretty_display=false;
+  pretty_display=true;
   joystick=axis=button=-1;
   axis_threshold=0.2;
 }
@@ -101,6 +101,7 @@ int jsInput::getInput(void){
 
         ulMilliSecondSleep(1);
       }
+#if 0
       if(button_bits != 0) {
         for(int i=1;i<=31;i++) {
           if( ( button_bits & (1 << i) ) > 0 ) {
@@ -109,6 +110,9 @@ int jsInput::getInput(void){
           } 
         }    
       } 
+#else
+      button = button_bits;
+#endif
 
       return 0;
 }