github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-04-25 03:45:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev-v1.1.0' into dev-v1.1.0-mqttraw

Browse Source
This commit is contained in:
Gunnar Skjold
2020-02-21 20:58:17 +01:00
parent 9c8552869c fdac8f88af
commit 73fd228e2f
4 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/HanReader/src/Aidon.h
View File

@@ -3,7 +3,6 @@
#ifndef _AIDON_h #ifndef _AIDON_h
#define _AIDON_h #define _AIDON_h
enum class Aidon enum class Aidon
{ {
List1 = 0x01, List1 = 0x01,

8
lib/HanReader/src/HanReader.cpp
View File

@@ -80,10 +80,10 @@ void HanReader::debugPrint(byte *buffer, int start, int length)
bool HanReader::read() bool HanReader::read()
{ {
if (han->available()) while(han->available()) {
{ if(read(han->read())) {
byte newByte = han->read(); return true;
return read(newByte); }
} }
return false; return false;
} }

1
lib/HanReader/src/Kamstrup.h
View File

@@ -3,7 +3,6 @@
#ifndef _KAMSTRUP_h #ifndef _KAMSTRUP_h
#define _KAMSTRUP_h #define _KAMSTRUP_h
enum class Kamstrup enum class Kamstrup
{ {
List3PhaseShort = 0x19, List3PhaseShort = 0x19,

2
web/index.html
View File

@@ -217,7 +217,7 @@ var setStatus = function(id, status) {
item.addClass('badge badge-' + status); item.addClass('badge badge-' + status);
}; };
var interval = 10000; var interval = 5000;
var fetch = function() { var fetch = function() {
$.ajax({ $.ajax({
url: '/data.json', url: '/data.json',