From 3b92497769bc7d6d215b2b88750082a2828e947b Mon Sep 17 00:00:00 2001
From: Stuart Buchanan <stuart_d_buchanan@yahoo.co.uk>
Date: Sun, 6 Jan 2019 20:48:47 +0000
Subject: [PATCH] Joystick Config fixes from Ron HAERTEL

---
 Nasal/joystick.nas                 | 1 -
 gui/dialogs/button-axis-config.xml | 8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Nasal/joystick.nas b/Nasal/joystick.nas
index 4402c0cab..7346bf999 100644
--- a/Nasal/joystick.nas
+++ b/Nasal/joystick.nas
@@ -301,7 +301,6 @@ var axisBindings = [
   PropertyScaleAxis.new("Brake Right", "/controls/gear/brake-right", 0.5, 1.0),
   PropertyScaleAxis.new("Flaps", "/controls/flight/flaps", 0.5, 1.0),
   PropertyScaleAxis.new("Wings", "/controls/flight/wings", 0.5, 1.0),
-  PropertyScaleAxis.new("Brake Right", "/controls/gear/brake-right", 0.5, 1.0),
   NasalLowHighAxis.new("Aileron Trim inc.",  "controls.aileronTrim(-1);", "controls.aileronTrim(1);", "/controls/flight/aileron-trim-delta", 1),
   NasalLowHighAxis.new("Elevator Trim inc.", "controls.elevatorTrim(-1);", "controls.elevatorTrim(1);", "/controls/flight/elevator-trim-delta", 1),
   NasalLowHighAxis.new("Rudder Trim inc.",   "controls.rudderTrim(-1);", "controls.rudderTrim(1);", "/controls/flight/rudder-trim-delta", 1),
diff --git a/gui/dialogs/button-axis-config.xml b/gui/dialogs/button-axis-config.xml
index a57507d73..5824601d2 100644
--- a/gui/dialogs/button-axis-config.xml
+++ b/gui/dialogs/button-axis-config.xml
@@ -147,7 +147,7 @@ var assignAxis = func(cmd) {
       </binding>
     </button>
     <button>
-      <row>5</row>
+      <row>7</row>
       <col>0</col>
       <halign>fill</halign>
       <legend>Wings</legend>
@@ -159,7 +159,7 @@ var assignAxis = func(cmd) {
       </binding>
     </button>
 
- 
+
     <text>
       <row>0</row>
       <col>3</col>
@@ -351,7 +351,7 @@ var assignAxis = func(cmd) {
         </script>
       </binding>
     </button>
- 
+
     <button>
       <row>9</row>
       <col>1</col>
@@ -364,7 +364,7 @@ var assignAxis = func(cmd) {
         </script>
       </binding>
     </button>
- 
+
     <text>
       <row>0</row>
       <col>2</col>