Skip to content

Commit 688f901

Browse files
TimNekkTimNekk
authored
Merge pull request #5 from MusicBoxRaspberryPi/develop
Add Config and Refactor
2 parents 699d6cf + 77ea3d3 commit 688f901

File tree

5 files changed

+126
-72
lines changed

5 files changed

+126
-72
lines changed

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,4 +158,5 @@ cython_debug/
158158
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
159159
.idea/
160160
urequests.py
161-
src/test/
161+
src/test/
162+
config.py

‎src/api.py‎

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,18 @@ class ApiInterface:
88
"accept": "application/json"
99
}
1010

11-
__BASE_URL = "http://185.185.71.49:8000"
12-
__HEALTH_URL = __BASE_URL + "/health"
13-
__DEVICE_URL = __BASE_URL + "/device"
14-
__NEXT_DEVICE_URL = __DEVICE_URL + "/next"
15-
__PREVIOUS_DEVICE_URL = __DEVICE_URL + "/previous"
16-
__PLAY_URL = __BASE_URL + "/play"
11+
def __init__(self, base_url: str):
12+
if "https" in base_url:
13+
raise ValueError("Base URL must not contain https://")
14+
if "http://" not in base_url:
15+
base_url = "http://" + base_url
16+
17+
self.__base_url = base_url
18+
self.__health_url = base_url + "/health"
19+
self.__play_url = base_url + "/play"
20+
self.__device_url = base_url + "/device"
21+
self.__next_device_url = self.__device_url + "/next"
22+
self.__previous_device_url = self.__device_url + "/previous"
1723

1824
def request(self, method: str, url: str, data=None, params=None) -> urequests.Response:
1925
if data is None:
@@ -41,18 +47,18 @@ def request(self, method: str, url: str, data=None, params=None) -> urequests.Re
4147

4248
def check_health(self) -> bool:
4349
try:
44-
return self.request("GET", self.__HEALTH_URL).status_code == 200
50+
return self.request("GET", self.__health_url).status_code == 200
4551
except:
4652
return False
4753

4854
def get_current_device(self, reset: bool = False) -> dict:
49-
return self.request("GET", self.__DEVICE_URL, params={"reset": reset}).json()
55+
return self.request("GET", self.__device_url, params={"reset": reset}).json()
5056

5157
def next_device(self) -> dict:
52-
return self.request("POST", self.__NEXT_DEVICE_URL).json()
58+
return self.request("POST", self.__next_device_url).json()
5359

5460
def previous_device(self) -> dict:
55-
return self.request("POST", self.__PREVIOUS_DEVICE_URL).json()
61+
return self.request("POST", self.__previous_device_url).json()
5662

5763
def play(self, track: str) -> dict:
58-
return self.request("POST", self.__PLAY_URL, {"id": track}).json()
64+
return self.request("POST", self.__play_url, {"id": track}).json()

‎src/config.py.dist‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
class Track:
2+
def __init__(self, id: str, name: str):
3+
self.id = id
4+
self.name = name
5+
6+
7+
class Config:
8+
TRACKS = {
9+
4117885779: Track(id="3uMUdlo47oEes3kgL4T4EC", name="Nonstop"),
10+
4233351011: Track(id="5UW6yvwo3nVA609NgprdhK", name="Supermarket")
11+
}
12+
13+
class Wifi:
14+
SSID = "WIFI_SSID"
15+
PASSWORD = "WIFI_PASSWORD"
16+
17+
class Buttons:
18+
LEFT_PIN = 12
19+
RIGHT_PIN = 13
20+
21+
class Display:
22+
SDA_PIN = 0
23+
SCL_PIN = 1
24+
25+
BUZZER_PIN = 11
26+
27+
class RFID:
28+
SDA_PIN = 15
29+
SCK_PIN = 18
30+
MOSI_PIN = 19
31+
MISO_PIN = 16
32+
RST_PIN = 14
33+
READ_DELAY = 2
34+
35+
API_BASE_URL = "http://apiurl.com"

‎src/main.py‎

Lines changed: 70 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,31 @@
66
from buttons import ButtonsInterface
77
from buzzer import BuzzerInterface
88
from rfid import RFIDInterface
9-
10-
11-
class Track:
12-
def __init__(self, id: str, name: str):
13-
self.id = id
14-
self.name = name
9+
from config import Config
1510

1611

1712
class App:
1813
def __init__(self):
19-
self.__display = DisplayInterface(sda_pin=0, scl_pin=1)
20-
self.__api = ApiInterface()
21-
self.__buttons = ButtonsInterface(left_button_pin=12, right_button_pin=13)
22-
self.__buzzer = BuzzerInterface(pin=11)
23-
self.__rfid = RFIDInterface(sda_pin=15, sck_pin=18, mosi_pin=19, miso_pin=16, rst_pin=14)
24-
self.__last_rfid_successful_read_time = 0
25-
self.__rfid_read_delay = 2
14+
self.__display = DisplayInterface(
15+
sda_pin=Config.Display.SDA_PIN,
16+
scl_pin=Config.Display.SCL_PIN
17+
)
18+
self.__buttons = ButtonsInterface(
19+
left_button_pin=Config.Buttons.LEFT_PIN,
20+
right_button_pin=Config.Buttons.RIGHT_PIN
21+
)
22+
self.__rfid = RFIDInterface(
23+
sda_pin=Config.RFID.SDA_PIN,
24+
sck_pin=Config.RFID.SCK_PIN,
25+
mosi_pin=Config.RFID.MOSI_PIN,
26+
miso_pin=Config.RFID.MISO_PIN,
27+
rst_pin=Config.RFID.RST_PIN
28+
)
29+
self.__buzzer = BuzzerInterface(pin=Config.BUZZER_PIN)
30+
self.__api = ApiInterface(base_url=Config.API_BASE_URL)
2631

