From 5230e2413e941487901626a8de2dc7b584204966 Mon Sep 17 00:00:00 2001 From: john30 Date: Sat, 17 Oct 2015 11:39:45 +0200 Subject: [PATCH] added base type VTM (reverse HTM) --- ChangeLog.md | 1 + src/lib/ebus/data.cpp | 1 + src/lib/ebus/test/test_data.cpp | 7 +++++++ 3 files changed, 9 insertions(+) diff --git a/ChangeLog.md b/ChangeLog.md index e9179130..00e2ac3f 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -25,6 +25,7 @@ * added possiblity to use a different name for referenced field template * added data type HCD (for Ochsner) * added base type TTH (truncated time with 30 minutes resolution) +* added base type VTM (reverse HTM) * added log entry for scan completion * automatically invalidate cached data of messages with same name+circuit (ignoring level) * added "info" command diff --git a/src/lib/ebus/data.cpp b/src/lib/ebus/data.cpp index 9cd78234..dafdcc60 100644 --- a/src/lib/ebus/data.cpp +++ b/src/lib/ebus/data.cpp @@ -53,6 +53,7 @@ static const dataType_t dataTypes[] = { {"HTI", 24, bt_tim, REQ, 0, 8, 8, 0}, // time, 00:00:00 - 23:59:59 (0x00,0x00,0x00 - 0x17,0x3b,0x3b) {"VTI", 24, bt_tim, REV, 0x63, 8, 8, 0}, // time, 00:00:00 - 23:59:59 (0x00,0x00,0x00 - 0x3b,0x3b,0x17, replacement 0x63) [Vaillant type] {"HTM", 16, bt_tim, REQ, 0, 5, 5, 0}, // time as hh:mm, 00:00 - 23:59 (0x00,0x00 - 0x17,0x3b) + {"VTM", 16, bt_tim, REV|REQ, 0, 5, 5, 0}, // time as hh:mm, 00:00 - 23:59 (0x00,0x00 - 0x3b,0x17) [Vaillant type] {"TTM", 8, bt_tim, 0, 0x90, 5, 5, 10}, // truncated time (only multiple of 10 minutes), 00:00 - 24:00 (minutes div 10 + hour * 6 as integer) {"TTH", 8, bt_tim, 0, 0, 5, 5, 30}, // truncated time (only multiple of 30 minutes), 00:30 - 24:00 (minutes div 30 + hour * 2 as integer) {"BDY", 8, bt_num, DAY|LST, 0x07, 0, 6, 1}, // weekday, "Mon" - "Sun" (0x00 - 0x06) [eBUS type] diff --git a/src/lib/ebus/test/test_data.cpp b/src/lib/ebus/test/test_data.cpp index f4fcb9a5..4c66dff6 100644 --- a/src/lib/ebus/test/test_data.cpp +++ b/src/lib/ebus/test/test_data.cpp @@ -98,6 +98,13 @@ int main() {"x,,htm", "", "10fe070002183b", "00", "rw"}, {"x,,htm", "24:01", "10fe0700021801", "00", "rw"}, {"x,,htm,2", "", "", "", "c"}, + {"x,,vtm", "21:04", "10fe0700020415", "00", ""}, + {"x,,vtm", "00:00", "10fe0700020000", "00", ""}, + {"x,,vtm", "23:59", "10fe0700023b17", "00", ""}, + {"x,,vtm", "24:00", "10fe0700020018", "00", ""}, + {"x,,vtm", "", "10fe0700023b18", "00", "rw"}, + {"x,,vtm", "24:01", "10fe0700020118", "00", "rw"}, + {"x,,vtm,2", "", "", "", "c"}, {"x,,ttm", "22:40", "10fe07000188", "00", ""}, {"x,,ttm", "00:00", "10fe07000100", "00", ""}, {"x,,ttm", "23:50", "10fe0700018f", "00", ""},