X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=decoders%2Fonewire_link%2Fpd.py;h=3641b9849bde1eb9c904be0f9d675e3caaa35bb7;hb=bf69977d12886794ac597083403859ac99ab38ac;hp=650a7a0297fc17059545cd758c55cb9107d325ee;hpb=ef36224880135a05d2fbde8f048ea3fe3f425df9;p=libsigrokdecode.git

diff --git a/decoders/onewire_link/pd.py b/decoders/onewire_link/pd.py
index 650a7a0..3641b98 100644
--- a/decoders/onewire_link/pd.py
+++ b/decoders/onewire_link/pd.py
@@ -21,7 +21,7 @@
 import sigrokdecode as srd
 
 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,38 +29,51 @@ 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 = {
-        'overdrive': ['Overdrive mode', 'no'],
+    )
+    options = (
+        {'id': 'overdrive',
+            'desc': 'Overdrive mode', 'default': 'no', 'values': ('yes', '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],
-    }
-    annotations = [
-        ['bit', 'Bit'],
-        ['warnings', 'Warnings'],
-        ['reset', 'Reset'],
-        ['presence', 'Presence'],
-        ['overdrive', 'Overdrive mode notifications'],
-    ]
+        {'id': 'cnt_normal_bit',
+            'desc': 'Normal mode sample bit time (μs)', 'default': 15},
+        {'id': 'cnt_normal_slot',
+            'desc': 'Normal mode data slot time (μs)', 'default': 60},
+        {'id': 'cnt_normal_presence',
+            'desc': 'Normal mode sample presence time (μs)', 'default': 75},
+        {'id': 'cnt_normal_reset',
+            'desc': 'Normal mode reset time (μs)', 'default': 480},
+        {'id': 'cnt_overdrive_bit',
+            'desc': 'Overdrive mode sample bit time (μs)', 'default': 2},
+        {'id': 'cnt_overdrive_slot',
+            'desc': 'Overdrive mode data slot time (μs)', 'default': 7.3},
+        {'id': 'cnt_overdrive_presence',
+            'desc': 'Overdrive mode sample presence time (μs)', 'default': 10},
+        {'id': 'cnt_overdrive_reset',
+            'desc': 'Overdrive mode reset time (μs)', 'default': 48},
+    )
+    annotations = (
+        ('bit', 'Bit'),
+        ('warnings', 'Warnings'),
+        ('reset', 'Reset'),
+        ('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)
@@ -72,7 +85,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)
@@ -90,7 +103,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):