diff --git a/src/main.cpp b/src/main.cpp index ea739e0..565f1af 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -101,9 +101,6 @@ long previousMotionMillis=millis(); short previousState=0; long previousNoMoNotifyMinutes=0; -uint repeatTriggerCounter=0; -const int repeatTriggerResetSeconds=30; -const short requiredRepeatsToTrigger=1; void loop() { if (!mqttClient.connected()) { reconnect(); @@ -117,27 +114,15 @@ void loop() { Serial.print(" previousState: "); Serial.println(previousState); if (currentState == HIGH) { - if (repeatTriggerCounter >= requiredRepeatsToTrigger) { send_mqtt("motion"); - } else { - send_mqtt("motion_ignored"); - } digitalWrite(LED_BUILTIN,HIGH); previousMotionMillis=millis(); - repeatTriggerCounter++; - } + } else { + digitalWrite(LED_BUILTIN,LOW); + } previousState = currentState; } - if ( - (currentState == LOW) - && (repeatTriggerCounter >= requiredRepeatsToTrigger) - && ((millis()-previousMotionMillis)/millisPerSecond >= repeatTriggerResetSeconds) - ) { - repeatTriggerCounter =0; - send_mqtt("motion_repeat_trigger_reset"); - } - const int secondsPerMinute=60; long minutesSinceLastMotion=(millis()-previousMotionMillis)/(millisPerSecond*secondsPerMinute); if ((previousNoMoNotifyMinutes != minutesSinceLastMotion) && (0 != minutesSinceLastMotion)) { @@ -145,10 +130,5 @@ void loop() { previousNoMoNotifyMinutes = minutesSinceLastMotion; } - const int ledDelaySeconds=5; - if ((millis()-previousMotionMillis)/(millisPerSecond) >= ledDelaySeconds) { - digitalWrite(LED_BUILTIN,LOW); - } - delay(20); }