Merge pull request #12 from GreenWizard2015/fix-bugs

quick fix
psmgeelen · Feb 8, 2024 · 34c73e1 · 34c73e1
2 parents 1cec79c + e5438a7
commit 34c73e1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/controller/tea_poor/lib/Arduino/RemoteControl.cpp b/controller/tea_poor/lib/Arduino/RemoteControl.cpp
@@ -96,7 +96,14 @@ void RemoteControl::reconnect() {
 }
 
 void RemoteControl::process() {
-  if(WL_CONNECTED != WiFi.status()) {
+  const auto status = WiFi.status();
+  // TODO: verify if this is the correct way to detect if we need to reconnect
+  const bool needsReconnect = (
+    (WL_CONNECT_FAILED == status) ||
+    (WL_CONNECTION_LOST == status) ||
+    (WL_DISCONNECTED == status)
+  );
+  if(needsReconnect) {
     reconnect();
     return; // wait for next tick, just to be sure that all is ok
   }

diff --git a/ui/src/components/SystemControls.js b/ui/src/components/SystemControls.js
@@ -6,11 +6,11 @@ import { useWaterPumpAPI } from '../contexts/WaterPumpAPIContext';
 import { startPump, stopPump } from '../store/slices/SystemStatus.js';
 
 export function SystemControlsComponent({
-  pouringTime, systemStatus, startPump, stopPump
+  pouringTime, powerLevel, systemStatus, startPump, stopPump
 }) {
   const api = useWaterPumpAPI().API;
   const handleStart = async () => {
-    await startPump({ api , pouringTime });
+    await startPump({ api, pouringTime, powerLevel });
   };
 
   const handleStop = async () => {
@@ -33,6 +33,7 @@ export function SystemControlsComponent({
 export default connect(
   state => ({
     pouringTime: state.UI.pouringTime,
+    powerLevel: state.UI.powerLevelInPercents,
     systemStatus: state.systemStatus,
   }), { startPump, stopPump }
 )(SystemControlsComponent);