diff options
| author | Uwe Hermann <uwe@hermann-uwe.de> | 2012-01-10 02:11:50 +0100 |
|---|---|---|
| committer | Uwe Hermann <uwe@hermann-uwe.de> | 2012-01-10 02:11:50 +0100 |
| commit | c9b24fc3d2f8c84338f07239edc1d4850164ae0c (patch) | |
| tree | 9f8213adbf83a1941fbbcd77913a5b8629f6e3d1 /decoders/i2c.py | |
| parent | 2fd89a85c4a1131ca259d794a43b26b8bd84b6a0 (diff) | |
| download | libsigrokdecode-c9b24fc3d2f8c84338f07239edc1d4850164ae0c.tar.gz libsigrokdecode-c9b24fc3d2f8c84338f07239edc1d4850164ae0c.zip | |
srd: output_{protocol,annotation} -> out_{proto,ann}.
Diffstat (limited to 'decoders/i2c.py')
| -rw-r--r-- | decoders/i2c.py | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/decoders/i2c.py b/decoders/i2c.py index 08d0053..5e63fdf 100644 --- a/decoders/i2c.py +++ b/decoders/i2c.py @@ -149,8 +149,8 @@ class Decoder(sigrokdecode.Decoder): ] def __init__(self, **kwargs): - self.output_protocol = None - self.output_annotation = None + self.out_proto = None + self.out_ann = None self.samplecnt = 0 self.bitcount = 0 self.databyte = 0 @@ -162,8 +162,8 @@ class Decoder(sigrokdecode.Decoder): self.oldsda = None def start(self, metadata): - self.output_protocol = self.add(sigrokdecode.SRD_OUTPUT_PROTOCOL, 'i2c') - self.output_annotation = self.add(sigrokdecode.SRD_OUTPUT_ANNOTATION, 'i2c') + self.out_proto = self.add(sigrokdecode.SRD_OUTPUT_PROTOCOL, 'i2c') + self.out_ann = self.add(sigrokdecode.SRD_OUTPUT_ANNOTATION, 'i2c') def report(self): pass @@ -191,9 +191,9 @@ class Decoder(sigrokdecode.Decoder): cmd = 'START_REPEAT' else: cmd = 'START' - self.put(self.output_protocol, [ cmd, None, None ]) - self.put(self.output_annotation, [ ANN_SHIFTED, [protocol[cmd][0]] ]) - self.put(self.output_annotation, [ ANN_SHIFTED_SHORT, [protocol[cmd][1]] ]) + self.put(self.out_proto, [ cmd, None, None ]) + self.put(self.out_ann, [ ANN_SHIFTED, [protocol[cmd][0]] ]) + self.put(self.out_ann, [ ANN_SHIFTED_SHORT, [protocol[cmd][1]] ]) self.state = FIND_ADDRESS self.bitcount = self.databyte = 0 @@ -218,7 +218,7 @@ class Decoder(sigrokdecode.Decoder): # send raw output annotation before we start shifting out # read/write and ack/nack bits - self.put(self.output_annotation, [ANN_RAW, ["0x%.2x" % self.databyte]]) + self.put(self.out_ann, [ANN_RAW, ["0x%.2x" % self.databyte]]) # We received 8 address/data bits and the ACK/NACK bit. self.databyte >>= 1 # Shift out unwanted ACK/NACK bit here. @@ -251,13 +251,13 @@ class Decoder(sigrokdecode.Decoder): cmd = 'DATA_WRITE' elif self.state == FIND_DATA and self.wr == 0: cmd = 'DATA_READ' - self.put(self.output_protocol, [ cmd, d, ack_bit ] ) - self.put(self.output_annotation, [ANN_SHIFTED, [ + self.put(self.out_proto, [ cmd, d, ack_bit ] ) + self.put(self.out_ann, [ANN_SHIFTED, [ "%s" % protocol[cmd][0], "0x%02x" % d, "%s" % protocol[ack_bit][0]] ] ) - self.put(self.output_annotation, [ANN_SHIFTED_SHORT, [ + self.put(self.out_ann, [ANN_SHIFTED_SHORT, [ "%s" % protocol[cmd][1], "0x%02x" % d, "%s" % protocol[ack_bit][1]] @@ -274,9 +274,9 @@ class Decoder(sigrokdecode.Decoder): pass def found_stop(self, scl, sda): - self.put(self.output_protocol, [ 'STOP', None, None ]) - self.put(self.output_annotation, [ ANN_SHIFTED, [protocol['STOP'][0]] ]) - self.put(self.output_annotation, [ ANN_SHIFTED_SHORT, [protocol['STOP'][1]] ]) + self.put(self.out_proto, [ 'STOP', None, None ]) + self.put(self.out_ann, [ ANN_SHIFTED, [protocol['STOP'][0]] ]) + self.put(self.out_ann, [ ANN_SHIFTED_SHORT, [protocol['STOP'][1]] ]) self.state = FIND_START self.is_repeat_start = 0 |