From a8831884e4cc6015a74de2eff735562b3da7c7ce Mon Sep 17 00:00:00 2001
From: Nils Schulte <git@nilsschulte.de>
Date: Thu, 19 Mar 2020 17:35:20 +0100
Subject: [PATCH] cleanup

---
 Button.py | 9 ++++++---
 boot.py   | 2 +-
 main.py   | 9 ++++-----
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/Button.py b/Button.py
index bfa0f77..c360323 100644
--- a/Button.py
+++ b/Button.py
@@ -8,13 +8,16 @@ class Button():
         self.debounceTimeMs = int(debounceTimeMs)
         self.clickTime = clickTime
         self.pushDownTimeStamp = -clickTime
+        self.setCallbacks(onPushDown,onPushUp,onClick,onHold)
+        self.pin.irq(trigger=machine.Pin.IRQ_RISING|machine.Pin.IRQ_FALLING , handler=self._IRQ)
+        self.value = self.pin.value()
+        self.inverted = inverted
+
+    def setCallbacks(self,onPushDown = None, onPushUp = None,onClick = None,onHold = None):
         self.onPushDown = onPushDown
         self.onPushUp = onPushUp
         self.onClick = onClick
         self.onHold = onHold
-        self.pin.irq(trigger=machine.Pin.IRQ_RISING|machine.Pin.IRQ_FALLING , handler=self._IRQ)
-        self.value = self.pin.value()
-        self.inverted = inverted
 
     def _IRQ(self,p):
         new_value = self.pin.value()
diff --git a/boot.py b/boot.py
index d739e66..f3d3aa5 100644
--- a/boot.py
+++ b/boot.py
@@ -3,7 +3,7 @@ import webrepl
 
 webrepl.start()
 
-sta_if = network.WLAN(network.STA_IF);
+sta_if = network.WLAN(network.STA_IF)
 sta_if.active(True)
 
 #load wifi credentials from file
diff --git a/main.py b/main.py
index 89a5de4..d3fe059 100644
--- a/main.py
+++ b/main.py
@@ -28,13 +28,16 @@ Buzzer = machine.PWM(machine.Pin(2), freq=10000, duty=0)
 stepDurationMs = 8
 stepperminu = StepperL298M.Stepper([19,21,22,23],inverted=False,stepDurationMs=stepDurationMs)
 stepperhour = StepperL298M.Stepper([12,27,26,25],inverted=True, stepDurationMs=stepDurationMs)
-clock = StepperClock.StepperClock(stepperhour,stepperminu)
 
 
 leftButtonLED = machine.Pin(32,machine.Pin.OUT)
 middleButtonLED = machine.Pin(33,machine.Pin.OUT)
 rightButtonLED = machine.Pin(13,machine.Pin.OUT)
 
+
+clock = StepperClock.StepperClock(stepperhour,stepperminu)
+
+
 def leftButtonClickDown():
     leftButtonLED.on()
 def leftButtonClickUp():
@@ -56,10 +59,6 @@ def rightButtonClick():
     else:
         stepperminu.rotateTo(stepperminu.getOrientation()-0.25)
 
-    #if(clock.isRunning()):
-    #    stepperhour.stepnum = (stepperhour.stepnum+8)%stepperhour.stepsPerRev
-    #else:
-    #    stepperhour.rotateTo(stepperhour.getOrientation()+0.25)
 rightButton = Button.Button(pin=34,onPushDown=rightButtonClickDown,onPushUp=rightButtonClickUp,onClick=rightButtonClick,inverted=True)
 
 def middleButtonClickDown():