From f707840b105fcc70935736fec423f8337d43cd50 Mon Sep 17 00:00:00 2001
From: Stuart Buchanan <stuart_d_buchanan@yahoo.co.uk>
Date: Sat, 29 Feb 2020 19:23:51 +0000
Subject: [PATCH] FG1000: Fix RANGE, HDG, CRS knob behaviour

- Make Range knob behaviour consistent between PFD inset and MFD maps
- Add rotation animations for the HDG and CRS knobs
- Change the CRS knob behaviour:
  - BARO on outer knob (consistent with FMS knob)
  - CRS on inner knob
  - Shift-click on inner knob to center (consistent with HDG knob)
---
 .../FG1000/GDU104X/GDU-1040.1.xml             |  82 +++++++---
 .../FG1000/GDU104X/GDU-1040.2.xml             |  86 +++++++---
 .../FG1000/GDU104X/GDU-1040.3.xml             |  84 +++++++---
 .../FG1000/GDU104X/GDU-1040.4.xml             | 148 +++++++++++-------
 .../FG1000/GDU104X/GDU-1044B.1.xml            |  82 +++++++---
 .../FG1000/GDU104X/GDU-1044B.2.xml            |  84 +++++++---
 .../FG1000/GDU104X/GDU-1044B.3.xml            |  84 +++++++---
 .../FG1000/GDU104X/GDU-1044B.4.xml            |  84 +++++++---
 .../FG1000/GDU104X/GDU-1045.1.xml             |  82 +++++++---
 .../FG1000/GDU104X/GDU-1045.2.xml             |  83 +++++-----
 .../FG1000/GDU104X/GDU-1045.3.xml             |  84 +++++++---
 .../FG1000/GDU104X/GDU-1045.4.xml             |  84 +++++++---
 .../PFDInstrumentsController.nas              |   7 +-
 .../Instruments-3d/FG1000/Nasal/NavMap.nas    |   7 +-
 14 files changed, 747 insertions(+), 334 deletions(-)

diff --git a/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1040.1.xml b/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1040.1.xml
index 2f77bdd45..391b32a41 100644
--- a/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1040.1.xml
+++ b/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1040.1.xml
@@ -264,6 +264,22 @@
     </hovered>
   </animation>
 
+  <animation>
+    <type>rotate</type>
+    <object-name>HDG</object-name>
+    <property>instrumentation/fg1000/screen1/heading-bug-deg</property>
+    <center>
+      <x-m>0.03255</x-m>
+      <y-m>-0.12940</y-m>
+      <z-m>0.01934</z-m>
+    </center>
+    <axis>
+      <x>-1</x>
+      <y>0</y>
+      <z>0</z>
+    </axis>
+  </animation>
+
   <animation>
     <type>knob</type>
     <object-name>AltOuter</object-name>
@@ -370,47 +386,67 @@
 
   <animation>
     <type>knob</type>
-    <object-name>BARO</object-name>
+    <object-name>CRS</object-name>
     <action>
       <binding>
         <command>FG1000HardKeyPushed</command>
         <device>1</device>
         <notification>CRS</notification>
       </binding>
+      <binding>
+        <command>property-adjust</command>
+        <property>instrumentation/fg1000/screen1/course-deg</property>
+        <factor>15</factor>
+      </binding>
     </action>
     <shift-action>
-      <binding>
-        <command>FG1000HardKeyPushed</command>
-        <device>1</device>
-        <notification>BARO</notification>
-      </binding>
-    </shift-action>
-    <hovered>
-      <binding>
-        <command>set-tooltip</command>
-        <tooltip-id>BARO</tooltip-id>
-        <label>Change Nav Course (Shift to change Barometric pressure setting)</label>
-      </binding>
-    </hovered>
-  </animation>
-
-  <animation>
-    <type>pick</type>
-    <object-name>CRS</object-name>
-    <action>
-      <button>0</button>
       <binding>
         <command>FG1000HardKeyPushed</command>
         <device>1</device>
         <notification>CRS_CENTER</notification>
         <offset>1</offset>
       </binding>
+    </shift-action>
+    <hovered>
+      <binding>
+        <command>set-tooltip</command>
+        <tooltip-id>CRS</tooltip-id>
+        <label>Change Nav Course (Shift to center)</label>
+      </binding>
+    </hovered>
+  </animation>
+
+  <animation>
+    <type>rotate</type>
+    <object-name>CRS</object-name>
+    <property>instrumentation/fg1000/screen1/course-deg</property>
+    <center>
+      <x-m>0.00397</x-m>
+      <y-m>0.13004</y-m>
+      <z-m>0.01956</z-m>
+    </center>
+    <axis>
+      <x>-1</x>
+      <y>0</y>
+      <z>0</z>
+    </axis>
+  </animation>
+
+  <animation>
+    <type>knob</type>
+    <object-name>BARO</object-name>
+    <action>
+      <binding>
+        <command>FG1000HardKeyPushed</command>
+        <device>1</device>
+        <notification>BARO</notification>
+      </binding>
     </action>
     <hovered>
       <binding>
         <command>set-tooltip</command>
-        <tooltip-id>ComInner</tooltip-id>
-        <label>Center CDI on current VOR</label>
+        <tooltip-id>BARO</tooltip-id>
+        <label>Change barometric pressure setting)</label>
       </binding>
     </hovered>
   </animation>
diff --git a/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1040.2.xml b/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1040.2.xml
index 6cb89175c..8fbba3844 100644
--- a/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1040.2.xml
+++ b/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1040.2.xml
@@ -243,7 +243,7 @@
       </binding>
       <binding>
         <command>property-adjust</command>
-        <property>instrumentation/fg1000/screen1/heading-bug-deg</property>
+        <property>instrumentation/fg1000/screen2/heading-bug-deg</property>
         <factor>15</factor>
       </binding>
     </action>
@@ -263,6 +263,22 @@
     </hovered>
   </animation>
 
+  <animation>
+    <type>rotate</type>
+    <object-name>HDG</object-name>
+    <property>instrumentation/fg1000/screen2/heading-bug-deg</property>
+    <center>
+      <x-m>0.03255</x-m>
+      <y-m>-0.12940</y-m>
+      <z-m>0.01934</z-m>
+    </center>
+    <axis>
+      <x>-1</x>
+      <y>0</y>
+      <z>0</z>
+    </axis>
+  </animation>
+
   <animation>
     <type>knob</type>
     <object-name>AltOuter</object-name>
@@ -368,51 +384,71 @@
 
   <animation>
     <type>knob</type>
-    <object-name>BARO</object-name>
+    <object-name>CRS</object-name>
     <action>
       <binding>
         <command>FG1000HardKeyPushed</command>
         <device>2</device>
         <notification>CRS</notification>
       </binding>
+      <binding>
+        <command>property-adjust</command>
+        <property>instrumentation/fg1000/screen2/course-deg</property>
+        <factor>15</factor>
+      </binding>
     </action>
     <shift-action>
