From: Uwe Hermann <redacted>
Date: Sun, 18 Apr 2010 01:15:06 +0000 (+0200)
Subject: Python: Bugfixes (True/False != 1/0).
X-Git-Tag: libsigrokdecode-0.1.0~337
X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=commitdiff_plain;h=930bd9d961b9a13259ffb4997be9fa6ebcdb9da9

Python: Bugfixes (True/False != 1/0).
---

diff --git a/scripts/i2c.py b/scripts/i2c.py
index 46c3381..973751b 100644
--- a/scripts/i2c.py
+++ b/scripts/i2c.py
@@ -84,8 +84,8 @@ def sigrokdecode_i2c(inbuf):
 
 	# Get SCL/SDA bit values (0/1 for low/high) of the first sample.
 	s = ord(inbuf[0])
-	oldscl = (s & (1 << scl_bit)) != 0
-	oldsda = (s & (1 << sda_bit)) != 0
+	oldscl = (s & (1 << scl_bit)) >> scl_bit
+	oldsda = (s & (1 << sda_bit)) >> sda_bit
 
 	# Loop over all samples.
 	# TODO: Handle LAs with more/less than 8 channels.
@@ -94,8 +94,8 @@ def sigrokdecode_i2c(inbuf):
 		s = ord(s) # FIXME
 
 		# Get SCL/SDA bit values (0/1 for low/high).
-		scl = (s & (1 << scl_bit)) != 0
-		sda = (s & (1 << sda_bit)) != 0
+		scl = (s & (1 << scl_bit)) >> scl_bit
+		sda = (s & (1 << sda_bit)) >> sda_bit
 
 		# TODO: Wait until the bus is idle (SDA = SCL = 1) first?
 
diff --git a/scripts/transitioncounter.py b/scripts/transitioncounter.py
index 7c9c6a3..c16ce46 100644
--- a/scripts/transitioncounter.py
+++ b/scripts/transitioncounter.py
@@ -41,7 +41,7 @@ def sigrokdecode_count_transitions(inbuf):
 	# Presets...
 	oldbyte = inbuf[0]
 	for i in range(channels):
-		oldbit[i] = (oldbyte & (1 << i)) != 0
+		oldbit[i] = (oldbyte & (1 << i)) >> i
 
 	# Loop over all samples.
 	# TODO: Handle LAs with more/less than 8 channels.
@@ -50,7 +50,7 @@ def sigrokdecode_count_transitions(inbuf):
 		if oldbyte == s:
 			continue
 		for i in range(channels):
-			curbit = (s & (1 << i) != 0)
+			curbit = (s & (1 << i)) >> i
 			# Optimization: Skip identical bits (no transitions).
 			if oldbit[i] == curbit:
 				continue