From b9e4bb909c897a6f016d6e2afe24bcb643a1b78c Mon Sep 17 00:00:00 2001
From: remi22 <82544308+remibiche@users.noreply.github.com>
Date: Sun, 16 Nov 2025 19:26:36 +0100
Subject: [PATCH 1/2] Add warning for joystick calibration issues

Added a warning about potential calibration issues with some radiocontrollers due to incorrect channel mappings.
---
 docs/en/qgc-user-guide/setup_view/joystick.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/en/qgc-user-guide/setup_view/joystick.md b/docs/en/qgc-user-guide/setup_view/joystick.md
index 86a24c1f603c..d2d0d3614758 100644
--- a/docs/en/qgc-user-guide/setup_view/joystick.md
+++ b/docs/en/qgc-user-guide/setup_view/joystick.md
@@ -45,6 +45,10 @@ To configure a joystick:
 
    The joystick is _enabled_ as the last step of the calibration process.
 
+    ::: warning
+    On some radiocontrollers, the calibration process does not work because of wrong channel mappings. You can follow [supported joysticks section](#supported-joysticks) for more information.
+    :::
+
 1. Test the buttons and sticks work as intended by pressing them, and viewing the result in the Axis/Button monitor in the **General** tab.
 1. Select the flight modes/vehicle functions activated by each joystick button.
    ![Joystick setup - Buttons](../../../assets/setup/joystick_buttons.jpg)

From 3bab2110dce7672d61fb6a4bacc949a9bfb2596f Mon Sep 17 00:00:00 2001
From: remi22 <82544308+remibiche@users.noreply.github.com>
Date: Sun, 16 Nov 2025 19:36:08 +0100
Subject: [PATCH 2/2] Update joystick.md with TBS TANGO 2 support

Added instructions for using TBS TANGO 2 as a joystick and provided remapping commands.
---
 docs/en/qgc-user-guide/setup_view/joystick.md | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/docs/en/qgc-user-guide/setup_view/joystick.md b/docs/en/qgc-user-guide/setup_view/joystick.md
index d2d0d3614758..62e48edd2981 100644
--- a/docs/en/qgc-user-guide/setup_view/joystick.md
+++ b/docs/en/qgc-user-guide/setup_view/joystick.md
@@ -46,7 +46,7 @@ To configure a joystick:
    The joystick is _enabled_ as the last step of the calibration process.
 
     ::: warning
-    On some radiocontrollers, the calibration process does not work because of wrong channel mappings. You can follow [supported joysticks section](#supported-joysticks) for more information.
+    On some radiocontrollers, the calibration process does not work because of wrong channels mapping. You can follow [supported joysticks section](#supported-joysticks) for more information.
     :::
 
 1. Test the buttons and sticks work as intended by pressing them, and viewing the result in the Axis/Button monitor in the **General** tab.
@@ -173,6 +173,23 @@ The Taranis is an open system that is openly being worked on.
 It is possible that at time of writing there is a firmware or configuration that allows it to work effectively as a joystick.
 :::
 
+### Radiocontroller TBS TANGO 2
+
+The radio TBS TANGO 2 can also be used as a joystick controlled via QGroundControl. In order to make it work, you need to remap the channels by using the following commands:
+
+```bash
+export SDL_GAMECONTROLLERCONFIG="03002de7d80400001057000011010000,Team-BlackSheep TBS Joystick,a:b0,b:b1,x:b3,y:b4,back:b10,guide:b12,start:b11,leftstick:b13,rightstick:b14,leftshoulder:b6,rightshoulder:b7,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:a4,righttrigger:a5,crc:e72d,platform:Linux"
+./QGroundControl-x86_64.AppImage
+```
+
+For another radio, the first command above can be found by using the [jstest software tool](http://github.com/meleu/jstest-sdl) and run:
+
+```bash
+jstest-sdl -l
+```
+
+**Take care of the channels remapping you need to do between a2, a3 and other if needed**
+
 ### Logitech Gamepad F310
 
 The Logitech Gamepad F310 has been tested via USB on MacOSX "Sierra".