-      <binding>
-        <command>FG1000HardKeyPushed</command>
-        <device>2</device>
-        <notification>BARO</notification>
-      </binding>
-    </shift-action>
-    <hovered>
-      <binding>
-        <command>set-tooltip</command>
-        <tooltip-id>BARO</tooltip-id>
-        <label>Change Nav Course (Shift to change Barometric pressure setting)</label>
-      </binding>
-    </hovered>
-  </animation>
-
-  <animation>
-    <type>pick</type>
-    <object-name>CRS</object-name>
-    <action>
-      <button>0</button>
       <binding>
         <command>FG1000HardKeyPushed</command>
         <device>2</device>
         <notification>CRS_CENTER</notification>
         <offset>1</offset>
       </binding>
-    </action>
+    </shift-action>
     <hovered>
       <binding>
         <command>set-tooltip</command>
-        <tooltip-id>ComInner</tooltip-id>
-        <label>Center CDI on current VOR</label>
+        <tooltip-id>CRS</tooltip-id>
+        <label>Change Nav Course (Shift to center)</label>
       </binding>
     </hovered>
   </animation>
 
+  <animation>
+    <type>rotate</type>
+    <object-name>CRS</object-name>
+    <property>instrumentation/fg1000/screen2/course-deg</property>
+    <center>
+      <x-m>0.00397</x-m>
+      <y-m>0.13004</y-m>
+      <z-m>0.01956</z-m>
+    </center>
+    <axis>
+      <x>-1</x>
+      <y>0</y>
+      <z>0</z>
+    </axis>
+  </animation>
+
+  <animation>
+    <type>knob</type>
+    <object-name>BARO</object-name>
+    <action>
+      <binding>
+        <command>FG1000HardKeyPushed</command>
+        <device>2</device>
+        <notification>BARO</notification>
+      </binding>
+    </action>
+    <hovered>
+      <binding>
+        <command>set-tooltip</command>
+        <tooltip-id>BARO</tooltip-id>
+        <label>Change barometric pressure setting</label>
+      </binding>
+    </hovered>
+  </animation>
+  
   <animation>
     <type>knob</type>
     <object-name>PAN</object-name>
diff --git a/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1040.3.xml b/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1040.3.xml
index 1e73dcd91..04221697d 100644
--- a/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1040.3.xml
+++ b/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1040.3.xml
@@ -243,7 +243,7 @@
       </binding>
       <binding>
         <command>property-adjust</command>
-        <property>instrumentation/fg1000/screen1/heading-bug-deg</property>
+        <property>instrumentation/fg1000/screen3/heading-bug-deg</property>
         <factor>15</factor>
       </binding>
     </action>
@@ -263,6 +263,22 @@
     </hovered>
   </animation>
 
+  <animation>
+    <type>rotate</type>
+    <object-name>HDG</object-name>
+    <property>instrumentation/fg1000/screen3/heading-bug-deg</property>
+    <center>
+      <x-m>0.03255</x-m>
+      <y-m>-0.12940</y-m>
+      <z-m>0.01934</z-m>
+    </center>
+    <axis>
+      <x>-1</x>
+      <y>0</y>
+      <z>0</z>
+    </axis>
+  </animation>
+
   <animation>
     <type>knob</type>
     <object-name>AltOuter</object-name>
@@ -368,47 +384,67 @@
 
   <animation>
     <type>knob</type>
-    <object-name>BARO</object-name>
+    <object-name>CRS</object-name>
     <action>
       <binding>
         <command>FG1000HardKeyPushed</command>
         <device>3</device>
         <notification>CRS</notification>
       </binding>
+      <binding>
+        <command>property-adjust</command>
+        <property>instrumentation/fg1000/screen3/course-deg</property>
+        <factor>15</factor>
+      </binding>
     </action>
     <shift-action>
-      <binding>
-        <command>FG1000HardKeyPushed</command>
-        <device>3</device>
-        <notification>BARO</notification>
-      </binding>
-    </shift-action>
-    <hovered>
-      <binding>
-        <command>set-tooltip</command>
-        <tooltip-id>BARO</tooltip-id>
-        <label>Change Nav Course (Shift to change Barometric pressure setting)</label>
-      </binding>
-    </hovered>
-  </animation>
-
-  <animation>
-    <type>pick</type>
-    <object-name>CRS</object-name>
-    <action>
-      <button>0</button>
       <binding>
         <command>FG1000HardKeyPushed</command>
         <device>3</device>
         <notification>CRS_CENTER</notification>
         <offset>1</offset>
       </binding>
+    </shift-action>
+    <hovered>
+      <binding>
+        <command>set-tooltip</command>
+        <tooltip-id>CRS</tooltip-id>
+        <label>Change Nav Course (Shift to center)</label>
+      </binding>
+    </hovered>
+  </animation>
+
+  <animation>
+    <type>rotate</type>
+    <object-name>CRS</object-name>
+    <property>instrumentation/fg1000/screen3/course-deg</property>
+    <center>
+      <x-m>0.00397</x-m>
+      <y-m>0.13004</y-m>
+      <z-m>0.01956</z-m>
+    </center>
+    <axis>
+      <x>-1</x>
+      <y>0</y>
+      <z>0</z>
+    </axis>
+  </animation>
+
+  <animation>
+    <type>knob</type>
+    <object-name>BARO</object-name>
+    <action>
+      <binding>
+        <command>FG1000HardKeyPushed</command>
+        <device>3</device>
+        <notification>BARO</notification>
+      </binding>
     </action>
     <hovered>
       <binding>
         <command>set-tooltip</command>
-        <tooltip-id>ComInner</tooltip-id>
-        <label>Center CDI on current VOR</label>
+        <tooltip-id>BARO</tooltip-id>
+        <label>Change barometric pressure setting</label>
       </binding>
     </hovered>
   </animation>
diff --git a/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1040.4.xml b/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1040.4.xml
index 1ed06d159..c9678ba90 100644
--- a/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1040.4.xml
+++ b/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1040.4.xml
@@ -164,7 +164,7 @@
     <action>
       <binding>
         <command>FG1000HardKeyPushed</command>
-        <device>1</device>
+        <device>4</device>
         <notification>NAV_VOL</notification>
         <offset>1</offset>
       </binding>
@@ -178,7 +178,7 @@
       <button>0</button>
       <binding>
         <command>FG1000HardKeyPushed</command>
-        <device>1</device>
+        <device>4</device>
         <notification>NAV_FREQ_TRANSFER</notification>
         <offset>1</offset>
       </binding>
@@ -191,14 +191,14 @@
     <action>
       <binding>
         <command>FG1000HardKeyPushed</command>
-        <device>1</device>
+        <device>4</device>
         <notification>NAV_INNER</notification>
       </binding>
     </action>
     <shift-action>
       <binding>
         <command>FG1000HardKeyPushed</command>
-        <device>1</device>
+        <device>4</device>
         <notification>NAV_OUTER</notification>
       </binding>
     </shift-action>
@@ -218,7 +218,7 @@
       <button>0</button>
       <binding>
         <command>FG1000HardKeyPushed</command>
-        <device>1</device>
+        <device>4</device>
         <notification>NAV_TOGGLE</notification>
         <offset>1</offset>
       </binding>
@@ -238,19 +238,19 @@
     <action>
       <binding>
         <command>FG1000HardKeyPushed</command>
-        <device>1</device>
+        <device>4</device>
         <notification>HEADING</notification>
       </binding>
       <binding>
         <command>property-adjust</command>
