onewire_link: Replaced us with µs

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

diff --git a/decoders/onewire_link/pd.py b/decoders/onewire_link/pd.py
index 9c4913ce422a6dfd287896e41d7c49f59d5f98e4..5b5ebd01c6df1c8d2cb057035c39d6c3b5bc65a2 100644 (file)
--- a/decoders/onewire_link/pd.py
+++ b/decoders/onewire_link/pd.py
@@ -18,8 +18,6 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-# 1-Wire protocol decoder (link layer)
-
 import sigrokdecode as srd
 
 class Decoder(srd.Decoder):
@@ -40,15 +38,15 @@ class Decoder(srd.Decoder):
     options = {
         'overdrive': ['Overdrive mode', 'no'],
         # Time options (specified in microseconds):
-        'cnt_normal_bit': ['Normal mode sample bit time (us)', 15],
-        'cnt_normal_slot': ['Normal mode data slot time (us)', 60],
-        'cnt_normal_presence': ['Normal mode sample presence time (us)', 75],
-        'cnt_normal_reset': ['Normal mode reset time (us)', 480],
-        'cnt_overdrive_bit': ['Overdrive mode sample bit time (us)', 2],
-        # 'cnt_overdrive_slot': ['Overdrive mode data slot time (us)', 7.3],
-        'cnt_overdrive_slot': ['Overdrive mode data slot time (us)', 7],
-        'cnt_overdrive_presence': ['Overdrive mode sample presence time (us)', 10],
-        'cnt_overdrive_reset': ['Overdrive mode reset time (us)', 48],
+        'cnt_normal_bit': ['Normal mode sample bit time (µs)', 15],
+        'cnt_normal_slot': ['Normal mode data slot time (µs)', 60],
+        'cnt_normal_presence': ['Normal mode sample presence time (µs)', 75],
+        'cnt_normal_reset': ['Normal mode reset time (µs)', 480],
+        'cnt_overdrive_bit': ['Overdrive mode sample bit time (µs)', 2],
+        # 'cnt_overdrive_slot': ['Overdrive mode data slot time (µs)', 7.3],
+        'cnt_overdrive_slot': ['Overdrive mode data slot time (µs)', 7],
+        'cnt_overdrive_presence': ['Overdrive mode sample presence time (µs)', 10],
+        'cnt_overdrive_reset': ['Overdrive mode reset time (µs)', 48],
     }
     annotations = [
         ['bit', 'Bit'],
@@ -57,12 +55,17 @@ class Decoder(srd.Decoder):
         ['presence', 'Presence'],
         ['overdrive', 'Overdrive mode notifications'],
     ]
+    annotation_rows = (
+        ('bits', 'Bits', (0, 2, 3)),
+        ('info', 'Info', (4,)),
+        ('warnings', 'Warnings', (1,)),
+    )
 
     def putm(self, data):
         self.put(0, 0, self.out_ann, data)
 
     def putpb(self, data):
-        self.put(self.fall, self.samplenum, self.out_proto, data)
+        self.put(self.fall, self.samplenum, self.out_python, data)
 
     def putb(self, data):
         self.put(self.fall, self.samplenum, self.out_ann, data)
@@ -74,7 +77,7 @@ class Decoder(srd.Decoder):
         self.put(self.fall, self.rise, self.out_ann, data)
 
     def putprs(self, data):
-        self.put(self.rise, self.samplenum, self.out_proto, data)
+        self.put(self.rise, self.samplenum, self.out_python, data)
 
     def putrs(self, data):
         self.put(self.rise, self.samplenum, self.out_ann, data)
@@ -92,7 +95,7 @@ class Decoder(srd.Decoder):
         self.rise = 0
 
     def start(self):
-        self.out_proto = self.register(srd.OUTPUT_PYTHON)
+        self.out_python = self.register(srd.OUTPUT_PYTHON)
         self.out_ann = self.register(srd.OUTPUT_ANN)
 
     def metadata(self, key, value):