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

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

diff --git a/decoders/ir_nec/pd.py b/decoders/ir_nec/pd.py
index bb52420fc19baf4662c74e5f720735f1bed7d503..3ee3716b14bc3e572c521c02c0eb78916d5dc02f 100644 (file)
--- a/decoders/ir_nec/pd.py
+++ b/decoders/ir_nec/pd.py
@@ -54,12 +54,12 @@ class Decoder(srd.Decoder):
         ('cmd-inv', 'Command#'),
         ('repeat-code', 'Repeat code'),
         ('remote', 'Remote'),
-        ('warnings', 'Warnings'),
+        ('warning', 'Warning'),
     )
     annotation_rows = (
         ('bits', 'Bits', (0, 1, 2, 3, 4)),
         ('fields', 'Fields', (5, 6, 7, 8, 9, 10)),
-        ('remote', 'Remote', (11,)),
+        ('remote-vals', 'Remote', (11,)),
         ('warnings', 'Warnings', (12,)),
     )
 
@@ -111,7 +111,6 @@ class Decoder(srd.Decoder):
 
     def start(self):
         self.out_ann = self.register(srd.OUTPUT_ANN)
-        self.active = 0 if self.options['polarity'] == 'active-low' else 1
 
     def metadata(self, key, value):
         if key == srd.SRD_CONF_SAMPLERATE:
@@ -164,7 +163,9 @@ class Decoder(srd.Decoder):
         cd_count = None
         if self.options['cd_freq']:
             cd_count = int(self.samplerate / self.options['cd_freq']) + 1
-            prev_ir = None
+        prev_ir = None
+
+        self.active = 0 if self.options['polarity'] == 'active-low' else 1
 
         while True:
             # Detect changes in the presence of an active input signal.