-        <property>instrumentation/fg1000/screen1/heading-bug-deg</property>
+        <property>instrumentation/fg1000/screen4/heading-bug-deg</property>
         <factor>15</factor>
       </binding>
     </action>
     <shift-action>
       <binding>
         <command>FG1000HardKeyPushed</command>
-        <device>1</device>
+        <device>4</device>
         <notification>HEADING_PRESS</notification>
       </binding>
     </shift-action>
@@ -263,6 +263,22 @@
     </hovered>
   </animation>
 
+  <animation>
+    <type>rotate</type>
+    <object-name>HDG</object-name>
+    <property>instrumentation/fg1000/screen4/heading-bug-deg</property>
+    <center>
+      <x-m>0.03255</x-m>
+      <y-m>-0.12940</y-m>
+      <z-m>0.01934</z-m>
+    </center>
+    <axis>
+      <x>-1</x>
+      <y>0</y>
+      <z>0</z>
+    </axis>
+  </animation>
+
   <animation>
     <type>knob</type>
     <object-name>AltOuter</object-name>
@@ -270,7 +286,7 @@
     <action>
       <binding>
         <command>FG1000HardKeyPushed</command>
-        <device>1</device>
+        <device>4</device>
         <notification>ALT_INNER</notification>
         <offset>1</offset>
       </binding>
@@ -278,7 +294,7 @@
     <shift-action>
       <binding>
         <command>FG1000HardKeyPushed</command>
-        <device>1</device>
+        <device>4</device>
         <notification>ALT_OUTER</notification>
         <offset>1</offset>
       </binding>
@@ -304,7 +320,7 @@
     <action>
       <binding>
         <command>FG1000HardKeyPushed</command>
-        <device>1</device>
+        <device>4</device>
         <notification>COM_VOL</notification>
         <offset>1</offset>
       </binding>
@@ -318,7 +334,7 @@
       <button>0</button>
       <binding>
         <command>FG1000HardKeyPushed</command>
-        <device>1</device>
+        <device>4</device>
         <notification>COM_FREQ_TRANSFER</notification>
         <offset>1</offset>
       </binding>
@@ -331,14 +347,14 @@
     <action>
       <binding>
         <command>FG1000HardKeyPushed</command>
-        <device>1</device>
+        <device>4</device>
         <notification>COM_INNER</notification>
       </binding>
     </action>
     <shift-action>
       <binding>
         <command>FG1000HardKeyPushed</command>
-        <device>1</device>
+        <device>4</device>
         <notification>COM_OUTER</notification>
       </binding>
     </shift-action>
@@ -358,7 +374,7 @@
       <button>0</button>
       <binding>
         <command>FG1000HardKeyPushed</command>
-        <device>1</device>
+        <device>4</device>
         <notification>COM_TOGGLE</notification>
         <offset>1</offset>
       </binding>
@@ -374,47 +390,67 @@
 
   <animation>
     <type>knob</type>
-    <object-name>BARO</object-name>
+    <object-name>CRS</object-name>
     <action>
       <binding>
         <command>FG1000HardKeyPushed</command>
-        <device>1</device>
+        <device>4</device>
         <notification>CRS</notification>
       </binding>
+      <binding>
+        <command>property-adjust</command>
+        <property>instrumentation/fg1000/screen4/course-deg</property>
+        <factor>15</factor>
+      </binding>
     </action>
     <shift-action>
       <binding>
         <command>FG1000HardKeyPushed</command>
-        <device>1</device>
-        <notification>BARO</notification>
+        <device>4</device>
+        <notification>CRS_CENTER</notification>
+        <offset>1</offset>
       </binding>
     </shift-action>
     <hovered>
       <binding>
         <command>set-tooltip</command>
-        <tooltip-id>BARO</tooltip-id>
-        <label>Change Nav Course (Shift to change Barometric pressure setting)</label>
+        <tooltip-id>CRS</tooltip-id>
+        <label>Change Nav Course (Shift to center)</label>
       </binding>
     </hovered>
   </animation>
 
   <animation>
-    <type>pick</type>
+    <type>rotate</type>
     <object-name>CRS</object-name>
+    <property>instrumentation/fg1000/screen4/course-deg</property>
+    <center>
+      <x-m>0.00397</x-m>
+      <y-m>0.13004</y-m>
+      <z-m>0.01956</z-m>
+    </center>
+    <axis>
+      <x>-1</x>
+      <y>0</y>
+      <z>0</z>
+    </axis>
+  </animation>
+
+  <animation>
+    <type>knob</type>
+    <object-name>BARO</object-name>
     <action>
-      <button>0</button>
       <binding>
         <command>FG1000HardKeyPushed</command>
-        <device>1</device>
-        <notification>CRS_CENTER</notification>
-        <offset>1</offset>
+        <device>4</device>
+        <notification>BARO</notification>
       </binding>
     </action>
     <hovered>
       <binding>
         <command>set-tooltip</command>
-        <tooltip-id>ComInner</tooltip-id>
-        <label>Center CDI on current VOR</label>
+        <tooltip-id>BARO</tooltip-id>
+        <label>Change barometric pressure setting</label>
       </binding>
     </hovered>
   </animation>
@@ -425,14 +461,14 @@
     <action>
       <binding>
         <command>FG1000HardKeyPushed</command>
-        <device>1</device>
+        <device>4</device>
         <notification>RANGE</notification>
       </binding>
     </action>
     <shift-action>
       <binding>
         <command>FG1000HardKeyPushed</command>
-        <device>1</device>
+        <device>4</device>
         <notification>JOYSTICK_PRESS</notification>
       </binding>
     </shift-action>
@@ -452,7 +488,7 @@
       <button>0</button>
       <binding>
         <command>FG1000HardKeyPushed</command>
-        <device>1</device>
+        <device>4</device>
         <notification>JOYSTICK_VERTICAL</notification>
         <offset>-1</offset>
       </binding>
@@ -473,7 +509,7 @@
       <button>0</button>
       <binding>
         <command>FG1000HardKeyPushed</command>
-        <device>1</device>
+        <device>4</device>
         <notification>JOYSTICK_VERTICAL</notification>
         <offset>1</offset>
       </binding>
@@ -494,7 +530,7 @@
       <button>0</button>
       <binding>
         <command>FG1000HardKeyPushed</command>
-        <device>1</device>
+        <device>4</device>
         <notification>JOYSTICK_HORIZONTAL</notification>
         <offset>-1</offset>
       </binding>
@@ -515,7 +551,7 @@
       <button>0</button>
       <binding>
         <command>FG1000HardKeyPushed</command>
-        <device>1</device>
+        <device>4</device>
         <notification>JOYSTICK_HORIZONTAL</notification>
         <offset>1</offset>
       </binding>
@@ -537,7 +573,7 @@
       <button>0</button>
       <binding>
         <command>FG1000HardKeyPushed</command>
-        <device>1</device>
+        <device>4</device>
         <notification>DTO</notification>
         <offset>1</offset>
       </binding>
@@ -558,7 +594,7 @@
       <button>0</button>
       <binding>
         <command>FG1000HardKeyPushed</command>
-        <device>1</device>
+        <device>4</device>
         <notification>MENU</notification>
         <offset>1</offset>
       </binding>
