Added setSyncDir and setSyncPullup (#25)

* Update keywords.txt * Update thyristor.h * Update thyristor.cpp * Update readme.md * uniforming license * remove setGateTurnOffTime, cleanup * fixing dimmable_light_linearized * fix PinStatus incompatibility * typo --------- Co-authored-by: Fabiano Riccardi <fabiano.riccardi@outlook.com>
fabianoriccardi · Nov 22, 2023 · 3137e9e · 3137e9e
1 parent dda54f7
commit 3137e9e
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 5 deletions.
diff --git a/src/dimmable_light.h b/src/dimmable_light.h
@@ -118,6 +118,21 @@ class DimmableLight {
     Thyristor::setSyncPin(pin);
   }
 
+  /**
+   * Set the pin direction (RISING (default), FALLING, CHANGE).
+   */
+  static void setSyncDir(decltype(RISING) dir) {
+    Thyristor::setSyncDir(dir);
+  }
+
+  /**
+   * Set the pin pullup (true = INPUT_PULLUP, false = INPUT). The internal pullup resistor is not
+   * available for each platform and each pin.
+   */
+  static void setSyncPullup(bool pullup) {
+    Thyristor::setSyncPullup(pullup);
+  }
+
   /**
    * Return the number of instantiated lights.
    */

diff --git a/src/dimmable_light_linearized.h b/src/dimmable_light_linearized.h
@@ -131,6 +131,21 @@ class DimmableLightLinearized {
     Thyristor::setSyncPin(pin);
   }
 
+  /**
+   * Set the pin direction (RISING (default), FALLING, CHANGE).
+   */
+  static void setSyncDir(decltype(RISING) dir) {
+    Thyristor::setSyncDir(dir);
+  }
+
+  /**
+   * Set the pin pullup (true = INPUT_PULLUP, false = INPUT). The internal pullup resistor is not
+   * available for each platform and each pin.
+   */
+  static void setSyncPullup(bool pullup) {
+    Thyristor::setSyncPullup(pullup);
+  }
+
   /**
    * Return the number of instantiated lights.
    */

diff --git a/src/thyristor.cpp b/src/thyristor.cpp
@@ -593,7 +593,7 @@ void Thyristor::setDelay(uint16_t newDelay) {
   if (enableInt) {
     if (verbosity > 2) Serial.println("Re-enabling interrupt");
     interruptEnabled = true;
-    attachInterrupt(digitalPinToInterrupt(syncPin), zero_cross_int, RISING);
+    attachInterrupt(digitalPinToInterrupt(syncPin), zero_cross_int, syncDir);
   }
 
   if (verbosity > 2) {
@@ -611,7 +611,7 @@ void Thyristor::turnOn() {
 }
 
 void Thyristor::begin() {
-  pinMode(digitalPinToInterrupt(syncPin), INPUT);
+  pinMode(syncPin, syncPullup ? INPUT_PULLUP : INPUT);
 
 #if defined(ARDUINO_ARCH_ESP8266)
   timer1_attachInterrupt(activate_thyristors);
@@ -632,7 +632,7 @@ void Thyristor::begin() {
   // Starts immediately to sense the eletricity grid
 
   interruptEnabled = true;
-  attachInterrupt(digitalPinToInterrupt(syncPin), zero_cross_int, RISING);
+  attachInterrupt(digitalPinToInterrupt(syncPin), zero_cross_int, syncDir);
 #endif
 }
 
@@ -699,7 +699,7 @@ void Thyristor::frequencyMonitorAlwaysOn(bool enable) {
 
     if (enable && !interruptEnabled) {
       interruptEnabled = true;
-      attachInterrupt(digitalPinToInterrupt(syncPin), zero_cross_int, RISING);
+      attachInterrupt(digitalPinToInterrupt(syncPin), zero_cross_int, syncDir);
     }
     frequencyMonitorAlwaysEnabled = enable;
 
@@ -783,4 +783,6 @@ bool Thyristor::newDelayValues = false;
 bool Thyristor::updatingStruct = false;
 bool Thyristor::allThyristorsOnOff = true;
 uint8_t Thyristor::syncPin = 255;
+decltype(RISING) Thyristor::syncDir = RISING;
+bool Thyristor::syncPullup = false;
 bool Thyristor::frequencyMonitorAlwaysEnabled = true;
diff --git a/src/thyristor.h b/src/thyristor.h
@@ -20,7 +20,7 @@
 #ifndef THYRISTOR_H
 #define THYRISTOR_H
 
-#include <stdint.h>
+#include <Arduino.h>
 
 /**
  * These defines affect the declaration of this class and the relative wrappers.
@@ -114,6 +114,21 @@ class Thyristor {
     syncPin = pin;
   }
 
+  /**
+   * Set the pin direction (RISING (default), FALLING, CHANGE).
+   */
+  static void setSyncDir(decltype(RISING) dir) {
+    syncDir = dir;
+  }
+
+  /**
+   * Set the pin pullup (true = INPUT_PULLUP, false = INPUT). The internal pullup resistor is not
+   * available for each platform and each pin.
+   */
+  static void setSyncPullup(bool pullup) {
+    syncPullup = pullup;
+  }
+
   /**
    * Get frequency.
    */
@@ -214,6 +229,16 @@ class Thyristor {
    */
   static uint8_t syncPin;
 
+  /**
+   * Pin direction (FALLING, RISING, CHANGE).
+   */
+  static decltype(RISING) syncDir;
+
+  /**
+   * Pin pullup active.
+   */
+  static bool syncPullup;
+
   /**
    * 0) no messages
    * 1) error messages