nils/ebusd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added TTQ data type

Browse Source
This commit is contained in:
john30
2016-12-10 17:18:30 +01:00
parent a995d2c982
commit cc7f61f78d
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/ebus/datatype.cpp
+1
View File
@@ -995,6 +995,7 @@ DataTypeList::DataTypeList()
add(new DateTimeDataType("MIN", 16, SPE, 0xff, false, true, 0)); // time, minutes since last midnight, 00:00 - 24:00 (minutes + hour * 60 as integer)
add(new DateTimeDataType("TTM", 8, 0, 0x90, false, true, 10)); // truncated time (only multiple of 10 minutes), 00:00 - 24:00 (minutes div 10 + hour * 6 as integer)
add(new DateTimeDataType("TTH", 8, 0, 0, false, true, 30)); // truncated time (only multiple of 30 minutes), 00:00 - 24:00 (minutes div 30 + hour * 2 as integer)
add(new DateTimeDataType("TTQ", 8, 0, 0, false, true, 15)); // truncated time (only multiple of 15 minutes), 00:00 - 24:00 (minutes div 15 + hour * 4 as integer)
add(new NumberDataType("BDY", 8, DAY, 0x07, 0, 6, 1)); // weekday, "Mon" - "Sun" (0x00 - 0x06) [eBUS type]
add(new NumberDataType("HDY", 8, DAY, 0x00, 1, 7, 1)); // weekday, "Mon" - "Sun" (0x01 - 0x07) [Vaillant type]
add(new NumberDataType("BCD", 8, BCD, 0xff, 0, 99, 1)); // unsigned decimal in BCD, 0 - 99
src/lib/ebus/test/test_data.cpp
+9
View File
@@ -168,6 +168,15 @@ int main()
{"x,,tth", "-:-", "10fe07000100", "00", ""},
{"x,,tth", "", "10fe07000131", "00", "rw"},
{"x,,tth,2", "", "", "", "c"},
{"x,,ttq", "22:30", "10fe0700015a", "00", ""},
{"x,,ttq", "00:30", "10fe07000102", "00", ""},
{"x,,ttq", "23:31", "10fe0700015e", "00", "R"},
{"x,,ttq", "23:44", "10fe0700015f", "00", "R"},
{"x,,ttq", "23:45", "10fe0700015f", "00", ""},
{"x,,ttq", "24:00", "10fe07000160", "00", ""},
{"x,,ttq", "-:-", "10fe07000100", "00", ""},
{"x,,ttq", "", "10fe07000161", "00", "rw"},
{"x,,ttq,2", "", "", "", "c"},
{"x,,bdy", "Mon", "10fe07000100", "00", ""},
{"x,,bdy", "Sun", "10fe07000106", "00", ""},
{"x,,bdy", "8", "10fe07000108", "00", "w"},