basic impl. of power control

Author: GreenWizard2015

controller/tea_poor/lib/Arduino/WaterPumpController.cpp

@@ -20,10 +20,11 @@ void WaterPumpController::setup() {
   stop();
 }
 
-void WaterPumpController::start() {
+void WaterPumpController::start(int powerInPercents) {
+  const int power = map(powerInPercents, 0, 100, 0, _maxPower);
   _isRunning = true;
   digitalWrite(_brakePin, LOW); // release breaks
-  analogWrite(_powerPin, 255);
+  analogWrite(_powerPin, power);
 }
 
 void WaterPumpController::stop() {

controller/tea_poor/lib/Arduino/WaterPumpController.h

@@ -14,7 +14,7 @@ class WaterPumpController: public IWaterPump {
   virtual ~WaterPumpController() override;
 
   virtual void setup() override;
-  virtual void start() override;
+  virtual void start(int powerInPercents) override;
   virtual void stop() override;
 
   virtual bool isRunning() const override { return _isRunning; }

controller/tea_poor/lib/CommandProcessor/CommandProcessor.cpp

@@ -44,13 +44,17 @@ std::string CommandProcessor::status() {
   return response.str();
 }
 
-std::string CommandProcessor::pour_tea(const char *milliseconds) {
+std::string CommandProcessor::pour_tea(const char *milliseconds, const char *power) {
   if (!isValidIntNumber(milliseconds, _waterPumpSafeThreshold + 1)) {
     // send error message as JSON
     return std::string("{ \"error\": \"invalid milliseconds value\" }");
   }
+  if (!isValidIntNumber(power, 101)) {
+    // send error message as JSON
+    return std::string("{ \"error\": \"invalid power value\" }");
+  }
   // start pouring tea
-  _waterPump->start( atoi(milliseconds), _env->time() );
+  _waterPump->start( atoi(milliseconds), atoi(power), _env->time() );
   return status();
 }
 

controller/tea_poor/lib/CommandProcessor/CommandProcessor.h

@@ -20,7 +20,7 @@ class CommandProcessor {
     {}
 
     std::string status();
-    std::string pour_tea(const char *milliseconds);
+    std::string pour_tea(const char *milliseconds, const char *power);
     std::string stop();
   private:
     const int _waterPumpSafeThreshold;

controller/tea_poor/lib/WaterPumpScheduler/WaterPumpScheduler.cpp

@@ -12,9 +12,9 @@ void WaterPumpScheduler::setup() {
   _waterPump->setup();
 }
 
-void WaterPumpScheduler::start(unsigned long runTimeMs, unsigned long currentTimeMs) {
+void WaterPumpScheduler::start(unsigned long runTimeMs, int power, unsigned long currentTimeMs) {
   _stopTime = currentTimeMs + runTimeMs;
-  _waterPump->start();
+  _waterPump->start(power);
 }
 
 void WaterPumpScheduler::stop() {

controller/tea_poor/lib/WaterPumpScheduler/WaterPumpScheduler.h

@@ -23,7 +23,7 @@ class WaterPumpScheduler : public IWaterPumpSchedulerAPI {
   void tick(unsigned long currentTimeMs);
 
   // Public API
-  void start(unsigned long runTimeMs, unsigned long currentTimeMs) override;
+  void start(unsigned long runTimeMs, int power, unsigned long currentTimeMs) override;
   void stop() override;
   WaterPumpStatus status() override;
 };

controller/tea_poor/lib/interfaces/IWaterPump.h

@@ -8,7 +8,7 @@ class IWaterPump {
   virtual ~IWaterPump() {}
 
   virtual void setup() = 0;
-  virtual void start() = 0;
+  virtual void start(int powerInPercents) = 0;
   virtual void stop() = 0;
 
   virtual bool isRunning() const = 0;

controller/tea_poor/lib/interfaces/IWaterPumpSchedulerAPI.h

@@ -22,7 +22,7 @@ class IWaterPumpSchedulerAPI {
 public:
   virtual ~IWaterPumpSchedulerAPI() {}
   virtual void stop() = 0;
-  virtual void start(unsigned long runTimeMs, unsigned long currentTimeMs) = 0;
+  virtual void start(unsigned long runTimeMs, int power, unsigned long currentTimeMs) = 0;
   virtual WaterPumpStatus status() = 0;
 };
 

controller/tea_poor/src/main.cpp

@@ -46,8 +46,11 @@ RemoteControl remoteControl(
     app.get("/pour_tea", [](Request &req, Response &res) {
       char milliseconds[64];
       req.query("milliseconds", milliseconds, 64);
+
+      char power[64];
+      req.query("powerLevel", power, 64);
 
-      const auto response = commandProcessor.pour_tea(milliseconds);
+      const auto response = commandProcessor.pour_tea(milliseconds, power);
       withExtraHeaders(res);
       res.print(response.c_str());
     });

controller/tea_poor/test/test_native/tests/CommandProcessor_test.h

@@ -3,6 +3,7 @@
 #include "mocks/FakeWaterPumpSchedulerAPI.h"
 #include "mocks/FakeEnvironment.h"
 
+const auto VALID_POWER = "100";
 const auto INVALID_TIME_ERROR_MESSAGE = "{ \"error\": \"invalid milliseconds value\" }";
 // test that pour_tea() method returns error message if milliseconds:
 // - greater than threshold
@@ -11,20 +12,20 @@ const auto INVALID_TIME_ERROR_MESSAGE = "{ \"error\": \"invalid milliseconds val
 // - not a number
 TEST(CommandProcessor, pour_tea_invalid_milliseconds) {
   CommandProcessor commandProcessor(123, nullptr, nullptr);
-  ASSERT_EQ(commandProcessor.pour_tea("1234"), INVALID_TIME_ERROR_MESSAGE);
-  ASSERT_EQ(commandProcessor.pour_tea("-1"), INVALID_TIME_ERROR_MESSAGE);
-  ASSERT_EQ(commandProcessor.pour_tea(""), INVALID_TIME_ERROR_MESSAGE);
-  ASSERT_EQ(commandProcessor.pour_tea("abc"), INVALID_TIME_ERROR_MESSAGE);
+  ASSERT_EQ(commandProcessor.pour_tea("1234", VALID_POWER), INVALID_TIME_ERROR_MESSAGE);
+  ASSERT_EQ(commandProcessor.pour_tea("-1", VALID_POWER), INVALID_TIME_ERROR_MESSAGE);
+  ASSERT_EQ(commandProcessor.pour_tea("", VALID_POWER), INVALID_TIME_ERROR_MESSAGE);
+  ASSERT_EQ(commandProcessor.pour_tea("abc", VALID_POWER), INVALID_TIME_ERROR_MESSAGE);
 }
 
 // for simplicity of the UI, we should accept as valid 0 and exactly threshold value
 TEST(CommandProcessor, pour_tea_valid_boundary_values) {
   auto env = std::make_shared<FakeEnvironment>();
   auto waterPump = std::make_shared<FakeWaterPumpSchedulerAPI>();
   CommandProcessor commandProcessor(123, env, waterPump);
-
-  ASSERT_NE(commandProcessor.pour_tea("0"), INVALID_TIME_ERROR_MESSAGE);
-  ASSERT_NE(commandProcessor.pour_tea("123"), INVALID_TIME_ERROR_MESSAGE);
+  
+  ASSERT_NE(commandProcessor.pour_tea("0", VALID_POWER), INVALID_TIME_ERROR_MESSAGE);
+  ASSERT_NE(commandProcessor.pour_tea("123", VALID_POWER), INVALID_TIME_ERROR_MESSAGE);
 }
 
 // test that start pouring tea by calling pour_tea() method and its stops after T milliseconds
@@ -33,8 +34,8 @@ TEST(CommandProcessor, pour_tea) {
   env->time(2343);
   auto waterPump = std::make_shared<FakeWaterPumpSchedulerAPI>();
   CommandProcessor commandProcessor(10000, env, waterPump);
-  const auto response = commandProcessor.pour_tea("1234");
-  ASSERT_EQ(waterPump->_log, "start(1234, 2343)\n");
+  const auto response = commandProcessor.pour_tea("1234", "23");
+  ASSERT_EQ(waterPump->_log, "start(1234, 23, 2343)\n");
 }
 
 // test that stop() method stops pouring tea
@@ -69,7 +70,7 @@ TEST(CommandProcessor, status_running) {
   auto waterPump = std::make_shared<FakeWaterPumpSchedulerAPI>();
   CommandProcessor commandProcessor(12345, env, waterPump);
 
-  commandProcessor.pour_tea("1123");
+  commandProcessor.pour_tea("1123", "100");
 
   env->time(123);
   waterPump->_status.isRunning = true;

controller/tea_poor/test/test_native/tests/WaterPumpScheduler_test.h

@@ -11,7 +11,7 @@ TEST(WaterPumpScheduler, test_pump_stops_after_given_time) {
   waterPumpScheduler.setup();
   // start water pump
   unsigned long currentTimeMs = 0;
-  waterPumpScheduler.start(runTimeMs, currentTimeMs);
+  waterPumpScheduler.start(runTimeMs, 1, currentTimeMs);
   // check status
   auto status = waterPumpScheduler.status();
   ASSERT_TRUE(status.isRunning);
@@ -34,14 +34,14 @@ TEST(WaterPumpScheduler, test_pump_is_periodically_forced_to_stop_after_given_ti
   waterPumpScheduler.setup();
   // start water pump
   unsigned long currentTimeMs = 0;
-  waterPumpScheduler.start(1, currentTimeMs);
+  waterPumpScheduler.start(1, 1, currentTimeMs);
   currentTimeMs += 1;
   waterPumpScheduler.tick(currentTimeMs);
   ASSERT_FALSE(fakeWaterPump->isRunning()); // pump should be stopped after given time
 
   for(int i = 0; i < 10; i++) {
     // emulate that pump was started again
-    fakeWaterPump->start();
+    fakeWaterPump->start(1);
     currentTimeMs += 1000;
     waterPumpScheduler.tick(currentTimeMs);
     ASSERT_FALSE(fakeWaterPump->isRunning()); // pump should be stopped

controller/tea_poor/test/test_native/tests/mocks/FakeWaterPump.h

@@ -7,12 +7,17 @@
 class FakeWaterPump : public IWaterPump {
 private:
   bool _isRunning = false;
+  int _powerInPercents = 0;
 public:
   void setup() override { _isRunning = false; }
-  void start() override { _isRunning = true;  }
   void stop() override  { _isRunning = false; }
+  void start(int powerInPercents) override {
+    _isRunning = true;
+    _powerInPercents = powerInPercents;
+  }
 
   bool isRunning() const override { return _isRunning; }
+  int powerInPercents() const { return _powerInPercents; }
 };
 
 #endif // FAKE_WATER_PUMP_H

controller/tea_poor/test/test_native/tests/mocks/FakeWaterPumpSchedulerAPI.h

@@ -11,8 +11,12 @@ class FakeWaterPumpSchedulerAPI : public IWaterPumpSchedulerAPI {
     _log += "stop()\n";
   }
 
-  void start(unsigned long runTimeMs, unsigned long currentTimeMs) override {
-    _log += "start(" + std::to_string(runTimeMs) + ", " + std::to_string(currentTimeMs) + ")\n";
+  void start(unsigned long runTimeMs, int power, unsigned long currentTimeMs) override {
+    _log += "start(" + 
+      std::to_string(runTimeMs) + ", " +
+      std::to_string(power) + ", " +
+      std::to_string(currentTimeMs) +
+      ")\n";
   }
 
   WaterPumpStatus status() override {