@@ -579,7 +615,7 @@
       <button>0</button>
       <binding>
         <command>FG1000HardKeyPushed</command>
-        <device>1</device>
+        <device>4</device>
         <notification>FPL</notification>
         <offset>1</offset>
       </binding>
@@ -600,7 +636,7 @@
       <button>0</button>
       <binding>
         <command>FG1000HardKeyPushed</command>
-        <device>1</device>
+        <device>4</device>
         <notification>PROC</notification>
         <offset>1</offset>
       </binding>
@@ -621,7 +657,7 @@
       <button>0</button>
       <binding>
         <command>FG1000HardKeyPushed</command>
-        <device>1</device>
+        <device>4</device>
         <notification>CLR</notification>
         <offset>1</offset>
       </binding>
@@ -630,7 +666,7 @@
       <button>1</button>
       <binding>
         <command>FG1000HardKeyPushed</command>
-        <device>1</device>
+        <device>4</device>
         <notification>CLR_HOLD</notification>
         <offset>1</offset>
       </binding>
@@ -651,7 +687,7 @@
       <button>0</button>
       <binding>
         <command>FG1000HardKeyPushed</command>
-        <device>1</device>
+        <device>4</device>
         <notification>ENT</notification>
         <offset>1</offset>
       </binding>
@@ -671,14 +707,14 @@
     <action>
       <binding>
         <command>FG1000HardKeyPushed</command>
-        <device>1</device>
+        <device>4</device>
         <notification>FMS_INNER</notification>
       </binding>
     </action>
     <shift-action>
       <binding>
         <command>FG1000HardKeyPushed</command>
-        <device>1</device>
+        <device>4</device>
         <notification>FMS_OUTER</notification>
       </binding>
     </shift-action>
@@ -698,7 +734,7 @@
       <button>0</button>
       <binding>
         <command>FG1000HardKeyPushed</command>
-        <device>1</device>
+        <device>4</device>
         <notification>FMS_CRSR</notification>
         <offset>1</offset>
       </binding>
@@ -719,7 +755,7 @@
       <button>0</button>
       <binding>
         <command>FG1000SoftKeyPushed</command>
-        <device>1</device>
+        <device>4</device>
         <offset>1</offset>
       </binding>
     </action>
@@ -732,7 +768,7 @@
       <button>0</button>
       <binding>
         <command>FG1000SoftKeyPushed</command>
-        <device>1</device>
+        <device>4</device>
         <offset>2</offset>
       </binding>
     </action>
@@ -745,7 +781,7 @@
       <button>0</button>
       <binding>
         <command>FG1000SoftKeyPushed</command>
-        <device>1</device>
+        <device>4</device>
         <offset>3</offset>
       </binding>
     </action>
@@ -758,7 +794,7 @@
       <button>0</button>
       <binding>
         <command>FG1000SoftKeyPushed</command>
-        <device>1</device>
+        <device>4</device>
         <offset>4</offset>
       </binding>
     </action>
@@ -771,7 +807,7 @@
       <button>0</button>
       <binding>
         <command>FG1000SoftKeyPushed</command>
-        <device>1</device>
+        <device>4</device>
         <offset>5</offset>
       </binding>
     </action>
@@ -784,7 +820,7 @@
       <button>0</button>
       <binding>
         <command>FG1000SoftKeyPushed</command>
-        <device>1</device>
+        <device>4</device>
         <offset>6</offset>
       </binding>
     </action>
@@ -797,7 +833,7 @@
       <button>0</button>
       <binding>
         <command>FG1000SoftKeyPushed</command>
-        <device>1</device>
+        <device>4</device>
         <offset>7</offset>
       </binding>
     </action>
@@ -810,7 +846,7 @@
       <button>0</button>
       <binding>
         <command>FG1000SoftKeyPushed</command>
-        <device>1</device>
+        <device>4</device>
         <offset>8</offset>
       </binding>
     </action>
@@ -823,7 +859,7 @@
       <button>0</button>
       <binding>
         <command>FG1000SoftKeyPushed</command>
-        <device>1</device>
+        <device>4</device>
         <offset>9</offset>
       </binding>
     </action>
@@ -836,7 +872,7 @@
       <button>0</button>
       <binding>
         <command>FG1000SoftKeyPushed</command>
-        <device>1</device>
+        <device>4</device>
         <offset>10</offset>
       </binding>
     </action>
@@ -849,7 +885,7 @@
       <button>0</button>
       <binding>
         <command>FG1000SoftKeyPushed</command>
-        <device>1</device>
+        <device>4</device>
         <offset>11</offset>
       </binding>
     </action>
@@ -862,7 +898,7 @@
       <button>0</button>
       <binding>
         <command>FG1000SoftKeyPushed</command>
-        <device>1</device>
+        <device>4</device>
         <offset>12</offset>
       </binding>
     </action>
diff --git a/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1044B.1.xml b/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1044B.1.xml
index 4329fb7b6..97ed90428 100644
--- a/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1044B.1.xml
+++ b/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1044B.1.xml
@@ -275,6 +275,22 @@
     </hovered>
   </animation>
 
+  <animation>
+    <type>rotate</type>
+    <object-name>HDG</object-name>
+    <property>instrumentation/fg1000/screen1/heading-bug-deg</property>
+    <center>
+      <x-m>0.03255</x-m>
+      <y-m>-0.12940</y-m>
+      <z-m>0.01934</z-m>
+    </center>
+    <axis>
+      <x>-1</x>
+      <y>0</y>
+      <z>0</z>
+    </axis>
+  </animation>
+
   <animation>
     <type>pick</type>
     <object-name>AP.L0</object-name>
@@ -632,47 +648,67 @@
 
   <animation>
     <type>knob</type>
-    <object-name>BARO</object-name>
+    <object-name>CRS</object-name>
     <action>
       <binding>
         <command>FG1000HardKeyPushed</command>
         <device>1</device>
         <notification>CRS</notification>
       </binding>
+      <binding>
+        <command>property-adjust</command>
+        <property>instrumentation/fg1000/screen1/course-deg</property>
+        <factor>15</factor>
+      </binding>
     </action>
     <shift-action>
-      <binding>
-        <command>FG1000HardKeyPushed</command>
-        <device>1</device>
-        <notification>BARO</notification>
-      </binding>
-    </shift-action>
-    <hovered>
-      <binding>
-        <command>set-tooltip</command>
-        <tooltip-id>BARO</tooltip-id>
-        <label>Change Nav Course (Shift to change Barometric pressure setting)</label>
-      </binding>
-    </hovered>
-  </animation>
-
-  <animation>
-    <type>pick</type>
-    <object-name>CRS</object-name>
-    <action>
-      <button>0</button>
       <binding>
         <command>FG1000HardKeyPushed</command>
         <device>1</device>
         <notification>CRS_CENTER</notification>
         <offset>1</offset>
       </binding>
