X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=decoders%2Fpwm%2Fpd.py;h=2eda02ca42a1c174b48aa66e19bf74d7f36137b5;hb=fc0544b76d5ee1d41e145a5ee579c14f899b7a66;hp=2301523c1abd06923999aff4476b3ceae9c04a62;hpb=10aeb8ea8b183394cebc0033f048f49f4262b57d;p=libsigrokdecode.git

diff --git a/decoders/pwm/pd.py b/decoders/pwm/pd.py
index 2301523..2eda02c 100644
--- a/decoders/pwm/pd.py
+++ b/decoders/pwm/pd.py
@@ -20,6 +20,9 @@
 
 import sigrokdecode as srd
 
+class SamplerateError(Exception):
+    pass
+
 class Decoder(srd.Decoder):
     api_version = 3
     id = 'pwm'
@@ -28,7 +31,8 @@ class Decoder(srd.Decoder):
     desc = 'Analog level encoded in duty cycle percentage.'
     license = 'gplv2+'
     inputs = ['logic']
-    outputs = ['pwm']
+    outputs = []
+    tags = ['Encoding']
     channels = (
         {'id': 'data', 'name': 'Data', 'desc': 'Data line'},
     )
@@ -41,8 +45,8 @@ class Decoder(srd.Decoder):
         ('period', 'Period'),
     )
     annotation_rows = (
-         ('duty-cycle', 'Duty cycle', (0,)),
-         ('period', 'Period', (1,)),
+         ('duty-cycle-vals', 'Duty cycles', (0,)),
+         ('periods', 'Periods', (1,)),
     )
     binary = (
         ('raw', 'RAW file'),
@@ -52,6 +56,7 @@ class Decoder(srd.Decoder):
         self.reset()
 
     def reset(self):
+        self.samplerate = None
         self.ss_block = self.es_block = None
 
     def metadata(self, key, value):
@@ -89,6 +94,9 @@ class Decoder(srd.Decoder):
         self.put(self.ss_block, self.es_block, self.out_binary, data)
 
     def decode(self):
+        if not self.samplerate:
+            raise SamplerateError('Cannot decode without samplerate.')
+
         num_cycles = 0
         average = 0