X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=decoders%2Fonewire_link%2Fpd.py;h=aa1cb2e16a13744c2ddc86953ce2ee8655a7e05b;hb=6a15597a7b3f901b566b7bfc8c484a14e0fb6a11;hp=d603dba30af8af3a0733b5655d5a4ee1c5bedb1d;hpb=da9bcbd9f45b0153465c55ec726a0d76f6d7f01e;p=libsigrokdecode.git

diff --git a/decoders/onewire_link/pd.py b/decoders/onewire_link/pd.py
index d603dba..aa1cb2e 100644
--- a/decoders/onewire_link/pd.py
+++ b/decoders/onewire_link/pd.py
@@ -29,41 +29,32 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['logic']
     outputs = ['onewire_link']
-    probes = (
+    channels = (
         {'id': 'owr', 'name': 'OWR', 'desc': '1-Wire signal line'},
     )
-    optional_probes = (
+    optional_channels = (
         {'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'),