diff options
| author | Patrick Venture <venture@google.com> | 2019-02-20 07:35:48 -0800 |
|---|---|---|
| committer | Patrick Venture <venture@google.com> | 2019-02-20 07:40:04 -0800 |
| commit | 903b04276b98c072b3399ac20101ad44daf335cd (patch) | |
| tree | c34928ba570ddfeba6e3a6fad885f6544f8b858f | |
| parent | dca2d484ee91ee40fc94509d831ef2c5fa792ca0 (diff) | |
| download | phosphor-pid-control-903b04276b98c072b3399ac20101ad44daf335cd.tar.gz phosphor-pid-control-903b04276b98c072b3399ac20101ad44daf335cd.zip | |
conf change: s/feedFwdOffOffsetCoeff/feedFwdOffsetCoeff/g
Fixup spelling mistake for configuration field name.
Change-Id: I92d0af06f4e15f4408dd10f0dd9cd71099b77f4f
Signed-off-by: Patrick Venture <venture@google.com>
| -rw-r--r-- | examples/README | 2 | ||||
| -rw-r--r-- | examples/fan-info.json | 10 | ||||
| -rw-r--r-- | pid/buildjson.cpp | 2 | ||||
| -rw-r--r-- | test/json_parse_unittest.cpp | 6 | ||||
| -rw-r--r-- | test/pid_json_unittest.cpp | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/examples/README b/examples/README index 33c2077..df76978 100644 --- a/examples/README +++ b/examples/README @@ -67,7 +67,7 @@ The PID configuration is a list of PIDs per zone. "samplePeriod": 0.1, /* The input sample period. (double) */ "proportionalCoeff": 0.0, /* The proportional coefficient. (double) */ "integralCoeff": 0.0, /* The integral coefficient. (double) */ - "feedFwdOffOffsetCoeff": 0.0, /* The feed-forward offset coefficient. (double) */ + "feedFwdOffsetCoeff": 0.0, /* The feed-forward offset coefficient. (double) */ "feedFwdGainCoeff": 0.010, /* The feed-forward gain coefficient. (double) */ "integralLimit_min": 0.0, /* The integral limit clamp, min, max (double) */ "integralLimit_max": 0.0, diff --git a/examples/fan-info.json b/examples/fan-info.json index 15c2d09..e0b87ee 100644 --- a/examples/fan-info.json +++ b/examples/fan-info.json @@ -74,7 +74,7 @@ "samplePeriod": 0.1, "proportionalCoeff": 0.0, "integralCoeff": 0.0, - "feedFwdOffOffsetCoeff": 0.0, + "feedFwdOffsetCoeff": 0.0, "feedFwdGainCoeff": 0.010, "integralLimit_min": 0.0, "integralLimit_max": 0.0, @@ -93,7 +93,7 @@ "samplePeriod": 0.1, "proportionalCoeff": 0.0, "integralCoeff": 0.0, - "feedFwdOffOffsetCoeff": 0.0, + "feedFwdOffsetCoeff": 0.0, "feedFwdGainCoeff": 0.010, "integralLimit_min": 0.0, "integralLimit_max": 0.0, @@ -112,7 +112,7 @@ "samplePeriod": 0.1, "proportionalCoeff": 0.0, "integralCoeff": 0.0, - "feedFwdOffOffsetCoeff": 0.0, + "feedFwdOffsetCoeff": 0.0, "feedFwdGainCoeff": 0.010, "integralLimit_min": 0.0, "integralLimit_max": 0.0, @@ -131,7 +131,7 @@ "samplePeriod": 0.1, "proportionalCoeff": 0.0, "integralCoeff": 0.0, - "feedFwdOffOffsetCoeff": 0.0, + "feedFwdOffsetCoeff": 0.0, "feedFwdGainCoeff": 0.010, "integralLimit_min": 0.0, "integralLimit_max": 0.0, @@ -150,7 +150,7 @@ "samplePeriod": 1, "proportionalCoeff": 750.0, "integralCoeff": 16.0, - "feedFwdOffOffsetCoeff": 0.0, + "feedFwdOffsetCoeff": 0.0, "feedFwdGainCoeff": 0.0, "integralLimit_min": 3000, "integralLimit_max": 10000, diff --git a/pid/buildjson.cpp b/pid/buildjson.cpp index d89da92..97f2bf0 100644 --- a/pid/buildjson.cpp +++ b/pid/buildjson.cpp @@ -38,7 +38,7 @@ void from_json(const json& j, ControllerInfo& c) p.at("samplePeriod").get_to(c.pidInfo.ts); p.at("proportionalCoeff").get_to(c.pidInfo.proportionalCoeff); p.at("integralCoeff").get_to(c.pidInfo.integralCoeff); - p.at("feedFwdOffOffsetCoeff").get_to(c.pidInfo.feedFwdOffset); + p.at("feedFwdOffsetCoeff").get_to(c.pidInfo.feedFwdOffset); p.at("feedFwdGainCoeff").get_to(c.pidInfo.feedFwdGain); p.at("integralLimit_min").get_to(c.pidInfo.integralLimit.min); p.at("integralLimit_max").get_to(c.pidInfo.integralLimit.max); diff --git a/test/json_parse_unittest.cpp b/test/json_parse_unittest.cpp index 7d3d449..ba6ff11 100644 --- a/test/json_parse_unittest.cpp +++ b/test/json_parse_unittest.cpp @@ -27,7 +27,7 @@ TEST(ConfigurationVerificationTest, VerifyHappy) "samplePeriod": 0.1, "proportionalCoeff": 0.0, "integralCoeff": 0.0, - "feedFwdOffOffsetCoeff": 0.0, + "feedFwdOffsetCoeff": 0.0, "feedFwdGainCoeff": 0.010, "integralLimit_min": 0.0, "integralLimit_max": 0.0, @@ -62,7 +62,7 @@ TEST(ConfigurationVerificationTest, VerifyNoSensorKey) "samplePeriod": 0.1, "proportionalCoeff": 0.0, "integralCoeff": 0.0, - "feedFwdOffOffsetCoeff": 0.0, + "feedFwdOffsetCoeff": 0.0, "feedFwdGainCoeff": 0.010, "integralLimit_min": 0.0, "integralLimit_max": 0.0, @@ -114,7 +114,7 @@ TEST(ConfigurationVerificationTest, VerifyNoSensor) "samplePeriod": 0.1, "proportionalCoeff": 0.0, "integralCoeff": 0.0, - "feedFwdOffOffsetCoeff": 0.0, + "feedFwdOffsetCoeff": 0.0, "feedFwdGainCoeff": 0.010, "integralLimit_min": 0.0, "integralLimit_max": 0.0, diff --git a/test/pid_json_unittest.cpp b/test/pid_json_unittest.cpp index f0effbd..42402d1 100644 --- a/test/pid_json_unittest.cpp +++ b/test/pid_json_unittest.cpp @@ -45,7 +45,7 @@ TEST(ZoneFromJson, oneZoneOnePid) "samplePeriod": 0.1, "proportionalCoeff": 0.0, "integralCoeff": 0.0, - "feedFwdOffOffsetCoeff": 0.0, + "feedFwdOffsetCoeff": 0.0, "feedFwdGainCoeff": 0.010, "integralLimit_min": 0.0, "integralLimit_max": 0.0, |
