github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-01-29 05:20:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Getting more values, fixing some bugs

Browse Source
This commit is contained in:
Roar Fredriksen
2017-10-24 22:36:33 +02:00
parent d1c2ca7093
commit d206c57747
11 changed files with 37 additions and 517 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Code/Arduino/HanReader/src/HanReader.cpp
View File

@@ -115,7 +115,10 @@ int HanReader::findValuePosition(int dataPosition, byte *buffer, int start, int
time_t HanReader::getTime(int dataPosition, byte *buffer, int start, int length)
{
// TODO: check if the time is represented always as a 12 byte string (0x09 0x0C)
int timeStart = findValuePosition(dataPosition, buffer, start, length);
timeStart += 2;
int year = buffer[start + timeStart] << 8 |
buffer[start + timeStart + 1];
@@ -154,7 +157,6 @@ int HanReader::getInt(int dataPosition, byte *buffer, int start, int length)
value = value << 8 | buffer[i];
}
debug->println(value);
return value;
}
return 0;
@@ -166,7 +168,7 @@ String HanReader::getString(int dataPosition, byte *buffer, int start, int lengt
if (valuePosition > 0)
{
String value = String("");
for (int i = valuePosition + 2; i < valuePosition + buffer[valuePosition + 1]; i++)
for (int i = valuePosition + 2; i < valuePosition + buffer[valuePosition + 1] + 2; i++)
{
value += String((char)buffer[i]);
}