created class, removed a few unneccesary rows

In order to make edits to class readable i commit this mostly white
space edit. Further more it removes a few application specific or
testing lines.

sgp30/sgp30.py

@@ -2,7 +2,6 @@ import smbus2
 from smbus2 import SMBusWrapper, SMBus, i2c_msg
 from collections import namedtuple 
 from functools import partial
-#import Adafruit_PureIO.smbus as adabus
 from time import sleep, asctime,time
 import json
 from copy import copy
@@ -15,57 +14,57 @@ BASELINE_FILENAME = os.path.expanduser("~/sgp_config_data.txt")
 #print bus.write_byte_datadata(DEVICE_ADDR, 0x00, 0x01)
 #self._i2c_read_words_from_cmd([0x36, 0x82], 0.01, 3)
 
-Sgp30Cmd = namedtuple("Sgp30Cmd",["commands","replylen","waittime"])
-GET_SERIAL=Sgp30Cmd([0x36, 0x82],6,10)
-GET_FEATURES=Sgp30Cmd([0x20, 0x15],2,2)
-IAQ_INIT=Sgp30Cmd([0x20, 0x03],0,10)
-IAQ_MEASURE=Sgp30Cmd([0x20, 0x08],6,12)
-IAQ_SELFTEST=Sgp30Cmd([0x20, 0x32],3,520)
-GET_BASELINE=Sgp30Cmd([0x20, 0x15],6,120)
-SET_BASELINE=Sgp30Cmd([0x20, 0x1e],0,10)
+class Sgp30():
+    Sgp30Cmd = namedtuple("Sgp30Cmd",["commands","replylen","waittime"])
+    GET_SERIAL=Sgp30Cmd([0x36, 0x82],6,10)
+    GET_FEATURES=Sgp30Cmd([0x20, 0x15],2,2)
+    IAQ_INIT=Sgp30Cmd([0x20, 0x03],0,10)
+    IAQ_MEASURE=Sgp30Cmd([0x20, 0x08],6,12)
+    IAQ_SELFTEST=Sgp30Cmd([0x20, 0x32],3,520)
+    GET_BASELINE=Sgp30Cmd([0x20, 0x15],6,120)
+    SET_BASELINE=Sgp30Cmd([0x20, 0x1e],0,10)
 
-Sgp30Answer = namedtuple("Sgp30Answer",["data","raw"])
+    Sgp30Answer = namedtuple("Sgp30Answer",["data","raw"])
 
-def read_write(cmd,bus,addr=DEVICE_ADDR):
-    write = i2c_msg.write(addr,cmd.commands)
-    if cmd.replylen <= 0 :
-       bus.i2c_rdwr(write)
-    else:
-        read = i2c_msg.read(addr,cmd.replylen)
-        bus.i2c_rdwr(write) 
-        sleep(waittime/1000.0)
-        bus.i2c_rdwr(read)
-        r = list(read)
-        answer = [i<<8 | j for i,j in zip(r[0::3],r[1::3])]
-        return Sgp30Answer(answer,r)
+    def read_write(cmd,bus,addr=DEVICE_ADDR):
+        write = i2c_msg.write(addr,cmd.commands)
+        if cmd.replylen <= 0 :
+           bus.i2c_rdwr(write)
+        else:
+            read = i2c_msg.read(addr,cmd.replylen)
+            bus.i2c_rdwr(write) 
+            sleep(waittime/1000.0)
+            bus.i2c_rdwr(read)
+            r = list(read)
+            answer = [i<<8 | j for i,j in zip(r[0::3],r[1::3])]
+            return Sgp30Answer(answer,r)
 
-def try_set_baseline():
-    try:
-        with open(BASELINE_FILENAME,"w") as conf:
-            baseline=json.load(conf)
-            baseline_cmd = copy(SET_BASELINE)
-            baseline_cmd.commands += baseline
-    except IOError:
-        pass
-    except ValueError:
-        pass
-    else:
-        if len(baseline) == 6:
-            print("Loading baseline data into sensor")
-            rw(baseline_cmd)
+    def try_set_baseline():
+        try:
+            with open(BASELINE_FILENAME,"w") as conf:
+                baseline=json.load(conf)
+                baseline_cmd = copy(SET_BASELINE)
+                baseline_cmd.commands += baseline
+        except IOError:
+            pass
+        except ValueError:
+            pass
+        else:
+            if len(baseline) == 6:
+                print("Loading baseline data into sensor")
+                rw(baseline_cmd)
 
-def init_sgp(bus):
-    print("Initializing SGP30")
-    rw(IAQ_INIT)
-    print("Waiting for sensor warmup")
-    try_set_baseline()
-    #print(rw(SET_BASELINE))
-    sleep(15)
+    def init_sgp(bus):
+        print("Initializing SGP30")
+        rw(IAQ_INIT)
+        print("Waiting for sensor warmup")
+        try_set_baseline()
+        #print(rw(SET_BASELINE))
+        sleep(15)
 
-def i2c_geral_call(bus):
-    print("resetting bus")
-    bus.write_byte(0,0x06)
-    sleep(.1)
+    def i2c_geral_call(bus):
+        bus.write_byte(0,0x06)
+        sleep(.1)
 
 def store_baseline(n):
     if (n > 3600 * 12) and (n % 3600 == 3599):
@@ -73,27 +72,21 @@ def store_baseline(n):
             baseline= rw(GET_BASELINE)
             json.dump(baseline.raw,conf)
 
-def http_post_data(url="http://localhost/setdata"):
-    try:
-        requests.get(url,params={"co2": co2eq,"tvoc":tvoc},timeout=.5)
-    except:
-        pass
-
-with SMBusWrapper(1) as bus:
-    rw=partial(read_write,bus=bus)
-    i2c_geral_call(bus)
-    print("Features: %s"%repr(rw(GET_FEATURES)))
-    print("Serial: %s"%repr(rw(GET_SERIAL)))
-    init_sgp(bus)
-    #print(rw(IAQ_SELFTEST))
-    print("Testing meassure")
-    print(rw(IAQ_MEASURE))
-    print("Testing meassure again")
-    sleep(1)
-    print(rw(IAQ_MEASURE))
-    sleep(1)
-    print("Running")
-    with open("/tmp/air.txt","w") as f:
+if __name__ == "__main__":
+    main()
+main():
+    with SMBusWrapper(1) as bus:
+        rw=partial(read_write,bus=bus)
+        i2c_geral_call(bus)
+        print("Features: %s"%repr(rw(GET_FEATURES)))
+        print("Serial: %s"%repr(rw(GET_SERIAL)))
+        init_sgp(bus)
+        #print(rw(IAQ_SELFTEST))
+        print("Testing meassure")
+        print(rw(IAQ_MEASURE))
+        print("Testing meassure again")
+        sleep(1)
+        print("Running")
         n=0
         while(True):
             start = time()
@@ -102,9 +95,8 @@ with SMBusWrapper(1) as bus:
             res = ( "%s CO_2eq: %d ppm, TVOC: %d"%( asctime(), co2eq, tvoc ))
             print(res)
             f.write("%i %i %i \n"%(time(),co2eq,tvoc))
-            http_post_data()
             store_baseline(n)
             elapsed = (time() - start)
             sleep(1 - elapsed )
 
-bus.close()
+    bus.close()