wn/WiFiPowerMeter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ready so far

Browse Source
This commit is contained in:
hg
2015-05-13 22:47:57 +02:00
parent e581e4e3b1
commit 8935590aeb
2 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.settings/org.eclipse.cdt.core.prefs
View File

@ -151,10 +151,10 @@ environment/project/it.baeyens.arduino.core.toolChain.release.1600398586/A.EXTRA
environment/project/it.baeyens.arduino.core.toolChain.release.1600398586/A.EXTRA.TIME.DTS/value=3600 environment/project/it.baeyens.arduino.core.toolChain.release.1600398586/A.EXTRA.TIME.DTS/value=3600
environment/project/it.baeyens.arduino.core.toolChain.release.1600398586/A.EXTRA.TIME.LOCAL/delimiter=\: environment/project/it.baeyens.arduino.core.toolChain.release.1600398586/A.EXTRA.TIME.LOCAL/delimiter=\:
environment/project/it.baeyens.arduino.core.toolChain.release.1600398586/A.EXTRA.TIME.LOCAL/operation=replace environment/project/it.baeyens.arduino.core.toolChain.release.1600398586/A.EXTRA.TIME.LOCAL/operation=replace
environment/project/it.baeyens.arduino.core.toolChain.release.1600398586/A.EXTRA.TIME.LOCAL/value=1430902339 environment/project/it.baeyens.arduino.core.toolChain.release.1600398586/A.EXTRA.TIME.LOCAL/value=1431556581
environment/project/it.baeyens.arduino.core.toolChain.release.1600398586/A.EXTRA.TIME.UTC/delimiter=\: environment/project/it.baeyens.arduino.core.toolChain.release.1600398586/A.EXTRA.TIME.UTC/delimiter=\:
environment/project/it.baeyens.arduino.core.toolChain.release.1600398586/A.EXTRA.TIME.UTC/operation=replace environment/project/it.baeyens.arduino.core.toolChain.release.1600398586/A.EXTRA.TIME.UTC/operation=replace
environment/project/it.baeyens.arduino.core.toolChain.release.1600398586/A.EXTRA.TIME.UTC/value=1430895139 environment/project/it.baeyens.arduino.core.toolChain.release.1600398586/A.EXTRA.TIME.UTC/value=1431549381
environment/project/it.baeyens.arduino.core.toolChain.release.1600398586/A.EXTRA.TIME.ZONE/delimiter=\: environment/project/it.baeyens.arduino.core.toolChain.release.1600398586/A.EXTRA.TIME.ZONE/delimiter=\:
environment/project/it.baeyens.arduino.core.toolChain.release.1600398586/A.EXTRA.TIME.ZONE/operation=replace environment/project/it.baeyens.arduino.core.toolChain.release.1600398586/A.EXTRA.TIME.ZONE/operation=replace
environment/project/it.baeyens.arduino.core.toolChain.release.1600398586/A.EXTRA.TIME.ZONE/value=3600 environment/project/it.baeyens.arduino.core.toolChain.release.1600398586/A.EXTRA.TIME.ZONE/value=3600
@ -355,7 +355,7 @@ environment/project/it.baeyens.arduino.core.toolChain.release.1600398586/JANTJE.
environment/project/it.baeyens.arduino.core.toolChain.release.1600398586/JANTJE.BOARD_NAME/value=Arduino Mega or Mega 2560 environment/project/it.baeyens.arduino.core.toolChain.release.1600398586/JANTJE.BOARD_NAME/value=Arduino Mega or Mega 2560
environment/project/it.baeyens.arduino.core.toolChain.release.1600398586/JANTJE.COM_PORT/delimiter=\: environment/project/it.baeyens.arduino.core.toolChain.release.1600398586/JANTJE.COM_PORT/delimiter=\:
environment/project/it.baeyens.arduino.core.toolChain.release.1600398586/JANTJE.COM_PORT/operation=replace environment/project/it.baeyens.arduino.core.toolChain.release.1600398586/JANTJE.COM_PORT/operation=replace
environment/project/it.baeyens.arduino.core.toolChain.release.1600398586/JANTJE.COM_PORT/value=/dev/tty.usbmodemfa131 environment/project/it.baeyens.arduino.core.toolChain.release.1600398586/JANTJE.COM_PORT/value=/dev/tty.usbmodemfd111
environment/project/it.baeyens.arduino.core.toolChain.release.1600398586/JANTJE.COM_PROGMR/delimiter=\: environment/project/it.baeyens.arduino.core.toolChain.release.1600398586/JANTJE.COM_PROGMR/delimiter=\:
environment/project/it.baeyens.arduino.core.toolChain.release.1600398586/JANTJE.COM_PROGMR/operation=replace environment/project/it.baeyens.arduino.core.toolChain.release.1600398586/JANTJE.COM_PROGMR/operation=replace
environment/project/it.baeyens.arduino.core.toolChain.release.1600398586/JANTJE.COM_PROGMR/value=Default environment/project/it.baeyens.arduino.core.toolChain.release.1600398586/JANTJE.COM_PROGMR/value=Default

