X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=decoders%2Fonewire_link%2Fpd.py;h=c8d6cd75406d7dbc3c045113e226dd703bc7c10c;hb=22fc7ace72f3165c98208a8f544156e04a709639;hp=d603dba30af8af3a0733b5655d5a4ee1c5bedb1d;hpb=da9bcbd9f45b0153465c55ec726a0d76f6d7f01e;p=libsigrokdecode.git

diff --git a/decoders/onewire_link/pd.py b/decoders/onewire_link/pd.py
index d603dba..c8d6cd7 100644
--- a/decoders/onewire_link/pd.py
+++ b/decoders/onewire_link/pd.py
@@ -20,8 +20,11 @@
 
 import sigrokdecode as srd
 
+class SamplerateError(Exception):
+    pass
+
 class Decoder(srd.Decoder):
-    api_version = 1
+    api_version = 2
     id = 'onewire_link'
     name = '1-Wire link layer'
     longname = '1-Wire serial communication bus (link layer)'
@@ -29,41 +32,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'),
@@ -194,8 +188,8 @@ class Decoder(srd.Decoder):
                  % (time_min*1000000, time_max*1000000)]])
 
     def decode(self, ss, es, data):
-        if self.samplerate is None:
-            raise Exception("Cannot decode without samplerate.")
+        if not self.samplerate:
+            raise SamplerateError('Cannot decode without samplerate.')
         for (self.samplenum, (owr, pwr)) in data:
             # State machine.
             if self.state == 'WAIT FOR FALLING EDGE':
@@ -260,10 +254,10 @@ class Decoder(srd.Decoder):
                     # Save the sample number for the rising edge.
                     self.rise = self.samplenum
                     self.putfr([2, ['Reset', 'Rst', 'R']])
-                    self.state = "WAIT FOR PRESENCE DETECT"
+                    self.state = 'WAIT FOR PRESENCE DETECT'
                 # Otherwise this is assumed to be a data bit.
                 else:
-                    self.state = "WAIT FOR FALLING EDGE"
+                    self.state = 'WAIT FOR FALLING EDGE'
             elif self.state == 'WAIT FOR PRESENCE DETECT':
                 # Sample presence status.
                 t = self.samplenum - self.rise
@@ -287,5 +281,3 @@ class Decoder(srd.Decoder):
 
                 # Wait for next slot.
                 self.state = 'WAIT FOR FALLING EDGE'
-            else:
-                raise Exception('Invalid state: %s' % self.state)