ESP8266: Fix example compilation error (#932)

This commit is contained in:
Olivier
2017-09-19 22:48:54 +02:00
committed by Patrick Fallberg
parent f5dce5b61b
commit 5164af7edc
16 changed files with 54 additions and 57 deletions
@@ -51,17 +51,17 @@
#define MAX_WATT 10000 // Max watt value to report. This filetrs outliers.
#define CHILD_ID 1 // Id of the sensor child
unsigned long SEND_FREQUENCY =
uint32_t SEND_FREQUENCY =
20000; // Minimum time between send (in milliseconds). We don't wnat to spam the gateway.
double ppwh = ((double)PULSE_FACTOR)/1000; // Pulses per watt hour
bool pcReceived = false;
volatile unsigned long pulseCount = 0;
volatile unsigned long lastBlink = 0;
volatile unsigned long watt = 0;
unsigned long oldPulseCount = 0;
unsigned long oldWatt = 0;
volatile uint32_t pulseCount = 0;
volatile uint32_t lastBlink = 0;
volatile uint32_t watt = 0;
uint32_t oldPulseCount = 0;
uint32_t oldWatt = 0;
double oldKwh;
unsigned long lastSend;
uint32_t lastSend;
MyMessage wattMsg(CHILD_ID,V_WATT);
MyMessage kwhMsg(CHILD_ID,V_KWH);
MyMessage pcMsg(CHILD_ID,V_VAR1);
@@ -91,7 +91,7 @@ void presentation()
void loop()
{
unsigned long now = millis();
uint32_t now = millis();
// Only send values at a maximum frequency or woken up from sleep
bool sendTime = now - lastSend > SEND_FREQUENCY;
if (pcReceived && (SLEEP_MODE || sendTime)) {
@@ -99,7 +99,7 @@ void loop()
if (!SLEEP_MODE && watt != oldWatt) {
// Check that we dont get unresonable large watt value.
// could hapen when long wraps or false interrupt triggered
if (watt<((unsigned long)MAX_WATT)) {
if (watt<((uint32_t)MAX_WATT)) {
send(wattMsg.set(watt)); // Send watt value to gw
}
Serial.print("Watt:");
@@ -142,8 +142,8 @@ void receive(const MyMessage &message)
void onPulse()
{
if (!SLEEP_MODE) {
unsigned long newBlink = micros();
unsigned long interval = newBlink-lastBlink;
uint32_t newBlink = micros();
uint32_t interval = newBlink-lastBlink;
if (interval<10000L) { // Sometimes we get interrupt on RISING
return;
}
@@ -151,7 +151,4 @@ void onPulse()
lastBlink = newBlink;
}
pulseCount++;
}
}