FF -> FEEDFORWARD, indentation

Author: ctzsnooze

js/flightlog_fielddefs.js

@@ -322,8 +322,8 @@ var
             "BARO",
             "GPS_RESCUE_THROTTLE_PID",
             "DYN_IDLE",
-            "FF_LIMIT",
-            "FF_INTERPOLATED",
+            "FEEDFORWARD_LIMIT",
+            "FEEDFORWARD",
     ]),
 
     SUPER_EXPO_YAW = makeReadOnly([

js/flightlog_fields_presenter.js

@@ -404,9 +404,9 @@ function FlightLogFieldPresenter() {
         },
         'FF_LIMIT' : {
             'debug[all]':'FF Limit', 
-            'debug[0]':'FF [Roll]',
-            'debug[1]':'FF [Pitch]',
-            'debug[2]':'FF Final [Roll]',
+            'debug[0]':'FF input [roll]',
+            'debug[1]':'FF input [pitch]',
+            'debug[2]':'FF limited [roll]',
             'debug[3]':'Not Used',
         },
         'FF_INTERPOLATED' : {
@@ -449,8 +449,17 @@ function FlightLogFieldPresenter() {
                 'debug[3]':'rcCommand Delta [roll]',
             };
         }
+        if (firmwareType === FIRMWARE_TYPE_BETAFLIGHT && semver.gte(firmwareVersion, '4.3.0')) {
+            DEBUG_FRIENDLY_FIELD_NAMES.FF_LIMIT = {
+                'debug[all]':'Feedforward Limit [roll]',
+                'debug[0]':'Feedforward input [roll]',
+                'debug[1]':'Feedforward input [pitch]',
+                'debug[2]':'Feedforward limited [roll]',
+                'debug[3]':'Not Used',
+            };
+        }
     };
-        
+
     FlightLogFieldPresenter.presentFlags = function(flags, flagNames) {
         var 
             printedFlag = false,

js/graph_config.js

@@ -535,37 +535,37 @@ GraphConfig.load = function(config) {
                                 return getCurveForMinMaxFieldsZeroOffset(fieldName);
                         }
                         break;
-                    case 'FF_LIMIT':
+                    case 'FEEDFORWARD_LIMIT':
                         return {
                             offset: 0,
                             power: 1.0,
                             inputRange: 300,
                             outputRange: 1.0
                         };
-                    case 'FF_INTERPOLATED':
+                    case 'FEEDFORWARD':
                         switch (fieldName) {
                             case 'debug[0]': // in 4.3 is interpolated setpoint
-                            return {
-                                offset: 0,
-                                power: 1.0,
-                                inputRange: maxDegreesSecond(gyroScaleMargin),
-                                outputRange: 1.0
-                            };
+                                return {
+                                    offset: 0,
+                                    power: 1.0,
+                                    inputRange: maxDegreesSecond(gyroScaleMargin),
+                                    outputRange: 1.0
+                                };
                             case 'debug[1]': // feedforward delta element
                             case 'debug[2]': // feedforward boost element
-                            return {
-                                offset: 0,
-                                power: 1.0,
-                                inputRange: 1000,
-                                outputRange: 1.0
-                            };
+                                return {
+                                    offset: 0,
+                                    power: 1.0,
+                                    inputRange: 1000,
+                                    outputRange: 1.0
+                                };
                             case 'debug[3]': // rcCommand delta
-                            return {
-                                offset: 0,
-                                power: 1.0,
-                                inputRange: 10000,
-                                outputRange: 1.0
-                            };
+                                return {
+                                    offset: 0,
+                                    power: 1.0,
+                                    inputRange: 10000,
+                                    outputRange: 1.0
+                                };
                         }
                         break;
                 }