Add vor_methane and vor_switch.

Author: kenkus-futurice

vor-arduino/vor_actuator.cpp

@@ -1,5 +1,5 @@
 /*
-    Abstraction of a sensor.
+    Abstraction of an actuator.
 */
 
 #include "vor_actuator.h"

vor-arduino/vor_button.cpp

@@ -1,5 +1,5 @@
 /*
-    Button sensor.
+    Digital button sensor.
 */
 
 #include "vor_button.h"

vor-arduino/vor_button.h

@@ -1,5 +1,5 @@
 /*
-    Button sensor.
+    Digital button sensor.
 */
 
 #ifndef VOR_BUTTON_H

vor-arduino/vor_methane.cpp

@@ -0,0 +1,19 @@
+/*
+    Analog methane sensor.
+*/
+
+#include "vor_methane.h"
+
+VorMethane::VorMethane(uint8_t pin) :
+VorSensor(pin, ANALOG_INPUT) {
+
+}
+
+float VorMethane::process(int value) {
+    float volts = value / MAX_ANALOG_VALUE * MAX_VOLTS;
+    // this equation was determined from a graph in datasheet, page 5:
+    // https://cdn.sparkfun.com/datasheets/Sensors/Biometric/MQ-4%20Ver1.3%20-%20Manual.pdf
+    float ppm = pow(M_E, (volts + 1.8992) / 0.619);
+    //float ppm = 23.953 * pow(M_E, 1.58 * volts); // alternative equation
+    return ppm;
+}

vor-arduino/vor_methane.h

@@ -0,0 +1,19 @@
+/*
+    Analog methane sensor.
+*/
+
+#ifndef VOR_METHANE_H
+#define VOR_METHANE_H
+
+#include "env.h"
+#include "vor_sensor.h"
+
+class VorMethane : public VorSensor {
+public:
+    VorMethane(uint8_t pin);
+
+    float process(int value);
+
+};
+
+#endif

vor-arduino/vor_motion.cpp

@@ -1,12 +1,13 @@
 /*
-    Button sensor.
+    Digital PIR motion sensor.
 */
 
 #include "vor_motion.h"
 
-VorMotion::VorMotion(uint8_t pin) :
+VorMotion::VorMotion(uint8_t pin, uint32_t debounce) :
 VorSensor(pin, DIGITAL_INPUT_PULLUP),
 _motionValue(HIGH),
+_debounce(debounce),
 _debounceTime(0) {
 
 }
@@ -20,7 +21,7 @@ int VorMotion::read() {
         _debounceTime = now;
     }
 
-    if (now - _debounceTime > DEBOUNCE) {
+    if (now - _debounceTime > _debounce) {
         _motionValue = value;
     }
 

vor-arduino/vor_motion.h

@@ -1,23 +1,25 @@
 /*
-    PIR motion sensor.
+    Digital PIR motion sensor.
 */
 
 #ifndef VOR_MOTION_H
 #define VOR_MOTION_H
 
 #include "vor_sensor.h"
 
-#define DEBOUNCE 30000 // milliseconds
-
 class VorMotion : public VorSensor {
 public:
-    VorMotion(uint8_t pin);
+    VorMotion(uint8_t pin, uint32_t debounce = 30000);
 
     int read();
 
+    void setDebounce(uint32_t debounce) { _debounce = debounce; }
+    uint32_t getDebounce() { return _debounce; }
+
 private:
 
     int _motionValue;
+    uint32_t _debounce;
     uint64_t _debounceTime; // milliseconds
 
 };

vor-arduino/vor_switch.cpp

@@ -0,0 +1,26 @@
+/*
+    Digital switch sensor.
+*/
+
+#include "vor_switch.h"
+
+VorSwitch::VorSwitch(uint8_t pin) :
+VorSensor(pin, DIGITAL_INPUT),
+_debounceTime(0) {
+
+}
+
+int VorSwitch::read() {
+    int value = VorSensor::read();
+    if (!_debounceTime) {
+        _switchValue = value;
+    }
+    uint64_t now = millis();
+
+    if (now - _debounceTime > DEBOUNCE && value != _switchValue) {
+        _debounceTime = now;
+        _switchValue = value;
+    }
+
+    return _switchValue;
+}

vor-arduino/vor_switch.h

@@ -0,0 +1,25 @@
+/*
+    Digital switch sensor.
+*/
+
+#ifndef VOR_SWITCH_H
+#define VOR_SWITCH_H
+
+#include "vor_sensor.h"
+
+#define DEBOUNCE 100 // milliseconds
+
+class VorSwitch : public VorSensor {
+public:
+    VorSwitch(uint8_t pin);
+
+    int read();
+
+private:
+
+    int _switchValue;
+    uint64_t _debounceTime; // milliseconds
+
+};
+
+#endif