Cleanup

src/Joystick/Joystick.cc

@@ -143,9 +143,9 @@ void Joystick::run(void)
 
             // We only send the buttons the firmwware has reserved
             int reservedButtonCount = _activeVehicle->manualControlReservedButtonCount();
-            if (reservedButtonCount == -1) {
+            if (reservedButtonCount == -1)
                 reservedButtonCount = _buttonCount;
-            }
+
 
             quint16 newButtonBits = 0;      // New set of button which are down
             quint16 buttonPressedBits = 0;  // Buttons pressed for manualControl signal

src/Joystick/JoystickAndroid.cc

@@ -55,14 +55,14 @@ JoystickAndroid::JoystickAndroid(const QString& name, int id, MultiVehicleManage
         axisValue[i] = 0;
     }
 
-    qDebug() << "joystick constructor:" << _name;
+    _axisCount = 4;
 
+    qDebug() << "axis:" <<_axisCount << "buttons:" <<_buttonCount;
     QtAndroidPrivate::registerGenericMotionEventListener(this);
     QtAndroidPrivate::registerKeyEventListener(this);
 }
 
 JoystickAndroid::~JoystickAndroid() {
-    qDebug() << "joystick destructor" << _name;
 
     delete btnCode;
     delete axisCode;
@@ -150,11 +150,11 @@ bool JoystickAndroid::update(void)
 }
 
 bool JoystickAndroid::getButton(int i) {
-    return btnValue[ btnCode[i] ]; 
+    return btnValue[ i ];
 }
 
 int JoystickAndroid::getAxis(int i) {
-    return axisValue[ axisCode[i] ]; 
+    return axisValue[ i ];
 }
 
 

src/VehicleSetup/SetupView.qml

@@ -287,6 +287,7 @@ Rectangle {
                 setupComplete:  joystickManager.activeJoystick ? joystickManager.activeJoystick.calibrated : false
                 exclusiveGroup: setupButtonGroup
                 visible:        _fullParameterVehicleAvailable && joystickManager.joysticks.length != 0
+		//visible:	true
                 text:           "Joystick"
 
                 onClicked: showJoystickPanel()