Various PDs: Minor option related fixes.

[libsigrokdecode.git] / decoders / onewire_link / pd.py

diff --git a/decoders/onewire_link/pd.py b/decoders/onewire_link/pd.py
index 38ef8ccea3b5907fa1f020ba4964741e853bcb9d..ceb5da20e203f6334448e125e852ce567f302e45 100644 (file)
--- a/decoders/onewire_link/pd.py
+++ b/decoders/onewire_link/pd.py
@@ -29,49 +29,40 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['logic']
     outputs = ['onewire_link']
-    probes = [
+    probes = (
         {'id': 'owr', 'name': 'OWR', 'desc': '1-Wire signal line'},
-    ]
-    optional_probes = [
+    )
+    optional_probes = (
         {'id': 'pwr', 'name': 'PWR', 'desc': '1-Wire power supply pin'},
-    ]
+    )
     options = (
         {'id': 'overdrive',
-            'desc': 'Overdrive mode',
-            'default': 'no'},
+            'desc': 'Overdrive mode', 'default': 'no', 'values': ('yes', 'no')},
         # Time options (specified in microseconds):
         {'id': 'cnt_normal_bit',
-            'desc': 'Normal mode sample bit time (μs)',
-            'default': 15},
+            'desc': 'Normal mode sample bit time (μs)', 'default': 15},
         {'id': 'cnt_normal_slot',
-            'desc': 'Normal mode data slot time (μs)',
-            'default': 60},
+            'desc': 'Normal mode data slot time (μs)', 'default': 60},
         {'id': 'cnt_normal_presence',
-            'desc': 'Normal mode sample presence time (μs)',
-            'default': 75},
+            'desc': 'Normal mode sample presence time (μs)', 'default': 75},
         {'id': 'cnt_normal_reset',
-            'desc': 'Normal mode reset time (μs)',
-            'default': 480},
+            'desc': 'Normal mode reset time (μs)', 'default': 480},
         {'id': 'cnt_overdrive_bit',
-            'desc': 'Overdrive mode sample bit time (μs)',
-            'default': 2},
+            'desc': 'Overdrive mode sample bit time (μs)', 'default': 2},
         {'id': 'cnt_overdrive_slot',
-            'desc': 'Overdrive mode data slot time (μs)',
-            'default': 7.3},
+            'desc': 'Overdrive mode data slot time (μs)', 'default': 7.3},
         {'id': 'cnt_overdrive_presence',
-            'desc': 'Overdrive mode sample presence time (μs)',
-            'default': 10},
+            'desc': 'Overdrive mode sample presence time (μs)', 'default': 10},
         {'id': 'cnt_overdrive_reset',
-            'desc': 'Overdrive mode reset time (μs)',
-            'default': 48},
+            'desc': 'Overdrive mode reset time (μs)', 'default': 48},
+    )
+    annotations = (
+        ('bit', 'Bit'),
+        ('warnings', 'Warnings'),
+        ('reset', 'Reset'),
+        ('presence', 'Presence'),
+        ('overdrive', 'Overdrive mode notifications'),
     )
-    annotations = [
-        ['bit', 'Bit'],
-        ['warnings', 'Warnings'],
-        ['reset', 'Reset'],
-        ['presence', 'Presence'],
-        ['overdrive', 'Overdrive mode notifications'],
-    ]
     annotation_rows = (
         ('bits', 'Bits', (0, 2, 3)),
         ('info', 'Info', (4,)),