From a9737b2c99bf176b17d72925c807b2f810d40c49 Mon Sep 17 00:00:00 2001
From: pendos <djvlad967891@gmail.com>
Date: Mon, 16 Aug 2021 14:55:21 +0300
Subject: [PATCH] fix big

---
 firmware/{ => pump_encoder}/pump_encoder.ino | 21 ++++++++++----------
 firmware/{ => pump_simple}/pump_simple.ino   |  0
 2 files changed, 10 insertions(+), 11 deletions(-)
 rename firmware/{ => pump_encoder}/pump_encoder.ino (52%)
 rename firmware/{ => pump_simple}/pump_simple.ino (100%)

diff --git a/firmware/pump_encoder.ino b/firmware/pump_encoder/pump_encoder.ino
similarity index 52%
rename from firmware/pump_encoder.ino
rename to firmware/pump_encoder/pump_encoder.ino
index 08bd4ab..4cda2df 100644
--- a/firmware/pump_encoder.ino
+++ b/firmware/pump_encoder/pump_encoder.ino
@@ -1,5 +1,5 @@
-#define pressure_port 0
-#define relay_port 5
+#define pressure_Aport 0
+#define relay_Dport 5
 
 #define CLK 2
 #define DT 3
@@ -21,34 +21,33 @@ Encoder enc(CLK, DT, SW);
 void setup() {
   Serial.begin(9600);
   enc.setType(TYPE2);
-
+  pinMode(relay_Dport, OUTPUT);
 }
 
 void loop() {
 
-  // encoder_val = constrain(map(analogRead(encoder_port), 0, 1023, const_pressure_min, const_pressure_max), const_pressure_max);
 
   enc.tick();
   if (enc.isTurn()) {
     if (enc.isRight()) {
-      pressure_min = constrain(pressure_min++, pressure_min, const_pressure_max);
+      pressure_min = constrain(pressure_min+10, pressure_min, const_pressure_max);
     }
     if (enc.isLeft()) {
-      pressure_min = constrain(pressure_min--, pressure_min, const_pressure_max);
+      pressure_min = constrain(pressure_min-10, pressure_min, const_pressure_max);
     }
     if (enc.isRightH()) {
-      pressure_min = constrain(pressure_max++, pressure_min, const_pressure_max);
+      pressure_min = constrain(pressure_max+10, pressure_min, const_pressure_max);
     }
     if (enc.isLeftH()) {
-      pressure_min = constrain(pressure_max--, pressure_min, const_pressure_max);
+      pressure_min = constrain(pressure_max-10, pressure_min, const_pressure_max);
     }
   }
   
-  pressure = analogRead(pressure_port);
+  pressure = analogRead(pressure_Aport);
 
   if (pressure < pressure_min) {
     if (!flag) {
-      digitalWrite(relay_port, HIGH);
+      digitalWrite(relay_Dport, HIGH);
       flag = true;
     }
     
@@ -56,7 +55,7 @@ void loop() {
   } else {
       if (pressure > pressure_max) {
         if (flag) {
-          digitalWrite(relay_port, LOW);
+          digitalWrite(relay_Dport, LOW);
           flag = false;
         }
         
diff --git a/firmware/pump_simple.ino b/firmware/pump_simple/pump_simple.ino
similarity index 100%
rename from firmware/pump_simple.ino
rename to firmware/pump_simple/pump_simple.ino