+    </shift-action>
+    <hovered>
+      <binding>
+        <command>set-tooltip</command>
+        <tooltip-id>CRS</tooltip-id>
+        <label>Change Nav Course (Shift to center)</label>
+      </binding>
+    </hovered>
+  </animation>
+
+  <animation>
+    <type>rotate</type>
+    <object-name>CRS</object-name>
+    <property>instrumentation/fg1000/screen1/course-deg</property>
+    <center>
+      <x-m>0.00397</x-m>
+      <y-m>0.13004</y-m>
+      <z-m>0.01956</z-m>
+    </center>
+    <axis>
+      <x>-1</x>
+      <y>0</y>
+      <z>0</z>
+    </axis>
+  </animation>
+
+  <animation>
+    <type>knob</type>
+    <object-name>BARO</object-name>
+    <action>
+      <binding>
+        <command>FG1000HardKeyPushed</command>
+        <device>1</device>
+        <notification>BARO</notification>
+      </binding>
     </action>
     <hovered>
       <binding>
         <command>set-tooltip</command>
-        <tooltip-id>ComInner</tooltip-id>
-        <label>Center CDI on current VOR</label>
+        <tooltip-id>BARO</tooltip-id>
+        <label>Change barometric pressure setting</label>
       </binding>
     </hovered>
   </animation>
diff --git a/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1044B.2.xml b/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1044B.2.xml
index e3f0dc38a..ca99f7c29 100644
--- a/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1044B.2.xml
+++ b/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1044B.2.xml
@@ -255,7 +255,7 @@
       </binding>
       <binding>
         <command>property-adjust</command>
-        <property>instrumentation/fg1000/screen1/heading-bug-deg</property>
+        <property>instrumentation/fg1000/screen2/heading-bug-deg</property>
         <factor>15</factor>
       </binding>
     </action>
@@ -275,6 +275,22 @@
     </hovered>
   </animation>
 
+  <animation>
+    <type>rotate</type>
+    <object-name>HDG</object-name>
+    <property>instrumentation/fg1000/screen2/heading-bug-deg</property>
+    <center>
+      <x-m>0.03255</x-m>
+      <y-m>-0.12940</y-m>
+      <z-m>0.01934</z-m>
+    </center>
+    <axis>
+      <x>-1</x>
+      <y>0</y>
+      <z>0</z>
+    </axis>
+  </animation>
+
   <animation>
     <type>pick</type>
     <object-name>AP.L0</object-name>
@@ -632,47 +648,67 @@
 
   <animation>
     <type>knob</type>
-    <object-name>BARO</object-name>
+    <object-name>CRS</object-name>
     <action>
       <binding>
         <command>FG1000HardKeyPushed</command>
         <device>2</device>
         <notification>CRS</notification>
       </binding>
+      <binding>
+        <command>property-adjust</command>
+        <property>instrumentation/fg1000/screen2/course-deg</property>
+        <factor>15</factor>
+      </binding>
     </action>
     <shift-action>
-      <binding>
-        <command>FG1000HardKeyPushed</command>
-        <device>2</device>
-        <notification>BARO</notification>
-      </binding>
-    </shift-action>
-    <hovered>
-      <binding>
-        <command>set-tooltip</command>
-        <tooltip-id>BARO</tooltip-id>
-        <label>Change Nav Course (Shift to change Barometric pressure setting)</label>
-      </binding>
-    </hovered>
-  </animation>
-
-  <animation>
-    <type>pick</type>
-    <object-name>CRS</object-name>
-    <action>
-      <button>0</button>
       <binding>
         <command>FG1000HardKeyPushed</command>
         <device>2</device>
         <notification>CRS_CENTER</notification>
         <offset>1</offset>
       </binding>
+    </shift-action>
+    <hovered>
+      <binding>
+        <command>set-tooltip</command>
+        <tooltip-id>CRS</tooltip-id>
+        <label>Change Nav Course (Shift to center)</label>
+      </binding>
+    </hovered>
+  </animation>
+
+  <animation>
+    <type>rotate</type>
+    <object-name>CRS</object-name>
+    <property>instrumentation/fg1000/screen2/course-deg</property>
+    <center>
+      <x-m>0.00397</x-m>
+      <y-m>0.13004</y-m>
+      <z-m>0.01956</z-m>
+    </center>
+    <axis>
+      <x>-1</x>
+      <y>0</y>
+      <z>0</z>
+    </axis>
+  </animation>
+
+  <animation>
+    <type>knob</type>
+    <object-name>BARO</object-name>
+    <action>
+      <binding>
+        <command>FG1000HardKeyPushed</command>
+        <device>2</device>
+        <notification>BARO</notification>
+      </binding>
     </action>
     <hovered>
       <binding>
         <command>set-tooltip</command>
-        <tooltip-id>ComInner</tooltip-id>
-        <label>Center CDI on current VOR</label>
+        <tooltip-id>BARO</tooltip-id>
+        <label>Change barometric pressure setting</label>
       </binding>
     </hovered>
   </animation>
diff --git a/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1044B.3.xml b/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1044B.3.xml
index f0fd0a93f..0277dc1b6 100644
--- a/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1044B.3.xml
+++ b/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1044B.3.xml
@@ -255,7 +255,7 @@
       </binding>
       <binding>
         <command>property-adjust</command>
-        <property>instrumentation/fg1000/screen1/heading-bug-deg</property>
+        <property>instrumentation/fg1000/screen3/heading-bug-deg</property>
         <factor>15</factor>
       </binding>
     </action>
@@ -275,6 +275,22 @@
     </hovered>
   </animation>
 
+  <animation>
+    <type>rotate</type>
+    <object-name>HDG</object-name>
+    <property>instrumentation/fg1000/screen3/heading-bug-deg</property>
+    <center>
+      <x-m>0.03255</x-m>
+      <y-m>-0.12940</y-m>
+      <z-m>0.01934</z-m>
+    </center>
+    <axis>
+      <x>-1</x>
+      <y>0</y>
+      <z>0</z>
+    </axis>
+  </animation>
+
   <animation>
     <type>pick</type>
     <object-name>AP.L0</object-name>
@@ -632,47 +648,67 @@
 
   <animation>
     <type>knob</type>
-    <object-name>BARO</object-name>
+    <object-name>CRS</object-name>
     <action>
       <binding>
         <command>FG1000HardKeyPushed</command>
         <device>3</device>
         <notification>CRS</notification>
       </binding>
+      <binding>
+        <command>property-adjust</command>
+        <property>instrumentation/fg1000/screen3/course-deg</property>
+        <factor>15</factor>
+      </binding>
     </action>
     <shift-action>
-      <binding>
-        <command>FG1000HardKeyPushed</command>
-        <device>3</device>
-        <notification>BARO</notification>
-      </binding>
-    </shift-action>
-    <hovered>
-      <binding>
-        <command>set-tooltip</command>
-        <tooltip-id>BARO</tooltip-id>
-        <label>Change Nav Course (Shift to change Barometric pressure setting)</label>
-      </binding>
-    </hovered>
-  </animation>
-
-  <animation>
-    <type>pick</type>
-    <object-name>CRS</object-name>
-    <action>
-      <button>0</button>
       <binding>
         <command>FG1000HardKeyPushed</command>
         <device>3</device>
         <notification>CRS_CENTER</notification>
         <offset>1</offset>
       </binding>
