All PDs: Consistently use singular/plural for annotation classes/rows.

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

diff --git a/decoders/flexray/pd.py b/decoders/flexray/pd.py
index 0c52041612b42eaabe751b74f6620ec8d6d3f181..c348bdd0d45a290222be4f4de3891464470801f6 100644 (file)
--- a/decoders/flexray/pd.py
+++ b/decoders/flexray/pd.py
@@ -58,8 +58,8 @@ class Decoder(srd.Decoder):
     options = (
         {'id': 'channel_type', 'desc': 'Channel type', 'default': 'A',
             'values': ('A', 'B')},
-        {'id': 'bitrate', 'desc': 'Bitrate (Mbit/s)', 'default': '10.0',
-            'values': ('10.0', '5.0', '2.5')},
+        {'id': 'bitrate', 'desc': 'Bitrate (bit/s)', 'default': 10000000,
+            'values': (10000000, 5000000, 2500000)},
     )
     annotations = (
         ('data', 'FlexRay payload data'),
@@ -78,7 +78,7 @@ class Decoder(srd.Decoder):
         ('frame-crc', 'Frame CRC'),
         ('cid-delimiter', 'Channel idle delimiter'),
         ('bss', 'Byte start sequence'),
-        ('warnings', 'Human-readable warnings'),
+        ('warning', 'Warning'),
         ('bit', 'Bit'),
         ('cid', 'Channel idle delimiter'),
         ('dts', 'Dynamic trailing sequence'),
@@ -102,7 +102,7 @@ class Decoder(srd.Decoder):
 
     def metadata(self, key, value):
         if key == srd.SRD_CONF_SAMPLERATE:
-            bitrate = 1000000 * float(self.options['bitrate'])
+            bitrate = float(self.options['bitrate'])
             self.samplerate = value
             self.bit_width = float(self.samplerate) / bitrate
             self.sample_point = (self.bit_width / 100.0) * self.sample_point_percent