From abf40a47ebc65fbdbff2491b0a30e5ebede3777f Mon Sep 17 00:00:00 2001
From: Alessio Morale <alessiomorale@gmail.com>
Date: Sat, 19 Sep 2015 15:31:08 +0200
Subject: [PATCH] LP-124 - Fix renamed fields/options in GCS

---
 .../gcs/src/plugins/config/configtxpidwidget.cpp |  8 ++++----
 ground/gcs/src/plugins/config/txpid.ui           | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/ground/gcs/src/plugins/config/configtxpidwidget.cpp b/ground/gcs/src/plugins/config/configtxpidwidget.cpp
index 4ab3e657b..59acb17a6 100644
--- a/ground/gcs/src/plugins/config/configtxpidwidget.cpp
+++ b/ground/gcs/src/plugins/config/configtxpidwidget.cpp
@@ -167,8 +167,8 @@ static bool isExpoOption(int pidOption)
 static bool isFullPIDOption(int pidOption)
 {
     switch (pidOption) {
-    case TxPIDSettings::PIDS_ROLLRATEPID:
-    case TxPIDSettings::PIDS_PITCHRATEPID:
+    case TxPIDSettings::PIDS_EASYTUNERATEPITCH:
+    case TxPIDSettings::PIDS_EASYTUNERATEROLL:
         return true;
 
     default:
@@ -197,11 +197,11 @@ static float defaultValueForPidOption(const StabilizationSettingsBankX *bank, in
         return 0.0f;
 
     case TxPIDSettings::PIDS_ROLLRATEKP:
-    case TxPIDSettings::PIDS_ROLLRATEPID:
+    case TxPIDSettings::PIDS_EASYTUNERATEROLL:
         return bank->getRollRatePID_Kp();
 
     case TxPIDSettings::PIDS_PITCHRATEKP:
-    case TxPIDSettings::PIDS_PITCHRATEPID:
+    case TxPIDSettings::PIDS_EASYTUNERATEPITCH:
         return bank->getPitchRatePID_Kp();
 
     case TxPIDSettings::PIDS_ROLLPITCHRATEKP:
diff --git a/ground/gcs/src/plugins/config/txpid.ui b/ground/gcs/src/plugins/config/txpid.ui
index 2f4a78637..b4829de7f 100644
--- a/ground/gcs/src/plugins/config/txpid.ui
+++ b/ground/gcs/src/plugins/config/txpid.ui
@@ -883,7 +883,7 @@ font:bold;</string>
                 <property name="objrelation" stdset="0">
                  <stringlist>
                   <string>objname:TxPIDSettings</string>
-                  <string>fieldname:PitchRollRateFactors</string>
+                  <string>fieldname:EasyTunePitchRollRateFactors</string>
                   <string>scale:0.1</string>
                   <string>element:I</string>
                   <string>buttongroup:10</string>
@@ -948,7 +948,7 @@ font:bold;</string>
                 <property name="objrelation" stdset="0">
                  <stringlist>
                   <string>objname:TxPIDSettings</string>
-                  <string>fieldname:PitchRollRateFactors</string>
+                  <string>fieldname:EasyTunePitchRollRateFactors</string>
                   <string>scale:1</string>
                   <string>element:D</string>
                   <string>buttongroup:10</string>
@@ -973,7 +973,7 @@ font:bold;</string>
                 <property name="objrelation" stdset="0">
                  <stringlist>
                   <string>objname:TxPIDSettings</string>
-                  <string>fieldname:RatePIDRecalculateYaw</string>
+                  <string>fieldname:EasyTuneRatePIDRecalculateYaw</string>
                   <string>buttongroup:11</string>
                  </stringlist>
                 </property>
@@ -1039,7 +1039,7 @@ font:bold;</string>
                 <property name="objrelation" stdset="0">
                  <stringlist>
                   <string>objname:TxPIDSettings</string>
-                  <string>fieldname:YawRateFactors</string>
+                  <string>fieldname:EasyTuneYawRateFactors</string>
                   <string>scale:0.1</string>
                   <string>element:P</string>
                   <string>buttongroup:11</string>
@@ -1101,7 +1101,7 @@ font:bold;</string>
                 <property name="objrelation" stdset="0">
                  <stringlist>
                   <string>objname:TxPIDSettings</string>
-                  <string>fieldname:YawRateFactors</string>
+                  <string>fieldname:EasyTuneYawRateFactors</string>
                   <string>scale:1</string>
                   <string>element:I</string>
                   <string>buttongroup:11</string>
@@ -1166,7 +1166,7 @@ font:bold;</string>
                 <property name="objrelation" stdset="0">
                  <stringlist>
                   <string>objname:TxPIDSettings</string>
-                  <string>fieldname:YawRateFactors</string>
+                  <string>fieldname:EasyTuneYawRateFactors</string>
                   <string>scale:1</string>
                   <string>element:D</string>
                   <string>buttongroup:11</string>
@@ -1284,7 +1284,7 @@ font:bold;</string>
                 <property name="objrelation" stdset="0">
                  <stringlist>
                   <string>objname:TxPIDSettings</string>
-                  <string>fieldname:YawRateFactors</string>
+                  <string>fieldname:EasyTuneYawRateFactors</string>
                   <string>scale:1</string>
                   <string>element:P</string>
                   <string>buttongroup:11</string>
@@ -1324,7 +1324,7 @@ font:bold;</string>
                 <property name="objrelation" stdset="0">
                  <stringlist>
                   <string>objname:TxPIDSettings</string>
-                  <string>fieldname:PitchRollRateFactors</string>
+                  <string>fieldname:EasyTunePitchRollRateFactors</string>
                   <string>scale:1</string>
                   <string>element:I</string>
                   <string>buttongroup:10</string>