Make seconds between pump does configurable. (#16)

Also:

- version -> 0.7.2
- move example .ini files into place before platformio test build in CI

.github/workflows/platformio-run.yaml

@@ -20,5 +20,8 @@ jobs:
       - name: Install PlatformIO Core
         run: pip install --upgrade platformio
 
+      - name: Setup secrets for build
+        run: cp secrets.ini.example secrets.ini && cp secrets-usb.ini.example secrets-usb.ini
+
       - name: Build PlatformIO Project
         run: pio run

lib/watering/watering.cpp

@@ -94,6 +94,8 @@ Watering::Watering(unsigned index, const char* name, uint8_t moisture_pin, uint8
                             kCfgSet, 0, m_cfg_vg),
       m_pump_dose_msec("pump_on_msec", 3 * kMsecInSec, units::kMilliseconds, "Pump on time",
                        kCfgSet, 0, m_cfg_vg),
+      m_between_doses_sec("between_doses_sec", kPumpOffSec, units::kSeconds, "Wait between doses",
+                          kCfgSet, 0, m_cfg_vg),
       m_state("watering_state", kStateWaitForNextCycle, "", "watering state", 0, m_vg),
       m_watering_enabled("watering_enabled", false, "watering enabled", kCfgSet, m_cfg_vg),
       m_reservoir_check_enabled("res_check_enabled", false, "reservior check enabled", kCfgSet,
@@ -193,7 +195,7 @@ void Watering::loop() {
       //  before the watering by more than they were during watering mode.
       // The time in seconds that the state machine might have switched out of watering mode.
       const float stateChangeSec =
-          static_cast<float>(m_pump.lastOnMsec() + kPumpOffMsec) / kMsecInSec;
+          static_cast<float>(m_pump.lastOnMsec()) / kMsecInSec + kPumpOffSec;
       const float secSinceStateChange = static_cast<float>(nowMsec) / kMsecInSec - stateChangeSec;
       // The growing sigma value that should be kKernelWateringSec when the state changed.
       const float sigma1 = secSinceStateChange + kKernelWateringSec;
@@ -231,7 +233,7 @@ void Watering::loop() {
       m_pump.turnOff();
       // Don't consider turning the pump back on until it has been off for the
       //  required amount of time.
-      if (msecSincePump < kPumpOffMsec) {
+      if (msecSincePump < (m_between_doses_sec.value() * kMsecInSec)) {
         setState(kStateEval, kWaitForNextCycleMsec, "pump not off for long enough");
       } else if (reservoirCheckEnabled() && isReservoirEmpty()) {
         // Reservoir may be low, so don't consider using the pump.
@@ -270,7 +272,7 @@ void Watering::loop() {
       if (m_reservoir_check) {
         m_reservoir_check->pumpRanForMsec(m_pump_dose_msec.value());
       }
-      // Eval mode will wait until kPumpOffMsec until it will allow the pump to run again.
+      // Eval mode will wait until kPumpOffSec until it will allow the pump to run again.
       setState(kStateEval, kWaitForNextCycleMsec, "continue watering");
       break;
 

lib/watering/watering.h

@@ -118,6 +118,7 @@ class Watering : public Module {
   FloatVariable m_max_moisture_target;
   FloatVariable m_min_moisture_target;
   FloatVariable m_pump_dose_msec;
+  FloatVariable m_between_doses_sec;
   StateVariable m_state;
   BoolVariable m_watering_enabled;
   BoolVariable m_reservoir_check_enabled;

lib/watering/watering_constants.h

@@ -15,7 +15,7 @@ constexpr long kWaitBetweenPumpAndMoisureReadingMsec = kMsecInSec;
 // < 5% means the sensor is probably not in soil.
 constexpr float kMinPlausibleMoisture = 5.0f;
 // Always wait 15 minutes between pump cycles.
-constexpr long kPumpOffMsec = 15 * kMsecInMin;
+constexpr long kPumpOffSec = 15 * kSecInMin;
 // Wait 1 minute between checks in eval mode while waiting for moisture level to drop.
 constexpr long kWaitForNextCycleMsec = 1 * kMsecInMin;
 

src/main.cpp

@@ -16,7 +16,7 @@
 
 #include "watering.h"
 
-#define SW_VERSION "0.7.1"
+#define SW_VERSION "0.7.2"
 
 namespace {