Merge pull request #714 from iNavFlight/dzikuvx-untangle-fw-pid-ff-d-settings

Untangle fw pid ff and d settings

js/fc.js

@@ -64,6 +64,12 @@ var FC = {
     isNewMixer: function () {
         return !!(typeof CONFIG != "undefined" && semver.gte(CONFIG.flightControllerVersion, "2.0.0"));
     },
+    isRpyFfComponentUsed: function () {
+        return MIXER_CONFIG.platformType == PLATFORM_AIRPLANE;
+    },
+    isRpyDComponentUsed: function () {
+        return MIXER_CONFIG.platformType != PLATFORM_AIRPLANE;
+    },
     resetState: function () {
         SENSOR_STATUS = {
             isHardwareHealthy: 0,

tabs/pid_tuning.html

@@ -40,24 +40,24 @@
                             <td></td>
                             <td><input type="number" name="p" step="1" min="0" max="255" /></td>
                             <td><input type="number" name="i" step="1" min="0" max="255" /></td>
-                            <td><input type="number" name="d" step="1" min="0" max="255" /></td>
-                            <td></td>
+                            <td><input type="number" class="rpy_d" name="d" step="1" min="0" max="255" /></td>
+                            <td><input type="number" class="rpy_ff" name="ff" step="1" min="0" max="255" /></td>
                         </tr>
                         <tr class="PITCH" data-pid-bank-position="1">
                             <!-- 1 -->
                             <td></td>
                             <td><input type="number" name="p" step="1" min="0" max="255" /></td>
                             <td><input type="number" name="i" step="1" min="0" max="255" /></td>
-                            <td><input type="number" name="d" step="1" min="0" max="255" /></td>
-                            <td></td>
+                            <td><input type="number" class="rpy_d" name="d" step="1" min="0" max="255" /></td>
+                            <td><input type="number" class="rpy_ff" name="ff" step="1" min="0" max="255" /></td>
                         </tr>
                         <tr class="YAW" data-pid-bank-position="2">
                             <!-- 2 -->
                             <td></td>
                             <td><input type="number" name="p" step="1" min="0" max="255" /></td>
                             <td><input type="number" name="i" step="1" min="0" max="255" /></td>
-                            <td><input type="number" name="d" step="1" min="0" max="255" /></td>
-                            <td></td>
+                            <td><input type="number" class="rpy_d" name="d" step="1" min="0" max="255" /></td>
+                            <td><input type="number" class="rpy_ff" name="ff" step="1" min="0" max="255" /></td>
                         </tr>
                     </table>
                     <table id="pid_baro" class="pid_tuning">

tabs/pid_tuning.js

@@ -212,6 +212,13 @@ TABS.pid_tuning.initialize = function (callback) {
             $('[name=ff]').prop('disabled', 'disabled');
         }
 
+        if (!FC.isRpyFfComponentUsed()) {
+            $('.rpy_ff').prop('disabled', 'disabled');
+        }
+        if (!FC.isRpyDComponentUsed()) {
+            $('.rpy_d').prop('disabled', 'disabled');
+        }
+
         GUI.simpleBind();
 
         // UI Hooks

tabs/profiles.js

@@ -25,9 +25,9 @@ presets.defaultValues = {
             [100, 50, 10, 0]   //PID_VEL_Z
         ],
         fw: [
-            [5, 7, 50, 0],     //PID_ROLL
-            [5, 7, 50, 0],     //PID_PITCH
-            [6, 10, 60, 0],    //PID_YAW
+            [5, 7, 0, 50],     //PID_ROLL
+            [5, 7, 0, 50],     //PID_PITCH
+            [6, 10, 0, 60],    //PID_YAW
             [40, 5, 10, 0],    //PID_POS_Z
             [75, 5, 8, 0],     //PID_POS_XY
             [0, 0, 0, 0],      //PID_VEL_XY