cec: Simplify a few code snippets.

diff --git a/decoders/cec/pd.py b/decoders/cec/pd.py
index 6c84a4b2af057eaeae0ba95fe9bc6de22133c4c7..a742f81b326be761a266260373fdfdbb3d5ba98d 100644 (file)
--- a/decoders/cec/pd.py
+++ b/decoders/cec/pd.py
@@ -84,8 +84,7 @@ class Decoder(srd.Decoder):
 
     def precalculate(self):
         # Restrict max length of ACK/NACK labels to 2 BIT pulses.
 
     def precalculate(self):
         # Restrict max length of ACK/NACK labels to 2 BIT pulses.

-        bit_time = timing[Pulse.ZERO]['total']['min']
-        bit_time = bit_time * 2
+        bit_time = timing[Pulse.ZERO]['total']['min'] * 2

         self.max_ack_len_samples = round((bit_time / 1000) * self.samplerate)
 
     def reset(self):
         self.max_ack_len_samples = round((bit_time / 1000) * self.samplerate)
 
     def reset(self):


@@ -149,16 +148,10 @@ class Decoder(srd.Decoder):
 
         # Header only commands are PINGS
         if i == 1:
 
         # Header only commands are PINGS
         if i == 1:

-            if self.eom:
-                str += ' | OPC: PING'
-            else:
-                str += ' | OPC: NONE. Aborted cmd'
+            str += ' | OPC: PING' if self.eom else ' | OPC: NONE. Aborted cmd'

 
         # Add extra information (ack of the command from the destination)
 
         # Add extra information (ack of the command from the destination)

-        if is_nack:
-            str += ' | R: NACK'
-        else:
-            str += ' | R: ACK'
+        str += ' | R: NACK' if is_nack else ' | R: ACK'

 
         self.put(self.frame_start, self.frame_end, self.out_ann, [8, [str]])
 
 
         self.put(self.frame_start, self.frame_end, self.out_ann, [8, [str]])
 


@@ -254,10 +247,8 @@ class Decoder(srd.Decoder):
             self.eom = bit
             self.frame_end = self.fall_end
 
             self.eom = bit
             self.frame_end = self.fall_end
 

-            if self.eom:
-                self.put(self.fall_start, self.fall_end, self.out_ann, [2, ['EOM=Y']])
-            else:
-                self.put(self.fall_start, self.fall_end, self.out_ann, [1, ['EOM=N']])
+            a = [2, ['EOM=Y']] if self.eom else [1, ['EOM=N']]
+            self.put(self.fall_start, self.fall_end, self.out_ann, a)

 
             self.set_stat(Stat.WAIT_ACK)
 
 
             self.set_stat(Stat.WAIT_ACK)
 

diff --git a/decoders/cec/protocoldata.py b/decoders/cec/protocoldata.py
index dd867e0b29503620cb284c2aaa053c8986f112ef..fb8049480a4151cd23d76abf4c2e968266b8623e 100644 (file)
--- a/decoders/cec/protocoldata.py
+++ b/decoders/cec/protocoldata.py
@@ -107,10 +107,7 @@ def resolve_logical_address(id, is_initiator):
 
     # Special handling of 0x0F.
     if id == 0x0F:
 
     # Special handling of 0x0F.
     if id == 0x0F:

-        if is_initiator:
-            return 'Unregistered'
-        else:
-            return 'Broadcast'
+        return 'Unregistered' if is_initiator else 'Broadcast'

 
     return logical_adresses[id]
 
 
     return logical_adresses[id]