diff options
| author | Uwe Hermann <uwe@hermann-uwe.de> | 2019-11-30 15:17:50 +0100 |
|---|---|---|
| committer | Uwe Hermann <uwe@hermann-uwe.de> | 2019-11-30 15:23:10 +0100 |
| commit | 88b84b3ce771a49680644c4a30819ccd90030018 (patch) | |
| tree | 9b84c99e2461f83796d7cdf44b68e9b86eef1771 /decoders/flexray | |
| parent | 20d71243aff524a383e6183cb4366cff3aaf3749 (diff) | |
| download | libsigrokdecode-88b84b3ce771a49680644c4a30819ccd90030018.tar.gz libsigrokdecode-88b84b3ce771a49680644c4a30819ccd90030018.zip | |
flexray: Use bit/s instead of Mbit/s for bitrate.
This avoids floating point number option values, which makes things
a bit easier/clearer on the command-line and also matches what other
decoders do.
Also, use numbers instead of strings for the option values.
Diffstat (limited to 'decoders/flexray')
| -rw-r--r-- | decoders/flexray/pd.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/decoders/flexray/pd.py b/decoders/flexray/pd.py index 0c52041..e13f2d4 100644 --- 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'), @@ -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 |