diff options
| -rw-r--r-- | decoders/dmx512/pd.py | 4 | ||||
| -rw-r--r-- | decoders/edid/pd.py | 2 | ||||
| -rw-r--r-- | decoders/enc28j60/pd.py | 2 | ||||
| -rw-r--r-- | decoders/jtag_ejtag/pd.py | 2 | ||||
| -rw-r--r-- | decoders/sda2506/pd.py | 2 | ||||
| -rw-r--r-- | decoders/spdif/pd.py | 2 | ||||
| -rw-r--r-- | decoders/uart/pd.py | 4 |
7 files changed, 9 insertions, 9 deletions
diff --git a/decoders/dmx512/pd.py b/decoders/dmx512/pd.py index 4ecc4db..3fd2aba 100644 --- a/decoders/dmx512/pd.py +++ b/decoders/dmx512/pd.py @@ -46,9 +46,9 @@ class Decoder(srd.Decoder): ('error', 'Error'), ) annotation_rows = ( - ('name', 'Logical', (1, 2, 5, 6, 7, 8)), - ('data', 'Data', (9,)), ('bits', 'Bits', (0, 3, 4)), + ('data', 'Data', (9,)), + ('name', 'Logical', (1, 2, 5, 6, 7, 8)), ('errors', 'Errors', (10,)), ) diff --git a/decoders/edid/pd.py b/decoders/edid/pd.py index 2d7460c..e2e7fee 100644 --- a/decoders/edid/pd.py +++ b/decoders/edid/pd.py @@ -87,8 +87,8 @@ class Decoder(srd.Decoder): ('sections', 'EDID structure sections'), ) annotation_rows = ( - ('sections', 'Sections', (1,)), ('fields', 'Fields', (0,)), + ('sections', 'Sections', (1,)), ) def __init__(self): diff --git a/decoders/enc28j60/pd.py b/decoders/enc28j60/pd.py index f7a6625..e8ce6e7 100644 --- a/decoders/enc28j60/pd.py +++ b/decoders/enc28j60/pd.py @@ -67,9 +67,9 @@ class Decoder(srd.Decoder): ('warning', 'Warning'), ) annotation_rows = ( + ('fields', 'Fields', (ANN_DATA, ANN_REG_ADDR)), ('commands', 'Commands', (ANN_RCR, ANN_RBM, ANN_WCR, ANN_WBM, ANN_BFS, ANN_BFC, ANN_SRC)), - ('fields', 'Fields', (ANN_DATA, ANN_REG_ADDR)), ('warnings', 'Warnings', (ANN_WARNING,)), ) diff --git a/decoders/jtag_ejtag/pd.py b/decoders/jtag_ejtag/pd.py index f16f0b4..5a537c9 100644 --- a/decoders/jtag_ejtag/pd.py +++ b/decoders/jtag_ejtag/pd.py @@ -207,9 +207,9 @@ class Decoder(srd.Decoder): ) annotation_rows = ( ('instructions', 'Instructions', (0,)), - ('regs', 'Registers', regs_items['rows_range']), ('control_fields_in', 'Control fields in', (10,)), ('control_fields_out', 'Control fields out', (11,)), + ('regs', 'Registers', regs_items['rows_range']), ('pracc', 'PrAcc', (12,)), ) diff --git a/decoders/sda2506/pd.py b/decoders/sda2506/pd.py index 782fd83..9ae5c01 100644 --- a/decoders/sda2506/pd.py +++ b/decoders/sda2506/pd.py @@ -46,8 +46,8 @@ class Decoder(srd.Decoder): ) annotation_rows = ( ('bits', 'Bits', (ann_cmdbit, ann_databit)), - ('commands', 'Commands', (ann_cmd,)), ('data', 'Data', (ann_data,)), + ('commands', 'Commands', (ann_cmd,)), ('warnings', 'Warnings', (ann_warning,)), ) diff --git a/decoders/spdif/pd.py b/decoders/spdif/pd.py index 532bf82..bec28cf 100644 --- a/decoders/spdif/pd.py +++ b/decoders/spdif/pd.py @@ -47,8 +47,8 @@ class Decoder(srd.Decoder): ('parity', 'Parity Bit'), ) annotation_rows = ( - ('info', 'Info', (0, 1, 3, 5, 6, 7, 8)), ('bits', 'Bits', (2,)), + ('info', 'Info', (0, 1, 3, 5, 6, 7, 8)), ('samples', 'Samples', (4,)), ) diff --git a/decoders/uart/pd.py b/decoders/uart/pd.py index 1492aed..802c593 100644 --- a/decoders/uart/pd.py +++ b/decoders/uart/pd.py @@ -141,13 +141,13 @@ class Decoder(srd.Decoder): ('tx-packet', 'TX packet'), ) annotation_rows = ( - ('rx-data', 'RX', (0, 2, 4, 6, 8)), ('rx-data-bits', 'RX bits', (12,)), + ('rx-data', 'RX', (0, 2, 4, 6, 8)), ('rx-warnings', 'RX warnings', (10,)), ('rx-break', 'RX break', (14,)), ('rx-packets', 'RX packets', (16,)), - ('tx-data', 'TX', (1, 3, 5, 7, 9)), ('tx-data-bits', 'TX bits', (13,)), + ('tx-data', 'TX', (1, 3, 5, 7, 9)), ('tx-warnings', 'TX warnings', (11,)), ('tx-break', 'TX break', (15,)), ('tx-packets', 'TX packets', (17,)), |