From fe8fdc00de99b78c95c029ffbbb245a9f68c990d Mon Sep 17 00:00:00 2001 From: gizmocuz Date: Mon, 23 Mar 2015 08:47:57 +0100 Subject: [PATCH 1/3] Modified example code, solved some issues in previous version --- .../WaterMeterPulseSensor.ino | 117 ++++++++++-------- 1 file changed, 68 insertions(+), 49 deletions(-) diff --git a/libraries/MySensors/examples/WaterMeterPulseSensor/WaterMeterPulseSensor.ino b/libraries/MySensors/examples/WaterMeterPulseSensor/WaterMeterPulseSensor.ino index 1add41d..39e70dc 100644 --- a/libraries/MySensors/examples/WaterMeterPulseSensor/WaterMeterPulseSensor.ino +++ b/libraries/MySensors/examples/WaterMeterPulseSensor/WaterMeterPulseSensor.ino @@ -1,7 +1,7 @@ // // Use this sensor to measure volume and flow of your house watermeter. // You need to set the correct pulsefactor of your meter (pulses per m3). -// The sensor starts by fetching current volume reading from gateway (VAR 1). +// The sensor starts by reading the pulse count reading from the eprom. // Reports both volume and flow back to gateway. // // Unfortunately millis() won't increment when the Arduino is in @@ -13,15 +13,23 @@ #include #define DIGITAL_INPUT_SENSOR 3 // The digital input you attached your sensor. (Only 2 and 3 generates interrupt!) +#define SENSOR_INTERRUPT DIGITAL_INPUT_SENSOR-2 // Usually the interrupt = pin -2 (on uno/nano anyway) + #define PULSE_FACTOR 1000 // Nummber of blinks per m3 of your meter (One rotation/liter) + #define SLEEP_MODE false // flowvalue can only be reported when sleep mode is false. -#define MAX_FLOW 40 // Max flow (l/min) value to report. This filetrs outliers. -#define INTERRUPT DIGITAL_INPUT_SENSOR-2 // Usually the interrupt = pin -2 (on uno/nano anyway) -#define CHILD_ID 5 // Id of the sensor child + +#define MAX_FLOW 40 // Max flow (l/min) value to report. This filters outliers. + +#define CHILD_ID 1 // Id of the sensor child + unsigned long SEND_FREQUENCY = 20000; // Minimum time between send (in milliseconds). We don't want to spam the gateway. MySensor gw; - +MyMessage flowMsg(CHILD_ID,V_FLOW); +MyMessage volumeMsg(CHILD_ID,V_VOLUME); +MyMessage lastCounterMsg(CHILD_ID,V_VAR1); + double ppl = ((double)PULSE_FACTOR)/1000; // Pulses per liter volatile unsigned long pulseCount = 0; @@ -31,108 +39,119 @@ boolean pcReceived = false; unsigned long oldPulseCount = 0; unsigned long newBlink = 0; double oldflow = 0; -double volume; -double oldvolume; -unsigned long lastSend; -unsigned long lastPulse; -unsigned long currentTime; -boolean metric; -MyMessage flowMsg(CHILD_ID,V_FLOW); -MyMessage volumeMsg(CHILD_ID,V_VOLUME); -MyMessage pcMsg(CHILD_ID,V_VAR1); - +double volume =0; +double oldvolume =0; +unsigned long lastSend =0; +unsigned long lastPulse =0; void setup() { gw.begin(incomingMessage); // Send the sketch version information to the gateway and Controller - gw.sendSketchInfo("Water Meter", "1.0"); + gw.sendSketchInfo("Water Meter", "1.2"); // Register this device as Waterflow sensor gw.present(CHILD_ID, S_WATER); + pulseCount = oldPulseCount = 0; + // Fetch last known pulse count value from gw gw.request(CHILD_ID, V_VAR1); - attachInterrupt(INTERRUPT, onPulse, RISING); - lastSend = millis(); + lastSend = lastPulse = millis(); + + attachInterrupt(SENSOR_INTERRUPT, onPulse, RISING); } void loop() { gw.process(); - currentTime = millis(); + unsigned long currentTime = millis(); // Only send values at a maximum frequency or woken up from sleep - bool sendTime = currentTime - lastSend > SEND_FREQUENCY; - if (pcReceived && (SLEEP_MODE || sendTime)) { - // New flow value has been calculated + if (SLEEP_MODE || (currentTime - lastSend > SEND_FREQUENCY)) + { + lastSend=currentTime; + + if (!pcReceived) { + //Last Pulsecount not yet received from controller, request it again + gw.request(CHILD_ID, V_VAR1); + return; + } + if (!SLEEP_MODE && flow != oldflow) { + oldflow = flow; + + Serial.print("l/min:"); + Serial.println(flow); + // Check that we dont get unresonable large flow value. // could hapen when long wraps or false interrupt triggered if (flow<((unsigned long)MAX_FLOW)) { gw.send(flowMsg.set(flow, 2)); // Send flow value to gw } - //Serial.print("l/min:"); - //Serial.println(flow); - oldflow = flow; } - // No Pulse count in 2min + // No Pulse count received in 2min if(currentTime - lastPulse > 120000){ flow = 0; } - - + // Pulse count has changed if (pulseCount != oldPulseCount) { - gw.send(pcMsg.set(pulseCount)); // Send volumevalue to gw VAR1 - double volume = ((double)pulseCount/((double)PULSE_FACTOR)); oldPulseCount = pulseCount; + + Serial.print("pulsecount:"); + Serial.println(pulseCount); + + gw.send(lastCounterMsg.set(pulseCount)); // Send pulsecount value to gw in VAR1 + + double volume = ((double)pulseCount/((double)PULSE_FACTOR)); if (volume != oldvolume) { - gw.send(volumeMsg.set(volume, 3)); // Send volume value to gw oldvolume = volume; + + Serial.print("volume:"); + Serial.println(volume, 3); + + gw.send(volumeMsg.set(volume, 3)); // Send volume value to gw } } - lastSend = currentTime; - } else if (sendTime && !pcReceived) { - // No count received. Try requesting it again - gw.request(CHILD_ID, V_VAR1); - lastSend=currentTime; } - if (SLEEP_MODE) { gw.sleep(SEND_FREQUENCY); } } void incomingMessage(const MyMessage &message) { - if (message.type==V_VAR1) { - pulseCount = oldPulseCount = message.getLong(); + if (message.type==V_VAR1) { + unsigned long gwPulseCount=message.getULong(); + pulseCount += gwPulseCount; Serial.print("Received last pulse count from gw:"); Serial.println(pulseCount); pcReceived = true; } } - void onPulse() -{ - if (!SLEEP_MODE) { +{ + if (!SLEEP_MODE) + { unsigned long newBlink = micros(); unsigned long interval = newBlink-lastBlink; - lastPulse = millis(); - if (interval<500000L) { - // Sometimes we get interrupt on RISING, 500000 = 0.5sek debounce ( max 120 l/min) - return; + + if (interval!=0) + { + lastPulse = millis(); + if (interval<500000L) { + // Sometimes we get interrupt on RISING, 500000 = 0.5sek debounce ( max 120 l/min) + return; + } + flow = (60000000.0 /interval) / ppl; } - flow = (60000000.0 /interval) / ppl; lastBlink = newBlink; } pulseCount++; } - - From 93e8f2e1072ef035124cdf1001161d4ab5e28def Mon Sep 17 00:00:00 2001 From: gizmocuz Date: Mon, 23 Mar 2015 08:53:04 +0100 Subject: [PATCH 2/3] Corrected Sketch header --- .../examples/WaterMeterPulseSensor/WaterMeterPulseSensor.ino | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/MySensors/examples/WaterMeterPulseSensor/WaterMeterPulseSensor.ino b/libraries/MySensors/examples/WaterMeterPulseSensor/WaterMeterPulseSensor.ino index 39e70dc..6e9c4ee 100644 --- a/libraries/MySensors/examples/WaterMeterPulseSensor/WaterMeterPulseSensor.ino +++ b/libraries/MySensors/examples/WaterMeterPulseSensor/WaterMeterPulseSensor.ino @@ -1,7 +1,7 @@ // // Use this sensor to measure volume and flow of your house watermeter. // You need to set the correct pulsefactor of your meter (pulses per m3). -// The sensor starts by reading the pulse count reading from the eprom. +// The sensor starts by fetching current volume reading from gateway (VAR 1). // Reports both volume and flow back to gateway. // // Unfortunately millis() won't increment when the Arduino is in From e908e854c1cabd5cb19afcd70daa8c066f24e0d5 Mon Sep 17 00:00:00 2001 From: gizmocuz Date: Tue, 24 Mar 2015 09:26:50 +0100 Subject: [PATCH 3/3] Enhanced the UVSensor example with 1 decimal to the UVI index. Because the UVI graph is almost lineair This gives a more accurate overview Also the UVI is send at least every 5 minutes, this is good for the controller to know the sensor is still 'alive' --- .../MySensors/examples/UVSensor/UVSensor.ino | 61 +++++++++++++------ 1 file changed, 42 insertions(+), 19 deletions(-) diff --git a/libraries/MySensors/examples/UVSensor/UVSensor.ino b/libraries/MySensors/examples/UVSensor/UVSensor.ino index 838cdbd..417ae43 100644 --- a/libraries/MySensors/examples/UVSensor/UVSensor.ino +++ b/libraries/MySensors/examples/UVSensor/UVSensor.ino @@ -1,5 +1,7 @@ +#include +#include /* - Vera Arduino UVM-30A + Arduino UVM-30A connect the sensor as follows : @@ -7,44 +9,55 @@ - >>> GND out >>> A0 - Contribution: epierre, bulldoglowell - Converted to 1.4 by Henrik Ekblad + Contribution: epierre, bulldoglowell, gizmocuz + + Index table taken from: http://www.elecrow.com/sensors-c-111/environment-c-111_112/uv-sensor-moduleuvm30a-p-716.html + Because this table is pretty lineair, we can calculate a UVI with one decimal License: Attribution-NonCommercial-ShareAlike 3.0 Unported (CC BY-NC-SA 3.0) - */ #include #include -#define CHILD_ID_UV 0 #define UV_SENSOR_ANALOG_PIN 0 + +#define CHILD_ID_UV 0 + unsigned long SLEEP_TIME = 30*1000; // Sleep time between reads (in milliseconds) MySensor gw; MyMessage uvMsg(CHILD_ID_UV, V_UV); -int lastUV = -1; -int uvIndexValue [13] = { 50, 227, 318, 408, 503, 606, 696, 795, 881, 976, 1079, 1170, 3000}; -int uvIndex; + +unsigned long lastSend =0; +float uvIndex; +float lastUV = -1; +int uvIndexValue [12] = { 50, 227, 318, 408, 503, 606, 696, 795, 881, 976, 1079, 1170}; void setup() { gw.begin(); // Send the sketch version information to the gateway and Controller - gw.sendSketchInfo("UV Sensor", "1.1"); + gw.sendSketchInfo("UV Sensor", "1.2"); // Register all sensors to gateway (they will be created as child devices) gw.present(CHILD_ID_UV, S_UV); - } void loop() -{ - uint16_t uv = analogRead(0);// Get UV value - Serial.print("Uv reading: "); - Serial.println(uv); - for (int i = 0; i < 13; i++) +{ + unsigned long currentTime = millis(); + + uint16_t uv = analogRead(UV_SENSOR_ANALOG_PIN);// Get UV value + if (uv>1170) + uv=1170; + + //Serial.print("UV Analog reading: "); + //Serial.println(uv); + + int i; + for (i = 0; i < 12; i++) { if (uv <= uvIndexValue[i]) { @@ -52,11 +65,21 @@ void loop() break; } } - Serial.print("Uv index: "); - Serial.println(uvIndex); + + //calculate 1 decimal if possible + if (i>0) { + float vRange=uvIndexValue[i]-uvIndexValue[i-1]; + float vCalc=uv-uvIndexValue[i-1]; + uvIndex+=(1.0/vRange)*vCalc-1.0; + } - if (uvIndex != lastUV) { - gw.send(uvMsg.set(uvIndex)); + //Serial.print("UVI: "); + //Serial.println(uvIndex,2); + + //Send value to gateway if changed, or at least every 5 minutes + if ((uvIndex != lastUV)||(currentTime-lastSend >= 5*60*1000)) { + lastSend=currentTime; + gw.send(uvMsg.set(uvIndex,2)); lastUV = uvIndex; }