+    </shift-action>
+    <hovered>
+      <binding>
+        <command>set-tooltip</command>
+        <tooltip-id>CRS</tooltip-id>
+        <label>Change Nav Course (Shift to center)</label>
+      </binding>
+    </hovered>
+  </animation>
+
+  <animation>
+    <type>rotate</type>
+    <object-name>CRS</object-name>
+    <property>instrumentation/fg1000/screen3/course-deg</property>
+    <center>
+      <x-m>0.00397</x-m>
+      <y-m>0.13004</y-m>
+      <z-m>0.01956</z-m>
+    </center>
+    <axis>
+      <x>-1</x>
+      <y>0</y>
+      <z>0</z>
+    </axis>
+  </animation>
+
+  <animation>
+    <type>knob</type>
+    <object-name>BARO</object-name>
+    <action>
+      <binding>
+        <command>FG1000HardKeyPushed</command>
+        <device>3</device>
+        <notification>BARO</notification>
+      </binding>
     </action>
     <hovered>
       <binding>
         <command>set-tooltip</command>
-        <tooltip-id>ComInner</tooltip-id>
-        <label>Center CDI on current VOR</label>
+        <tooltip-id>BARO</tooltip-id>
+        <label>Change barometric pressure setting</label>
       </binding>
     </hovered>
   </animation>
diff --git a/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1044B.4.xml b/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1044B.4.xml
index 4f13781f3..30d344e54 100644
--- a/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1044B.4.xml
+++ b/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1044B.4.xml
@@ -255,7 +255,7 @@
       </binding>
       <binding>
         <command>property-adjust</command>
-        <property>instrumentation/fg1000/screen1/heading-bug-deg</property>
+        <property>instrumentation/fg1000/screen4/heading-bug-deg</property>
         <factor>15</factor>
       </binding>
     </action>
@@ -275,6 +275,22 @@
     </hovered>
   </animation>
 
+  <animation>
+    <type>rotate</type>
+    <object-name>HDG</object-name>
+    <property>instrumentation/fg1000/screen4/heading-bug-deg</property>
+    <center>
+      <x-m>0.03255</x-m>
+      <y-m>-0.12940</y-m>
+      <z-m>0.01934</z-m>
+    </center>
+    <axis>
+      <x>-1</x>
+      <y>0</y>
+      <z>0</z>
+    </axis>
+  </animation>
+
   <animation>
     <type>pick</type>
     <object-name>AP.L0</object-name>
@@ -632,47 +648,67 @@
 
   <animation>
     <type>knob</type>
-    <object-name>BARO</object-name>
+    <object-name>CRS</object-name>
     <action>
       <binding>
         <command>FG1000HardKeyPushed</command>
         <device>4</device>
         <notification>CRS</notification>
       </binding>
+      <binding>
+        <command>property-adjust</command>
+        <property>instrumentation/fg1000/screen4/course-deg</property>
+        <factor>15</factor>
+      </binding>
     </action>
     <shift-action>
-      <binding>
-        <command>FG1000HardKeyPushed</command>
-        <device>4</device>
-        <notification>BARO</notification>
-      </binding>
-    </shift-action>
-    <hovered>
-      <binding>
-        <command>set-tooltip</command>
-        <tooltip-id>BARO</tooltip-id>
-        <label>Change Nav Course (Shift to change Barometric pressure setting)</label>
-      </binding>
-    </hovered>
-  </animation>
-
-  <animation>
-    <type>pick</type>
-    <object-name>CRS</object-name>
-    <action>
-      <button>0</button>
       <binding>
         <command>FG1000HardKeyPushed</command>
         <device>4</device>
         <notification>CRS_CENTER</notification>
         <offset>1</offset>
       </binding>
+    </shift-action>
+    <hovered>
+      <binding>
+        <command>set-tooltip</command>
+        <tooltip-id>CRS</tooltip-id>
+        <label>Change Nav Course (Shift to center)</label>
+      </binding>
+    </hovered>
+  </animation>
+
+  <animation>
+    <type>rotate</type>
+    <object-name>CRS</object-name>
+    <property>instrumentation/fg1000/screen4/course-deg</property>
+    <center>
+      <x-m>0.00397</x-m>
+      <y-m>0.13004</y-m>
+      <z-m>0.01956</z-m>
+    </center>
+    <axis>
+      <x>-1</x>
+      <y>0</y>
+      <z>0</z>
+    </axis>
+  </animation>
+
+  <animation>
+    <type>knob</type>
+    <object-name>BARO</object-name>
+    <action>
+      <binding>
+        <command>FG1000HardKeyPushed</command>
+        <device>4</device>
+        <notification>BARO</notification>
+      </binding>
     </action>
     <hovered>
       <binding>
         <command>set-tooltip</command>
-        <tooltip-id>ComInner</tooltip-id>
-        <label>Center CDI on current VOR</label>
+        <tooltip-id>BARO</tooltip-id>
+        <label>Change barometric pressure setting</label>
       </binding>
     </hovered>
   </animation>
diff --git a/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1045.1.xml b/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1045.1.xml
index 7a44f5bb7..e81fdeaee 100644
--- a/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1045.1.xml
+++ b/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1045.1.xml
@@ -280,6 +280,22 @@
     </hovered>
   </animation>
 
+  <animation>
+    <type>rotate</type>
+    <object-name>HDG</object-name>
+    <property>instrumentation/fg1000/screen1/heading-bug-deg</property>
+    <center>
+      <x-m>0.03255</x-m>
+      <y-m>-0.12940</y-m>
+      <z-m>0.01934</z-m>
+    </center>
+    <axis>
+      <x>-1</x>
+      <y>0</y>
+      <z>0</z>
+    </axis>
+  </animation>
+
   <animation>
     <type>pick</type>
     <object-name>AP.L0</object-name>
@@ -625,47 +641,67 @@
 
   <animation>
     <type>knob</type>
-    <object-name>BARO</object-name>
+    <object-name>CRS</object-name>
     <action>
       <binding>
         <command>FG1000HardKeyPushed</command>
         <device>1</device>
         <notification>CRS</notification>
       </binding>
+      <binding>
+        <command>property-adjust</command>
+        <property>instrumentation/fg1000/screen1/course-deg</property>
+        <factor>15</factor>
+      </binding>
     </action>
     <shift-action>
-      <binding>
-        <command>FG1000HardKeyPushed</command>
-        <device>1</device>
-        <notification>BARO</notification>
-      </binding>
-    </shift-action>
-    <hovered>
-      <binding>
-        <command>set-tooltip</command>
-        <tooltip-id>BARO</tooltip-id>
-        <label>Change Nav Course (Shift to change Barometric pressure setting)</label>
-      </binding>
-    </hovered>
-  </animation>
-
-  <animation>
-    <type>pick</type>
-    <object-name>CRS</object-name>
-    <action>
-      <button>0</button>
       <binding>
         <command>FG1000HardKeyPushed</command>
         <device>1</device>
         <notification>CRS_CENTER</notification>
         <offset>1</offset>
       </binding>
