add pump functions

include/flow.h

@@ -9,8 +9,16 @@ uint16_t flow_counter=0; //maximum counts/s measured with Eden 128 Pump was 171
 void IRAM_ATTR isr_flow();
 
 unsigned long last_read_flow=0;
+#ifndef READINTERVAL_FLOW
 #define READINTERVAL_FLOW 10000
-float flow_factor=7.5; //F=7.5*flowrate[L/min]
+#endif
+
+#ifndef FLOW_FACTOR
+#define LOW_FACTOR 7.5
+//LOW_FACTOR=7.5 [L/min] for YF-S201
+#endif
+float flow_factor=LOW_FACTOR; //F=7.5*flowrate[L/min]
+
 float flow;
 
 uint32_t flow_counter_sum=0;
@@ -19,11 +27,17 @@ uint32_t flow_counter_sum=0;
 
 
 void flow_setup() {
-
+  #ifndef TIMING_FLOW_MINCHANGE
   timing_flow.minchange=0.0;
   timing_flow.maxchange=0.3;
   timing_flow.mintime=10*1000;
   timing_flow.maxtime=30*60*1000;
+  #else
+  timing_flow.minchange=TIMING_FLOW_MINCHANGE;
+  timing_flow.maxchange=TIMING_FLOW_MAXCHANGE;
+  timing_flow.mintime=TIMING_FLOW_MINTIME;
+  timing_flow.maxtime=TIMING_FLOW_MAXTIME;
+  #endif
 
   
 

include/pump.h

@@ -0,0 +1,128 @@
+#ifndef _PUMP_H_
+#define _PUMP_H_
+
+#include "wifi_functions.h"
+
+const int pin_relais[]=PIN_RELAIS;
+
+unsigned long valveOffTime[VALVECOUNT]; //array with millis when to turn off valve. 0->off, >0 -> turn valveid index off at this millis. Index offset by 1!
+
+uint8_t srdata=0;
+
+
+unsigned long relaisOffTime[RELAISCOUNT]; //array with millis when to turn off valve. 0->off, >0 -> turn valveid index off at this millis. Index offset by 1!
+
+
+void srEnableValve(int valveid);
+void srDisableValve(int valveid);
+void srOutputOff();
+bool enableValve(int valveid,unsigned long duration);
+bool enableRelais(int relaisid,unsigned long duration);
+void shiftOutSlow(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder, uint8_t val);
+
+
+#define MICROS_SHIFTDELAY 50
+#define MICROS_SHIFT_LATCH 200
+
+void pump_setup() {
+  pinMode(PIN_SERIAL_LATCH, OUTPUT);
+  pinMode(PIN_SERIAL_CLOCK, OUTPUT);
+  pinMode(PIN_SERIAL_DATA, OUTPUT);
+
+  
+  for (uint8_t i=0;i<RELAISCOUNT;i++) {
+    pinMode(pin_relais[i], OUTPUT);
+    digitalWrite(pin_relais[i], HIGH); //active low
+  }
+
+  
+  srOutputOff();
+
+
+}
+void pump_loop(unsigned long loopmillis) {
+
+  for (uint8_t i=0;i<VALVECOUNT;i++){
+    if (valveOffTime[i]!=0 && loopmillis>=valveOffTime[i]) { //time to turn off
+      valveOffTime[i]=0;
+      srDisableValve(i+1);
+      
+    }
+  }
+  for (uint8_t i=0;i<RELAISCOUNT;i++){
+    if (relaisOffTime[i]!=0 && loopmillis>=relaisOffTime[i]) { //time to turn off
+      relaisOffTime[i]=0;
+      digitalWrite(pin_relais[i],HIGH); //active low
+    }
+  }
+}
+
+bool enableValve(int valveid,unsigned long duration) { //duration in ms
+  if (valveid>=1 && valveid<=VALVECOUNT) {
+    valveOffTime[valveid-1]=millis()+duration;
+    srEnableValve(valveid);
+    return true;
+  }else{
+    return false;
+  }
+  
+}
+
+void srOutputOff() {
+  srdata=0;
+  digitalWrite(PIN_SERIAL_LATCH, LOW);
+  shiftOutSlow(PIN_SERIAL_DATA, PIN_SERIAL_CLOCK, MSBFIRST, srdata);
+  digitalWrite(PIN_SERIAL_LATCH, HIGH);
+}
+
+void srEnableValve(int valveid) {
+  if (valveid>=1 && valveid<=VALVECOUNT) {
+    srdata|= 1<<(valveid-1);
+    digitalWrite(PIN_SERIAL_LATCH, LOW);
+    shiftOutSlow(PIN_SERIAL_DATA, PIN_SERIAL_CLOCK, MSBFIRST, srdata);
+    digitalWrite(PIN_SERIAL_LATCH, HIGH);
+  }
+  Serial.print("enabled. srdata="); Serial.print(srdata); Serial.println();
+}
+void srDisableValve(int valveid) {
+  if (valveid>=1 && valveid<=VALVECOUNT) {
+    srdata&= ~(1<<(valveid-1));
+    digitalWrite(PIN_SERIAL_LATCH, LOW);
+    shiftOutSlow(PIN_SERIAL_DATA, PIN_SERIAL_CLOCK, MSBFIRST, srdata);
+    digitalWrite(PIN_SERIAL_LATCH, HIGH);
+  }
+  Serial.print("disabled. srdata="); Serial.print(srdata); Serial.println();
+}
+
+
+void shiftOutSlow(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder, uint8_t val)
+{
+	uint8_t i;
+
+	for (i = 0; i < 8; i++)  {
+		if (bitOrder == LSBFIRST)
+			digitalWrite(dataPin, !!(val & (1 << i)));
+		else	
+			digitalWrite(dataPin, !!(val & (1 << (7 - i))));
+			
+        delayMicroseconds(MICROS_SHIFTDELAY);
+		digitalWrite(clockPin, HIGH);
+        delayMicroseconds(MICROS_SHIFTDELAY);
+		digitalWrite(clockPin, LOW);
+	}
+}
+
+bool enableRelais(int relaisid,unsigned long duration) { //duration in ms
+  if (relaisid>=1 && relaisid<=VALVECOUNT) {
+    relaisOffTime[relaisid-1]=millis()+duration;
+    digitalWrite(pin_relais[relaisid-1],LOW); //active low
+    return true;
+  }else{
+    return false;
+  }
+  
+}
+
+
+
+#endif

platformio.ini

@@ -31,6 +31,13 @@ build_flags=
     -D RES_AREA=77*56.8
     -D WATERLEVELSENSOR_VL53L1X
 
+    -D FLOW_PIN=17
+    -D READINTERVAL_FLOW=5*1000
+    -D TIMING_FLOW_MINCHANGE=0.0
+    -D TIMING_FLOW_MAXCHANGE=0.3
+    -D TIMING_FLOW_MINTIME=5*1000
+    -D TIMING_FLOW_MAXTIME=60*60*1000
+
     -D VALVECOUNT=8
     -D PIN_SERIAL_DATA=25
     -D PIN_SERIAL_LATCH=33