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

Updated naming conventions, remerged test into source file

Browse Source
This commit is contained in:
Connor
2019-06-28 20:48:45 +10:00
parent db9d78bcf8
commit 6415737639
4 changed files with 12 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
setup.py
View File

@@ -10,7 +10,7 @@ with open('LICENSE') as f:
setup( setup(
name='sgp30', name='sgp30',
description='Library for reading data from the sensiron SGP30', description='Library for reading data from the Sensirion SGP30',
version='0.1.5', version='0.1.5',
long_description=readme, long_description=readme,
author='Simon Albinsson', author='Simon Albinsson',

6
sgp30/crc.py
View File

@@ -1,4 +1,4 @@
class Crc8: class CRC8:
def __init__(s): def __init__(s):
s.crc = 255 s.crc = 255
@@ -18,6 +18,6 @@ class Crc8:
s.crc = crc & 0xFF s.crc = crc & 0xFF
return s.crc return s.crc
# print(Crc8().hash([1,144])) #print(CRC8().hash([1,144]))
#print(hex(Crc8().hash([0xBE, 0xEF]))) #print(hex(CRC8().hash([0xBE, 0xEF])))
#[1, 144, 76, 0, 6, 39] #[1, 144, 76, 0, 6, 39]

13
sgp30/sgp30.py
View File

@@ -3,10 +3,8 @@ from smbus2 import SMBusWrapper, SMBus, i2c_msg
from collections import namedtuple from collections import namedtuple
from functools import partial from functools import partial
from time import sleep, asctime, time from time import sleep, asctime, time
import json
from copy import copy from copy import copy
import os.path from .crc import CRC8
from .crc import Crc8
DEVICE_BUS = 1 DEVICE_BUS = 1
@@ -37,11 +35,11 @@ class SGP30():
self._last_save_time = time() self._last_save_time = time()
self._baseline = baseline self._baseline = baseline
SGP30Answer = namedtuple("SGP30Answer", ["data", "raw", "crc_ok"]) SGP30Packet = namedtuple("SGP30Packet", ["data", "raw", "crc_ok"])
def _raw_validate_crc(s, r): def _raw_validate_crc(s, r):
a = list(zip(r[0::3], r[1::3])) a = list(zip(r[0::3], r[1::3]))
crc = r[2::3] == [Crc8().hash(i) for i in a] crc = r[2::3] == [CRC8().hash(i) for i in a]
return(crc, a) return(crc, a)
def read_write(self, cmd): def read_write(self, cmd):
@@ -56,7 +54,7 @@ class SGP30():
r = list(read) r = list(read)
crc_ok, a = self._raw_validate_crc(r) crc_ok, a = self._raw_validate_crc(r)
answer = [i << 8 | j for i, j in a] answer = [i << 8 | j for i, j in a]
return self.SGP30Answer(answer, r, crc_ok) return self.SGP30Packet(answer, r, crc_ok)
def dump_baseline(self): def dump_baseline(self):
baseline = self.read_write(_cmds.GET_BASELINE) baseline = self.read_write(_cmds.GET_BASELINE)
@@ -111,7 +109,10 @@ def main():
print(sgp.read_features()) print(sgp.read_features())
print(sgp.read_serial()) print(sgp.read_serial())
sgp.init_sgp() sgp.init_sgp()
for i in range(300):
print(sgp.read_measurements()) print(sgp.read_measurements())
time.sleep(0.1)
sgp.store_baseline()
bus.close() bus.close()

14
test.py
View File

@@ -1,14 +0,0 @@
from smbus2 import SMBusWrapper
from sgp30 import SGP30
import time
with SMBusWrapper(1) as bus:
sgp = SGP30(bus)
print("resetting all i2c devices")
sgp.i2c_general_call()
print(sgp.read_features())
print(sgp.read_serial())
sgp.init_sgp()
for i in range(300):
print(sgp.read_measurements())
time.sleep(0.1)
sgp.store_baseline()