commit 7442c37a1f037ae9615309cc1a22664b008eeac7
author Patrick Venture <venture@google.com> Mon Feb 11 10:21:05 2019 -0800
committer Patrick Venture <venture@google.com> Mon Feb 11 11:22:27 2019 -0800
tree eb2cb3fa61b93a5c5b4cbf4ced7627037807c799
parent a1c5d3741d2ac66fe4fb04401e51547338b305da

conf change: pid: all pid details are now camelCase

Convert all PID configuration details are now camelCase instead of snake
case.

Change-Id: Id132053f122dfcd8abaace17df91c99758eb2b0c
Signed-off-by: Patrick Venture <venture@google.com>

dbus/dbusconfiguration.cpp

diff --git a/dbus/dbusconfiguration.cpp b/dbus/dbusconfiguration.cpp
index e4396c4..fa7a3dd 100644
--- a/dbus/dbusconfiguration.cpp
+++ b/dbus/dbusconfiguration.cpp
@@ -113,16 +113,21 @@
             std::cout << "\t\t\t}\n";
             std::cout << "\t\t\t" << pidconf.second.setpoint << ",\n";
             std::cout << "\t\t\t{" << pidconf.second.pidInfo.ts << ",\n";
-            std::cout << "\t\t\t" << pidconf.second.pidInfo.p_c << ",\n";
-            std::cout << "\t\t\t" << pidconf.second.pidInfo.i_c << ",\n";
-            std::cout << "\t\t\t" << pidconf.second.pidInfo.ff_off << ",\n";
-            std::cout << "\t\t\t" << pidconf.second.pidInfo.ff_gain << ",\n";
-            std::cout << "\t\t\t{" << pidconf.second.pidInfo.i_lim.min << ","
-                      << pidconf.second.pidInfo.i_lim.max << "},\n";
-            std::cout << "\t\t\t{" << pidconf.second.pidInfo.out_lim.min << ","
-                      << pidconf.second.pidInfo.out_lim.max << "},\n";
-            std::cout << "\t\t\t" << pidconf.second.pidInfo.slew_neg << ",\n";
-            std::cout << "\t\t\t" << pidconf.second.pidInfo.slew_pos << ",\n";
+            std::cout << "\t\t\t" << pidconf.second.pidInfo.proportionalCoeff
+                      << ",\n";
+            std::cout << "\t\t\t" << pidconf.second.pidInfo.integralCoeff
+                      << ",\n";
+            std::cout << "\t\t\t" << pidconf.second.pidInfo.feedFwdOffset
+                      << ",\n";
+            std::cout << "\t\t\t" << pidconf.second.pidInfo.feedFwdGain
+                      << ",\n";
+            std::cout << "\t\t\t{" << pidconf.second.pidInfo.integralLimit.min
+                      << "," << pidconf.second.pidInfo.integralLimit.max
+                      << "},\n";
+            std::cout << "\t\t\t{" << pidconf.second.pidInfo.outLim.min << ","
+                      << pidconf.second.pidInfo.outLim.max << "},\n";
+            std::cout << "\t\t\t" << pidconf.second.pidInfo.slewNeg << ",\n";
+            std::cout << "\t\t\t" << pidconf.second.pidInfo.slewPos << ",\n";
             std::cout << "\t\t\t}\n\t\t}\n";
         }
         std::cout << "\t},\n";
@@ -402,25 +407,25 @@
                                                base.at("SetPoint"));
                 }
                 info.pidInfo.ts = 1.0; // currently unused
-                info.pidInfo.p_c = std::visit(VariantToDoubleVisitor(),
-                                              base.at("PCoefficient"));
-                info.pidInfo.i_c = std::visit(VariantToDoubleVisitor(),
-                                              base.at("ICoefficient"));
-                info.pidInfo.ff_off = std::visit(VariantToDoubleVisitor(),
-                                                 base.at("FFOffCoefficient"));
-                info.pidInfo.ff_gain = std::visit(VariantToDoubleVisitor(),
-                                                  base.at("FFGainCoefficient"));
-                info.pidInfo.i_lim.max =
+                info.pidInfo.proportionalCoeff = std::visit(
+                    VariantToDoubleVisitor(), base.at("PCoefficient"));
+                info.pidInfo.integralCoeff = std::visit(
+                    VariantToDoubleVisitor(), base.at("ICoefficient"));
+                info.pidInfo.feedFwdOffset = std::visit(
+                    VariantToDoubleVisitor(), base.at("FFOffCoefficient"));
+                info.pidInfo.feedFwdGain = std::visit(
+                    VariantToDoubleVisitor(), base.at("FFGainCoefficient"));
+                info.pidInfo.integralLimit.max =
                     std::visit(VariantToDoubleVisitor(), base.at("ILimitMax"));
-                info.pidInfo.i_lim.min =
+                info.pidInfo.integralLimit.min =
                     std::visit(VariantToDoubleVisitor(), base.at("ILimitMin"));
-                info.pidInfo.out_lim.max = std::visit(VariantToDoubleVisitor(),
-                                                      base.at("OutLimitMax"));
-                info.pidInfo.out_lim.min = std::visit(VariantToDoubleVisitor(),
-                                                      base.at("OutLimitMin"));
-                info.pidInfo.slew_neg =
+                info.pidInfo.outLim.max = std::visit(VariantToDoubleVisitor(),
+                                                     base.at("OutLimitMax"));
+                info.pidInfo.outLim.min = std::visit(VariantToDoubleVisitor(),
+                                                     base.at("OutLimitMin"));
+                info.pidInfo.slewNeg =
                     std::visit(VariantToDoubleVisitor(), base.at("SlewNeg"));
-                info.pidInfo.slew_pos =
+                info.pidInfo.slewPos =
                     std::visit(VariantToDoubleVisitor(), base.at("SlewPos"));
                 double negativeHysteresis = 0;
                 double positiveHysteresis = 0;