code style

This commit is contained in:
john30
2017-01-14 15:02:10 +01:00
parent b3bb2e08ac
commit 54a6c0f673
32 changed files with 484 additions and 665 deletions
+234 -234
View File
@@ -86,45 +86,45 @@ int main() {
{"x,,hex:5, == 48 61 6c 6c 6f", "", "10fe070005ababababab", "00", "rW"},
{"x,,hex:5,=48 61 6c 6c 6f", "", "10fe07000548616c6c6f", "00", ""},
{"x,,hex:5, == 48 61 6c 6c 6f", "", "10fe07000548616c6c6f", "00", ""},
{"x,,bda", "26.10.2014","10fe07000426100614", "00", ""}, // Sunday
{"x,,bda", "01.01.2000","10fe07000401010500", "00", ""}, // Saturday
{"x,,bda", "31.12.2099","10fe07000431120399", "00", ""}, // Thursday
{"x,,bda", "-.-.-", "10fe070004ffff00ff", "00", ""},
{"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", "-.-.-", "10fe070003ffffff", "00", ""},
{"x,,bda:3", "", "10fe070003321299", "00", "rw"},
{"x,,bda,2", "", "", "", "c"},
{"x,,hda", "26.10.2014","10fe0700041a0a070e", "00", ""}, // Sunday
{"x,,hda", "01.01.2000","10fe07000401010600", "00", ""}, // Saturday
{"x,,hda", "31.12.2099","10fe0700041f0c0463", "00", ""}, // Thursday
{"x,,hda", "-.-.-", "10fe070004ffff00ff", "00", ""},
{"x,,hda", "", "10fe070004200c0463", "00", "rw"},
{"x,,hda:3", "26.10.2014","10fe0700031a0a0e", "00", ""},
{"x,,hda:3", "01.01.2000","10fe070003010100", "00", ""},
{"x,,hda:3", "31.12.2099","10fe0700031f0c63", "00", ""},
{"x,,hda:3", "-.-.-", "10fe070003ffffff", "00", ""},
{"x,,hda:3", "", "10fe070003200c63", "00", "rw"},
{"x,,hda,2", "", "", "", "c"},
{"x,,day", "26.10.2014","10fe070002d0a3", "00", ""},
{"x,,day", "01.01.2000","10fe070002ac8e", "00", ""},
{"x,,day", "31.12.2078","10fe07000262ff", "00", ""},
{"x,,day", "-.-.-", "10fe070002ffff", "00", ""},
{"x,,day", "", "10fe0700020000", "00", "Rw"},
{"x,,bti", "21:04:58", "10fe070003580421", "00", ""},
{"x,,bti", "00:00:00", "10fe070003000000", "00", ""},
{"x,,bti", "23:59:59", "10fe070003595923", "00", ""},
{"x,,bti", "-:-:-", "10fe070003ffffff", "00", ""},
{"x,,bti", "", "10fe070003605923", "00", "rw"},
{"x,,bti,2", "", "", "", "c"},
{"x,,hti", "21:04:58", "10fe07000315043a", "00", ""},
{"x,,hti", "-:-:-", "10fe070003ffffff", "00", ""},
{"x,,hti,2", "", "", "", "c"},
{"x,,vti", "21:04:58", "10fe0700033a0415", "00", ""},
{"x,,vti", "-:-:-", "10fe070003636363", "00", ""},
{"x,,vti,2", "", "", "", "c"},
{"x,,bda", "26.10.2014", "10fe07000426100614", "00", ""}, // Sunday
{"x,,bda", "01.01.2000", "10fe07000401010500", "00", ""}, // Saturday
{"x,,bda", "31.12.2099", "10fe07000431120399", "00", ""}, // Thursday
{"x,,bda", "-.-.-", "10fe070004ffff00ff", "00", ""},
{"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", "-.-.-", "10fe070003ffffff", "00", ""},
{"x,,bda:3", "", "10fe070003321299", "00", "rw"},
{"x,,bda,2", "", "", "", "c"},
{"x,,hda", "26.10.2014", "10fe0700041a0a070e", "00", ""}, // Sunday
{"x,,hda", "01.01.2000", "10fe07000401010600", "00", ""}, // Saturday
{"x,,hda", "31.12.2099", "10fe0700041f0c0463", "00", ""}, // Thursday
{"x,,hda", "-.-.-", "10fe070004ffff00ff", "00", ""},
{"x,,hda", "", "10fe070004200c0463", "00", "rw"},
{"x,,hda:3", "26.10.2014", "10fe0700031a0a0e", "00", ""},
{"x,,hda:3", "01.01.2000", "10fe070003010100", "00", ""},
{"x,,hda:3", "31.12.2099", "10fe0700031f0c63", "00", ""},
{"x,,hda:3", "-.-.-", "10fe070003ffffff", "00", ""},
{"x,,hda:3", "", "10fe070003200c63", "00", "rw"},
{"x,,hda,2", "", "", "", "c"},
{"x,,day", "26.10.2014", "10fe070002d0a3", "00", ""},
{"x,,day", "01.01.2000", "10fe070002ac8e", "00", ""},
{"x,,day", "31.12.2078", "10fe07000262ff", "00", ""},
{"x,,day", "-.-.-", "10fe070002ffff", "00", ""},
{"x,,day", "", "10fe0700020000", "00", "Rw"},
{"x,,bti", "21:04:58", "10fe070003580421", "00", ""},
{"x,,bti", "00:00:00", "10fe070003000000", "00", ""},
{"x,,bti", "23:59:59", "10fe070003595923", "00", ""},
{"x,,bti", "-:-:-", "10fe070003ffffff", "00", ""},
{"x,,bti", "", "10fe070003605923", "00", "rw"},
{"x,,bti,2", "", "", "", "c"},
{"x,,hti", "21:04:58", "10fe07000315043a", "00", ""},
{"x,,hti", "-:-:-", "10fe070003ffffff", "00", ""},
{"x,,hti,2", "", "", "", "c"},
{"x,,vti", "21:04:58", "10fe0700033a0415", "00", ""},
{"x,,vti", "-:-:-", "10fe070003636363", "00", ""},
{"x,,vti,2", "", "", "", "c"},
{"x,,btm", "21:04", "10fe0700020421", "00", ""},
{"x,,btm", "00:00", "10fe0700020000", "00", ""},
{"x,,btm", "23:59", "10fe0700025923", "00", ""},
@@ -191,9 +191,9 @@ int main() {
{"x,,hdy", "Mon", "10fe07000101", "00", ""},
{"x,,hdy", "Sun", "10fe07000107", "00", ""},
{"x,,hdy", "8", "10fe07000108", "00", "w"},
{"x,,pin","1234", "10feffff021234", "00", ""},
{"x,,pin","0000", "10feffff020000", "00", ""},
{"x,,pin","9999", "10feffff029999", "00", ""},
{"x,,pin", "1234", "10feffff021234", "00", ""},
{"x,,pin", "0000", "10feffff020000", "00", ""},
{"x,,pin", "9999", "10feffff029999", "00", ""},
{"x,,pin", "", "10feffff020000", "00", "Rw"},
{"x,,pin", "100", "10feffff020100", "00", "R"},
{"x,,bcd", "26", "10feffff0126", "00", ""},
@@ -202,194 +202,194 @@ int main() {
{"x,,bcd", "100", "10feffff0199", "00", "Rw"},
{"x,,bcd", "-", "10feffff01ff", "00", ""},
{"x,,bcd", "", "10feffff019a", "00", "rw"},
{"x,,bcd:1","26", "10feffff0126", "00", ""},
{"x,,bcd:1","0", "10feffff0100", "00", ""},
{"x,,bcd:1","99", "10feffff0199", "00", ""},
{"x,,bcd:1","100", "10feffff0199", "00", "Rw"},
{"x,,bcd:1","-", "10feffff01ff", "00", ""},
{"x,,bcd:1","", "10feffff019a", "00", "rw"},
{"x,,bcd:2","126", "10feffff022601", "00", ""},
{"x,,bcd:2","0", "10feffff020000", "00", ""},
{"x,,bcd:2","9999", "10feffff029999", "00", ""},
{"x,,bcd:2","10000","10feffff029999", "00", "Rw"},
{"x,,bcd:2","-", "10feffff02ffff", "00", ""},
{"x,,bcd:2","", "10feffff029a00", "00", "rw"},
{"x,,bcd:3","12346", "10feffff03462301", "00", ""},
{"x,,bcd:3","0", "10feffff03000000", "00", ""},
{"x,,bcd:3","999999", "10feffff03999999", "00", ""},
{"x,,bcd:3","1000000","10feffff03999999", "00", "Rw"},
{"x,,bcd:3","-", "10feffff03ffffff", "00", ""},
{"x,,bcd:3","", "10feffff03009a00", "00", "rw"},
{"x,,bcd:4","1234567", "10feffff0467452301", "00", ""},
{"x,,bcd:4","0", "10feffff0400000000", "00", ""},
{"x,,bcd:4","99999999", "10feffff0499999999", "00", ""},
{"x,,bcd:4","100000000","10feffff0499999999", "00", "Rw"},
{"x,,bcd:4","-", "10feffff04ffffffff", "00", ""},
{"x,,bcd:4","", "10feffff0400009a00", "00", "rw"},
{"x,,hcd:1", "26", "10feffff011a", "00", ""},
{"x,,hcd:1", "0", "10feffff0100", "00", ""},
{"x,,hcd:1", "99", "10feffff0163", "00", ""},
{"x,,hcd:1", "100", "10feffff0163", "00", "Rw"},
{"x,,hcd:1", "", "10feffff019a", "00", "rw"},
{"x,,hcd:2", "126", "10feffff021a01", "00", ""},
{"x,,hcd:2", "0", "10feffff020000", "00", ""},
{"x,,hcd:2", "9999", "10feffff026363", "00", ""},
{"x,,hcd:2", "10000", "10feffff026363", "00", "Rw"},
{"x,,hcd:2", "", "10feffff029a00", "00", "rw"},
{"x,,hcd:3","12346", "10feffff032e1701", "00", ""},
{"x,,hcd:3","0", "10feffff03000000", "00", ""},
{"x,,hcd:3","999999", "10feffff03636363", "00", ""},
{"x,,hcd:3","1000000", "10feffff03636363", "00", "Rw"},
{"x,,hcd:3","", "10feffff03009a00", "00", "rw"},
{"x,,hcd:4","1234567", "10feffff04432d1701", "00", ""},
{"x,,hcd:4","0", "10feffff0400000000", "00", ""},
{"x,,hcd:4","99999999", "10feffff0463636363", "00", ""},
{"x,,hcd:4","100000000","10feffff0463636363", "00", "Rw"},
{"x,,hcd","", "10feffff0400006400", "00", "rw"},
{"x,,hcd","1234567", "10feffff04432d1701", "00", ""},
{"x,,hcd","0", "10feffff0400000000", "00", ""},
{"x,,hcd","99999999", "10feffff0463636363", "00", ""},
{"x,,hcd","100000000", "10feffff0463636363", "00", "Rw"},
{"x,,hcd","", "10feffff0400006400", "00", "rw"},
{"x,,str:16", "0123456789ABCDEF", "10feffff1130313233343536373839414243444546", "00", ""},
{"x,,uch:17", "", "10feffff00", "00", "c"},
{"x,s,uch", "0", "1025ffff0310111213", "0300010203", "W"},
{"x,s,uch", "0", "1025ffff00", "0100", ""},
{"x,s,uch,,,,y,m,uch", "3;2","1025ffff0103", "0102", ""},
{"x,,uch", "38", "10feffff0126", "00", ""},
{"x,,uch", "38.5", "10feffff0126", "00", "R"},
{"x,,uch", "0", "10feffff0100", "00", ""},
{"x,,uch", "254", "10feffff01fe", "00", ""},
{"x,,uch", "-", "10feffff01ff", "00", ""},
{"x,,uch,10", "3.8", "10feffff0126", "00", ""},
{"x,,uch,-10", "380","10feffff0126", "00", ""},
{"x,,uch,=48", "", "10feffff01ab", "00", "W"},
{"x,,bcd:1", "26", "10feffff0126", "00", ""},
{"x,,bcd:1", "0", "10feffff0100", "00", ""},
{"x,,bcd:1", "99", "10feffff0199", "00", ""},
{"x,,bcd:1", "100", "10feffff0199", "00", "Rw"},
{"x,,bcd:1", "-", "10feffff01ff", "00", ""},
{"x,,bcd:1", "", "10feffff019a", "00", "rw"},
{"x,,bcd:2", "126", "10feffff022601", "00", ""},
{"x,,bcd:2", "0", "10feffff020000", "00", ""},
{"x,,bcd:2", "9999", "10feffff029999", "00", ""},
{"x,,bcd:2", "10000", "10feffff029999", "00", "Rw"},
{"x,,bcd:2", "-", "10feffff02ffff", "00", ""},
{"x,,bcd:2", "", "10feffff029a00", "00", "rw"},
{"x,,bcd:3", "12346", "10feffff03462301", "00", ""},
{"x,,bcd:3", "0", "10feffff03000000", "00", ""},
{"x,,bcd:3", "999999", "10feffff03999999", "00", ""},
{"x,,bcd:3", "1000000", "10feffff03999999", "00", "Rw"},
{"x,,bcd:3", "-", "10feffff03ffffff", "00", ""},
{"x,,bcd:3", "", "10feffff03009a00", "00", "rw"},
{"x,,bcd:4", "1234567", "10feffff0467452301", "00", ""},
{"x,,bcd:4", "0", "10feffff0400000000", "00", ""},
{"x,,bcd:4", "99999999", "10feffff0499999999", "00", ""},
{"x,,bcd:4", "100000000", "10feffff0499999999", "00", "Rw"},
{"x,,bcd:4", "-", "10feffff04ffffffff", "00", ""},
{"x,,bcd:4", "", "10feffff0400009a00", "00", "rw"},
{"x,,hcd:1", "26", "10feffff011a", "00", ""},
{"x,,hcd:1", "0", "10feffff0100", "00", ""},
{"x,,hcd:1", "99", "10feffff0163", "00", ""},
{"x,,hcd:1", "100", "10feffff0163", "00", "Rw"},
{"x,,hcd:1", "", "10feffff019a", "00", "rw"},
{"x,,hcd:2", "126", "10feffff021a01", "00", ""},
{"x,,hcd:2", "0", "10feffff020000", "00", ""},
{"x,,hcd:2", "9999", "10feffff026363", "00", ""},
{"x,,hcd:2", "10000", "10feffff026363", "00", "Rw"},
{"x,,hcd:2", "", "10feffff029a00", "00", "rw"},
{"x,,hcd:3", "12346", "10feffff032e1701", "00", ""},
{"x,,hcd:3", "0", "10feffff03000000", "00", ""},
{"x,,hcd:3", "999999", "10feffff03636363", "00", ""},
{"x,,hcd:3", "1000000", "10feffff03636363", "00", "Rw"},
{"x,,hcd:3", "", "10feffff03009a00", "00", "rw"},
{"x,,hcd:4", "1234567", "10feffff04432d1701", "00", ""},
{"x,,hcd:4", "0", "10feffff0400000000", "00", ""},
{"x,,hcd:4", "99999999", "10feffff0463636363", "00", ""},
{"x,,hcd:4", "100000000", "10feffff0463636363", "00", "Rw"},
{"x,,hcd", "", "10feffff0400006400", "00", "rw"},
{"x,,hcd", "1234567", "10feffff04432d1701", "00", ""},
{"x,,hcd", "0", "10feffff0400000000", "00", ""},
{"x,,hcd", "99999999", "10feffff0463636363", "00", ""},
{"x,,hcd", "100000000", "10feffff0463636363", "00", "Rw"},
{"x,,hcd", "", "10feffff0400006400", "00", "rw"},
{"x,,str:16", "0123456789ABCDEF", "10feffff1130313233343536373839414243444546", "00", ""},
{"x,,uch:17", "", "10feffff00", "00", "c"},
{"x,s,uch", "0", "1025ffff0310111213", "0300010203", "W"},
{"x,s,uch", "0", "1025ffff00", "0100", ""},
{"x,s,uch,,,,y,m,uch", "3;2", "1025ffff0103", "0102", ""},
{"x,,uch", "38", "10feffff0126", "00", ""},
{"x,,uch", "38.5", "10feffff0126", "00", "R"},
{"x,,uch", "0", "10feffff0100", "00", ""},
{"x,,uch", "254", "10feffff01fe", "00", ""},
{"x,,uch", "-", "10feffff01ff", "00", ""},
{"x,,uch,10", "3.8", "10feffff0126", "00", ""},
{"x,,uch,-10", "380", "10feffff0126", "00", ""},
{"x,,uch,=48", "", "10feffff01ab", "00", "W"},
{"x,,uch, == 48", "", "10feffff01ab", "00", "rW"},
{"x,,uch,=48", "", "10feffff0130", "00", ""},
{"x,,uch,=48", "", "10feffff0130", "00", ""},
{"x,,uch, == 48", "", "10feffff0130", "00", ""},
{"x,,sch", "-90", "10feffff01a6", "00", ""},
{"x,,sch", "0", "10feffff0100", "00", ""},
{"x,,sch", "-1", "10feffff01ff", "00", ""},
{"x,,sch", "-", "10feffff0180", "00", ""},
{"x,,sch", "-127", "10feffff0181", "00", ""},
{"x,,sch", "127", "10feffff017f", "00", ""},
{"x,,sch,10", "-9.0","10feffff01a6", "00", ""},
{"x,,sch,-10","-900","10feffff01a6", "00", ""},
{"x,,d1b", "-90", "10feffff01a6", "00", ""},
{"x,,d1b", "0", "10feffff0100", "00", ""},
{"x,,d1b", "-1", "10feffff01ff", "00", ""},
{"x,,d1b", "-", "10feffff0180", "00", ""},
{"x,,d1b", "-127", "10feffff0181", "00", ""},
{"x,,d1b", "127", "10feffff017f", "00", ""},
{"x,,d1b,-10","-900","10feffff01a6", "00", ""},
{"x,,sch", "-90", "10feffff01a6", "00", ""},
{"x,,sch", "0", "10feffff0100", "00", ""},
{"x,,sch", "-1", "10feffff01ff", "00", ""},
{"x,,sch", "-", "10feffff0180", "00", ""},
{"x,,sch", "-127", "10feffff0181", "00", ""},
{"x,,sch", "127", "10feffff017f", "00", ""},
{"x,,sch,10", "-9.0", "10feffff01a6", "00", ""},
{"x,,sch,-10", "-900", "10feffff01a6", "00", ""},
{"x,,d1b", "-90", "10feffff01a6", "00", ""},
{"x,,d1b", "0", "10feffff0100", "00", ""},
{"x,,d1b", "-1", "10feffff01ff", "00", ""},
{"x,,d1b", "-", "10feffff0180", "00", ""},
{"x,,d1b", "-127", "10feffff0181", "00", ""},
{"x,,d1b", "127", "10feffff017f", "00", ""},
{"x,,d1b,-10", "-900", "10feffff01a6", "00", ""},
{"x,,d1c", "19.5", "10feffff0127", "00", ""},
{"x,,d1c", "0.0", "10feffff0100", "00", ""},
{"x,,d1c", "100.0", "10feffff01c8", "00", ""},
{"x,,d1c", "-", "10feffff01ff", "00", ""},
{"x,,uin", "38", "10feffff022600", "00", ""},
{"x,,uin", "0", "10feffff020000", "00", ""},
{"x,,uin", "65534", "10feffff02feff", "00", ""},
{"x,,uin", "-", "10feffff02ffff", "00", ""},
{"x,,uin,10", "3.8", "10feffff022600", "00", ""},
{"x,,uin,-10","380", "10feffff022600", "00", ""},
{"x,,uir", "38", "10feffff020026", "00", ""},
{"x,,uir", "0", "10feffff020000", "00", ""},
{"x,,uir", "65534", "10feffff02fffe", "00", ""},
{"x,,uir", "-", "10feffff02ffff", "00", ""},
{"x,,uir,10", "3.8", "10feffff020026", "00", ""},
{"x,,uir,-10","380", "10feffff020026", "00", ""},
{"uin10,uin,-10","", "", "", "t"}, // template
{"x,,uin10","380", "10feffff022600", "00", ""}, // template reference
{"x,,uin10,-10","3800","10feffff022600", "00", ""}, // template reference, valid divider product
{"x,,uin10,10","","", "", "c"}, // template reference, invalid divider product
{"x,,sin", "-90", "10feffff02a6ff", "00", ""},
{"x,,sin", "0", "10feffff020000", "00", ""},
{"x,,sin", "-1", "10feffff02ffff", "00", ""},
{"x,,sin", "-", "10feffff020080", "00", ""},
{"x,,sin", "-32767", "10feffff020180", "00", ""},
{"x,,sin", "32767", "10feffff02ff7f", "00", ""},
{"x,,sin,10","-9.0", "10feffff02a6ff", "00", ""},
{"x,,sin,-10","-900","10feffff02a6ff", "00", ""},
{"x,,sir", "-90", "10feffff02ffa6", "00", ""},
{"x,,sir", "0", "10feffff020000", "00", ""},
{"x,,sir", "-1", "10feffff02ffff", "00", ""},
{"x,,sir", "-", "10feffff028000", "00", ""},
{"x,,sir", "-32767", "10feffff028001", "00", ""},
{"x,,sir", "32767", "10feffff027fff", "00", ""},
{"x,,sir,10","-9.0", "10feffff02ffa6", "00", ""},
{"x,,sir,-10","-900","10feffff02ffa6", "00", ""},
{"x,,u3n", "38", "10feffff03260000", "00", ""},
{"x,,u3n", "0", "10feffff03000000", "00", ""},
{"x,,uin", "38", "10feffff022600", "00", ""},
{"x,,uin", "0", "10feffff020000", "00", ""},
{"x,,uin", "65534", "10feffff02feff", "00", ""},
{"x,,uin", "-", "10feffff02ffff", "00", ""},
{"x,,uin,10", "3.8", "10feffff022600", "00", ""},
{"x,,uin,-10", "380", "10feffff022600", "00", ""},
{"x,,uir", "38", "10feffff020026", "00", ""},
{"x,,uir", "0", "10feffff020000", "00", ""},
{"x,,uir", "65534", "10feffff02fffe", "00", ""},
{"x,,uir", "-", "10feffff02ffff", "00", ""},
{"x,,uir,10", "3.8", "10feffff020026", "00", ""},
{"x,,uir,-10", "380", "10feffff020026", "00", ""},
{"uin10,uin,-10", "", "", "", "t"}, // template
{"x,,uin10", "380", "10feffff022600", "00", ""}, // template reference
{"x,,uin10,-10", "3800", "10feffff022600", "00", ""}, // template reference, valid divider product
{"x,,uin10,10", "", "", "", "c"}, // template reference, invalid divider product
{"x,,sin", "-90", "10feffff02a6ff", "00", ""},
{"x,,sin", "0", "10feffff020000", "00", ""},
{"x,,sin", "-1", "10feffff02ffff", "00", ""},
{"x,,sin", "-", "10feffff020080", "00", ""},
{"x,,sin", "-32767", "10feffff020180", "00", ""},
{"x,,sin", "32767", "10feffff02ff7f", "00", ""},
{"x,,sin,10", "-9.0", "10feffff02a6ff", "00", ""},
{"x,,sin,-10", "-900", "10feffff02a6ff", "00", ""},
{"x,,sir", "-90", "10feffff02ffa6", "00", ""},
{"x,,sir", "0", "10feffff020000", "00", ""},
{"x,,sir", "-1", "10feffff02ffff", "00", ""},
{"x,,sir", "-", "10feffff028000", "00", ""},
{"x,,sir", "-32767", "10feffff028001", "00", ""},
{"x,,sir", "32767", "10feffff027fff", "00", ""},
{"x,,sir,10", "-9.0", "10feffff02ffa6", "00", ""},
{"x,,sir,-10", "-900", "10feffff02ffa6", "00", ""},
{"x,,u3n", "38", "10feffff03260000", "00", ""},
{"x,,u3n", "0", "10feffff03000000", "00", ""},
{"x,,u3n", "16777214", "10feffff03feffff", "00", ""},
{"x,,u3n", "-", "10feffff03ffffff", "00", ""},
{"x,,u3n,10", "3.8", "10feffff03260000", "00", ""},
{"x,,u3n,-10","380", "10feffff03260000", "00", ""},
{"x,,u3r", "38", "10feffff03000026", "00", ""},
{"x,,u3r", "0", "10feffff03000000", "00", ""},
{"x,,u3n", "-", "10feffff03ffffff", "00", ""},
{"x,,u3n,10", "3.8", "10feffff03260000", "00", ""},
{"x,,u3n,-10", "380", "10feffff03260000", "00", ""},
{"x,,u3r", "38", "10feffff03000026", "00", ""},
{"x,,u3r", "0", "10feffff03000000", "00", ""},
{"x,,u3r", "16777214", "10feffff03fffffe", "00", ""},
{"x,,u3r", "-", "10feffff03ffffff", "00", ""},
{"x,,u3r,10", "3.8", "10feffff03000026", "00", ""},
{"x,,u3r,-10","380", "10feffff03000026", "00", ""},
{"x,,s3n", "-90", "10feffff03a6ffff", "00", ""},
{"x,,s3n", "0", "10feffff03000000", "00", ""},
{"x,,s3n", "-1", "10feffff03ffffff", "00", ""},
{"x,,s3n", "-", "10feffff03000080", "00", ""},
{"x,,u3r", "-", "10feffff03ffffff", "00", ""},
{"x,,u3r,10", "3.8", "10feffff03000026", "00", ""},
{"x,,u3r,-10", "380", "10feffff03000026", "00", ""},
{"x,,s3n", "-90", "10feffff03a6ffff", "00", ""},
{"x,,s3n", "0", "10feffff03000000", "00", ""},
{"x,,s3n", "-1", "10feffff03ffffff", "00", ""},
{"x,,s3n", "-", "10feffff03000080", "00", ""},
{"x,,s3n", "-8388607", "10feffff03010080", "00", ""},
{"x,,s3n", "8388607", "10feffff03ffff7f", "00", ""},
{"x,,s3n,10","-9.0", "10feffff03a6ffff", "00", ""},
{"x,,s3n,-10","-900","10feffff03a6ffff", "00", ""},
{"x,,s3r", "-90", "10feffff03ffffa6", "00", ""},
{"x,,s3r", "0", "10feffff03000000", "00", ""},
{"x,,s3r", "-1", "10feffff03ffffff", "00", ""},
{"x,,s3r", "-", "10feffff03800000", "00", ""},
{"x,,s3n,10", "-9.0", "10feffff03a6ffff", "00", ""},
{"x,,s3n,-10", "-900", "10feffff03a6ffff", "00", ""},
{"x,,s3r", "-90", "10feffff03ffffa6", "00", ""},
{"x,,s3r", "0", "10feffff03000000", "00", ""},
{"x,,s3r", "-1", "10feffff03ffffff", "00", ""},
{"x,,s3r", "-", "10feffff03800000", "00", ""},
{"x,,s3r", "-8388607", "10feffff03800001", "00", ""},
{"x,,s3r", "8388607", "10feffff037fffff", "00", ""},
{"x,,s3r,10","-9.0", "10feffff03ffffa6", "00", ""},
{"x,,s3r,-10","-900","10feffff03ffffa6", "00", ""},
{"x,,s3r,10", "-9.0", "10feffff03ffffa6", "00", ""},
{"x,,s3r,-10", "-900", "10feffff03ffffa6", "00", ""},
{"x,,flt", "-0.090", "10feffff02a6ff", "00", ""},
{"x,,flt", "0.000", "10feffff020000", "00", ""},
{"x,,flt", "-0.001", "10feffff02ffff", "00", ""},
{"x,,flt", "-", "10feffff020080", "00", ""},
{"x,,flt","-32.767", "10feffff020180", "00", ""},
{"x,,flt", "-32.767", "10feffff020180", "00", ""},
{"x,,flt", "32.767", "10feffff02ff7f", "00", ""},
{"x,,flr", "-0.090", "10feffff02ffa6", "00", ""},
{"x,,flr", "0.000", "10feffff020000", "00", ""},
{"x,,flr", "-0.001", "10feffff02ffff", "00", ""},
{"x,,flr", "-", "10feffff028000", "00", ""},
{"x,,flr","-32.767", "10feffff028001", "00", ""},
{"x,,flr", "-32.767", "10feffff028001", "00", ""},
{"x,,flr", "32.767", "10feffff027fff", "00", ""},
{"x,,exp", "-0.09", "10feffff04ec51b8bd", "00", ""},
{"x,,exp", "0.0", "10feffff0400000000", "00", ""},
{"x,,exp", "-0.001", "10feffff046f1283ba", "00", ""},
{"x,,exp", "-", "10feffff040000807f", "00", ""},
{"x,,exp","-32.767", "10feffff04681103c2", "00", ""},
{"x,,exp", "-32.767", "10feffff04681103c2", "00", ""},
{"x,,exp,1000", "-0.000090000", "10feffff04ec51b8bd", "00", ""},
{"x,,exp,-100", "-9", "10feffff04ec51b8bd", "00", ""},
{"x,,exr", "-0.09", "10feffff04bdb851ec", "00", ""},
{"x,,exr", "0.0", "10feffff0400000000", "00", ""},
{"x,,exr", "-0.001", "10feffff04ba83126f", "00", ""},
{"x,,exr", "-", "10feffff047f800000", "00", ""},
{"x,,exr","-32.767", "10feffff04c2031168", "00", ""},
{"x,,exr,1000", "-0.000090000", "10feffff04bdb851ec", "00", ""},
{"x,,exr", "-32.767", "10feffff04c2031168", "00", ""},
{"x,,exr,1000", "-0.000090000", "10feffff04bdb851ec", "00", ""},
{"x,,exr,-100", "-9", "10feffff04bdb851ec", "00", ""},
{"x,,d2b", "18.004", "10fe0700090112", "00", ""},
{"x,,d2b", "0.000", "10feffff020000", "00", ""},
{"x,,d2b", "-0.004", "10feffff02ffff", "00", ""},
{"x,,d2b", "-", "10feffff020080", "00", ""},
{"x,,d2b","-127.996","10feffff020180", "00", ""},
{"x,,d2b", "127.996","10feffff02ff7f", "00", ""},
{"x,,d2c", "288.06", "10fe0700090112", "00", ""},
{"x,,d2c", "0.00", "10feffff020000", "00", ""},
{"x,,d2c", "-0.06", "10feffff02ffff", "00", ""},
{"x,,d2c", "-", "10feffff020080", "00", ""},
{"x,,d2c","-2047.94","10feffff020180", "00", ""},
{"x,,d2c", "2047.94","10feffff02ff7f", "00", ""},
{"x,,d2b", "18.004", "10fe0700090112", "00", ""},
{"x,,d2b", "0.000", "10feffff020000", "00", ""},
{"x,,d2b", "-0.004", "10feffff02ffff", "00", ""},
{"x,,d2b", "-", "10feffff020080", "00", ""},
{"x,,d2b", "-127.996", "10feffff020180", "00", ""},
{"x,,d2b", "127.996", "10feffff02ff7f", "00", ""},
{"x,,d2c", "288.06", "10fe0700090112", "00", ""},
{"x,,d2c", "0.00", "10feffff020000", "00", ""},
{"x,,d2c", "-0.06", "10feffff02ffff", "00", ""},
{"x,,d2c", "-", "10feffff020080", "00", ""},
{"x,,d2c", "-2047.94", "10feffff020180", "00", ""},
{"x,,d2c", "2047.94", "10feffff02ff7f", "00", ""},
{"x,,ulg", "38", "10feffff0426000000", "00", ""},
{"x,,ulg", "0", "10feffff0400000000", "00", ""},
{"x,,ulg", "4294967294", "10feffff04feffffff", "00", ""},
{"x,,ulg", "-", "10feffff04ffffffff", "00", ""},
{"x,,ulg,10","3.8", "10feffff0426000000", "00", ""},
{"x,,ulg,-10","380", "10feffff0426000000", "00", ""},
{"x,,ulg,10", "3.8", "10feffff0426000000", "00", ""},
{"x,,ulg,-10", "380", "10feffff0426000000", "00", ""},
{"x,,ulg,0x0FF0F00F = VRT 350 ;0x33CCCC33=VRT 360;0x3CC3C33C=SD 17;0x66999966=SD 37;0x69969669=VRT 360+",
"VRT 350", "10feffff040FF0F00F", "00", ""},
{"x,,ulg,0x=test", "", "10feffff040FF0F00F", "00", "c"},
@@ -397,8 +397,8 @@ int main() {
{"x,,ulr", "0", "10feffff0400000000", "00", ""},
{"x,,ulr", "4294967294", "10feffff04fffffffe", "00", ""},
{"x,,ulr", "-", "10feffff04ffffffff", "00", ""},
{"x,,ulr,10","3.8", "10feffff0400000026", "00", ""},
{"x,,ulr,-10","380", "10feffff0400000026", "00", ""},
{"x,,ulr,10", "3.8", "10feffff0400000026", "00", ""},
{"x,,ulr,-10", "380", "10feffff0400000026", "00", ""},
{"x,,slg", "-90", "10feffff04a6ffffff", "00", ""},
{"x,,slg", "0", "10feffff0400000000", "00", ""},
{"x,,slg", "-1", "10feffff04ffffffff", "00", ""},
@@ -409,53 +409,53 @@ int main() {
{"x,,slr", "-1", "10feffff04ffffffff", "00", ""},
{"x,,slr,10", "-9.0", "10feffff04ffffffa6", "00", ""},
{"x,,slr,-10", "-900", "10feffff04ffffffa6", "00", ""},
{"x,,bi3", "1", "10feffff0108", "00", ""},
{"x,,bi3", "0", "10feffff0100", "00", ""},
{"x,,bi3,0=off;1=on","on", "10feffff0108", "00", ""},
{"x,,bi3,0=off;1=on","off","10feffff0100", "00", ""},
{"x,,bi3", "1", "10feffff0108", "00", ""},
{"x,,bi3", "0", "10feffff0100", "00", ""},
{"x,,bi3,0=off;1=on", "on", "10feffff0108", "00", ""},
{"x,,bi3,0=off;1=on", "off", "10feffff0100", "00", ""},
{"x,,bi3:2", "1", "10feffff0108", "00", ""},
{"x,,bi3:2", "1", "10feffff01ef", "00", "W"},
{"x,,bi3:2", "0", "10feffff0100", "00", ""},
{"x,,bi3:2", "3", "10feffff0118", "00", ""},
{"x,,bi3:2,1=on","on", "10feffff0108", "00", ""},
{"x,,bi3:2,1=on","-", "10feffff0100", "00", ""},
{"x,,bi3:2,0=off;1=on;2=auto;3=eco","auto", "10feffff0110", "00", ""},
{"x,,bi3:2,0=off;1=on;2=auto;3=eco","2.5", "10feffff0110", "00", "R"},
{"x,,bi3:2,0=off;1=on","on", "10feffff0108", "00", ""},
{"x,,bi3:2,0=off;1=on","off","10feffff0100", "00", ""},
{"x,,bi3:2,0=off;1=on","1", "10feffff0108", "00", "n"},
{"x,,bi3:2,0=off;1=on,ja/nein,Wahrheitswert","x=on ja/nein [Wahrheitswert]", "10feffff0108", "00", "vvv"},
{"x,,bi3:2,0=off;1=on,ja/nein,Wahrheitswert","x=1 ja/nein [Wahrheitswert]", "10feffff0108", "00", "vvvn"},
{"x,,bi3:2,0=off;1=on,ja/nein,Wahrheitswert","\n \"x\": {\"value\": \"on\"}", "10feffff0108", "00", "vj"},
{",,bi3:2,0=off;1=on,ja/nein,Wahrheitswert", "\n \"0\": {\"name\": \"\", \"value\": \"on\"}", "10feffff0108", "00", "vj"},
{",,bi3:2,0=off;1=on,ja/nein,Wahrheitswert", "\n \"0\": {\"name\": \"\", \"value\": \"on\"}", "10feffff0108", "00", "j"},
{"x,,bi3:2,0=off;1=on,ja/nein,Wahrheitswert","\n \"x\": {\"value\": \"on\", \"unit\": \"ja/nein\", \"comment\": \"Wahrheitswert\"}", "10feffff0108", "00", "vvvj"},
{"x,,bi3:2,0=off;1=on,ja/nein,Wahrheitswert","\n \"x\": {\"value\": 1}", "10feffff0108", "00", "vnj"},
{"x,,bi3:2,0=off;1=on,ja/nein,Wahrheitswert","\n \"x\": {\"value\": 1, \"unit\": \"ja/nein\", \"comment\": \"Wahrheitswert\"}", "10feffff0108", "00", "vvvnj"},
{"x,,bi3:2,0=off;1=on,ja/nein,Wahrheitswert","\n \"0\": {\"name\": \"x\", \"value\": 1}", "10feffff0108", "00", "nj"},
{"x,,uch,1=test;2=high;3=off;0x10=on","on","10feffff0110", "00", ""},
{"x,s,uch","3","1050ffff00", "0103", ""},
{"x,,d2b,,°C,Aussentemperatur","x=18.004 °C [Aussentemperatur]","10fe0700090112", "00", "vvv"},
{"x,,bti,,,,y,,bda,,,,z,,bdy", "21:04:58;26.10.2014;Sun","10fe0700085804212610061406", "00", ""}, // combination
{"x,,bi3:2,1=on", "on", "10feffff0108", "00", ""},
{"x,,bi3:2,1=on", "-", "10feffff0100", "00", ""},
{"x,,bi3:2,0=off;1=on;2=auto;3=eco", "auto", "10feffff0110", "00", ""},
{"x,,bi3:2,0=off;1=on;2=auto;3=eco", "2.5", "10feffff0110", "00", "R"},
{"x,,bi3:2,0=off;1=on", "on", "10feffff0108", "00", ""},
{"x,,bi3:2,0=off;1=on", "off", "10feffff0100", "00", ""},
{"x,,bi3:2,0=off;1=on", "1", "10feffff0108", "00", "n"},
{"x,,bi3:2,0=off;1=on,ja/nein,Wahrheitswert", "x=on ja/nein [Wahrheitswert]", "10feffff0108", "00", "vvv"},
{"x,,bi3:2,0=off;1=on,ja/nein,Wahrheitswert", "x=1 ja/nein [Wahrheitswert]", "10feffff0108", "00", "vvvn"},
{"x,,bi3:2,0=off;1=on,ja/nein,Wahrheitswert", "\n \"x\": {\"value\": \"on\"}", "10feffff0108", "00", "vj"},
{",,bi3:2,0=off;1=on,ja/nein,Wahrheitswert", "\n \"0\": {\"name\": \"\", \"value\": \"on\"}", "10feffff0108", "00", "vj"},
{",,bi3:2,0=off;1=on,ja/nein,Wahrheitswert", "\n \"0\": {\"name\": \"\", \"value\": \"on\"}", "10feffff0108", "00", "j"},
{"x,,bi3:2,0=off;1=on,ja/nein,Wahrheitswert", "\n \"x\": {\"value\": \"on\", \"unit\": \"ja/nein\", \"comment\": \"Wahrheitswert\"}", "10feffff0108", "00", "vvvj"},
{"x,,bi3:2,0=off;1=on,ja/nein,Wahrheitswert", "\n \"x\": {\"value\": 1}", "10feffff0108", "00", "vnj"},
{"x,,bi3:2,0=off;1=on,ja/nein,Wahrheitswert", "\n \"x\": {\"value\": 1, \"unit\": \"ja/nein\", \"comment\": \"Wahrheitswert\"}", "10feffff0108", "00", "vvvnj"},
{"x,,bi3:2,0=off;1=on,ja/nein,Wahrheitswert", "\n \"0\": {\"name\": \"x\", \"value\": 1}", "10feffff0108", "00", "nj"},
{"x,,uch,1=test;2=high;3=off;0x10=on", "on", "10feffff0110", "00", ""},
{"x,s,uch", "3", "1050ffff00", "0103", ""},
{"x,,d2b,,°C,Aussentemperatur", "x=18.004 °C [Aussentemperatur]", "10fe0700090112", "00", "vvv"},
{"x,,bti,,,,y,,bda,,,,z,,bdy", "21:04:58;26.10.2014;Sun", "10fe0700085804212610061406", "00", ""}, // combination
{"x,,bi3,,,,y,,bi5", "1;0", "10feffff0108", "00", ""}, // bit combination
{"x,,bi3,,,,y,,bi5", "1;1", "10feffff0128", "00", ""}, // bit combination
{"x,,bi3,,,,y,,bi5", "0;1", "10feffff0120", "00", ""}, // bit combination
{"x,,bi3,,,,y,,bi5", "0;0", "10feffff0100", "00", ""}, // bit combination
{"x,,bi3,,,,y,,bi7,,,,t,,uch", "0;0;9","10feffff020009", "00", ""}, // bit combination
{"x,,bi6:2,,,,y,,bi0:2,,,,t,,uch", "2;1;9","10feffff03800109", "00", ""}, // bit combination
{"x,,BI0;BI1;BI2;BI3;BI4;BI5;BI6;BI7", "0;0;1;0;0;0;0;0","ff75b50900", "0104", ""}, // bits
{"temp,d2b,,°C,Aussentemperatur","","", "", "t"}, // template with relative pos
{"x,,temp","18.004","10fe0700020112", "00", ""}, // reference to template
{"x,,temp,10","1.8004","10fe0700020112", "00", ""}, // reference to template, valid divider product
{"x,,temp,-10","","", "", "c"}, // reference to template, invalid divider product
{"relrel,d2b,,,,y,d1c","","", "", "t"}, // template struct with relative pos
{"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
{"x,,temp;HEX:2","18.004;13 14","10fe07000401121314", "00", ""}, // reference to template and base type
{"x,,temp;HEX:2","temp=18.004;=13 14","10fe07000401121314", "00", "v"}, // reference to template and base type
{"x,,temp:degrees;HEX:2","degrees=18.004;=13 14","10fe07000401121314", "00", "v"}, // reference to template and base type
{"x,,bi3,,,,y,,bi7,,,,t,,uch", "0;0;9", "10feffff020009", "00", ""}, // bit combination
{"x,,bi6:2,,,,y,,bi0:2,,,,t,,uch", "2;1;9", "10feffff03800109", "00", ""}, // bit combination
{"x,,BI0;BI1;BI2;BI3;BI4;BI5;BI6;BI7", "0;0;1;0;0;0;0;0", "ff75b50900", "0104", ""}, // bits
{"temp,d2b,,°C,Aussentemperatur", "", "", "", "t"}, // template with relative pos
{"x,,temp", "18.004", "10fe0700020112", "00", ""}, // reference to template
{"x,,temp,10", "1.8004", "10fe0700020112", "00", ""}, // reference to template, valid divider product
{"x,,temp,-10", "", "", "", "c"}, // reference to template, invalid divider product
{"relrel,d2b,,,,y,d1c", "", "", "", "t"}, // template struct with relative pos
{"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
{"x,,temp;HEX:2", "18.004;13 14", "10fe07000401121314", "00", ""}, // reference to template and base type
{"x,,temp;HEX:2", "temp=18.004;=13 14", "10fe07000401121314", "00", "v"}, // reference to template and base type
{"x,,temp:degrees;HEX:2", "degrees=18.004;=13 14", "10fe07000401121314", "00", "v"}, // reference to template and base type
};
DataFieldTemplates* templates = new DataFieldTemplates();
DataField* fields = NULL;
+1 -1
View File
@@ -22,7 +22,7 @@
using namespace std;
int main () {
int main() {
Device* device = Device::create("/dev/ttyUSB20", true, false, false);
if (device == NULL) {
cout << "unable to create device" << endl;
+3 -4
View File
@@ -71,7 +71,7 @@ int main() {
{"pumpstate,UCH,0=off;1=on;2=overrun,,Pumpenstatus", "", "", "", "template"},
{"tempsensor,temp;sensor,,Temperatursensor", "", "", "", "template"},
{"tempsensorc,temp;sensorc,,Temperatursensor", "", "", "", "template"},
{"r,,Status01,VL/RL/AussenTemp/VLWW/SpeicherTemp/Status,,08,B511,01,,,temp1;temp1;temp2;temp1;temp1;pumpstate","28.0;24.0;4.938;35.0;41.0;4","ff08b5110101","093830f00446520400ff","d"},
{"r,,Status01,VL/RL/AussenTemp/VLWW/SpeicherTemp/Status,,08,B511,01,,,temp1;temp1;temp2;temp1;temp1;pumpstate", "28.0;24.0;4.938;35.0;41.0;4", "ff08b5110101", "093830f00446520400ff", "d"},
{"r,message circuit,message name,message comment,,25,B509,0d2800,,,tempsensor", "temp=-14.00 Temperatursensor [Temperatur];sensor=ok [Fühlerstatus]", "ff25b509030d2800", "0320ff00", "mD"},
{"r,message circuit,message name,message comment,,25,B509,0d2800,,,tempsensor,,field unit,field comment", "temp=-14.00 field unit [field comment];sensor=ok [Fühlerstatus]", "ff25b509030d2800", "0320ff00", "mD"},
{"r,message circuit,message name,message comment,,25,B509,0d2800,,,tempsensor,,field unit,field comment", "\n \"temp\": {\"value\": -14.00},\n \"sensor\": {\"value\": \"ok\"}", "ff25b509030d2800", "0320ff00", "mj"},
@@ -99,8 +99,8 @@ int main() {
{"r,ehp,error,,,08,b509,0d2800,index,m,UCH,,,,,,time", "index=3;time=15:00:17", "ff08b509040d280003", "0311000f", "mD"},
{"u,ehp,ActualEnvironmentPower,Energiebezug,,08,B509,29BA00,,s,IGN:2,,,,,s,power", "8", "1008b5090329ba00", "03ba0008", "pm"},
{"uw,ehp,test,Test,,08,B5de,ab,,,power,,,,,s,hex:1", "8;39", "1008b5de02ab08", "0139", "pm"},
{"u,ehp,hwTankTemp,Speichertemperatur IST,,25,B509,290000,,,IGN:2,,,,,,tempsensor", "","","","M"},
{"", "55.50;ok","1025b50903290000","050000780300","d"},
{"u,ehp,hwTankTemp,Speichertemperatur IST,,25,B509,290000,,,IGN:2,,,,,,tempsensor", "", "", "", "M"},
{"", "55.50;ok", "1025b50903290000", "050000780300", "d"},
{"r,ehp,datetime,Datum Uhrzeit,,50,B504,00,,,dcfstate,,,,time,,BTI,,,,date,,BDA,,,,temp,,temp2", "valid;08:24:51;31.12.2014;-0.875", "1050b5040100", "0a035124083112031420ff", "md" },
{"r,ehp,bad,invalid pos,,50,B5ff,000102,,m,HEX:8;tempsensor;tempsensor;tempsensor;tempsensor;power;power,,,", "", "", "", "c" },
{"r,ehp,bad,invalid pos,,50,B5ff,,,s,HEX:8;tempsensor;tempsensor;tempsensor;tempsensor;tempsensor;power;power,,,", "", "", "", "c" },
@@ -418,5 +418,4 @@ int main() {
delete *it;
}
return 0;
}