From c926e5c0ef179ce139308f89cb3a20a51fdf3049 Mon Sep 17 00:00:00 2001
From: Mark Haslinghuis <mark@numloq.nl>
Date: Sat, 9 Sep 2023 22:34:00 +0200
Subject: [PATCH] Simplify motor idle config

---
 locales/en/messages.json |  7 ++-----
 src/js/tabs/motors.js    | 10 +++++++---
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/locales/en/messages.json b/locales/en/messages.json
index 0e70dfe512..e693d41448 100755
--- a/locales/en/messages.json
+++ b/locales/en/messages.json
@@ -1349,11 +1349,8 @@
     "configurationDigitalIdlePercent": {
         "message": "Motor Idle ( %, static)"
     },
-    "configurationDigitalIdlePercentDisabled": {
-        "message": "Dynamic Idle is active at {{dynamicIdle}} rpm. See the PID tuning tab."
-    },
     "configurationDigitalIdlePercentHelp": {
-        "message": "The 'Motor Idle (static)' value is the percent of maximum throttle that is sent to the ESCs when the throttle at minimum stick position and the craft is armed. <br><br>Increase it to gain more idle speed and avoid desyncs. Too high and the craft feels floaty. Too low and the motors can desync or be slow to start up.<br><br>In 4.3, when Dynamic Idle is active, the static idle value is disregarded, because the idle value is continually adjusted to maintain the configured minimum rpm on the slowest motor."
+        "message": "The 'Motor Idle (static)' value is the percent of maximum throttle that is sent to the ESCs when the throttle at minimum stick position and the craft is armed. <br><br>Increase it to gain more idle speed and avoid desyncs. Too high and the craft feels floaty. Too low and the motors can desync or be slow to start up."
     },
     "configurationMotorPoles": {
         "message": "Motor poles",
@@ -4535,7 +4532,7 @@
         "message": "Dynamic Idle Value [* 100 RPM]"
     },
     "pidTuningIdleMinRpmHelp": {
-        "message": "Dynamic Idle improves control at low rpm and reduces risk of motor desyncs. <br /><br /> It improves PID authority, zero throttle stability, inverted hang time, and motor braking.<br /><br />The Dynamic Idle min rpm should be set to around 3000 - 3500 rpm. For 4.2, set the DShot idle value low, eg 1%.  There is no need to adjust the DShot Idle value in 4.3. <br /><br />Visit <a href=\"https://betaflight.com/docs/wiki/archive/Tuning-Dynamic-Idle\" target=\"_blank\" rel=\"noopener noreferrer\">this wiki entry</a> for more info."
+        "message": "Dynamic Idle improves control at low rpm and reduces risk of motor desyncs. <br /><br /> It improves PID authority, zero throttle stability, inverted hang time, and motor braking.<br /><br />The Dynamic Idle min rpm should be set to around 3000 - 3500 rpm. <br /><br />Visit <a href=\"https://betaflight.com/docs/wiki/archive/Tuning-Dynamic-Idle\" target=\"_blank\" rel=\"noopener noreferrer\">this wiki entry</a> for more info."
     },
     "pidTuningIdleMinRpmDisabled": {
         "message": "Dynamic Idle is OFF because Dshot Telemetry is OFF"
diff --git a/src/js/tabs/motors.js b/src/js/tabs/motors.js
index 71a46352cc..4987f52f9d 100644
--- a/src/js/tabs/motors.js
+++ b/src/js/tabs/motors.js
@@ -12,7 +12,7 @@ import FC from "../fc";
 import MSP from "../msp";
 import { mixerList } from "../model";
 import MSPCodes from "../msp/MSPCodes";
-import { API_VERSION_1_42, API_VERSION_1_44 } from "../data_storage";
+import { API_VERSION_1_42, API_VERSION_1_44, API_VERSION_1_46 } from "../data_storage";
 import EscProtocols from "../utils/EscProtocols";
 import { updateTabList } from "../utils/updateTabList";
 import { isInt, getMixerImageSrc } from "../utils/common";
@@ -777,8 +777,12 @@ motors.initialize = async function (callback) {
             }
 
             if (FC.ADVANCED_TUNING.idleMinRpm && FC.MOTOR_CONFIG.use_dshot_telemetry) {
-                const dynamicIdle = FC.ADVANCED_TUNING.idleMinRpm * 100;
-                $('span.digitalIdlePercentDisabled').text(i18n.getMessage('configurationDigitalIdlePercentDisabled', { dynamicIdle }));
+                if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_46)) {
+                    $('div.digitalIdlePercent').hide();
+                } else {
+                    const dynamicIdle = FC.ADVANCED_TUNING.idleMinRpm * 100;
+                    $('span.digitalIdlePercentDisabled').text(i18n.getMessage('configurationDigitalIdlePercentDisabled', { dynamicIdle }));
+                }
             } else {
                 $('span.digitalIdlePercentDisabled').text(i18n.getMessage('configurationDigitalIdlePercent'));
             }