smallsolar/PySGP30
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removes unneccesary bind

Browse Source 
There is no point in binding rw-function to the right bus-object if we
are already in an object that is bound to a bus.
This commit is contained in:
Simon Albinsson
2018-04-16 12:43:44 +00:00
parent 9292f4e17e
commit 5a3bfcfd3d
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sgp30/sgp30.py
View File

@@ -33,7 +33,6 @@ class Sgp30():
def __init__(self,bus,device_address = 0x58, baseline_filename=BASELINE_FILENAME): def __init__(self,bus,device_address = 0x58, baseline_filename=BASELINE_FILENAME):
self._bus = bus self._bus = bus
self._device_addr = device_address self._device_addr = device_address
self.rw=partial(self.read_write)
self._start_time = time() self._start_time = time()
self._baseline_filename=baseline_filename self._baseline_filename=baseline_filename
@@ -61,12 +60,12 @@ class Sgp30():
def store_baseline(self): def store_baseline(self):
with open(self._baseline_filename,"w") as conf: with open(self._baseline_filename,"w") as conf:
baseline=self.rw(_cmds.GET_BASELINE) baseline=self.read_write(_cmds.GET_BASELINE)
if baseline.crc_ok == True: if baseline.crc_ok == True:
json.dump(baseline.raw,conf) json.dump(baseline.raw,conf)
return True return True
else: else:
print("Ignoring baseline due to invalid CRC") #print("Ignoring baseline due to invalid CRC")
return False return False
def try_set_baseline(self): def try_set_baseline(self):
@@ -80,14 +79,14 @@ class Sgp30():
else: else:
crc,_ = self._raw_validate_crc(conf) crc,_ = self._raw_validate_crc(conf)
if len(conf) == 6 and crc == True: if len(conf) == 6 and crc == True:
self.rw(_cmds.new_set_baseline(conf)) self.read_write(_cmds.new_set_baseline(conf))
return True return True
else: else:
print("Failed to load baseline, invalid data") #print("Failed to load baseline, invalid data")
return False return False
def read_measurements(self): def read_measurements(self):
return self.rw(_cmds.IAQ_MEASURE) return self.read_write(_cmds.IAQ_MEASURE)
def read_selftest(self): def read_selftest(self):
return self.read_write(_cmds.IAQ_SELFTEST) return self.read_write(_cmds.IAQ_SELFTEST)
@@ -100,9 +99,7 @@ class Sgp30():
def init_sgp(self): def init_sgp(self):
#print("Initializing SGP30") #print("Initializing SGP30")
self.rw(_cmds.IAQ_INIT) self.read_write(_cmds.IAQ_INIT)
self.try_set_baseline()
#print(rw(SET_BASELINE))
def i2c_geral_call(self): def i2c_geral_call(self):
"""This attempts to reset _ALL_ devices on the i2c buss """This attempts to reset _ALL_ devices on the i2c buss