diff --git a/admin/main.go b/admin/main.go index 5b137b8..d342748 100644 --- a/admin/main.go +++ b/admin/main.go @@ -200,7 +200,7 @@ func getOpened(ctx context.Context, cmd *cli.Command) error { return err } - opened, err := makeGetReq(fmt.Sprintf("%s/read", server)) + opened, err := makeGetReq(fmt.Sprintf("%s/open", server)) if err != nil { return err } @@ -244,7 +244,7 @@ func getAlert(context.Context, *cli.Command) error { return err } - alert, err := makeGetReq(fmt.Sprintf("%s/alerts", server)) + alert, err := makeGetReq(fmt.Sprintf("%s/alert", server)) if err != nil { return err } @@ -305,7 +305,7 @@ func createManageAlert(alert bool) func(context.Context, *cli.Command) error { data.For = secs } - _, err = makePostReq(fmt.Sprintf("%s/alerts", server), data) + _, err = makePostReq(fmt.Sprintf("%s/alert", server), data) if err != nil { return err } diff --git a/peripheral/main.py b/peripheral/main.py index 2f57e11..cb8b0b0 100644 --- a/peripheral/main.py +++ b/peripheral/main.py @@ -7,7 +7,7 @@ from machine import Pin THRESHOLD_DISTANCE = 15 # cm SOUND_SPEED = 340 * 100 # m/s * centi = cm/s MAX_CONNECTION_RETRIES = 50 -ULTRA_OPENED_THRESHOLD = 3 +ULTRA_OPENED_THRESHOLD = 2 class App: @@ -148,14 +148,18 @@ class App: self.led.low() self.ultra_opened_counter = 0 + # was it just closed? if self.previously_opened: self.update_server() + self.previously_opened = False else: self.led.high() self.ultra_opened_counter += 1 - if self.ultra_opened_counter >= ULTRA_OPENED_THRESHOLD: + # was it just opened? +wait delay + if self.ultra_opened_counter >= ULTRA_OPENED_THRESHOLD and not self.previously_opened: self.update_server() + self.previously_opened = True if i >= 20: self.led.toggle() @@ -169,9 +173,8 @@ class App: utime.sleep_ms(500) except Exception as e: - print(f"Fatal exception occurred: {e}") + print(f"Fatal error occurred: {e}") - self.previously_opened = self.opened i += 1 if __name__ == "__main__":