From b6de0dc4efcb833a6f3d5d84a07bec5f1bd7d24b Mon Sep 17 00:00:00 2001
From: Elis Axelsson <elis.axelsson@gmail.com>
Date: Thu, 17 Aug 2017 23:00:36 +0200
Subject: [PATCH] Cleanup and make functions to just read values instead of
 doing things forever and ever

---
 README.org   | 12 ++++++++----
 code/main.py | 20 ++++----------------
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/README.org b/README.org
index 3c137ce..9818de6 100644
--- a/README.org
+++ b/README.org
@@ -27,9 +27,11 @@ ampy --port /dev/ttyUSB0 put hcsr04.py
 
 *** Set up distance measuring
 #+begin_src python
-import main
+import main, time
 
-main.distance()
+while True:
+    print(main.getDistance())
+    time.sleep(1)
 #+end_src
 
 ** Movement sensor
@@ -42,9 +44,11 @@ main.distance()
 
 *** Set up movement sensor
 #+begin_src python
-import main
+import main, time
 
-main.movement()
+while True:
+    print(main.getMovement())
+    time.sleep(0.5)
 #+end_src
 
 ** Relay
diff --git a/code/main.py b/code/main.py
index 56fecb8..62346d5 100644
--- a/code/main.py
+++ b/code/main.py
@@ -4,28 +4,16 @@ import time
 import machine
 
 
-def blink():
-    pin = machine.Pin(2, machine.Pin.OUT)
-
-    while True:
-        pin.value(not pin.value())
-        time.sleep_ms(500)
-
-
-def distance():
+def getDistance():
     sensor = HCSR04(trigger_pin=pins.D2, echo_pin=pins.D3)
 
-    while True:
-        print(sensor.distance_cm())
-        time.sleep(1)
+    return sensor.distance_cm()
 
 
-def movement():
+def getMovement():
     sensor = machine.Pin(pins.D2, mode=machine.Pin.IN, pull=None)
 
-    while True:
-        print(sensor.value())
-        time.sleep(0.5)
+    return sensor.value()
 
 
 def resetRelay():