improve feedforward debug modes

Author: ctzsnooze

js/flightlog_fielddefs.js

@@ -322,8 +322,8 @@ var
             "BARO",
             "GPS_RESCUE_THROTTLE_PID",
             "DYN_IDLE",
-            "FEEDFORWARD_LIMIT",
-            "FEEDFORWARD",
+            "FF_LIMIT",
+            "FF_INTERPOLATED",
     ]),
 
     SUPER_EXPO_YAW = makeReadOnly([
@@ -480,6 +480,10 @@ function adjustFieldDefsList(firmwareType, firmwareVersion) {
             DEBUG_MODE.splice(DEBUG_MODE.indexOf('DUAL_GYRO'),          1);
             DEBUG_MODE.splice(DEBUG_MODE.indexOf('DUAL_GYRO_COMBINED'), 1);
         }
+        if(semver.gte(firmwareVersion, '4.3.0')) {
+            DEBUG_MODE.splice(DEBUG_MODE.indexOf('FF_INTERPOLATED'), 1, 'FEEDFORWARD');
+            DEBUG_MODE.splice(DEBUG_MODE.indexOf('FF_LIMIT'),        1, 'FEEDFORWARD_LIMIT');
+        }
         DEBUG_MODE = makeReadOnly(DEBUG_MODE);
 
         // Flight mode names

js/flightlog_fields_presenter.js

@@ -442,14 +442,14 @@ function FlightLogFieldPresenter() {
                 };
             }
             if (semver.gte(firmwareVersion, '4.3.0')) {
-                DEBUG_FRIENDLY_FIELD_NAMES.FF_INTERPOLATED = {
+                DEBUG_FRIENDLY_FIELD_NAMES.FEEDFORWARD = {
                     'debug[all]':'Feedforward [roll]',
                     'debug[0]':'Setpoint, interpolated [roll]',
                     'debug[1]':'Delta, smoothed [roll]',
                     'debug[2]':'Boost, smoothed [roll]',
                     'debug[3]':'rcCommand Delta [roll]',
                 };
-                DEBUG_FRIENDLY_FIELD_NAMES.FF_LIMIT = {
+                DEBUG_FRIENDLY_FIELD_NAMES.FEEDFORWARD_LIMIT = {
                     'debug[all]':'Feedforward Limit [roll]',
                     'debug[0]':'Feedforward input [roll]',
                     'debug[1]':'Feedforward input [pitch]',

js/graph_config.js

@@ -535,14 +535,27 @@ GraphConfig.load = function(config) {
                                 return getCurveForMinMaxFieldsZeroOffset(fieldName);
                         }
                         break;
-                    case 'FEEDFORWARD_LIMIT':
-                        return {
-                            offset: 0,
-                            power: 1.0,
-                            inputRange: 300,
-                            outputRange: 1.0
-                        };
-                    case 'FEEDFORWARD':
+                    case 'FF_INTERPOLATED':
+                        switch (fieldName) {
+                            case 'debug[0]': // setpoint Delta
+                            case 'debug[1]': // AccelerationModified
+                            case 'debug[2]': // Acceleration
+                                return {
+                                    offset: 0,
+                                    power: 1.0,
+                                    inputRange: 1000,
+                                    outputRange: 1.0
+                                };
+                            case 'debug[3]': // Clip or Count
+                                return {
+                                    offset: -10,
+                                    power: 1.0,
+                                    inputRange: 10,
+                                    outputRange: 1.0
+                                };
+                        }
+                        break;
+                    case 'FEEDFORWARD': // replaces FF_INTERPOLATED in 4.3
                         switch (fieldName) {
                             case 'debug[0]': // in 4.3 is interpolated setpoint
                                 return {
@@ -568,6 +581,20 @@ GraphConfig.load = function(config) {
                                 };
                         }
                         break;
+                    case 'FF_LIMIT':
+                        return {
+                            offset: 0,
+                            power: 1.0,
+                            inputRange: 300,
+                            outputRange: 1.0
+                        };
+                    case 'FEEDFORWARD_LIMIT':
+                        return {
+                            offset: 0,
+                            power: 1.0,
+                            inputRange: 300,
+                            outputRange: 1.0
+                        };
                 }
             }
             // if not found above then