3 Commits

Author SHA1 Message Date
Daniel Svitan
995bf90efb 🐛 Fixes peripheral delay on door open
All checks were successful
Gitea Build Action / build (push) Successful in 25s
2025-06-01 12:49:30 +02:00
Daniel Svitan
100bab01e4 🐛 Fixes API routes
All checks were successful
Gitea Build Action / build (push) Successful in 25s
2025-06-01 12:40:13 +02:00
Daniel Svitan
2f3ccf14db 🐛 Fixes cannot update state
All checks were successful
Gitea Build Action / build (push) Successful in 29s
2025-06-01 12:30:42 +02:00
5 changed files with 28 additions and 17 deletions

1
.gitignore vendored
View File

@@ -104,3 +104,4 @@ flake.lock
# Before adding new lines, see the comment at the top. # Before adding new lines, see the comment at the top.
.env* .env*
.idea/

View File

@@ -85,6 +85,7 @@ func makePostReq(url string, body any) ([]byte, error) {
} }
req.Header.Set("Authorization", token) req.Header.Set("Authorization", token)
req.Header.Set("Content-Type", "application/json")
res, err := http.DefaultClient.Do(req) res, err := http.DefaultClient.Do(req)
if err != nil { if err != nil {
return nil, err return nil, err
@@ -119,8 +120,8 @@ func main() {
Action: test, Action: test,
}, },
{ {
Name: "get", Name: "open",
Usage: "get door state", Usage: "get door state (opened or closed)",
Flags: []cli.Flag{ Flags: []cli.Flag{
&cli.BoolFlag{ &cli.BoolFlag{
Name: "raw", Name: "raw",
@@ -200,7 +201,7 @@ func getOpened(ctx context.Context, cmd *cli.Command) error {
return err return err
} }
opened, err := makeGetReq(fmt.Sprintf("%s/read", server)) opened, err := makeGetReq(fmt.Sprintf("%s/open", server))
if err != nil { if err != nil {
return err return err
} }
@@ -244,7 +245,7 @@ func getAlert(context.Context, *cli.Command) error {
return err return err
} }
alert, err := makeGetReq(fmt.Sprintf("%s/alerts", server)) alert, err := makeGetReq(fmt.Sprintf("%s/alert", server))
if err != nil { if err != nil {
return err return err
} }
@@ -305,7 +306,7 @@ func createManageAlert(alert bool) func(context.Context, *cli.Command) error {
data.For = secs data.For = secs
} }
_, err = makePostReq(fmt.Sprintf("%s/alerts", server), data) _, err = makePostReq(fmt.Sprintf("%s/alert", server), data)
if err != nil { if err != nil {
return err return err
} }

View File

@@ -1 +1,3 @@
__pycache__/
.env.json .env.json

View File

@@ -7,7 +7,6 @@ from machine import Pin
THRESHOLD_DISTANCE = 15 # cm THRESHOLD_DISTANCE = 15 # cm
SOUND_SPEED = 340 * 100 # m/s * centi = cm/s SOUND_SPEED = 340 * 100 # m/s * centi = cm/s
MAX_CONNECTION_RETRIES = 50 MAX_CONNECTION_RETRIES = 50
ULTRA_OPENED_THRESHOLD = 3
class App: class App:
@@ -18,7 +17,6 @@ class App:
opened: bool = False opened: bool = False
previously_opened: bool = False previously_opened: bool = False
ultra_opened_counter: int = 0
led = Pin(15, Pin.OUT) led = Pin(15, Pin.OUT)
trigger = Pin(2, Pin.OUT) trigger = Pin(2, Pin.OUT)
@@ -90,6 +88,14 @@ class App:
print(f"Connected with IP {wlan.ifconfig()[0]}") print(f"Connected with IP {wlan.ifconfig()[0]}")
self.update_server() self.update_server()
def health_check_server(self):
print("Health checking server...", end="\r")
try:
r = urequests.get(f"{self.server}/")
print(f"Server healthy [{r.status_code}]{" " * 8}")
except Exception as e:
print(f"Error occurred: {e}")
def update_server(self): def update_server(self):
print("Updating state...", end="\r") print("Updating state...", end="\r")
data = {"opened": self.opened} data = {"opened": self.opened}
@@ -101,7 +107,7 @@ class App:
headers={"Authorization": self.token, "Content-Type": "application/json"}, headers={"Authorization": self.token, "Content-Type": "application/json"},
data=raw data=raw
) )
print(f"State updated [{r.status_code}]") print(f"State updated [{r.status_code}] {r.content.decode()}")
except Exception as e: except Exception as e:
print(f"Error occurred: {e}") print(f"Error occurred: {e}")
@@ -136,32 +142,34 @@ class App:
distance = self.measure_distance() distance = self.measure_distance()
self.opened = distance >= THRESHOLD_DISTANCE self.opened = distance >= THRESHOLD_DISTANCE
if not opened: if not self.opened:
self.led.low() self.led.low()
self.ultra_opened_counter = 0
# was it just closed?
if self.previously_opened: if self.previously_opened:
self.update_server() self.update_server()
self.previously_opened = False
else: else:
self.led.high() # was it just opened? +wait delay
self.ultra_opened_counter += 1 if not self.previously_opened:
self.led.high()
if self.ultra_opened_counter >= ULTRA_OPENED_THRESHOLD:
self.update_server() self.update_server()
self.previously_opened = True
if i >= 20: if i >= 20:
self.led.toggle() self.led.toggle()
utime.sleep_ms(100) utime.sleep_ms(100)
self.led.toggle() self.led.toggle()
utime.sleep_ms(400) utime.sleep_ms(400)
i = 0 i = 0
self.health_check_server()
else: else:
utime.sleep_ms(500) utime.sleep_ms(500)
except Exception as e: except Exception as e:
print(f"Fatal exception occurred: {e}") print(f"Fatal error occurred: {e}")
self.previously_opened = self.opened
i += 1 i += 1
if __name__ == "__main__": if __name__ == "__main__":

View File

@@ -130,7 +130,6 @@ func main() {
} }
if data.Opened == opened { if data.Opened == opened {
mut.Unlock()
return c.NoContent(http.StatusOK) return c.NoContent(http.StatusOK)
} }