uart: Make rxtx_overlapped test-case use format=hex.

diff --git a/decoder/test/uart/rxtx_overlapped.output b/decoder/test/uart/rxtx_overlapped.output
index 0f5a13dabb5de4df901c166a71055def4c6f2248..b9afa4fadd522c7216b95632e9ac4592a7e0691c 100644 (file)
--- a/decoder/test/uart/rxtx_overlapped.output
+++ b/decoder/test/uart/rxtx_overlapped.output
@@ -7,7 +7,7 @@
 163-180 uart: rx-data-bits: "1"
 180-197 uart: rx-data-bits: "1"
 198-215 uart: rx-data-bits: "0"
-76-215 uart: rx-data: "~"
+76-215 uart: rx-data: "7E"
 215-232 uart: rx-parity-ok: "Stop bit" "Stop" "T"
 232-249 uart: rx-start: "Start bit" "Start" "S"
 249-266 uart: rx-data-bits: "0"
@@ -18,7 +18,7 @@
 336-353 uart: rx-data-bits: "0"
 353-370 uart: rx-data-bits: "0"
 371-388 uart: rx-data-bits: "0"
-249-388 uart: rx-data: "[00]"
+249-388 uart: rx-data: "00"
 388-405 uart: rx-parity-ok: "Stop bit" "Stop" "T"
 405-422 uart: rx-start: "Start bit" "Start" "S"
 422-439 uart: rx-data-bits: "0"
@@ -32,7 +32,7 @@
 526-543 uart: rx-data-bits: "0"
 535-552 uart: tx-data-bits: "1"
 544-561 uart: rx-data-bits: "0"
-422-561 uart: rx-data: "[10]"
+422-561 uart: rx-data: "10"
 553-570 uart: tx-data-bits: "1"
 561-578 uart: rx-parity-ok: "Stop bit" "Stop" "T"
 570-587 uart: tx-data-bits: "1"
@@ -44,7 +44,7 @@
 622-639 uart: tx-data-bits: "1"
 630-647 uart: rx-data-bits: "0"
 640-657 uart: tx-data-bits: "0"
-518-657 uart: tx-data: "~"
+518-657 uart: tx-data: "7E"
 647-664 uart: rx-data-bits: "0"
 657-674 uart: tx-parity-ok: "Stop bit" "Stop" "T"
 664-681 uart: rx-data-bits: "0"
@@ -54,7 +54,7 @@
 699-716 uart: rx-data-bits: "0"
 708-725 uart: tx-data-bits: "0"
 717-734 uart: rx-data-bits: "0"
-595-734 uart: rx-data: " "
+595-734 uart: rx-data: "20"
 726-743 uart: tx-data-bits: "0"
 734-751 uart: rx-parity-ok: "Stop bit" "Stop" "T"
 743-760 uart: tx-data-bits: "0"
@@ -66,7 +66,7 @@
 795-812 uart: tx-data-bits: "0"
 804-821 uart: rx-data-bits: "0"
 813-830 uart: tx-data-bits: "0"
-691-830 uart: tx-data: "[00]"
+691-830 uart: tx-data: "00"
 821-838 uart: rx-data-bits: "0"
 830-847 uart: tx-parity-ok: "Stop bit" "Stop" "T"
 838-855 uart: rx-data-bits: "0"
@@ -76,7 +76,7 @@
 873-890 uart: rx-data-bits: "0"
 881-898 uart: tx-data-bits: "1"
 891-908 uart: rx-data-bits: "0"
-769-908 uart: rx-data: "[01]"
+769-908 uart: rx-data: "01"
 899-916 uart: tx-data-bits: "0"
 908-925 uart: rx-parity-ok: "Stop bit" "Stop" "T"
 916-933 uart: tx-data-bits: "0"
@@ -88,7 +88,7 @@
 968-985 uart: tx-data-bits: "0"
 977-994 uart: rx-data-bits: "0"
 986-1003 uart: tx-data-bits: "0"
-864-1003 uart: tx-data: "[03]"
+864-1003 uart: tx-data: "03"
 994-1011 uart: rx-data-bits: "0"
 1003-1020 uart: tx-parity-ok: "Stop bit" "Stop" "T"
 1011-1028 uart: rx-data-bits: "0"
@@ -98,7 +98,7 @@
 1046-1063 uart: rx-data-bits: "1"
 1055-1072 uart: tx-data-bits: "0"
 1064-1081 uart: rx-data-bits: "1"
-942-1081 uart: rx-data: "[C0]"
+942-1081 uart: rx-data: "C0"
 1073-1090 uart: tx-data-bits: "0"
 1081-1098 uart: rx-parity-ok: "Stop bit" "Stop" "T"
 1090-1107 uart: tx-data-bits: "1"