27-
self.__tracks = {
28-
4117885779: Track(id="3uMUdlo47oEes3kgL4T4EC", name="Nonstop"),
29-
4233351011: Track(id="5UW6yvwo3nVA609NgprdhK", name="Supermarket")
30-
}
32+
self.__last_rfid_successful_read_time = 0
33+
self.__rfid_read_delay = Config.RFID.READ_DELAY
3134

3235
def run(self) -> None:
3336
self.__display.print_centered(f"{chr(Symbols.NOTE.index)} Music Box {chr(Symbols.NOTE.index)}", line=1)
@@ -36,49 +39,18 @@ def run(self) -> None:
3639
self.__connect_to_wifi()
3740
if not self.__check_api_health():
3841
return
42+
43+
self.__display.print("Devices:", line=1, clear_full=True)
3944
self.__display_current_device()
4045

4146
while True:
42-
if self.__buttons.was_left_button_pressed():
43-
self.__display.print("Loading...", line=2, clear_line=True)
44-
current_device_data = self.__api.previous_device()
45-
self.__change_device(current_device_data)
46-
self.__buttons.reset()
47-
48-
if self.__buttons.was_right_button_pressed():
49-
self.__display.print("Loading...", line=2, clear_line=True)
50-
current_device_data = self.__api.next_device()
51-
self.__change_device(current_device_data)
52-
self.__buttons.reset()
53-
54-
if time.time() - self.__last_rfid_successful_read_time > self.__rfid_read_delay:
55-
card_id = self.__rfid.read_card_id()
56-
57-
if not card_id:
58-
continue
59-
60-
self.__display.print("Reading card...", line=2, clear_line=True)
61-
62-
if card_id not in self.__tracks:
63-
self.__display.print(f"{chr(Symbols.CROSS.index)} Unknown card", line=2, clear_line=True)
64-
self.__buzzer.play_failure()
65-
time.sleep(1)
66-
self.__display_current_device()
67-
continue
68-
69-
track = self.__tracks[card_id]
70-
self.__api.play(track.id)
71-
self.__display.print(f"{chr(Symbols.NOTE.index)} {track.name}", line=2, clear_line=True)
72-
self.__buzzer.play_success()
73-
time.sleep(1)
74-
self.__display_current_device()
75-
76-
self.__last_rfid_successful_read_time = time.time()
47+
self.__check_buttons_press()
48+
self.__check_rfid_read()
7749

7850
def __connect_to_wifi(self) -> None:
7951
self.__display.print_centered("WiFi", line=2)
8052

81-
wlan.connect()
53+
wlan.connect(Config.Wifi.SSID, Config.Wifi.PASSWORD)
8254

8355
self.__display.print_centered(f"{chr(Symbols.TICK.index)} WiFi ", line=2)
8456
self.__buzzer.play_success()
@@ -96,20 +68,60 @@ def __check_api_health(self) -> bool:
9668
return True
9769

9870
def __display_current_device(self) -> None:
99-
self.__display.clear()
100-
self.__display.print("Devices:", line=1)
101-
71+
self.__display.print("Loading...", line=2, clear_line=True)
10272
current_device_data = self.__api.get_current_device(reset=True)
103-
self.__change_device(current_device_data)
73+
self.__display_device(current_device_data)
10474

105-
def __change_device(self, device_data: dict) -> None:
75+
def __display_device(self, device_data: dict) -> None:
10676
if device_data == {}:
10777
self.__display.print("No devices", line=2)
10878
return
10979

11080
text = f"{device_data['index'] + 1}/{device_data['total']} {device_data['device']['name']}"
11181
self.__display.print(text, line=2)
11282

83+
def __check_buttons_press(self) -> None:
84+
was_left_button_pressed = self.__buttons.was_left_button_pressed()
85+
was_right_button_pressed = self.__buttons.was_right_button_pressed()
86+
87+
if not any((was_left_button_pressed, was_right_button_pressed)):
88+
return
89+
90+
self.__display.print("Loading...", line=2, clear_line=True)
91+
92+
if was_left_button_pressed:
93+
current_device_data = self.__api.previous_device()
94+
elif was_right_button_pressed:
95+
current_device_data = self.__api.next_device()
96+
97+
self.__display_device(current_device_data)
98+
self.__buttons.reset()
99+
100+
def __check_rfid_read(self) -> None:
101+
if time.time() - self.__last_rfid_successful_read_time <= self.__rfid_read_delay:
102+
return
103+
104+
card_id = self.__rfid.read_card_id()
105+
106+
if not card_id:
107+
return
108+
109+
self.__display.print("Reading card...", line=2, clear_line=True)
110+
111+
if card_id not in Config.TRACKS:
112+
self.__display.print(f"{chr(Symbols.CROSS.index)} Unknown card", line=2, clear_line=True)
113+
self.__buzzer.play_failure()
114+
else:
115+
track = Config.TRACKS[card_id]
116+
self.__api.play(track.id)
117+
self.__display.print(f"{chr(Symbols.NOTE.index)} {track.name}", line=2, clear_line=True)
118+
self.__buzzer.play_success()
119+
120+
time.sleep(1)
121+
self.__display_current_device()
122+
123+
self.__last_rfid_successful_read_time = time.time()
124+
113125

114126
if __name__ == "__main__":
115127
app = App()

‎src/wlan.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
import time
33

44

5-
def connect():
5+
def connect(ssid: str, password: str) -> None:
66
wlan = network.WLAN(network.STA_IF)
77
wlan.active(True)
8-
wlan.connect("Tima", "00000000")
8+
wlan.connect(ssid, password)
99

1010
wait = 10
1111
while wait > 0:

0 commit comments

Comments
 (0)