seven_segment: add option to display unknown characters

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

diff --git a/decoders/seven_segment/pd.py b/decoders/seven_segment/pd.py
index 26d1d83b294bb48a61ab26d9f58456ef45bb08f4..eedacf93e3b2d7a9460fae3405036f64484cfb97 100644 (file)
--- a/decoders/seven_segment/pd.py
+++ b/decoders/seven_segment/pd.py
@@ -67,6 +67,8 @@ class Decoder(srd.Decoder):
     options = (
         {'id': 'polarity', 'desc': 'Expected polarity',
             'default': 'common-cathode', 'values': ('common-cathode', 'common-anode')},
+        {'id': 'show_unknown', 'desc': 'Display Unknown characters as #',
+            'default': 'no', 'values': ('yes', 'no')},
     )
     annotations = (
         ('decoded-digit', 'Decoded digit'),
@@ -88,10 +90,7 @@ class Decoder(srd.Decoder):
         self.put(ss_block, es_block, self.out_ann, data)
 
     def pins_to_hex(self, pins):
-        if pins in digits:
-            return digits[pins]
-        else:
-            return None
+        return digits.get(pins, None)
 
     def decode(self):
         oldpins = self.wait()
@@ -123,13 +122,15 @@ class Decoder(srd.Decoder):
             # Convert to character string.
             digit = self.pins_to_hex(oldpins[:7])
 
+            if digit is None and self.options['show_unknown'] == 'yes':
+                digit = '#'
+
             if digit is not None:
                 dp = oldpins[7]
 
                 # Check if decimal point is present and active.
-                if self.have_dp:
-                    if dp == 1:
-                        digit = digit + '.'
+                if self.have_dp and dp == 1:
+                    digit += '.'
 
                 self.putb(lastpos, self.samplenum, [0, [digit]])