Gandalf/OctoPrint-Enclosure
1
0
Fork 0
Code Issues 156 Pull Requests 6 Actions Packages Projects Releases 28 Wiki Activity

Change read_raw_i2c_temp to return both temp & hum

Browse Source 
Change read_raw_i2c_temp to return both temperature and humidity.  Slave code concatenates the two float values into a byte array.
This commit is contained in:
Mitch Gallman
2021-05-03 23:22:52 -04:00
committed by GitHub
parent 65c0152437
commit 04d57cc6d7
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
octoprint_enclosure/__init__.py
View File

@@ -993,11 +993,9 @@ class EnclosurePlugin(octoprint.plugin.StartupPlugin, octoprint.plugin.TemplateP
temp = self.read_mcp_temp(sensor['temp_sensor_address'])
hum = 0
elif sensor['temp_sensor_type'] == "temp_raw_i2c":
temp = self.read_raw_i2c_temp(sensor)
hum = 0
temp, hum = self.read_raw_i2c_temp(sensor)
elif sensor['temp_sensor_type'] == "hum_raw_i2c":
temp = 0
hum = self.read_raw_i2c_temp(sensor)
hum, temp = self.read_raw_i2c_temp(sensor)
else:
self._logger.info("temp_sensor_type no match")
temp = None
@@ -1053,14 +1051,16 @@ class EnclosurePlugin(octoprint.plugin.StartupPlugin, octoprint.plugin.TemplateP
i2creg = self.to_int(sensor['temp_i2c_register'])
with SMBus(i2cbus) as bus:
data = bus.read_i2c_block_data(i2caddr, i2creg, 4)
val = struct.unpack('f', bytearray(data))
fval = val[0]
data = bus.read_i2c_block_data(i2caddr, i2creg, 8)
val = struct.unpack('f', bytearray(data[0:4]))
fval1 = val[0]
val = struct.unpack('f', bytearray(data[4:8]))
fval2 = val[0]
self._logger.debug("read_raw_i2c_temp(i2cbus=%s, i2caddr=%s, i2creg=%s) data == %s (%s)",
i2cbus, i2caddr, i2creg, data, fval)
self._logger.debug("read_raw_i2c_temp(i2cbus=%s, i2caddr=%s, i2creg=%s) data == %s (%s, %s)",
i2cbus, i2caddr, i2creg, data, fval1, fval2)
return str(fval)
return (fval1, fval2)
except Exception as ex:
template = "An exception of type {0} occurred on {1} when reading on i2c address {2}, reg {3}. Arguments:\n{4!r}"