From 84c1c0b52820af2418186ac3ecf93a5c6373a22e Mon Sep 17 00:00:00 2001 From: Bert Vermeulen Date: Sun, 9 Mar 2014 23:48:27 +0100 Subject: Change PD options to be a tuple of dictionaries. Each option consists of a dictionary with the following keys: id The option id, which is passed in when setting a value. desc A description of the option, suitable for display. def The default value for this option. values (optional) If present, a tuple containing values the option may take. They must be of the same type as the default. Valid types for the options are UTF-8-encoded strings, integers, and floating point values. --- decoders/can/pd.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'decoders/can') diff --git a/decoders/can/pd.py b/decoders/can/pd.py index c394cf1..e2b55fa 100644 --- a/decoders/can/pd.py +++ b/decoders/can/pd.py @@ -33,10 +33,10 @@ class Decoder(srd.Decoder): {'id': 'can_rx', 'name': 'CAN RX', 'desc': 'CAN bus line'}, ] optional_probes = [] - options = { - 'bitrate': ['Bitrate', 1000000], # 1Mbit/s - 'sample_point': ['Sample point', 70], # 70% - } + options = ( + {'id': 'bitrate', 'desc': 'Bitrate', 'default': 1000000}, # 1Mbit/s + {'id': 'sample_point', 'desc': 'Sample point', 'default': 70}, # 70% + ) annotations = [ ['data', 'CAN payload data'], ['sof', 'Start of frame'], -- cgit v1.2.3-70-g09d2