srd: decoders: Metadata consistency fixes/updates.

[libsigrokdecode.git] / decoders / i2c.py

diff --git a/decoders/i2c.py b/decoders/i2c.py
index edaeb9487b7c782c2479c2168ea5028907fd30d1..967899ed5c24d282e86809403a0aa2b5f2398ba0 100644 (file)
--- a/decoders/i2c.py
+++ b/decoders/i2c.py
@@ -120,7 +120,7 @@ FIND_DATA = 2
 class Decoder(srd.Decoder):
     id = 'i2c'
     name = 'I2C'
 class Decoder(srd.Decoder):
     id = 'i2c'
     name = 'I2C'

-    longname = 'Inter-Integrated Circuit (I2C) bus'
+    longname = 'Inter-Integrated Circuit'

     desc = 'I2C is a two-wire, multi-master, serial bus.'
     longdesc = '...'
     author = 'Uwe Hermann'
     desc = 'I2C is a two-wire, multi-master, serial bus.'
     longdesc = '...'
     author = 'Uwe Hermann'


@@ -183,10 +183,7 @@ class Decoder(srd.Decoder):
         return False
 
     def found_start(self, scl, sda):
         return False
 
     def found_start(self, scl, sda):

-        if self.is_repeat_start == 1:
-            cmd = 'START_REPEAT'
-        else:
-            cmd = 'START'
+        cmd = 'START_REPEAT' if (self.is_repeat_start == 1) else 'START'

 
         self.put(self.out_proto, [cmd, None, None])
         self.put(self.out_ann, [ANN_SHIFTED, [protocol[cmd][0]]])
 
         self.put(self.out_proto, [cmd, None, None])
         self.put(self.out_ann, [ANN_SHIFTED, [protocol[cmd][0]]])


@@ -222,10 +219,7 @@ class Decoder(srd.Decoder):
 
         if self.state == FIND_ADDRESS:
             # The READ/WRITE bit is only in address bytes, not data bytes.
 
         if self.state == FIND_ADDRESS:
             # The READ/WRITE bit is only in address bytes, not data bytes.

-            if self.databyte & 1:
-                self.wr = 0
-            else:
-                self.wr = 1
+            self.wr = 0 if (self.databyte & 1) else 1

             d = self.databyte >> 1
         elif self.state == FIND_DATA:
             d = self.databyte
             d = self.databyte >> 1
         elif self.state == FIND_DATA:
             d = self.databyte


@@ -234,10 +228,7 @@ class Decoder(srd.Decoder):
             pass
 
         # Last bit that came in was the ACK/NACK bit (1 = NACK).
             pass
 
         # Last bit that came in was the ACK/NACK bit (1 = NACK).

-        if sda == 1:
-            ack_bit = 'NACK'
-        else:
-            ack_bit = 'ACK'
+        ack_bit = 'NACK' if (sda == 1) else 'ACK'

 
         if self.state == FIND_ADDRESS and self.wr == 1:
             cmd = 'ADDRESS_WRITE'
 
         if self.state == FIND_ADDRESS and self.wr == 1:
             cmd = 'ADDRESS_WRITE'


@@ -249,16 +240,10 @@ class Decoder(srd.Decoder):
             cmd = 'DATA_READ'
 
         self.put(self.out_proto, [cmd, d, ack_bit])
             cmd = 'DATA_READ'
 
         self.put(self.out_proto, [cmd, d, ack_bit])

-        self.put(self.out_ann, [ANN_SHIFTED, [
-                '%s' % protocol[cmd][0],
-                '0x%02x' % d,
-                '%s' % protocol[ack_bit][0]]
-            ])
-        self.put(self.out_ann, [ANN_SHIFTED_SHORT, [
-                '%s' % protocol[cmd][1],
-                '0x%02x' % d,
-                '%s' % protocol[ack_bit][1]]
-            ])
+        self.put(self.out_ann, [ANN_SHIFTED,
+                 [protocol[cmd][0], '0x%02x' % d, protocol[ack_bit][0]]])
+        self.put(self.out_ann, [ANN_SHIFTED_SHORT,
+                 [protocol[cmd][1], '0x%02x' % d, protocol[ack_bit][1]]])

 
         self.bitcount = self.databyte = 0
         self.startsample = -1
 
         self.bitcount = self.databyte = 0
         self.startsample = -1