From 6339f65087412b84ae69156036233cfcc6c486cb Mon Sep 17 00:00:00 2001
From: Jasmine Iwanek <jasmine@iwanek.co.uk>
Date: Tue, 21 Oct 2025 14:04:17 -0400
Subject: [PATCH] Swap axis names on CH products things with pedals

---
 src/game/joystick_ch_flightstick_pro.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/game/joystick_ch_flightstick_pro.c b/src/game/joystick_ch_flightstick_pro.c
index 5c35b85a8..4d8a4cf29 100644
--- a/src/game/joystick_ch_flightstick_pro.c
+++ b/src/game/joystick_ch_flightstick_pro.c
@@ -256,7 +256,7 @@ const joystick_t joystick_ch_flightstick_ch_pedals = {
     .button_count  = 2,
     .pov_count     = 0,
     .max_joysticks = 1,
-    .axis_names    = { "X axis (Roll)", "Y axis (Pitch)", "Throttle", "Rudder (Yaw)" },
+    .axis_names    = { "X axis (Roll)", "Y axis (Pitch)", "Rudder (Yaw)", "Throttle" },
     .button_names  = { "Trigger", "Button 2" },
     .pov_names     = { NULL }
 };
@@ -274,7 +274,7 @@ const joystick_t joystick_ch_flightstick_ch_pedals_pro = {
     .button_count  = 2,
     .pov_count     = 0,
     .max_joysticks = 1,
-    .axis_names    = { "X axis (Roll)", "Y axis (Pitch)", "Right Pedal", "Left Pedal" },
+    .axis_names    = { "X axis (Roll)", "Y axis (Pitch)", "Left Pedal", "Right Pedal" },
     .button_names  = { "Trigger", "Button 2" },
     .pov_names     = { NULL }
 };
@@ -310,7 +310,7 @@ const joystick_t joystick_ch_flightstick_pro_ch_pedals = {
     .button_count  = 4,
     .pov_count     = 1,
     .max_joysticks = 1,
-    .axis_names    = { "X axis (Roll)", "Y axis (Pitch)", "Throttle", "Rudder (Yaw)" },
+    .axis_names    = { "X axis (Roll)", "Y axis (Pitch)", "Rudder (Yaw)", "Throttle" },
     .button_names  = { "Trigger", "Button 2", "Button 3", "Button 4" },
     .pov_names     = { "POV" }
 };
@@ -328,7 +328,7 @@ const joystick_t joystick_ch_flightstick_pro_ch_pedals_pro = {
     .button_count  = 4,
     .pov_count     = 1,
     .max_joysticks = 1,
-    .axis_names    = { "X axis (Roll)", "Y axis (Pitch)", "Right Pedal", "Left Pedal" },
+    .axis_names    = { "X axis (Roll)", "Y axis (Pitch)", "Left Pedal", "Right Pedal" },
     .button_names  = { "Trigger", "Button 2", "Button 3", "Button 4" },
     .pov_names     = { "POV" }
 };
@@ -364,7 +364,7 @@ const joystick_t joystick_ch_virtual_pilot_ch_pedals = {
     .button_count  = 2,
     .pov_count     = 0,
     .max_joysticks = 1,
-    .axis_names    = { "X axis (Roll)", "Y axis (Pitch)", "Throttle", "Rudder (Yaw)" },
+    .axis_names    = { "X axis (Roll)", "Y axis (Pitch)", "Rudder (Yaw)", "Throttle" },
     .button_names  = { "Button 1", "Button 2" },
     .pov_names     = { NULL }
 };
@@ -382,7 +382,7 @@ const joystick_t joystick_ch_virtual_pilot_ch_pedals_pro = {
     .button_count  = 2,
     .pov_count     = 0,
     .max_joysticks = 1,
-    .axis_names    = { "X axis (Roll)", "Y axis (Pitch)", "Right Pedal", "Left Pedal" },
+    .axis_names    = { "X axis (Roll)", "Y axis (Pitch)", "Left Pedal", "Right Pedal" },
     .button_names  = { "Button 1", "Button 2" },
     .pov_names     = { NULL }
 };
@@ -418,7 +418,7 @@ const joystick_t joystick_ch_virtual_pilot_pro_ch_pedals = {
     .button_count  = 6,
     .pov_count     = 2,
     .max_joysticks = 1,
-    .axis_names    = { "X axis (Roll)", "Y axis (Pitch)", "Throttle", "Rudder (Yaw)" },
+    .axis_names    = { "X axis (Roll)", "Y axis (Pitch)", "Rudder (Yaw)", "Throttle" },
     .button_names  = { "Button 1", "Button 2", "Button 3", "Button 4", "Button 5", "Button 6" },
     .pov_names     = { "Right POV", "Left POV" }
 };
@@ -436,7 +436,7 @@ const joystick_t joystick_ch_virtual_pilot_pro_ch_pedals_pro = {
     .button_count  = 6,
     .pov_count     = 2,
     .max_joysticks = 1,
-    .axis_names    = { "X axis (Roll)", "Y axis (Pitch)", "Right Pedal", "Left Pedal" },
+    .axis_names    = { "X axis (Roll)", "Y axis (Pitch)", "Left Pedal", "Right Pedal" },
     .button_names  = { "Button 1", "Button 2", "Button 3", "Button 4", "Button 5", "Button 6" },
     .pov_names     = { "Right POV", "Left POV" }
 };