New stream based error correction implementation

Author: nilscc

am2302.pxd

@@ -1,31 +1,34 @@
 from libc.stdint cimport uint8_t, uint16_t, uint32_t
 from libcpp cimport bool
 
+cdef extern from 'array':
+    cdef cppclass array:
+        uint32_t& operator[](uint32_t)
+
+cdef extern from 'bitset':
+    cdef cppclass bitset:
+        pass
+
 cdef extern from 'wiringPi.h':
-    int wiringPiSetup()
+    void wiringPiSetup()
 
-    int INPUT
-    int OUTPUT
-    void pinMode(int, int)
+cdef extern from 'am2302_py.hpp':
 
-    int HIGH
-    int LOW
-    void digitalWrite(int, int)
-    int digitalRead(int)
+    cdef cppclass StreamReader:
+        int pin
+        void run()
+        void print()
+        bool valid()
+        bool correct()
 
-    void delay(unsigned int)
-    void delayMicroseconds(unsigned int)
+        bitset bits()
+        uint16_t temperature(const bitset &)
+        uint16_t humidity(const bitset &)
+        uint8_t parity(const bitset &)
 
-cdef extern from 'am2302_py.hpp':
+        array timingsStart
+        array timingsHigh
+        array timingsLow
 
-    cdef cppclass CReader:
-        int m_pin
-        uint32_t m_start1, m_start2, m_start3
-        uint16_t m_temperature, m_humidity
-        uint8_t m_parity
-        bool m_tempDone, m_humidityDone, m_parityDone
-        int m_awaitLevel
-        int m_awaitBit
-        uint32_t m_awaitDuration
-
-        bool run()
+        int defectHigh()
+        int defectLow()

am2302.pyx

@@ -15,87 +15,57 @@ def setup():
 def initialized():
     return _initialized
 
-cdef class Reader:
-    cdef am2302.CReader m_reader
+cdef class Stream:
+    cdef am2302.StreamReader reader
 
-    def __init__(self, pin=7):
-        self.m_reader.m_pin = pin
+    def __init__(self, pin):
+        self.reader.pin = pin
 
     def run(self):
-        return self.m_reader.run()
+        self.reader.run()
 
-    # Main output properties
+    def print(self):
+        self.reader.print()
+
+    def valid(self):
+        return self.reader.valid()
+
+    def correct(self):
+        return self.reader.correct()
+
+    def humidity(self):
+        return float(self.reader.humidity(self.reader.bits())) / 10.0
 
-    @property
     def temperature(self):
-        t = self.m_reader.m_temperature
+        t = self.reader.temperature(self.reader.bits())
         if t & 0x8000:
             t = (~t + 1) | 0x8000
         return float(t) / 10.0
 
-    @property
-    def humidity(self):
-        return float(self.m_reader.m_humidity) / 10.0
-
-    @property
-    def parity(self):
-        return self.m_reader.m_parity
-
-    @property
-    def valid(self):
-        h = self.m_reader.m_humidity
-        t = self.m_reader.m_temperature
-        p = self.m_reader.m_parity
-        return (((h >> 8) + h + (t >> 8) + t) & 0xFF) == p
-
-    # Debug properties
-
-    @property
-    def start1(self):
-        return self.m_reader.m_start1
-    @property
-    def start2(self):
-        return self.m_reader.m_start2
-    @property
-    def start3(self):
-        return self.m_reader.m_start3
-
-    @property
-    def tempDone(self):
-        return self.m_reader.m_tempDone
-    @property
-    def humidityDone(self):
-        return self.m_reader.m_humidityDone
-    @property
-    def parityDone(self):
-        return self.m_reader.m_parityDone
-
-    @property
-    def awaitLevel(self):
-        return self.m_reader.m_awaitLevel
-
-    @property
-    def awaitDuration(self):
-        return self.m_reader.m_awaitDuration
-
-    @property
-    def awaitBit(self):
-        return self.m_reader.m_awaitBit
-
-class am3202_data:
-    def __init__(self, temperature, humidity):
-        self.temperature = temperature
-        self.humidity = humidity
-
-def read(pin=7, retries=10):
-    setup()
-    reader = Reader(pin)
-    for r in range(retries):
-        if reader.run() and reader.valid:
-            return am3202_data(
-                temperature=reader.temperature, 
-                humidity=reader.humidity,
-            )
-
-        # wait before checking sensor again
-        time.sleep(1)
+    def timingsStart(self, i, val=None):
+        if val is None:
+            return self.reader.timingsStart[i]
+        else:
+            self.reader.timingsStart[i] = val
+
+    def timingsHigh(self, i, val=None):
+        if val is None:
+            return self.reader.timingsHigh[i]
+        else:
+            self.reader.timingsHigh[i] = val
+
+    def timingsLow(self, i, val=None):
+        if val is None:
+            return self.reader.timingsLow[i]
+        else:
+            self.reader.timingsLow[i] = val
+
+    def defectHigh(self):
+        i = self.reader.defectHigh()
+        if i >= 0:
+            return i
+
+    def defectLow(self):
+        i = self.reader.defectLow()
+        if i >= 0:
+            return i