Merge pull request #1 from GoWired/dev

Dev

Author: feanor-anglin

library.properties

@@ -1,5 +1,5 @@
 name=GoWired-lib
-version=1.0.0
+version=1.1.0
 author=GoWired
 maintainer=GoWired <hello@gowired.dev>
 sentence=Common libraries used by GoWired software.

src/core/CommonIO.cpp

@@ -65,18 +65,18 @@ void CommonIO::SetValues(bool RelayOFF, bool Invert, uint8_t Type, uint8_t Pin1,
       break;
     // Touch button
     case 5:
-      _SensorPin = Pin1;    ReadReference();
+      _SensorPin = Pin1;    _ReadReference(_SensorPin);
       break;
     // Touch button + digital button + output
     case 6:
-      _SensorPin = Pin1;    ReadReference();
+      _SensorPin = Pin1;    _ReadReference(_SensorPin);
       _SensorPin2 = Pin2;   pinMode(_SensorPin2, INPUT_PULLUP);
       _RelayPin = Pin3;     pinMode(_RelayPin, OUTPUT);
       digitalWrite(_RelayPin, _RelayOFF);
       break;
     // Touch button + output
     case 7:
-      _SensorPin = Pin1;    ReadReference();
+      _SensorPin = Pin1;    _ReadReference(_SensorPin);
       _RelayPin = Pin2;     pinMode(_RelayPin, OUTPUT);
       digitalWrite(_RelayPin, _RelayOFF);
       break;
@@ -86,12 +86,25 @@ void CommonIO::SetValues(bool RelayOFF, bool Invert, uint8_t Type, uint8_t Pin1,
 }
 
 /**
- * @brief reads reference value for touch buttons
+ * @brief public function to call _ReadReference()
  * 
  */
 void CommonIO::ReadReference()  {
 
-  _TouchReference = ADCTouch.read(_SensorPin, 500);         // ADCTouch.read(pin, number of samples)
+  uint8_t InputPin;
+
+  if(SensorType == 5 || SensorType == 6 || SensorType == 7) InputPin = _SensorPin;
+
+  _ReadReference(InputPin);
+}
+
+/**
+ * @brief reads reference value for touch buttons
+ * 
+ */
+void CommonIO::_ReadReference(uint8_t InputPin)  {
+
+  _TouchReference = ADCTouch.read(InputPin, 512);         // ADCTouch.read(pin, number of samples)
 }
 
 /**
@@ -119,7 +132,7 @@ void CommonIO::CheckInput(uint16_t LongpressDuration, uint8_t DebounceValue) {
   uint32_t StartTime = millis();
 
   do  {
-    Reading = _ReadDigital(DebounceValue);
+    Reading = _ReadDigital(DebounceValue, _SensorPin);
 
     if(SensorType == 0 || SensorType == 1)  {
       if(State != Reading)  {
@@ -167,10 +180,10 @@ void CommonIO::CheckInput2(uint8_t Threshold, uint16_t LongpressDuration, uint8_
   uint32_t StartTime = millis();
 
   do  {
-    Reading = _ReadAnalog(Threshold);
+    Reading = _ReadAnalog(Threshold, _SensorPin);
 
     if(SensorType == 6 && !Reading) {
-      Reading = _ReadDigital(DebounceValue);
+      Reading = _ReadDigital(DebounceValue, _SensorPin2);
     }
 
     if(!Shortpress && Reading) {
@@ -195,10 +208,10 @@ void CommonIO::CheckInput3(uint8_t Threshold, uint8_t DebounceValue, bool Monost
   bool Shortpress = false;
 
   do  {
-    Reading = _ReadAnalog(Threshold);
+    Reading = _ReadAnalog(Threshold, _SensorPin);
 
     if(SensorType == 6 && !Reading) {
-      Reading = _ReadDigital(DebounceValue);
+      Reading = _ReadDigital(DebounceValue, _SensorPin2);
     }
 
     if(Monostable)  {
@@ -227,15 +240,15 @@ void CommonIO::CheckInput3(uint8_t Threshold, uint8_t DebounceValue, bool Monost
  * @return true if input state is true
  * @return false if input state is false
  */
-bool CommonIO::_ReadDigital(uint8_t DebounceValue) {
+bool CommonIO::_ReadDigital(uint8_t DebounceValue, uint8_t InputPin) {
 
   bool DigitalReading;
   bool PreviousReading = false;
   bool InputState = false;
   uint32_t StartTime = millis();
 
   do {
-    DigitalReading = (_Invert ? digitalRead(_SensorPin) : !digitalRead(_SensorPin));
+    DigitalReading = (_Invert ? digitalRead(InputPin) : !digitalRead(InputPin));
 
     if(DigitalReading && !PreviousReading)  {
       StartTime = millis();
@@ -267,12 +280,12 @@ bool CommonIO::_ReadDigital(uint8_t DebounceValue) {
  * @return true if touch was sensed
  * @return false if touch was not sensed
  */
-bool CommonIO::_ReadAnalog(uint8_t Threshold)  {
+bool CommonIO::_ReadAnalog(uint8_t Threshold, uint8_t InputPin)  {
 
   int TouchValue;
   bool ButtonState = false;
 
-  TouchValue = ADCTouch.read(_SensorPin, 64);
+  TouchValue = ADCTouch.read(InputPin, 64);
   TouchValue -= _TouchReference;
   TouchDiagnosisValue = TouchValue;
 

src/core/CommonIO.h

@@ -44,8 +44,9 @@ class CommonIO
     bool _HighStateDetected;
     bool _RelayOFF;
 
-    bool _ReadAnalog(uint8_t Threshold);
-    bool _ReadDigital(uint8_t DebounceValue);
+    bool _ReadAnalog(uint8_t Threshold, uint8_t InputPin);
+    bool _ReadDigital(uint8_t DebounceValue, uint8_t InputPin);
+    void _ReadReference(uint8_t InputPin);
 
 };
 

src/core/Shutters.cpp

@@ -77,23 +77,11 @@ uint32_t Shutters::ReadMessage(uint8_t Order) {
 
   uint32_t MovementTime;
 
-  if(State == 2)  {
-    NewState = Order;
+  NewState = Order;
 
-    if(Order == 0) {
-      MovementTime = _UpTime;
-    }
-    else if(Order == 1)  {
-      MovementTime = _DownTime;
-    }
-    else if(Order == 2) {
-      MovementTime = 0;
-    }
-  }
-  else  {
-    NewState = 2;
-    MovementTime = 0;
-  }
+  if(Order == 0) MovementTime = _UpTime;
+  else if(Order == 1) MovementTime = _DownTime;
+  else MovementTime = 0;
 
   return MovementTime;
 }
@@ -108,20 +96,15 @@ uint32_t Shutters::ReadButtons(uint8_t Button)  {
 
   uint32_t MovementTime;
 
-  // Roller shutter is stopped -> start moving
-  if(State == 2)  {
-    NewState = Button;
-    if(Button == 0) {
-      MovementTime = _UpTime;
-    }
-    else if(Button == 1)  {
-      MovementTime = _DownTime;
-    }
+  NewState = Button;
+
+  // Stop
+  if(State != 2 && State == NewState)  {
+    NewState = 2; MovementTime = 0;
   }
-  // Roller shutter is moving -> stop
+  // Start moving or change direction
   else  {
-    NewState = 2;
-    MovementTime = 0;
+    MovementTime = NewState == 0 ? _UpTime : _DownTime;
   }
 
   return MovementTime;
@@ -165,14 +148,18 @@ uint8_t Shutters::Movement()  {
   }
   // Move upward
   else if(NewState == 0)  {
-    digitalWrite(_DownPin, _RelayOff);
-	delay(20);
+    if(digitalRead(_DownPin) != _RelayOff) {
+      digitalWrite(_DownPin, _RelayOff);
+      delay(50);
+    }
     digitalWrite(_UpPin, _RelayOn);
   }
   // Move downward
   else if(NewState == 1) {
-    digitalWrite(_UpPin, _RelayOff);
-	delay(20);
+    if(digitalRead(_UpPin) != _RelayOff)  {
+      digitalWrite(_UpPin, _RelayOff);
+      delay(50);
+    }
     digitalWrite(_DownPin, _RelayOn);
   }