From da9bcbd9f45b0153465c55ec726a0d76f6d7f01e Mon Sep 17 00:00:00 2001 From: Bert Vermeulen Date: Mon, 10 Mar 2014 12:23:38 +0100 Subject: Probes, optional probes and annotations now take a tuple. Annotation entries also consist of a tuple, not a list. --- decoders/avr_isp/pd.py | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'decoders/avr_isp') diff --git a/decoders/avr_isp/pd.py b/decoders/avr_isp/pd.py index 8f3e128..42ac48b 100644 --- a/decoders/avr_isp/pd.py +++ b/decoders/avr_isp/pd.py @@ -32,21 +32,21 @@ class Decoder(srd.Decoder): license = 'gplv2+' inputs = ['spi', 'logic'] outputs = ['avr_isp'] - optional_probes = [ + optional_probes = ( {'id': 'reset', 'name': 'RESET#', 'desc': 'Target AVR MCU reset'}, - ] - annotations = [ - ['pe', 'Programming enable'], - ['rsb0', 'Read signature byte 0'], - ['rsb1', 'Read signature byte 1'], - ['rsb2', 'Read signature byte 2'], - ['ce', 'Chip erase'], - ['rfb', 'Read fuse bits'], - ['rhfb', 'Read high fuse bits'], - ['refb', 'Read extended fuse bits'], - ['warnings', 'Warnings'], - ['dev', 'Device'], - ] + ) + annotations = ( + ('pe', 'Programming enable'), + ('rsb0', 'Read signature byte 0'), + ('rsb1', 'Read signature byte 1'), + ('rsb2', 'Read signature byte 2'), + ('ce', 'Chip erase'), + ('rfb', 'Read fuse bits'), + ('rhfb', 'Read high fuse bits'), + ('refb', 'Read extended fuse bits'), + ('warnings', 'Warnings'), + ('dev', 'Device'), + ) annotation_rows = ( ('bits', 'Bits', ()), ('commands', 'Commands', tuple(range(7 + 1))), -- cgit v1.2.3-70-g09d2