@@ -110,7 +110,7 @@
 1142-1159 uart: tx-data-bits: "0"
 1150-1167 uart: rx-data-bits: "0"
 1160-1177 uart: tx-data-bits: "1"
-1038-1177 uart: tx-data: "[89]"
+1038-1177 uart: tx-data: "89"
 1167-1184 uart: rx-data-bits: "1"
 1177-1194 uart: tx-parity-ok: "Stop bit" "Stop" "T"
 1184-1201 uart: rx-data-bits: "0"
@@ -120,7 +120,7 @@
 1219-1236 uart: rx-data-bits: "0"
 1228-1245 uart: tx-data-bits: "0"
 1237-1254 uart: rx-data-bits: "1"
-1115-1254 uart: rx-data: "[A8]"
+1115-1254 uart: rx-data: "A8"
 1246-1263 uart: tx-data-bits: "0"
 1254-1271 uart: rx-parity-ok: "Stop bit" "Stop" "T"
 1263-1280 uart: tx-data-bits: "0"
@@ -132,7 +132,7 @@
 1315-1332 uart: tx-data-bits: "0"
 1324-1341 uart: rx-data-bits: "0"
 1333-1350 uart: tx-data-bits: "0"
-1211-1350 uart: tx-data: "[01]"
+1211-1350 uart: tx-data: "01"
 1341-1358 uart: rx-data-bits: "0"
 1350-1367 uart: tx-parity-ok: "Stop bit" "Stop" "T"
 1358-1375 uart: rx-data-bits: "1"
@@ -142,7 +142,7 @@
 1393-1410 uart: rx-data-bits: "0"
 1401-1418 uart: tx-data-bits: "0"
 1411-1428 uart: rx-data-bits: "1"
-1289-1428 uart: rx-data: "[B0]"
+1289-1428 uart: rx-data: "B0"
 1419-1436 uart: tx-data-bits: "0"
 1428-1445 uart: rx-parity-ok: "Stop bit" "Stop" "T"
 1436-1453 uart: tx-data-bits: "0"
@@ -154,7 +154,7 @@
 1488-1505 uart: tx-data-bits: "0"
 1497-1514 uart: rx-data-bits: "1"
 1506-1523 uart: tx-data-bits: "0"
-1384-1523 uart: tx-data: "[00]"
+1384-1523 uart: tx-data: "00"
 1514-1531 uart: rx-data-bits: "1"
 1523-1540 uart: tx-parity-ok: "Stop bit" "Stop" "T"
 1531-1548 uart: rx-data-bits: "1"
@@ -164,7 +164,7 @@
 1566-1583 uart: rx-data-bits: "0"
 1575-1592 uart: tx-data-bits: "0"
 1584-1601 uart: rx-data-bits: "0"
-1462-1601 uart: rx-data: "\1f"
+1462-1601 uart: rx-data: "1F"
 1593-1610 uart: tx-data-bits: "1"
 1601-1618 uart: rx-parity-ok: "Stop bit" "Stop" "T"
 1610-1627 uart: tx-data-bits: "0"
@@ -176,12 +176,12 @@
 1662-1679 uart: tx-data-bits: "1"
 1670-1687 uart: rx-data-bits: "0"
 1680-1697 uart: tx-data-bits: "0"
-1558-1697 uart: tx-data: "u"
+1558-1697 uart: tx-data: "75"
 1687-1704 uart: rx-data-bits: "1"
 1697-1714 uart: tx-parity-ok: "Stop bit" "Stop" "T"
 1704-1721 uart: rx-data-bits: "1"
 1722-1739 uart: rx-data-bits: "0"
 1739-1756 uart: rx-data-bits: "0"
 1757-1774 uart: rx-data-bits: "1"
-1635-1774 uart: rx-data: "[9A]"
+1635-1774 uart: rx-data: "9A"
 1774-1791 uart: rx-parity-ok: "Stop bit" "Stop" "T"

diff --git a/decoder/test/uart/test.conf b/decoder/test/uart/test.conf
index ad7094afb52cfbd064938d542049ba2a8d74cf6c..d5df2075822b189a2b5290f6e0822182fd2228cd 100644 (file)
--- a/decoder/test/uart/test.conf
+++ b/decoder/test/uart/test.conf
@@ -115,7 +115,7 @@ test hello_world_8o1_115200
        output uart binary class tx match hello_world_8o1_115200.bin_tx
 
 test rxtx_overlapped
-       protocol-decoder uart channel rx=3 channel tx=4
+       protocol-decoder uart channel rx=3 channel tx=4 option format=hex
        input uart/rxtx_overlapped/rxtx_overlapped.sr
        output uart annotation match rxtx_overlapped.output
        output uart python match rxtx_overlapped.python