From 0c65f53abcc340fc72efb4884f28c081dcbba242 Mon Sep 17 00:00:00 2001
From: fredlcore
Date: Mon, 27 Feb 2017 23:56:08 +0100
Subject: [PATCH] Add files via upload
---
BSB_lan/BSB_lan/BSB_lan.ino | 104 ++++++++++++++++++++++++++++---
BSB_lan/BSB_lan/BSB_lan_config.h | 19 ++++--
BSB_lan/BSB_lan/BSB_lan_defs.h | 86 ++++++++++++++-----------
3 files changed, 162 insertions(+), 47 deletions(-)
diff --git a/BSB_lan/BSB_lan/BSB_lan.ino b/BSB_lan/BSB_lan/BSB_lan.ino
index a6ff0c03..453c4999 100644
--- a/BSB_lan/BSB_lan/BSB_lan.ino
+++ b/BSB_lan/BSB_lan/BSB_lan.ino
@@ -34,8 +34,12 @@
* 0.23 - 12.02.2017
* 0.24 - 14.02.2017
* 0.25 - 21.02.2017
+ * 0.26 - 27.02.2017
*
* Changelog:
+ * version 0.26
+ * - added functionality for logging on micro SD card, using the slot of the w5100 Ethernet shield
+ * - more parameters added (e.g. 8009)
* version 0.25
* - more FUJITSU parameters added
* version 0.24
@@ -146,6 +150,11 @@
EthernetClient client;
+#ifdef LOGGER
+ #include
+ File Logfile;
+#endif
+
#ifdef ONE_WIRE_BUS
#include "OneWire.h"
#include
@@ -164,7 +173,9 @@ EthernetClient client;
dht DHT;
#endif
-static unsigned long nextAvgTime = millis();
+static unsigned long lastAvgTime = millis();
+static unsigned long lastLogTime = millis();
+static unsigned long oldmillis = millis();
int numAverages = sizeof(avg_parameters) / sizeof(int);
double *avgValues = new double[numAverages];
double *avgValues_Old = new double[numAverages];
@@ -1377,6 +1388,10 @@ void webPrintSite() {
#ifdef USE_BROADCAST
client.print(F(" /B | query accumulated duration of burner on status captured from broadcast messages |
"));
client.print(F(" /B0 | reset accumulated duration of burner on status captured from broadcast messages |
"));
+#endif
+#ifdef LOGGER
+ client.print(F(" /D | dump logged data from datalog.txt on micro SD card |
"));
+ client.print(F(" /D0 | delete datalog.txt on micro SD card |
"));
#endif
client.print(F(" "));
client.print(F(" multiple queries are possible, e.g. /K0/710/8000-8999/T
"));
@@ -2045,12 +2060,12 @@ void Ipwe() {
webPrintHeader();
int i;
int counter = 0;
- int numIPWESensors = sizeof(bsb_parameters) / sizeof(int);
+ int numIPWESensors = sizeof(ipwe_parameters) / sizeof(int);
Serial.print("IPWE sensors: ");
Serial.println(numIPWESensors);
double ipwe_sensors[numIPWESensors];
for (i=0; i < numIPWESensors; i++) {
- ipwe_sensors[i] = strtod(query(bsb_parameters[i],bsb_parameters[i],1),NULL);
+ ipwe_sensors[i] = strtod(query(ipwe_parameters[i],ipwe_parameters[i],1),NULL);
}
client.print(F("