X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=decoders%2Fonewire_link%2Fpd.py;h=9c4913ce422a6dfd287896e41d7c49f59d5f98e4;hb=4c3b1846c9c307c1c35f86d259ddb968ed92718d;hp=76e9b24bfe84d95abea2362052b0d8fd0b4fceb6;hpb=015dc33a9fe13c529bd84fcfdca39d3fa2f7c293;p=libsigrokdecode.git

diff --git a/decoders/onewire_link/pd.py b/decoders/onewire_link/pd.py
index 76e9b24..9c4913c 100644
--- a/decoders/onewire_link/pd.py
+++ b/decoders/onewire_link/pd.py
@@ -80,6 +80,7 @@ class Decoder(srd.Decoder):
         self.put(self.rise, self.samplenum, self.out_ann, data)
 
     def __init__(self, **kwargs):
+        self.samplerate = None
         self.samplenum = 0
         self.state = 'WAIT FOR FALLING EDGE'
         self.present = 0
@@ -90,11 +91,14 @@ class Decoder(srd.Decoder):
         self.fall = 0
         self.rise = 0
 
-    def start(self, metadata):
-        self.out_proto = self.add(srd.OUTPUT_PROTO, 'onewire_link')
-        self.out_ann = self.add(srd.OUTPUT_ANN, 'onewire_link')
+    def start(self):
+        self.out_proto = self.register(srd.OUTPUT_PYTHON)
+        self.out_ann = self.register(srd.OUTPUT_ANN)
 
-        self.samplerate = metadata['samplerate']
+    def metadata(self, key, value):
+        if key != srd.SRD_CONF_SAMPLERATE:
+            return
+        self.samplerate = value
 
         # Check if samplerate is appropriate.
         if self.options['overdrive'] == 'yes':
@@ -169,10 +173,9 @@ class Decoder(srd.Decoder):
                  '(%2.1fus-%2.1fus) should be inside (7.3us, 10.0us).'
                  % (time_min*1000000, time_max*1000000)]])
 
-    def report(self):
-        pass
-
     def decode(self, ss, es, data):
+        if self.samplerate is None:
+            raise Exception("Cannot decode without samplerate.")
         for (self.samplenum, (owr, pwr)) in data:
             # State machine.
             if self.state == 'WAIT FOR FALLING EDGE':
@@ -201,7 +204,7 @@ class Decoder(srd.Decoder):
                     self.state = 'WAIT FOR RISING EDGE'
                     continue
 
-                self.putb([0, ['Bit: %d' % self.bit]])
+                self.putb([0, ['Bit: %d' % self.bit, '%d' % self.bit]])
                 self.putpb(['BIT', self.bit])
 
                 # Checking the first command to see if overdrive mode
@@ -209,7 +212,7 @@ class Decoder(srd.Decoder):
                 if self.bit_cnt <= 8:
                     self.command |= (self.bit << self.bit_cnt)
                 elif self.bit_cnt == 8 and self.command in [0x3c, 0x69]:
-                    self.putx([4, ['Entering overdrive mode']])
+                    self.putx([4, ['Entering overdrive mode', 'Overdrive on']])
                 # Increment the bit counter.
                 self.bit_cnt += 1
                 # Wait for next slot.
@@ -224,11 +227,11 @@ class Decoder(srd.Decoder):
                 if t > self.cnt_normal_reset:
                     # Save the sample number for the rising edge.
                     self.rise = self.samplenum
-                    self.putfr([2, ['Reset']])
+                    self.putfr([2, ['Reset', 'Rst', 'R']])
                     self.state = 'WAIT FOR PRESENCE DETECT'
                     # Exit overdrive mode.
                     if self.overdrive:
-                        self.putx([4, ['Exiting overdrive mode']])
+                        self.putx([4, ['Exiting overdrive mode', 'Overdrive off']])
                         self.overdrive = 0
                     # Clear command bit counter and data register.
                     self.bit_cnt = 0
@@ -236,7 +239,7 @@ class Decoder(srd.Decoder):
                 elif (t > self.cnt_overdrive_reset) and self.overdrive:
                     # Save the sample number for the rising edge.
                     self.rise = self.samplenum
-                    self.putfr([2, ['Reset']])
+                    self.putfr([2, ['Reset', 'Rst', 'R']])
                     self.state = "WAIT FOR PRESENCE DETECT"
                 # Otherwise this is assumed to be a data bit.
                 else:
@@ -259,7 +262,7 @@ class Decoder(srd.Decoder):
                     continue
 
                 p = 'false' if self.present else 'true'
-                self.putrs([3, ['Presence: %s' % p]])
+                self.putrs([3, ['Presence: %s' % p, 'Presence', 'Pres', 'P']])
                 self.putprs(['RESET/PRESENCE', not self.present])
 
                 # Wait for next slot.