andreil/klipper
1
0
Fork 0
mirror of https://github.com/andreili/klipper.git synced 2025-08-23 19:34:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

htu21: fix crash on unknown dev id

Browse Source 
Signed-off-by: Timofey Titovets <nefelim4ag@gmail.com>
This commit is contained in:
Timofey Titovets 2025-05-31 15:25:17 +02:00 committed by KevinOConnor
parent 105ce35e1b
commit d6902240dd
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
klippy/extras/htu21d.py
View File

@ -15,7 +15,7 @@ from . import bus
# Si7013 - Untested # Si7013 - Untested
# Si7020 - Untested # Si7020 - Untested
# Si7021 - Tested on Pico MCU # Si7021 - Tested on Pico MCU
# SHT21 - Untested # SHT21 - Tested on Linux MCU.
# #
###################################################################### ######################################################################
@ -34,7 +34,7 @@ HTU21D_COMMANDS = {
} }
HTU21D_RESOLUTION_MASK = 0x7E; HTU21D_RESOLUTION_MASK = 0x7E
HTU21D_RESOLUTIONS = { HTU21D_RESOLUTIONS = {
'TEMP14_HUM12':int('00000000',2), 'TEMP14_HUM12':int('00000000',2),
'TEMP13_HUM10':int('10000000',2), 'TEMP13_HUM10':int('10000000',2),
@ -42,31 +42,40 @@ HTU21D_RESOLUTIONS = {
'TEMP11_HUM11':int('10000001',2) 'TEMP11_HUM11':int('10000001',2)
} }
ID_MAP = {
0x0D: 'SI7013',
0x14: 'SI7020',
0x15: 'SI7021',
0x31: 'SHT21',
0x01: 'SHT21',
0x32: 'HTU21D',
}
# Device with conversion time for tmp/resolution bit # Device with conversion time for tmp/resolution bit
# The format is: # The format is:
# <CHIPNAME>:{id:<ID>, ..<RESOlUTION>:[<temp time>,<humidity time>].. } # <CHIPNAME>:{id:<ID>, ..<RESOlUTION>:[<temp time>,<humidity time>].. }
HTU21D_DEVICES = { HTU21D_DEVICES = {
'SI7013':{'id':0x0D, 'SI7013':{
'TEMP14_HUM12':[.11,.12], 'TEMP14_HUM12':[.11,.12],
'TEMP13_HUM10':[ .7, .5], 'TEMP13_HUM10':[ .7, .5],
'TEMP12_HUM08':[ .4, .4], 'TEMP12_HUM08':[ .4, .4],
'TEMP11_HUM11':[ .3, .7]}, 'TEMP11_HUM11':[ .3, .7]},
'SI7020':{'id':0x14, 'SI7020':{
'TEMP14_HUM12':[.11,.12], 'TEMP14_HUM12':[.11,.12],
'TEMP13_HUM10':[ .7, .5], 'TEMP13_HUM10':[ .7, .5],
'TEMP12_HUM08':[ .4, .4], 'TEMP12_HUM08':[ .4, .4],
'TEMP11_HUM11':[ .3, .7]}, 'TEMP11_HUM11':[ .3, .7]},
'SI7021':{'id':0x15, 'SI7021':{
'TEMP14_HUM12':[.11,.12], 'TEMP14_HUM12':[.11,.12],
'TEMP13_HUM10':[ .7, .5], 'TEMP13_HUM10':[ .7, .5],
'TEMP12_HUM08':[ .4, .4], 'TEMP12_HUM08':[ .4, .4],
'TEMP11_HUM11':[ .3, .7]}, 'TEMP11_HUM11':[ .3, .7]},
'SHT21': {'id':0x31, 'SHT21': {
'TEMP14_HUM12':[.85,.29], 'TEMP14_HUM12':[.85,.29],
'TEMP13_HUM10':[.43, .9], 'TEMP13_HUM10':[.43, .9],
'TEMP12_HUM08':[.22, .4], 'TEMP12_HUM08':[.22, .4],
'TEMP11_HUM11':[.11,.15]}, 'TEMP11_HUM11':[.11,.15]},
'HTU21D':{'id':0x32, 'HTU21D':{
'TEMP14_HUM12':[.50,.16], 'TEMP14_HUM12':[.50,.16],
'TEMP13_HUM10':[.25, .5], 'TEMP13_HUM10':[.25, .5],
'TEMP12_HUM08':[.13, .3], 'TEMP12_HUM08':[.13, .3],
@ -128,19 +137,16 @@ class HTU21D:
if self._chekCRC8(rdevId) != checksum: if self._chekCRC8(rdevId) != checksum:
logging.warning("htu21d: Reading deviceId !Checksum error!") logging.warning("htu21d: Reading deviceId !Checksum error!")
rdevId = rdevId >> 8 rdevId = rdevId >> 8
deviceId_list = list( guess_dev = ID_MAP.get(rdevId, "Unknown")
filter( if guess_dev == self.deviceId:
lambda elem: HTU21D_DEVICES[elem]['id'] == rdevId,HTU21D_DEVICES) logging.info("htu21d: Found Device Type %s" % guess_dev)
)
if len(deviceId_list) != 0:
logging.info("htu21d: Found Device Type %s" % deviceId_list[0])
else: else:
logging.warning("htu21d: Unknown Device ID %#x " % rdevId) logging.warning("htu21d: Unknown Device ID %#x " % rdevId)
if self.deviceId != deviceId_list[0]: if self.deviceId != guess_dev:
logging.warning( logging.warning(
"htu21d: Found device %s. Forcing to type %s as config.", "htu21d: Found device %s. Forcing to type %s as config." %
deviceId_list[0],self.deviceId) (guess_dev, self.deviceId))
# Set Resolution # Set Resolution
params = self.i2c.i2c_read([HTU21D_COMMANDS['READ']], 1) params = self.i2c.i2c_read([HTU21D_COMMANDS['READ']], 1)