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

write weekday in BDA/32 and HDA/32, added constant, small fixes, added test cases for HDA

Browse Source
This commit is contained in:
john30
2014-11-22 20:42:39 +01:00
parent 24e46f5b44
commit f509d68912
2 changed files with 58 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/ebus/test/test_data.cpp
+12 -8
View File
@@ -52,14 +52,17 @@ int main()
{"x;;hex", "20", "10fe07000120", "00", ""},
{"x;;hex:10", "48 61 6c 6c 6f 2c 20 44 75 21", "10fe07000a48616c6c6f2c20447521", "00", ""},
{"x;;hex:11", "", "10fe07000a48616c6c6f2c20447521", "00", "rW"},
{"x;;bda", "26.10.2014","10fe07000426100014", "00", ""},
{"x;;bda", "01.01.2000","10fe07000401010000", "00", ""},
{"x;;bda", "31.12.2099","10fe07000431120099", "00", ""},
{"x;;bda", "26.10.2014","10fe07000426100614", "00", ""}, // Sunday
{"x;;hda", "26.10.2014","10fe07000426100714", "00", ""}, // Sunday
{"x;;bda", "01.01.2000","10fe07000401010500", "00", ""}, // Saturday
{"x;;hda", "01.01.2000","10fe07000401010600", "00", ""}, // Saturday
{"x;;bda", "31.12.2099","10fe07000431120399", "00", ""}, // Thursday
{"x;;hda", "31.12.2099","10fe07000431120499", "00", ""}, // Thursday
{"x;;bda", "", "10fe07000432100014", "00", "rw"},
{"x;;bda:3","26.10.2014","10fe070003261014", "00", ""},
{"x;;bda:3","01.01.2000","10fe070003010100", "00", ""},
{"x;;bda:3","31.12.2099","10fe070003311299", "00", ""},
{"x;;bda:3","", "10fe070003321299", "00", "rw"},
{"x;;bda:3", "26.10.2014","10fe070003261014", "00", ""},
{"x;;bda:3", "01.01.2000","10fe070003010100", "00", ""},
{"x;;bda:3", "31.12.2099","10fe070003311299", "00", ""},
{"x;;bda:3", "", "10fe070003321299", "00", "rw"},
{"x;;bti", "21:04:58", "10fe070003580421", "00", ""},
{"x;;bti", "00:00:00", "10fe070003000000", "00", ""},
{"x;;bti", "23:59:59", "10fe070003595923", "00", ""},
@@ -162,7 +165,7 @@ int main()
{"x;;uch;1=test,2=high,3=off,4=on","on","10feffff0104", "00", ""},
{"x;s;uch","3","1050ffff00", "0103", ""},
{"x;;d2b;;°C;Aussentemperatur","x=18.004 °C [Aussentemperatur]","10fe0700090112", "00", "v"},
{"x;;bti;;;;y;;bda;;;;z;;bdy", "21:04:58;26.10.2014;Sun","10fe0700085804212610001406", "00", ""}, // combination
{"x;;bti;;;;y;;bda;;;;z;;bdy", "21:04:58;26.10.2014;Sun","10fe0700085804212610061406", "00", ""}, // combination
{"x;;bi3;;;;y;;bi5", "1;-", "10feffff0108", "00", ""}, // bit combination
{"x;;bi3;;;;y;;bi5", "1;1", "10feffff0128", "00", ""}, // bit combination
{"x;;bi3;;;;y;;bi5", "-;1", "10feffff0120", "00", ""}, // bit combination
@@ -175,6 +178,7 @@ int main()
{"x;;relrel","18.004;9.5","10fe070003011213", "00", ""}, // reference to template struct
{"trelrel;;temp,temp","","", "", "t"}, // template struct with relative pos and ref to templates
{"x;;trelrel","18.004;19.008","10fe07000401120213", "00", ""}, // reference to template struct
{"x;;temp;;;;y;;d1c","18.004;9.5","10fe070003011213", "00", ""}, // reference to template, normal def
};
std::map<std::string, DataField*> templates;
DataField* fields = NULL;