right order

This commit is contained in:
Matthew Frost 2024-01-31 12:17:44 +01:00
parent 4eadaa84a6
commit 2c73bbc1eb

View file

@ -9,16 +9,6 @@ void unlockDoor(bool silent) {
if (!silent) { if (!silent) {
granted_beep(); granted_beep();
} }
#ifdef WIFI
#ifdef WEBHOOKS
#ifdef WEBHOOK_UNLOCK
ExecuteHTTPRequest(String(webhook_unlock_url));
#endif
#endif
#ifdef TINANCE2_BACKEND
tinance2logrequest("Door Unlocked");
#endif
#endif
#endif #endif
#ifdef RELAY1 #ifdef RELAY1
#ifdef RELAY1_REVERSED #ifdef RELAY1_REVERSED
@ -35,6 +25,17 @@ void unlockDoor(bool silent) {
digitalWrite(LEDCTL_PIN,LOW); digitalWrite(LEDCTL_PIN,LOW);
#endif #endif
#ifdef WIFI
#ifdef WEBHOOKS
#ifdef WEBHOOK_UNLOCK
ExecuteHTTPRequest(String(webhook_unlock_url));
#endif
#endif
#ifdef TINANCE2_BACKEND
tinance2logrequest("Door Unlocked");
#endif
#endif
} }
void lockDoor(bool silent) { void lockDoor(bool silent) {
@ -42,19 +43,6 @@ void lockDoor(bool silent) {
if (!silent) { if (!silent) {
short_beep(); short_beep();
} }
#ifdef WIFI
#ifdef WEBHOOKS
#ifdef WEBHOOK_LOCK
ExecuteHTTPRequest(String(webhook_lock_url));
#endif
#endif
#ifdef TINANCE2_BACKEND
tinance2logrequest("Door Locked");
#endif
#endif
#endif #endif
#ifdef RELAY1 #ifdef RELAY1
#ifdef RELAY1_REVERSED #ifdef RELAY1_REVERSED
@ -70,6 +58,17 @@ void lockDoor(bool silent) {
#ifdef LEDCTL_PIN #ifdef LEDCTL_PIN
digitalWrite(LEDCTL_PIN,HIGH); digitalWrite(LEDCTL_PIN,HIGH);
#endif #endif
#ifdef WIFI
#ifdef WEBHOOKS
#ifdef WEBHOOK_LOCK
ExecuteHTTPRequest(String(webhook_lock_url));
#endif
#endif
#ifdef TINANCE2_BACKEND
tinance2logrequest("Door Locked");
#endif
#endif
} }