Removed reciver.py fixed clock.py

~ fixed the clock
~ changed the url to api/clock (may need to further change ahead of commit on shopping gfx system)
- removed reciver.py

diff --git a/clock.py b/clock.py
old mode 100755 (executable)
new mode 100644 (file)
index 4e50ff7..18ab07c
--- a/clock.py
+++ b/clock.py
@@ -6,9 +6,7 @@ import subprocess
 import requests
 import socket
 import struct
-import fcntl
 import time
-import sacn
 import sys
 import os
 
@@ -42,7 +40,7 @@ class dummy():
                        print(output)
 
 # use the dummy class as GPIO if the real GPIO module does not exist
-try: import RPi.GPIO
+try: import RPi.GPIO as GPIO
 except ModuleNotFoundError:
        print("RPi.GPIO Not found!\nDefaulting to dummy GPIO...")
        GPIO = dummy(debug=False)
@@ -51,9 +49,13 @@ except ModuleNotFoundError:
 class clock():
        def __init__(self):
                # fixed variables
-               self.url = "https://data.ozva.co.uk/shopping/clock.json"
+               self.url = "https://data.ozva.co.uk/api/clock"
                self.request_speed = 0.1
 
+               self.ms1 = GPIO.HIGH
+               self.ms2 = GPIO.HIGH
+               self.total_steps = 1600
+
                # dynamic variables
                self.last_position = Value("I", 0)
                self.current_position = Value("I", 0)
@@ -65,15 +67,32 @@ class clock():
                print("connecting to OzVa...")
                try:
                        print("getting data...")
-                       r = requests.get(self.url)
+
+                       r = ""
+                       while r == "":
+                               try:
+                                       r = requests.get(self.url)
+                               except:
+                                       print("connection refused...")
+                                       time.sleep(5)
+
                        print("connected!")
                        while True:
                                t = time.time()
 
-                               r = requests.get(self.url)
+                               r = ""
+                               while r == "":
+                                       try:
+                                               r = requests.get(self.url)
+                                       except:
+                                               print("connection refused...")
+                                               time.sleep(5)
+
                                data = r.json()
 
                                new_target = int(data["currentPosition"])
+                               new_target = round((new_target / 360) * self.total_steps)
+
                                if new_target != self.target_position.value:
                                        self.last_position.value = self.current_position.value
                                        self.target_position.value = new_target
@@ -92,8 +111,16 @@ class clock():
 
        def move(self):
                print("starting motor service...")
-               GPIO.setmode(GPIO.BOARD)
-               GPIO.setup((11, 13, 15), GPIO.OUT)
+
+               move_delay = 0.01 # s
+
+               GPIO.setmode(GPIO.BCM)
+
+               GPIO.setup((15, 1, 4, 5, 0, 2), GPIO.OUT)
+
+               GPIO.output((0, 1), GPIO.HIGH)
+               GPIO.output(4, self.ms1)
+               GPIO.output(5, self.ms2)
 
                try:
                        print("sending movement data...")
@@ -111,16 +138,22 @@ class clock():
                                        print(f"moving... @ {self.current_position.value}")
 
                                if forward and (not parked):
-                                       GPIO.output(13, GPIO.HIGH)
-                                       GPIO.output(11, GPIO.HIGH)
-                                       GPIO.output((11, 13, 15), GPIO.LOW)
+                                       GPIO.output(2, GPIO.HIGH)
+                                       time.sleep(move_delay)
+                                       GPIO.output(15, GPIO.HIGH)
+                                       time.sleep(move_delay)
+                                       GPIO.output(15, GPIO.LOW)
                                        self.current_position.value += 1
 
                                elif (not forward) and (not parked):
-                                       GPIO.output(11, GPIO.HIGH)
-                                       GPIO.output((11, 13, 15), GPIO.LOW)
+                                       GPIO.output(2, GPIO.LOW)
+                                       time.sleep(move_delay)
+                                       GPIO.output(15, GPIO.HIGH)
+                                       time.sleep(move_delay)
+                                       GPIO.output(15, GPIO.LOW)
                                        self.current_position.value -= 1
 
+
                                duration = self.movement_speed.value / 1000 - (time.time() - t)
                                time.sleep(duration * (duration >= 0))
 

diff --git a/reciver.py b/reciver.py
deleted file mode 100755 (executable)
index 4e5f750..0000000
--- a/reciver.py
+++ /dev/null
@@ -1,27 +0,0 @@
-#!./.venv/bin/python
-
-import sacn
-import sys
-import os
-
-receiver = sacn.sACNreceiver(bind_address="192.168.8.103")
-receiver.start()
-
-@receiver.listen_on('universe', universe=2)
-def callback(packet):
-       if packet.dmxStartCode == 0x00:
-               print(packet.dmxData)
-
-receiver.join_multicast(2)
-
-try:
-       while True:
-               pass
-
-except KeyboardInterrupt:
-       receiver.leave_multicast(2)
-       receiver.stop()
-       try:
-               sys.exit()
-       except SystemExit:
-               os._exit(130)