26
WiModbusGateway.cpp
View File

@ -11,6 +11,7 @@
#include "PString.h" #include "PString.h"
#include "Streaming.h" #include "Streaming.h"
#include "PubSubClient.h" #include "PubSubClient.h"
#include <avr/wdt.h>
@ -22,7 +23,8 @@ LiquidCrystal lcd = LiquidCrystal(A0, A1, A2, A3, A4, A5);
// WiFiUDP udpSock; // WiFiUDP udpSock;
WiFiClient wifiClient; WiFiClient wifiClient;
//byte server[] = { 192, 168, 87, 100 }; //byte server[] = { 192, 168, 87, 100 };
byte server[] = { 172, 16, 2, 16 }; //byte server[] = { 172, 16, 2, 16 };
char server[] = "mqttbroker";
PubSubClient client(server, 1883, callback, wifiClient); PubSubClient client(server, 1883, callback, wifiClient);
uint8_t disconnectState = 0; uint8_t disconnectState = 0;
uint32_t disconnectTime = 0; uint32_t disconnectTime = 0;
@ -33,7 +35,7 @@ uint32_t disconnectTime = 0;
char ssid[] = "MessWLAN"; char ssid[] = "MessWLAN";
char pass[] = "UNVmpwbr6heQnMQ7ykXT"; char pass[] = "UNVmpwbr6heQnMQ7ykXT";
Metro tick = Metro(10000); Metro minute = Metro(60000);
Metro second = Metro(1000); Metro second = Metro(1000);
uint32_t uptime; uint32_t uptime;
@ -130,6 +132,8 @@ void setup() {
// Mb.R[123] = 0xdead; // magic // Mb.R[123] = 0xdead; // magic
// Mb.R[124] = 0xbeef; // Mb.R[124] = 0xbeef;
wdt_enable(WDTO_8S);
// modbusAppBegin(&Mb); // modbusAppBegin(&Mb);
modbusAppBegin(); modbusAppBegin();
@ -177,6 +181,8 @@ void updateDisplay() {
} }
void loop() { void loop() {
wdt_reset();
updateDisplay(); updateDisplay();
modbusAppExec(); modbusAppExec();
@ -221,9 +227,9 @@ void loop() {
if (second.check() == 1) {
uptime++;
if (minute.check() == 1) {
char strbuf[256]; char strbuf[256];
memset(strbuf, sizeof(strbuf), 0); memset(strbuf, sizeof(strbuf), 0);
PString buf = PString(strbuf, sizeof(strbuf)); PString buf = PString(strbuf, sizeof(strbuf));
@ -239,14 +245,22 @@ void loop() {
"}" << "}" <<
"}" << endl; "}" << endl;
if (disconnectState == 0) { if (disconnectState == 0) {
client.publish("IoT", strbuf); client.publish("IoT/WiFiPowerMeter/Measurement", strbuf);
} }
} }
if (tick.check() == 1) { if (second.check() == 1) {
uptime++;
Serial.println("tick"); Serial.println("tick");
String msg = String("{ \"metadata\": { \"device\": \"WiFiPowerMeter\" }, \"data\": { \"uptime\": ") + uptime + String("}}");
if (disconnectState == 0) {
client.publish("IoT/WiFiPowerMeter/Heartbeat", (char*)msg.c_str());
}
} }
} }