From cd2f302b5fda37b4ea6fa0f7677b582b9f7444e8 Mon Sep 17 00:00:00 2001 From: nerdCopter <56646290+nerdCopter@users.noreply.github.com> Date: Wed, 9 Oct 2024 08:49:36 -0500 Subject: [PATCH 1/5] add ToolTip for AirMode --- locales/en/messages.json | 3 +++ src/js/Features.js | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/locales/en/messages.json b/locales/en/messages.json index d7aaeedd2e..8a243072f6 100755 --- a/locales/en/messages.json +++ b/locales/en/messages.json @@ -1323,6 +1323,9 @@ "featureAIRMODE": { "message": "Permanently enable Airmode" }, + "featureAIRMODETip": { + "message": "Keeps the PID loop active at zero-throttle, especially I-Term, to allow maintaining control of the craft." + }, "featureRX_SPI": { "message": "SPI Rx (e.g. built-in Rx)" }, diff --git a/src/js/Features.js b/src/js/Features.js index 13e48959f1..9e5b065e86 100644 --- a/src/js/Features.js +++ b/src/js/Features.js @@ -26,7 +26,7 @@ const Features = function (config) { {bit: 18, group: 'other', name: 'OSD', haveTip: true, dependsOn: 'OSD'}, {bit: 20, group: 'other', name: 'CHANNEL_FORWARDING', dependsOn: 'SERVOS'}, {bit: 21, group: 'other', name: 'TRANSPONDER', haveTip: true, dependsOn: 'TRANSPONDER'}, - {bit: 22, group: 'other', name: 'AIRMODE'}, + {bit: 22, group: 'other', name: 'AIRMODE', haveTip: true}, {bit: 25, group: 'rxMode', mode: 'select', name: 'RX_SPI'}, {bit: 27, group: 'escSensor', name: 'ESC_SENSOR'}, {bit: 28, group: 'antiGravity', name: 'ANTI_GRAVITY', haveTip: true, hideName: true}, From b91e90c360358fd93e77d10b44deef983c777be9 Mon Sep 17 00:00:00 2001 From: nerdCopter <56646290+nerdCopter@users.noreply.github.com> Date: Wed, 9 Oct 2024 10:48:03 -0500 Subject: [PATCH 2/5] verbiage changes as requested; plus code re-use --- locales/en/messages.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/locales/en/messages.json b/locales/en/messages.json index 8a243072f6..0491994368 100755 --- a/locales/en/messages.json +++ b/locales/en/messages.json @@ -1324,7 +1324,7 @@ "message": "Permanently enable Airmode" }, "featureAIRMODETip": { - "message": "Keeps the PID loop active at zero-throttle, especially I-Term, to allow maintaining control of the craft." + "message": "Airmode allows for maintaining PID control at low throttle. Whereas in standard mode, when roll, pitch, and yaw calculations saturate a motor, all motors are equally reduced. If a motor goes below minimum, it gets clipped off. For example, with throttle just above minimum and a quick roll is attempted, two motors can't go any lower, resulting in half the power (half of the PID gain). If inputs demand more than a 100% difference between high and low motors, the low motors get clipped, causing an imbalance by unevenly reducing the gain." }, "featureRX_SPI": { "message": "SPI Rx (e.g. built-in Rx)" @@ -2411,7 +2411,7 @@ "description": "Help text to ANTIGRAVITY mode" }, "auxiliaryHelpMode_AIRMODE": { - "message": "In the standard mixer / mode, when the roll, pitch and yaw gets calculated and saturates a motor, all motors will be reduced equally. When a motor goes below minimum it gets clipped off. Say you had your throttle just above minimum and tried to pull a quick roll - since two motors can't go any lower, you essentially get half the power (half of your PID gain). If your inputs would have asked for more than a 100% difference between the high and low motors, the low motors would get clipped, breaking the symmetry of the motor balance by unevenly reducing the gain", + "message": "$t(featureAIRMODETip.message)", "description": "Help text to AIRMODE mode" }, "auxiliaryHelpMode_BEEPER": { From b33959c7a8dd8e5859cf0f29f3bc0bc178e874e6 Mon Sep 17 00:00:00 2001 From: nerdCopter <56646290+nerdCopter@users.noreply.github.com> Date: Wed, 9 Oct 2024 10:54:11 -0500 Subject: [PATCH 3/5] reverse variables; this should retain feature verbiage for non-english until translated. Co-authored-by: Mark Haslinghuis --- locales/en/messages.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/locales/en/messages.json b/locales/en/messages.json index 0491994368..d4a7815c0d 100755 --- a/locales/en/messages.json +++ b/locales/en/messages.json @@ -1324,7 +1324,7 @@ "message": "Permanently enable Airmode" }, "featureAIRMODETip": { - "message": "Airmode allows for maintaining PID control at low throttle. Whereas in standard mode, when roll, pitch, and yaw calculations saturate a motor, all motors are equally reduced. If a motor goes below minimum, it gets clipped off. For example, with throttle just above minimum and a quick roll is attempted, two motors can't go any lower, resulting in half the power (half of the PID gain). If inputs demand more than a 100% difference between high and low motors, the low motors get clipped, causing an imbalance by unevenly reducing the gain." + "message": "$t(auxiliaryHelpMode_AIRMODE.message)" }, "featureRX_SPI": { "message": "SPI Rx (e.g. built-in Rx)" @@ -2411,7 +2411,7 @@ "description": "Help text to ANTIGRAVITY mode" }, "auxiliaryHelpMode_AIRMODE": { - "message": "$t(featureAIRMODETip.message)", + "message": "AirMode allows for maintaining PID control at low throttle. Whereas in standard mode, when roll, pitch, and yaw calculations saturate a motor, all motors are equally reduced. If a motor goes below minimum, it gets clipped off. For example, with throttle just above minimum and a quick roll is attempted, two motors can't go any lower, resulting in half the power (half of the PID gain). If inputs demand more than a 100% difference between high and low motors, the low motors get clipped, causing an imbalance by unevenly reducing the gain.", "description": "Help text to AIRMODE mode" }, "auxiliaryHelpMode_BEEPER": { From db3400e742e764de8cea11a88ccad6be0b68deeb Mon Sep 17 00:00:00 2001 From: nerdCopter <56646290+nerdCopter@users.noreply.github.com> Date: Sat, 26 Oct 2024 19:20:33 -0500 Subject: [PATCH 4/5] Terminology simplification and URL link --- locales/en/messages.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/en/messages.json b/locales/en/messages.json index d4a7815c0d..9419976565 100755 --- a/locales/en/messages.json +++ b/locales/en/messages.json @@ -2411,7 +2411,7 @@ "description": "Help text to ANTIGRAVITY mode" }, "auxiliaryHelpMode_AIRMODE": { - "message": "AirMode allows for maintaining PID control at low throttle. Whereas in standard mode, when roll, pitch, and yaw calculations saturate a motor, all motors are equally reduced. If a motor goes below minimum, it gets clipped off. For example, with throttle just above minimum and a quick roll is attempted, two motors can't go any lower, resulting in half the power (half of the PID gain). If inputs demand more than a 100% difference between high and low motors, the low motors get clipped, causing an imbalance by unevenly reducing the gain.", + "message": "AirMode allows for maintaining PID control at low throttle. For more information please see AirMode on Betaflight.com.", "description": "Help text to AIRMODE mode" }, "auxiliaryHelpMode_BEEPER": { From d8a7b7d209ed0edb16b90b66f1d556c2d5c68e67 Mon Sep 17 00:00:00 2001 From: Mark Haslinghuis Date: Mon, 28 Oct 2024 16:30:37 +0100 Subject: [PATCH 5/5] Update locales/en/messages.json Co-authored-by: Jan Post --- locales/en/messages.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/en/messages.json b/locales/en/messages.json index 9419976565..e5c991e69f 100755 --- a/locales/en/messages.json +++ b/locales/en/messages.json @@ -2411,7 +2411,7 @@ "description": "Help text to ANTIGRAVITY mode" }, "auxiliaryHelpMode_AIRMODE": { - "message": "AirMode allows for maintaining PID control at low throttle. For more information please see AirMode on Betaflight.com.", + "message": "AirMode allows for maintaining drone stability at low throttle. For more information please see AirMode on Betaflight.com.", "description": "Help text to AIRMODE mode" }, "auxiliaryHelpMode_BEEPER": {