srd: decoders: Rename obsolete timeoffset/duration.

[libsigrokdecode.git] / decoders / uart.py

diff --git a/decoders/uart.py b/decoders/uart.py
index c3a90ef046670d6e0ecccd0bc328bfd6491b319b..f0f3bf85065eda1fc3f9a3e1a7ea595f550f72db 100644 (file)
--- a/decoders/uart.py
+++ b/decoders/uart.py
@@ -219,21 +219,18 @@ class Decoder(srd.Decoder):
     }
     annotations = [
         # ANN_ASCII
-        ["ASCII", "TODO: description"],
+        ['ASCII', 'TODO: description'],
         # ANN_DEC
-        ["Decimal", "TODO: description"],
+        ['Decimal', 'TODO: description'],
         # ANN_HEX
-        ["Hex", "TODO: description"],
+        ['Hex', 'TODO: description'],
         # ANN_OCT
-        ["Octal", "TODO: description"],
+        ['Octal', 'TODO: description'],
         # ANN_BITS
-        ["Bits", "TODO: description"],
+        ['Bits', 'TODO: description'],
     ]
 
     def __init__(self, **kwargs):
-        self.out_proto = None
-        self.out_ann = None
-
         # Set defaults, can be overridden in 'start'.
         self.baudrate = 115200
         self.num_data_bits = 8
@@ -258,8 +255,8 @@ class Decoder(srd.Decoder):
 
     def start(self, metadata):
         self.samplerate = metadata['samplerate']
-        self.out_proto = self.add(srd.SRD_OUTPUT_PROTO, 'uart')
-        self.out_ann = self.add(srd.SRD_OUTPUT_ANN, 'uart')
+        self.out_proto = self.add(srd.OUTPUT_PROTO, 'uart')
+        self.out_ann = self.add(srd.OUTPUT_ANN, 'uart')
 
         # TODO
         ### self.baudrate = metadata['baudrate']
@@ -419,7 +416,7 @@ class Decoder(srd.Decoder):
         self.put(self.samplenum, self.samplenum, self.out_ann,
                  [ANN_ASCII, ['Stop bit', 'Stop', 'P']])
 
-    def decode(self, timeoffset, duration, data): # TODO
+    def decode(self, ss, es, data): # TODO
         # for (samplenum, (rx, tx)) in data:
         for (samplenum, (rx,)) in data: