From a0cfedd5b089fae672eb01e86e6d0d50179111a1 Mon Sep 17 00:00:00 2001
From: Mark Haslinghuis <mark@numloq.nl>
Date: Fri, 3 Nov 2023 03:40:45 +0100
Subject: [PATCH 1/4] Make idleMinRpm configurable from motor tab (active
 profile)

---
 src/js/tabs/motors.js | 7 +++++++
 src/tabs/motors.html  | 9 +++++++++
 2 files changed, 16 insertions(+)

diff --git a/src/js/tabs/motors.js b/src/js/tabs/motors.js
index ac4a506329..0e34912958 100644
--- a/src/js/tabs/motors.js
+++ b/src/js/tabs/motors.js
@@ -281,6 +281,7 @@ motors.initialize = async function (callback) {
             dshotBidir:         FC.MOTOR_CONFIG.use_dshot_telemetry,
             motorPoles:         FC.MOTOR_CONFIG.motor_poles,
             digitalIdlePercent: FC.PID_ADVANCED_CONFIG.digitalIdlePercent,
+            idleMinRpm:         FC.ADVANCED_TUNING.idleMinRpm,
             _3ddeadbandlow:     FC.MOTOR_3D_CONFIG.deadband3d_low,
             _3ddeadbandhigh:    FC.MOTOR_3D_CONFIG.deadband3d_high,
             _3dneutral:         FC.MOTOR_3D_CONFIG.neutral,
@@ -693,6 +694,8 @@ motors.initialize = async function (callback) {
         unsyncedPWMSwitchElement.prop('checked', FC.PID_ADVANCED_CONFIG.use_unsyncedPwm !== 0).trigger("change");
         $('input[name="unsyncedpwmfreq"]').val(FC.PID_ADVANCED_CONFIG.motor_pwm_rate);
         $('input[name="digitalIdlePercent"]').val(FC.PID_ADVANCED_CONFIG.digitalIdlePercent);
+        $('input[name="idleMinRpm"]').val(FC.ADVANCED_TUNING.idleMinRpm);
+
         if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_42)) {
             dshotBidirElement.prop('checked', FC.MOTOR_CONFIG.use_dshot_telemetry).trigger("change");
 
@@ -771,6 +774,7 @@ motors.initialize = async function (callback) {
             divUnsyncedPWMFreq.toggle(protocolConfigured && !digitalProtocol);
 
             $('div.digitalIdlePercent').toggle(protocolConfigured && digitalProtocol);
+            $('div.idleMinRpm').toggle(protocolConfigured && digitalProtocol && FC.MOTOR_CONFIG.use_dshot_telemetry);
 
             if (FC.ADVANCED_TUNING.idleMinRpm && FC.MOTOR_CONFIG.use_dshot_telemetry) {
                 $('div.digitalIdlePercent').hide();
@@ -1160,10 +1164,13 @@ motors.initialize = async function (callback) {
             FC.PID_ADVANCED_CONFIG.motor_pwm_rate = parseInt($('input[name="unsyncedpwmfreq"]').val());
             FC.PID_ADVANCED_CONFIG.digitalIdlePercent = parseFloat($('input[name="digitalIdlePercent"]').val());
 
+            FC.ADVANCED_TUNING.idleMinRpm = parseInt($('input[name="idleMinRpm"]').val());
+
             await MSP.promise(MSPCodes.MSP_SET_FEATURE_CONFIG, mspHelper.crunch(MSPCodes.MSP_SET_FEATURE_CONFIG));
             await MSP.promise(MSPCodes.MSP_SET_MIXER_CONFIG, mspHelper.crunch(MSPCodes.MSP_SET_MIXER_CONFIG));
             await MSP.promise(MSPCodes.MSP_SET_MOTOR_CONFIG, mspHelper.crunch(MSPCodes.MSP_SET_MOTOR_CONFIG));
             await MSP.promise(MSPCodes.MSP_SET_MOTOR_3D_CONFIG, mspHelper.crunch(MSPCodes.MSP_SET_MOTOR_3D_CONFIG));
+            await MSP.promise(MSPCodes.MSP_SET_PID_ADVANCED, mspHelper.crunch(MSPCodes.MSP_SET_PID_ADVANCED));
             await MSP.promise(MSPCodes.MSP_SET_ADVANCED_CONFIG, mspHelper.crunch(MSPCodes.MSP_SET_ADVANCED_CONFIG));
             await MSP.promise(MSPCodes.MSP_SET_ARMING_CONFIG, mspHelper.crunch(MSPCodes.MSP_SET_ARMING_CONFIG));
 
diff --git a/src/tabs/motors.html b/src/tabs/motors.html
index 9f65fd5b1c..1c469055a7 100644
--- a/src/tabs/motors.html
+++ b/src/tabs/motors.html
@@ -111,6 +111,15 @@
                                     </label>
                                     <div class="helpicon cf_tip" i18n_title="configurationDigitalIdlePercentHelp"></div>
                                 </div>
+                                <div class="number idleMinRpm">
+                                    <label>
+                                        <div class="numberspacer">
+                                            <input type="number" name="idleMinRpm" min="0" max="100" step="1"/>
+                                        </div>
+                                        <span i18n="pidTuningIdleMinRpm"></span>
+                                    </label>
+                                    <div class="helpicon cf_tip" i18n_title="pidTuningIdleMinRpmHelp"></div>
+                                </div>
                                 <div class="number minthrottle">
                                     <label>
                                         <div class="numberspacer">

From fa24ccaece23635da4727dc0647215850bfd832c Mon Sep 17 00:00:00 2001
From: Mark Haslinghuis <mark@numloq.nl>
Date: Fri, 3 Nov 2023 04:14:16 +0100
Subject: [PATCH 2/4] Reorder idleMinRpm and digitalIdlePercent

---
 src/tabs/motors.html | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/tabs/motors.html b/src/tabs/motors.html
index 1c469055a7..81a5e59e28 100644
--- a/src/tabs/motors.html
+++ b/src/tabs/motors.html
@@ -102,23 +102,23 @@
                                     </label>
                                     <div class="helpicon cf_tip" i18n_title="configurationMotorPolesHelp"></div>
                                 </div>
-                                <div class="number digitalIdlePercent">
+                                <div class="number idleMinRpm">
                                     <label>
                                         <div class="numberspacer">
-                                            <input type="number" name="digitalIdlePercent" min="0.00" max="20.00" step="0.01"/>
+                                            <input type="number" name="idleMinRpm" min="0" max="100" step="1"/>
                                         </div>
-                                        <span i18n="configurationDigitalIdlePercent"></span>
+                                        <span i18n="pidTuningIdleMinRpm"></span>
                                     </label>
-                                    <div class="helpicon cf_tip" i18n_title="configurationDigitalIdlePercentHelp"></div>
+                                    <div class="helpicon cf_tip" i18n_title="pidTuningIdleMinRpmHelp"></div>
                                 </div>
-                                <div class="number idleMinRpm">
+                                <div class="number digitalIdlePercent">
                                     <label>
                                         <div class="numberspacer">
-                                            <input type="number" name="idleMinRpm" min="0" max="100" step="1"/>
+                                            <input type="number" name="digitalIdlePercent" min="0.00" max="20.00" step="0.01"/>
                                         </div>
-                                        <span i18n="pidTuningIdleMinRpm"></span>
+                                        <span i18n="configurationDigitalIdlePercent"></span>
                                     </label>
-                                    <div class="helpicon cf_tip" i18n_title="pidTuningIdleMinRpmHelp"></div>
+                                    <div class="helpicon cf_tip" i18n_title="configurationDigitalIdlePercentHelp"></div>
                                 </div>
                                 <div class="number minthrottle">
                                     <label>

From e450977df6cebb515857e3ada72c0b2a3f488e7f Mon Sep 17 00:00:00 2001
From: Mark Haslinghuis <mark@numloq.nl>
Date: Thu, 9 Nov 2023 23:17:29 +0100
Subject: [PATCH 3/4] Fixes per review

---
 locales/en/messages.json | 4 ++++
 src/js/tabs/motors.js    | 3 ---
 src/tabs/motors.html     | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/locales/en/messages.json b/locales/en/messages.json
index 98cdfcc2bc..b86741b95b 100755
--- a/locales/en/messages.json
+++ b/locales/en/messages.json
@@ -1355,6 +1355,10 @@
         "message": "The pole count is the number of magnets on the bell of the motor. Do NOT count the stators where the windings are located. 5\" motors usually have 14 magnets, 3\" or smaller often have 12 magnets.",
         "description": "Help text for the Motor poles field of the ESC/Motor configuration"
     },
+    "configurationMotorIdleRpmHelp" : {
+        "message": "You will be able to edit Dynamic Idle setting on the PID tuning tab as this setting is profile dependant. When Dynamic Idle is set to zero static motor idle will apply",
+        "description": "Help text for dynamic idle setting" 
+    },
     "configurationThrottleMinimum": {
         "message": "Minimum Throttle (Lowest ESC value when armed)"
     },
diff --git a/src/js/tabs/motors.js b/src/js/tabs/motors.js
index 0e34912958..453d3727ff 100644
--- a/src/js/tabs/motors.js
+++ b/src/js/tabs/motors.js
@@ -1164,13 +1164,10 @@ motors.initialize = async function (callback) {
             FC.PID_ADVANCED_CONFIG.motor_pwm_rate = parseInt($('input[name="unsyncedpwmfreq"]').val());
             FC.PID_ADVANCED_CONFIG.digitalIdlePercent = parseFloat($('input[name="digitalIdlePercent"]').val());
 
-            FC.ADVANCED_TUNING.idleMinRpm = parseInt($('input[name="idleMinRpm"]').val());
-
             await MSP.promise(MSPCodes.MSP_SET_FEATURE_CONFIG, mspHelper.crunch(MSPCodes.MSP_SET_FEATURE_CONFIG));
             await MSP.promise(MSPCodes.MSP_SET_MIXER_CONFIG, mspHelper.crunch(MSPCodes.MSP_SET_MIXER_CONFIG));
             await MSP.promise(MSPCodes.MSP_SET_MOTOR_CONFIG, mspHelper.crunch(MSPCodes.MSP_SET_MOTOR_CONFIG));
             await MSP.promise(MSPCodes.MSP_SET_MOTOR_3D_CONFIG, mspHelper.crunch(MSPCodes.MSP_SET_MOTOR_3D_CONFIG));
-            await MSP.promise(MSPCodes.MSP_SET_PID_ADVANCED, mspHelper.crunch(MSPCodes.MSP_SET_PID_ADVANCED));
             await MSP.promise(MSPCodes.MSP_SET_ADVANCED_CONFIG, mspHelper.crunch(MSPCodes.MSP_SET_ADVANCED_CONFIG));
             await MSP.promise(MSPCodes.MSP_SET_ARMING_CONFIG, mspHelper.crunch(MSPCodes.MSP_SET_ARMING_CONFIG));
 
diff --git a/src/tabs/motors.html b/src/tabs/motors.html
index 81a5e59e28..8f009171a1 100644
--- a/src/tabs/motors.html
+++ b/src/tabs/motors.html
@@ -105,11 +105,11 @@
                                 <div class="number idleMinRpm">
                                     <label>
                                         <div class="numberspacer">
-                                            <input type="number" name="idleMinRpm" min="0" max="100" step="1"/>
+                                            <input type="number" name="idleMinRpm" min="0" max="100" step="1" readonly/>
                                         </div>
                                         <span i18n="pidTuningIdleMinRpm"></span>
                                     </label>
-                                    <div class="helpicon cf_tip" i18n_title="pidTuningIdleMinRpmHelp"></div>
+                                    <div class="helpicon cf_tip" i18n_title="configurationMotorIdleRpmHelp"></div>
                                 </div>
                                 <div class="number digitalIdlePercent">
                                     <label>

From 0aaf0695249d6c9e0fe595da39709a2a960acb76 Mon Sep 17 00:00:00 2001
From: Mark Haslinghuis <mark@numloq.nl>
Date: Fri, 10 Nov 2023 18:50:49 +0100
Subject: [PATCH 4/4] Co-authored-by: nerdCopter
 <56646290+nerdCopter@users.noreply.github.com>

---
 locales/en/messages.json | 2 +-
 src/css/main.less        | 6 ++++++
 src/tabs/motors.html     | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/locales/en/messages.json b/locales/en/messages.json
index b86741b95b..ab1748a839 100755
--- a/locales/en/messages.json
+++ b/locales/en/messages.json
@@ -1356,7 +1356,7 @@
         "description": "Help text for the Motor poles field of the ESC/Motor configuration"
     },
     "configurationMotorIdleRpmHelp" : {
-        "message": "You will be able to edit Dynamic Idle setting on the PID tuning tab as this setting is profile dependant. When Dynamic Idle is set to zero static motor idle will apply",
+        "message": "This is the dynamic idle value from the active PID profile. When Dynamic Idle is set to zero, only static motor idle will apply. Change the Dynamic Idle settings on the PID tuning tab.",
         "description": "Help text for dynamic idle setting" 
     },
     "configurationThrottleMinimum": {
diff --git a/src/css/main.less b/src/css/main.less
index f0e1f4b0e1..b5eb22562e 100644
--- a/src/css/main.less
+++ b/src/css/main.less
@@ -103,6 +103,12 @@ input[type="number"] {
         margin-left: 5px;
     }
 }
+.noarrows {
+    input::-webkit-outer-spin-button,
+    input::-webkit-inner-spin-button {
+        -webkit-appearance: none;
+    }
+}
 .clear-both {
     clear: both;
 }
diff --git a/src/tabs/motors.html b/src/tabs/motors.html
index 8f009171a1..5fcf68126a 100644
--- a/src/tabs/motors.html
+++ b/src/tabs/motors.html
@@ -104,7 +104,7 @@
                                 </div>
                                 <div class="number idleMinRpm">
                                     <label>
-                                        <div class="numberspacer">
+                                        <div class="numberspacer noarrows">
                                             <input type="number" name="idleMinRpm" min="0" max="100" step="1" readonly/>
                                         </div>
                                         <span i18n="pidTuningIdleMinRpm"></span>