.gitignore

@@ -1,2 +0,0 @@
-laundry_notifier/laundry_notifier.conf
-

laundry_notifier/run.py

@@ -1,16 +1,20 @@
-import configparser
-import logging
-import math
-import smtplib
 import time
-from datetime import datetime
+import datetime
+import smtplib
+import math
 from email.mime.text import MIMEText
+from datetime import datetime
 
-import requests
 from microstacknode.hardware.accelerometer.mma8452q import MMA8452Q
 
 
-RECIPIENT_EMAILS = ['ianonavy@gmail.com']
+EMAIL_USERNAME = 'noreply@ianonavy.com'
+EMAIL_PASSWORD = 'S2PENjQbO6=cHgchw@CXs.bJ'
+RECIPIENT_EMAILS = [
+    'ianonavy@gmail.com',
+    'dmurvihill@gmail.com',
+    '5038304363@tmomail.net'
+]
 ALERT_EMAIL_TEXT = """Hi,
 
 Your laundry is done. Or maybe your roomate's. I don't know.
@@ -23,8 +27,6 @@ INTERVAL = 0.005  # seconds
 WINDOW_SIZE = 1000  # intervals
 THRESHOLD = 0.025  # G's
 MAX_EMAIL_FREQUENCY = 60  # seconds
-MAX_NOTIFICATION_FREQUENCY = 60  # seconds
-CONFIG_FILE_PATH = '/home/pi/laundry-notifier/laundry_notifier/laundry_notifier.conf'
 
 
 def average(s):
@@ -39,8 +41,8 @@ def stdev(s):
     return math.sqrt(average(list(variance)))
 
 
-def notify_user(username, password, recipient_email_address):
-    logging.info("Alerting " + recipient_email_address)
+def notify_user(recipient_email_address):
+    print("Alerting " + recipient_email_address)
 
     msg = MIMEText(ALERT_EMAIL_TEXT)
 
@@ -51,6 +53,8 @@ def notify_user(username, password, recipient_email_address):
     msg['To'] = recipient_email_address
 
     # Send the message via our own SMTP server.
+    username = EMAIL_USERNAME
+    password = EMAIL_PASSWORD
     server = smtplib.SMTP('smtp.gmail.com:587')
     server.starttls()
     server.login(username, password)
@@ -67,37 +71,21 @@ def enqueue(sliding_window, item):
 def amplitude_stdev(sliding_window):
     standard_deviations = {}
     for key in ('x', 'y', 'z'):
-        values = [measurement[key] for measurement in sliding_window]
+        values = [instance[key] for instance in sliding_window]
         standard_deviations[key] = stdev(values)
     return standard_deviations
 
 
-def send_notifications(last_notification_sent_at, iftttkey):
-    seconds_since_last_notification = \
-        (datetime.now() - last_notification_sent_at).seconds
-    logging.info("Sending notification after %ds" % seconds_since_last_notification)
-    # limit frequency of notifications
-    if seconds_since_last_notification > MAX_NOTIFICATION_FREQUENCY:
+def send_emails(last_email_sent_at):
+    print((datetime.now() - last_email_sent_at).seconds)  # for debugging
+    # limit frequency of emails
+    if (datetime.now() - last_email_sent_at).seconds > MAX_EMAIL_FREQUENCY:
         [notify_user(email) for email in RECIPIENT_EMAILS]
-        # Notify if this, then that
-        requests.get(
-            'https://maker.ifttt.com/trigger/laundry_done/with/key/%s'
-            % iftttkey)
         return datetime.now()
-    return last_notification_sent_at
+    return last_email_sent_at
 
 
 def main():
-    LOG_FORMAT = '%(asctime)-15s %(message)s'
-    logging.basicConfig(format=LOG_FORMAT)
-    logging.getLogger().setLevel(logging.INFO)
-    logging.info('Started laundry notifier')
-    config = configparser.ConfigParser()
-    config.read(CONFIG_FILE_PATH)
-    notifications_section = config['notifications']
-    iftttkey = notifications_section['ifttt_key']
-    email_username = notifications_section['email_username']
-    email_password = notifications_section['email_password']
     with MMA8452Q() as accelerometer:
         # Configure accelerometer
         accelerometer.standby()
@@ -109,27 +97,20 @@ def main():
 
         sliding_window = []
         dryer_state = 'off'
-        last_notification_sent_at = datetime(1970, 1, 1, 0, 0, 0)
+        last_email_sent_at = datetime(1970, 1, 1, 0, 0, 0)
 
         while True:
             g_values = accelerometer.get_xyz()
             enqueue(sliding_window, g_values)
             sliding_stdev = amplitude_stdev(sliding_window)
+            print(sliding_stdev, dryer_state, len(sliding_window))
+            # don't send emails right at the beginning
             if g_values:
                 if sliding_stdev['x'] < THRESHOLD:
-                    # Notify recipients on state transitions from 'on' to 'off'
                     if dryer_state == 'on':
-                        logging.info('Dryer turned off; sliding stdev is %f' % sliding_stdev['x'])
-                        last_notification_sent_at = send_notifications(
-                            last_notification_sent_at,
-                            email_username,
-                            email_password,
-                            iftttkey)
+                        last_email_sent_at = send_emails(last_email_sent_at)
                     dryer_state = 'off'
                 else:
-                    # Log state transitions from 'off' to 'on'
-                    if dryer_state == 'off':
-                        logging.info('Dryer turned on; sliding stdev is %f' % sliding_stdev['x'])
                     dryer_state = 'on'
 
             time.sleep(INTERVAL)