updating serial logger

Author: siddacious

CircuitPython_Sip_and_Puff/serial_logger.py

@@ -1,45 +1,23 @@
-class SerialLogger:
-
-    # def __init__(self):
-    # print("MIN_PRESSURE::", detector.min_pressure)
-    # print("HIGH_PRESSURE_THRESHOLD::", detector.high_pressure)
-
-    @classmethod
-    def run(cls, detector, state_map, puff_stat):
-        polarity, peak_level, duration = puff_stat
-        state_str = state_map[detector.state][polarity][0]
-        state_str = state_str.replace(" ", "_").upper()
-
-        input_type_str = state_map[detector.state][polarity][1][peak_level]
-
-        if state_map[detector.state]["name"] == "WAITING":
-            print(state_str)
-
-        if state_map[detector.state]["name"] == "STARTED":
-            print(state_str.replace(" ", "_").upper())
-
-        if state_map[detector.state]["name"] == "DETECTED":
-            type_detected = input_type_str[0].replace(" ", "_").upper()
-            log_str = "%s::%s::DURATION:%0.3f" % (state_str, type_detected, duration)
-            print(log_str)
-
-
-#################################
-# def log_state_change(self, puff_stat):
-#     state_changed = self.prev_state == self.state
-#     self.prev_state = self.state
-#     if state_changed:
-#         return
-#     polarity, peak_level, duration = puff_stat
-
-#     state_str = STATE_MAP[self.state][polarity][0]
-#     input_type_str = STATE_MAP[self.state][polarity][1][peak_level]
-#     state_str = state_str.replace(" ", "_").upper()
-#     if self.state is WAITING:
-#         print(state_str)
-#     if self.state is STARTED:
-#         print(state_str.replace(" ", "_").upper())
-#     if self.state is DETECTED:
-#         type_detected = input_type_str[0]
-#         log_str = "%s::%s::DURATION:%0.3f" % (state_str, type_detected, duration)
-#         print(log_str)
+import puff_detector
+
+detector = puff_detector.PuffDetector()
+
+@detector.on_sip
+def on_sip(strength, duration):
+    if strength == puff_detector.STRONG:
+        strength_str = "STRONG"
+    if strength == puff_detector.SOFT:
+        strength_str = "SOFT"
+    log_str = "DETECTED::SIP:%s::DURATION:%0.3f" % (strength_str, duration)
+    print(log_str)
+
+@detector.on_puff
+def on_puff(strength, duration):
+    if strength == puff_detector.STRONG:
+        strength_str = "STRONG"
+    if strength == puff_detector.SOFT:
+        strength_str = "SOFT"
+    log_str = "DETECTED::PUFF:%s::DURATION:%0.3f" % (strength_str, duration)
+    print(log_str)
+
+detector.run()