Move implementation from __i2c_rdwr__() function in Micropython/CircuitPython to write_read_block()

Author: malcolm-sparkfun

qwiic_i2c/circuitpy_i2c.py

@@ -300,7 +300,21 @@ def write_block(self, address, commandCode, value):
 		return self.writeBlock(address, commandCode, value)
 
 	def writeReadBlock(self, address, writeBytes, readNBytes):
-		return self.__i2c_rdwr__(address, writeBytes, readNBytes)
+		read_buffer = bytearray(readNBytes)
+
+		if not self._i2cbus.try_lock():
+			raise Exception("Unable to lock I2C bus")
+		
+		try:
+			self._i2cbus.writeto_then_readfrom(address, bytes(writeBytes), read_buffer)
+		except Exception as e:
+			self._i2cbus.unlock()
+			raise e
+		else:
+			self._i2cbus.unlock()
+
+		return list(read_buffer)
+		
 
 	def write_read_block(self, address, writeBytes, readNBytes):
 		return self.writeReadBlock(address, writeBytes, readNBytes)
@@ -347,33 +361,4 @@ def scan(self):
 			self._i2cbus.unlock()
 
 		return devices
-	
-	#-----------------------------------------------------------------------
-	# Custom method for reading +8-bit register using `i2c_msg` from `smbus2`
-	#
-	# Designed to have same operation as the __i2c_rdwr method in linux_i2c.py
-	def __i2c_rdwr__(self, address, write_message, read_nbytes):
-		"""
-		Custom method used for 16-bit (or greater) register reads
-		:param address: 7-bit address
-		:param write_message: list with register(s) to read
-		:param read_nbytes: number of bytes to be read
-
-		:return: response of read transaction
-		:rtype: list
-		"""
-		read_buffer = bytearray(read_nbytes)
-
-		if not self._i2cbus.try_lock():
-			raise Exception("Unable to lock I2C bus")
-		
-		try:
-			self._i2cbus.writeto_then_readfrom(address, bytes(write_message), read_buffer)
-		except Exception as e:
-			self._i2cbus.unlock()
-			raise e
-		else:
-			self._i2cbus.unlock()
-
-		return list(read_buffer)
-		
+	

qwiic_i2c/micropython_i2c.py

@@ -171,7 +171,9 @@ def write_block(self, address, commandCode, value):
 		return self.writeBlock(address, commandCode, value)
 
 	def writeReadBlock(self, address, writeBytes, readNBytes):
-		return self.__i2c_rdwr__(address, writeBytes, readNBytes)
+		# micropython I2C doesn't have a corresponding "i2c_rdwr" function like smbus2, so we will make our own by passing stop=False to not send stop bits between repeated transfers
+		self._i2cbus.writeto(address, bytes(writeBytes), False)
+		return self._i2cbus.readfrom(address, readNBytes)
 
 	def write_read_block(self, address, writeBytes, readNBytes):
 		return self.writeReadBlock(address, writeBytes, readNBytes)
@@ -198,24 +200,3 @@ def ping(self, devAddress):
 	def scan(self):
 		""" Returns a list of addresses for the devices connected to the I2C bus."""
 		return self._i2cbus.scan()
-	
-	#-----------------------------------------------------------------------
-	# Custom method for reading +8-bit register using `i2c_msg` from `smbus2`
-	#
-	# Designed to have same operation as the __i2c_rdwr method in linux_i2c.py
-	def __i2c_rdwr__(self, address, write_message, read_nbytes):
-		"""
-		Custom method used for 16-bit (or greater) register reads
-		:param address: 7-bit address
-		:param write_message: list with register(s) to read
-		:param read_nbytes: number of bytes to be read
-
-		:return: response of read transaction
-		:rtype: list
-		"""
-
-		# micropython I2C doesn't have a corresponding "i2c_rdwr" function like smbus2, so we will make our own by passing stop=False to not send stop bits between repeated transfers
-		self._i2cbus.writeto(address, bytes(write_message), False)
-		return self._i2cbus.readfrom(address, read_nbytes)
-
-