+    </shift-action>
+    <hovered>
+      <binding>
+        <command>set-tooltip</command>
+        <tooltip-id>CRS</tooltip-id>
+        <label>Change Nav Course (Shift to center)</label>
+      </binding>
+    </hovered>
+  </animation>
+
+  <animation>
+    <type>rotate</type>
+    <object-name>CRS</object-name>
+    <property>instrumentation/fg1000/screen1/course-deg</property>
+    <center>
+      <x-m>0.00397</x-m>
+      <y-m>0.13004</y-m>
+      <z-m>0.01956</z-m>
+    </center>
+    <axis>
+      <x>-1</x>
+      <y>0</y>
+      <z>0</z>
+    </axis>
+  </animation>
+
+  <animation>
+    <type>knob</type>
+    <object-name>BARO</object-name>
+    <action>
+      <binding>
+        <command>FG1000HardKeyPushed</command>
+        <device>1</device>
+        <notification>BARO</notification>
+      </binding>
     </action>
     <hovered>
       <binding>
         <command>set-tooltip</command>
-        <tooltip-id>ComInner</tooltip-id>
-        <label>Center CDI on current VOR</label>
+        <tooltip-id>BARO</tooltip-id>
+        <label>Change barometric pressure setting</label>
       </binding>
     </hovered>
   </animation>
diff --git a/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1045.2.xml b/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1045.2.xml
index cdca79b74..86daa9636 100644
--- a/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1045.2.xml
+++ b/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1045.2.xml
@@ -255,7 +255,7 @@
       </binding>
       <binding>
         <command>property-adjust</command>
-        <property>instrumentation/fg1000/screen1/heading-bug-deg</property>
+        <property>instrumentation/fg1000/screen2/heading-bug-deg</property>
         <factor>15</factor>
       </binding>
     </action>
@@ -275,6 +275,22 @@
     </hovered>
   </animation>
 
+  <animation>
+    <type>rotate</type>
+    <object-name>HDG</object-name>
+    <property>instrumentation/fg1000/screen2/heading-bug-deg</property>
+    <center>
+      <x-m>0.03255</x-m>
+      <y-m>-0.12940</y-m>
+      <z-m>0.01934</z-m>
+    </center>
+    <axis>
+      <x>-1</x>
+      <y>0</y>
+      <z>0</z>
+    </axis>
+  </animation>
+
   <animation>
     <type>pick</type>
     <object-name>AP.L0</object-name>
@@ -620,77 +636,70 @@
 
   <animation>
     <type>knob</type>
-    <object-name>BARO</object-name>
+    <object-name>CRS</object-name>
     <action>
       <binding>
         <command>FG1000HardKeyPushed</command>
         <device>2</device>
         <notification>CRS</notification>
       </binding>
+      <binding>
+        <command>property-adjust</command>
+        <property>instrumentation/fg1000/screen2/course-deg</property>
+        <factor>15</factor>
+      </binding>
     </action>
     <shift-action>
-      <binding>
-        <command>FG1000HardKeyPushed</command>
-        <device>2</device>
-        <notification>BARO</notification>
-      </binding>
-    </shift-action>
-    <hovered>
-      <binding>
-        <command>set-tooltip</command>
-        <tooltip-id>BARO</tooltip-id>
-        <label>Change Nav Course (Shift to change Barometric pressure setting)</label>
-      </binding>
-    </hovered>
-  </animation>
-
-  <animation>
-    <type>pick</type>
-    <object-name>CRS</object-name>
-    <action>
-      <button>0</button>
       <binding>
         <command>FG1000HardKeyPushed</command>
         <device>2</device>
         <notification>CRS_CENTER</notification>
         <offset>1</offset>
       </binding>
-    </action>
+    </shift-action>
     <hovered>
       <binding>
         <command>set-tooltip</command>
-        <tooltip-id>ComInner</tooltip-id>
-        <label>Center CDI on current VOR</label>
+        <tooltip-id>CRS</tooltip-id>
+        <label>Change Nav Course (Shift to center)</label>
       </binding>
     </hovered>
   </animation>
 
+  <animation>
+    <type>rotate</type>
+    <object-name>CRS</object-name>
+    <property>instrumentation/fg1000/screen2/course-deg</property>
+    <center>
+      <x-m>0.00397</x-m>
+      <y-m>0.13004</y-m>
+      <z-m>0.01956</z-m>
+    </center>
+    <axis>
+      <x>-1</x>
+      <y>0</y>
+      <z>0</z>
+    </axis>
+  </animation>
+
   <animation>
     <type>knob</type>
-    <object-name>PAN</object-name>
+    <object-name>BARO</object-name>
     <action>
       <binding>
         <command>FG1000HardKeyPushed</command>
         <device>2</device>
-        <notification>RANGE</notification>
+        <notification>BARO</notification>
       </binding>
     </action>
-    <shift-action>
-      <binding>
-        <command>FG1000HardKeyPushed</command>
-        <device>2</device>
-        <notification>JOYSTICK_PRESS</notification>
-      </binding>
-    </shift-action>
     <hovered>
       <binding>
         <command>set-tooltip</command>
-        <tooltip-id>PAN</tooltip-id>
-        <label>Change map range (Shift to activate map pointer)</label>
+        <tooltip-id>BARO</tooltip-id>
+        <label>Change barometric pressure setting</label>
       </binding>
     </hovered>
   </animation>
-
   <animation>
     <type>pick</type>
     <object-name>PANUp</object-name>
diff --git a/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1045.3.xml b/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1045.3.xml
index bc0b2af35..ea75ec205 100644
--- a/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1045.3.xml
+++ b/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1045.3.xml
@@ -255,7 +255,7 @@
       </binding>
       <binding>
         <command>property-adjust</command>
-        <property>instrumentation/fg1000/screen1/heading-bug-deg</property>
+        <property>instrumentation/fg1000/screen3/heading-bug-deg</property>
         <factor>15</factor>
       </binding>
     </action>
@@ -275,6 +275,22 @@
     </hovered>
   </animation>
 
+  <animation>
+    <type>rotate</type>
+    <object-name>HDG</object-name>
+    <property>instrumentation/fg1000/screen3/heading-bug-deg</property>
+    <center>
+      <x-m>0.03255</x-m>
+      <y-m>-0.12940</y-m>
+      <z-m>0.01934</z-m>
+    </center>
+    <axis>
+      <x>-1</x>
+      <y>0</y>
+      <z>0</z>
+    </axis>
+  </animation>
+
   <animation>
     <type>pick</type>
     <object-name>AP.L0</object-name>
@@ -620,47 +636,67 @@
 
   <animation>
     <type>knob</type>
-    <object-name>BARO</object-name>
+    <object-name>CRS</object-name>
     <action>
       <binding>
         <command>FG1000HardKeyPushed</command>
         <device>3</device>
         <notification>CRS</notification>
       </binding>
+      <binding>
+        <command>property-adjust</command>
+        <property>instrumentation/fg1000/screen3/course-deg</property>
+        <factor>15</factor>
+      </binding>
     </action>
     <shift-action>
-      <binding>
-        <command>FG1000HardKeyPushed</command>
-        <device>3</device>
-        <notification>BARO</notification>
-      </binding>
-    </shift-action>
-    <hovered>
-      <binding>
-        <command>set-tooltip</command>
-        <tooltip-id>BARO</tooltip-id>
-        <label>Change Nav Course (Shift to change Barometric pressure setting)</label>
-      </binding>
-    </hovered>
-  </animation>
-
-  <animation>
-    <type>pick</type>
-    <object-name>CRS</object-name>
-    <action>
-      <button>0</button>
       <binding>
         <command>FG1000HardKeyPushed</command>
         <device>3</device>
         <notification>CRS_CENTER</notification>
         <offset>1</offset>
       </binding>
