MySmartHome/MySensors
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better "control" for determining if humiidty changes should fire off a transmission

Browse Source
This commit is contained in:
Thomas Mørch
2015-07-30 22:34:47 +02:00
parent 190479df6d
commit 668a5f649b
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/MySensors/examples/SensebenderMicro/SensebenderMicro.ino
+6 -6
View File
@@ -15,7 +15,7 @@
#include <sha204_lib_return_codes.h> #include <sha204_lib_return_codes.h>
#include <sha204_library.h> #include <sha204_library.h>
#include <RunningAverage.h> #include <RunningAverage.h>
#include <avr/power.h> //#include <avr/power.h>
// Define a static node address, remove if you want auto address assignment // Define a static node address, remove if you want auto address assignment
//#define NODE_ADDRESS 3 //#define NODE_ADDRESS 3
@@ -149,7 +149,7 @@ void loop() {
if ((measureCount == 5) && highfreq) if ((measureCount == 5) && highfreq)
{ {
clock_prescale_set(clock_div_8); // Switch to 1Mhz for the reminder of the sketch, save power. // clock_prescale_set(clock_div_8); // Switch to 1Mhz for the reminder of the sketch, save power.
highfreq = false; highfreq = false;
} }
@@ -184,19 +184,18 @@ void sendTempHumidityMeasurements(bool force)
bool tx = force; bool tx = force;
si7021_env data = humiditySensor.getHumidityAndTemperature(); si7021_env data = humiditySensor.getHumidityAndTemperature();
float oldAvgHum = raHum.getAverage();
raHum.addValue(data.humidityPercent); raHum.addValue(data.humidityPercent);
float diffTemp = abs(lastTemperature - (isMetric ? data.celsiusHundredths : data.fahrenheitHundredths)/100); float diffTemp = abs(lastTemperature - (isMetric ? data.celsiusHundredths : data.fahrenheitHundredths)/100);
float diffHum = abs(oldAvgHum - raHum.getAverage()); float diffHum = abs(lastHumidity - raHum.getAverage());
Serial.print(F("TempDiff :"));Serial.println(diffTemp); Serial.print(F("TempDiff :"));Serial.println(diffTemp);
Serial.print(F("HumDiff :"));Serial.println(diffHum); Serial.print(F("HumDiff :"));Serial.println(diffHum);
if (isnan(diffHum)) tx = true; if (isnan(diffHum)) tx = true;
if (diffTemp > TEMP_TRANSMIT_THRESHOLD) tx = true; if (diffTemp > TEMP_TRANSMIT_THRESHOLD) tx = true;
if (diffHum >= HUMI_TRANSMIT_THRESHOLD) tx = true; if (diffHum > HUMI_TRANSMIT_THRESHOLD) tx = true;
if (tx) { if (tx) {
measureCount = 0; measureCount = 0;
@@ -246,7 +245,7 @@ void sendBattLevel(bool force)
* Internal battery ADC measuring * Internal battery ADC measuring
* *
*******************************************/ *******************************************/
long readVcc() { long readVcc() {/*
// Read 1.1V reference against AVcc // Read 1.1V reference against AVcc
// set the reference to Vcc and the measurement to the internal 1.1V reference // set the reference to Vcc and the measurement to the internal 1.1V reference
#if defined(__AVR_ATmega32U4__) || defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) #if defined(__AVR_ATmega32U4__) || defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
@@ -270,6 +269,7 @@ long readVcc() {
result = 1125300L / result; // Calculate Vcc (in mV); 1125300 = 1.1*1023*1000 result = 1125300L / result; // Calculate Vcc (in mV); 1125300 = 1.1*1023*1000
return result; // Vcc in millivolts return result; // Vcc in millivolts
*/
} }
/**************************************************** /****************************************************