Merge pull request #241 from Zer0-bit/parked/nano

Parked/nano
Zer0-bit · Jun 30, 2022 · 5ab2144 · 5ab2144
2 parents 5faac0f + 1630057
commit 5ab2144
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/platformio.ini b/platformio.ini
@@ -9,7 +9,7 @@
 ; https://docs.platformio.org/page/projectconf.html
 
 [platformio]
-default_envs = blackpill
+default_envs = nano
 ; src_dir = scales-calibration
 
 [extra]

diff --git a/src/gaggiuino.ino b/src/gaggiuino.ino
@@ -126,12 +126,12 @@ HX711 LoadCell_2; //HX711 2
 
 // Some vars are better global
 //Timers
-unsigned long pressureTimer = 0;
-unsigned long thermoTimer = 0;
-unsigned long scalesTimer = 0;
-unsigned long flowTimer = 0;
-unsigned long pageRefreshTimer = 0;
-unsigned long brewingTimer = 0;
+unsigned long pressureTimer = millis();
+unsigned long thermoTimer = millis();
+unsigned long scalesTimer = millis();
+unsigned long flowTimer = millis();
+unsigned long pageRefreshTimer = millis();
+unsigned long brewingTimer = millis();
 
 //volatile vars
 volatile float kProbeReadValue; //temp val
@@ -1009,6 +1009,7 @@ void brewDetect() {
   } else{
     digitalWrite(valvePin, LOW);
     brewTimer(0); // stopping timer
+    pump.set(0);
     brewActive = false;
     /* UPDATE VARIOUS INTRASHOT TIMERS and VARS */
     brewingTimer = millis();