+    </shift-action>
+    <hovered>
+      <binding>
+        <command>set-tooltip</command>
+        <tooltip-id>CRS</tooltip-id>
+        <label>Change Nav Course (Shift to center)</label>
+      </binding>
+    </hovered>
+  </animation>
+
+  <animation>
+    <type>rotate</type>
+    <object-name>CRS</object-name>
+    <property>instrumentation/fg1000/screen3/course-deg</property>
+    <center>
+      <x-m>0.00397</x-m>
+      <y-m>0.13004</y-m>
+      <z-m>0.01956</z-m>
+    </center>
+    <axis>
+      <x>-1</x>
+      <y>0</y>
+      <z>0</z>
+    </axis>
+  </animation>
+
+  <animation>
+    <type>knob</type>
+    <object-name>BARO</object-name>
+    <action>
+      <binding>
+        <command>FG1000HardKeyPushed</command>
+        <device>3</device>
+        <notification>BARO</notification>
+      </binding>
     </action>
     <hovered>
       <binding>
         <command>set-tooltip</command>
-        <tooltip-id>ComInner</tooltip-id>
-        <label>Center CDI on current VOR</label>
+        <tooltip-id>BARO</tooltip-id>
+        <label>Change barometric pressure setting</label>
       </binding>
     </hovered>
   </animation>
diff --git a/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1045.4.xml b/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1045.4.xml
index 670eccc3e..6345b79a4 100644
--- a/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1045.4.xml
+++ b/Aircraft/Instruments-3d/FG1000/GDU104X/GDU-1045.4.xml
@@ -255,7 +255,7 @@
       </binding>
       <binding>
         <command>property-adjust</command>
-        <property>instrumentation/fg1000/screen1/heading-bug-deg</property>
+        <property>instrumentation/fg1000/screen4/heading-bug-deg</property>
         <factor>15</factor>
       </binding>
     </action>
@@ -275,6 +275,22 @@
     </hovered>
   </animation>
 
+  <animation>
+    <type>rotate</type>
+    <object-name>HDG</object-name>
+    <property>instrumentation/fg1000/screen4/heading-bug-deg</property>
+    <center>
+      <x-m>0.03255</x-m>
+      <y-m>-0.12940</y-m>
+      <z-m>0.01934</z-m>
+    </center>
+    <axis>
+      <x>-1</x>
+      <y>0</y>
+      <z>0</z>
+    </axis>
+  </animation>
+
   <animation>
     <type>pick</type>
     <object-name>AP.L0</object-name>
@@ -620,47 +636,67 @@
 
   <animation>
     <type>knob</type>
-    <object-name>BARO</object-name>
+    <object-name>CRS</object-name>
     <action>
       <binding>
         <command>FG1000HardKeyPushed</command>
         <device>4</device>
         <notification>CRS</notification>
       </binding>
+      <binding>
+        <command>property-adjust</command>
+        <property>instrumentation/fg1000/screen4/course-deg</property>
+        <factor>15</factor>
+      </binding>
     </action>
     <shift-action>
-      <binding>
-        <command>FG1000HardKeyPushed</command>
-        <device>4</device>
-        <notification>BARO</notification>
-      </binding>
-    </shift-action>
-    <hovered>
-      <binding>
-        <command>set-tooltip</command>
-        <tooltip-id>BARO</tooltip-id>
-        <label>Change Nav Course (Shift to change Barometric pressure setting)</label>
-      </binding>
-    </hovered>
-  </animation>
-
-  <animation>
-    <type>pick</type>
-    <object-name>CRS</object-name>
-    <action>
-      <button>0</button>
       <binding>
         <command>FG1000HardKeyPushed</command>
         <device>4</device>
         <notification>CRS_CENTER</notification>
         <offset>1</offset>
       </binding>
+    </shift-action>
+    <hovered>
+      <binding>
+        <command>set-tooltip</command>
+        <tooltip-id>CRS</tooltip-id>
+        <label>Change Nav Course (Shift to center)</label>
+      </binding>
+    </hovered>
+  </animation>
+
+  <animation>
+    <type>rotate</type>
+    <object-name>CRS</object-name>
+    <property>instrumentation/fg1000/screen4/course-deg</property>
+    <center>
+      <x-m>0.00397</x-m>
+      <y-m>0.13004</y-m>
+      <z-m>0.01956</z-m>
+    </center>
+    <axis>
+      <x>-1</x>
+      <y>0</y>
+      <z>0</z>
+    </axis>
+  </animation>
+
+  <animation>
+    <type>knob</type>
+    <object-name>BARO</object-name>
+    <action>
+      <binding>
+        <command>FG1000HardKeyPushed</command>
+        <device>4</device>
+        <notification>BARO</notification>
+      </binding>
     </action>
     <hovered>
       <binding>
         <command>set-tooltip</command>
-        <tooltip-id>ComInner</tooltip-id>
-        <label>Center CDI on current VOR</label>
+        <tooltip-id>BARO</tooltip-id>
+        <label>Change barometric pressure setting</label>
       </binding>
     </hovered>
   </animation>
diff --git a/Aircraft/Instruments-3d/FG1000/Nasal/MFDPages/PFDInstruments/PFDInstrumentsController.nas b/Aircraft/Instruments-3d/FG1000/Nasal/MFDPages/PFDInstruments/PFDInstrumentsController.nas
index e215ca6f4..020951079 100644
--- a/Aircraft/Instruments-3d/FG1000/Nasal/MFDPages/PFDInstruments/PFDInstrumentsController.nas
+++ b/Aircraft/Instruments-3d/FG1000/Nasal/MFDPages/PFDInstruments/PFDInstrumentsController.nas
@@ -161,7 +161,12 @@ var PFDInstrumentsController =
 
   handleRange : func(val)
   {
-    var incr_or_decr = (val > 0) ? me.page.insetMap.zoomIn() : me.page.insetMap.zoomOut();
+    if (val >0) {
+      me.page.insetMap.zoomOut();
+    } else {
+      me.page.insetMap.zoomIn();
+    }
+    return emesary.Transmitter.ReceiptStatus_Finished;
   },
 
   handleFPL : func (value) {
diff --git a/Aircraft/Instruments-3d/FG1000/Nasal/NavMap.nas b/Aircraft/Instruments-3d/FG1000/Nasal/NavMap.nas
index f45a2a9e8..de6537b16 100644
--- a/Aircraft/Instruments-3d/FG1000/Nasal/NavMap.nas
+++ b/Aircraft/Instruments-3d/FG1000/Nasal/NavMap.nas
@@ -252,8 +252,11 @@ var NavMap = {
 
   handleRange : func(val)
   {
-    var incr_or_decr = (val > 0) ? 1 : -1;
-    me.setZoom(me._current_zoom + incr_or_decr);
+    if (val >0) {
+      me.zoomOut();
+    } else {
+      me.zoomIn();
+    }
     return emesary.Transmitter.ReceiptStatus_OK;
   },