linting and refactoring

Author: siddacious

SipNPyuff/code.py

@@ -3,63 +3,13 @@
 import busio
 import adafruit_lps35hw
 from puff_detector import PuffDetector
-from adafruit_debug_i2c import DebugI2C
 
 
 
 
-    # if pressure > 0:
-    #     if pressure_level == 1:
-    #         pressure_type = "Soft Puff"
-    #     if pressure_level == 2:
-    #         pressure_type = "Hard Puff"
-    # else:
-
-    #     if pressure_level == 1:
-    #         pressure_type = "Soft Sip"
-    #     if pressure_level == 2:
-    #         pressure_type = "Hard Sip"
-#pylint:disable:invalid-name
-
-def catagorize_pressure(pressure):
-    """determine the strength and polarity of the pressure reading"""
-    level = 0
-    direction = 0
-    abs_pressure = abs(pressure)
-
-    if abs_pressure > min_pressure:
-        level = 1
-    if abs_pressure > high_pressure:
-        level = 2
-
-    if level != 0:
-        if pressure > 0:
-            direction = 1
-        else:
-            direction = -1
-
-    return (direction, level)
-
-def pressure_string(pressure_type):
-    dir, level =  pressure_type
-    pressure_str = "HIGH"
-    if level == 0 or dir == 0:
-        return ""
-    #print("pressure level:", level)
-    if level == 1:
-        pressure_str = "LOW"
-    elif level == 2:
-        presure_str = "HIGH"
-
-    if dir == 1:
-        pressure_str += "PUFF"
-    elif dir == -1:
-        pressure_str += "SIP"
-    return pressure_str
-
 i2c = busio.I2C(board.SCL, board.SDA)
 # i2c = DebugI2C(i2c)
-lps = adafruit_lps35hw.LPS35HW(i2c, 0x5c)
+lps = adafruit_lps35hw.LPS35HW(i2c, 0x5C)
 
 lps.zero_pressure()
 lps.data_rate = adafruit_lps35hw.DataRate.RATE_75_HZ
@@ -74,7 +24,7 @@ def pressure_string(pressure_type):
 
 lps.filter_config = True
 # print("Filter Config:", lps.low_pass_config)
-
+detector = PuffDetector(min_pressure=8, high_pressure=20)
 time.sleep(1)
 prev_direction = None
 pressure_list = []
@@ -89,16 +39,16 @@ def pressure_string(pressure_type):
     current_pressure = lps.pressure
     # print((current_pressure,))
 
-    pressure_type = catagorize_pressure(current_pressure)
+    pressure_type = detector.catagorize_pressure(current_pressure)
 
     if pressure_type != prev_pressure_type:
         puff_end = time.monotonic()
-        puff_duration = puff_end-puff_start
+        puff_duration = puff_end - puff_start
         puff_start = puff_end
-        #print("\tpressure type:", pressure_type)
-        #print("duration:", puff_duration)
+        # print("\tpressure type:", pressure_type)
+        # print("duration:", puff_duration)
         direction, level = pressure_type
-        #print("direction:", direction, "level:", level)
+        # print("direction:", direction, "level:", level)
 
         if (direction == 1) and (prev_level > level):
             print("Down")
@@ -108,18 +58,18 @@ def pressure_string(pressure_type):
             print("Up")
             puff_duration += prev_duration
             level = prev_level
-        
-        #print("direction:", direction, "level:", level)
+
+        # print("direction:", direction, "level:", level)
         if puff_duration > 0.2:
             print("direction:", direction, "level:", level)
 
             print("\tduration:", puff_duration)
-        #   print(current_pressure)
-            label = pressure_string((direction, level))
-            label = pressure_string(pressure_type)
+            #   print(current_pressure)
+            label = detector.pressure_string((direction, level))
+            label = detector.pressure_string(pressure_type)
             print("\t\t\t\t", label)
             print("____________________")
         prev_pressure_type = pressure_type
         prev_duration = puff_duration
     prev_level = level
-    time.sleep(0.01)
+    time.sleep(0.01)

SipNPyuff/puff_detector.py

@@ -1,15 +1,17 @@
 class PuffDetector:
+
+    def __init__(self, min_pressure=8, high_pressure=20):
+        self.high_pressure=high_pressure
+        self.min_pressure = min_pressure
     @classmethod
-    def rolling_average(self, measurements):
-        measurement_sum = 0
-        window_size = 3
+    def rolling_average(cls, measurements, window_size=3):
         # print("measurements", measurements)
         window = measurements[-window_size:]
 
         return sum(window) / window_size
 
     @classmethod
-    def slope(self, a, b):
+    def slope(cls, a, b):
 
         if a > b:
             return 1
@@ -19,18 +21,55 @@ def slope(self, a, b):
             return 0
 
     @classmethod
-    def direction(self, measurements):  # requires 6 measurements
-        average = self.rolling_average(measurements)
-        prev_average = self.rolling_average(measurements[-6:-3])
+    def direction(cls, measurements):  # requires 6 measurements
+        average = cls.rolling_average(measurements)
+        prev_average = cls.rolling_average(measurements[-6:-3])
         # print()
         # print("measurements:", measurements)
         # print("prev_average", prev_average)
         # print("average:", average)
-        current_slope = self.slope(average, prev_average)
+        current_slope = cls.slope(average, prev_average)
         # print("slope:", current_slope)
         return current_slope
 
     @classmethod
-    def direction_changed(self, measurements, prev_direction):
-        direction = self.direction(measurements)
+    def direction_changed(cls, measurements, prev_direction):
+        direction = cls.direction(measurements)
         return prev_direction != direction
+
+    def catagorize_pressure(self, pressure):
+        """determine the strength and polarity of the pressure reading"""
+        level = 0
+        direction = 0
+        abs_pressure = abs(pressure)
+
+        if abs_pressure > self.min_pressure:
+            level = 1
+        if abs_pressure > self.high_pressure:
+            level = 2
+
+        if level != 0:
+            if pressure > 0:
+                direction = 1
+            else:
+                direction = -1
+
+        return (direction, level)
+
+    @staticmethod
+    def pressure_string(pressure_type):
+        direction, level = pressure_type
+        pressure_str = "HIGH"
+        if level == 0 or direction == 0:
+            return ""
+        # print("pressure level:", level)
+        if level == 1:
+            pressure_str = "LOW"
+        elif level == 2:
+            pressure_str = "HIGH"
+
+        if direction == 1:
+            pressure_str += "PUFF"
+        elif direction == -1:
+            pressure_str += "SIP"
+        return pressure_str

SipNPyuff/puff_detector_test.py

@@ -1,6 +1,4 @@
 import unittest
-
-import puff_detector
 from puff_detector import PuffDetector
 
 
@@ -28,7 +26,7 @@ def test_negative_to_positive(self):
         self.assertEqual(PuffDetector.direction_changed(reading_list, -1), True)
 
     def test_negative_to_negative_er(self):
-        reading_list = [-1, -2, -3, -4, -5. -6, -7, -8]
+        reading_list = [-1, -2, -3, -4, -5.0 - 6, -7, -8]
         self.assertEqual(PuffDetector.direction_changed(reading_list, -1), False)
 
     def test_positive_to_negative(self):