From 9a193e837f06d6d38fe41962a974add376afbcb7 Mon Sep 17 00:00:00 2001
From: Moirtz Wagner <m0w1337@gmail.com>
Date: Fri, 2 Jan 2026 20:37:25 +0100
Subject: [PATCH] Better keypad scanning and reboot with *****

---
 FingerprintDoorbell/lib/Keypad/src/Keypad.cpp |  4 ++--
 FingerprintDoorbell/src/main.cpp              | 10 ++++++----
 FingerprintDoorbell/src/sunrise.hpp           |  2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/FingerprintDoorbell/lib/Keypad/src/Keypad.cpp b/FingerprintDoorbell/lib/Keypad/src/Keypad.cpp
index e79c52b..afbd0f5 100644
--- a/FingerprintDoorbell/lib/Keypad/src/Keypad.cpp
+++ b/FingerprintDoorbell/lib/Keypad/src/Keypad.cpp
@@ -40,7 +40,7 @@ Keypad::Keypad(char *userKeymap, byte *row, byte *col, byte numRows, byte numCol
 
 	begin(userKeymap);
 
-	setDebounceTime(10);
+	setDebounceTime(15);
 	setHoldTime(500);
 	keypadEventListener = 0;
 
@@ -86,7 +86,7 @@ void Keypad::scanKeys() {
 		pin_mode(rowPins[r],OUTPUT);
 		pin_write(rowPins[r],HIGH);
 	}
-	delayMicroseconds(3);	// Let pins settle.
+	delayMicroseconds(1000);	// Let pins settle.
 	for (byte r=0; r<sizeKpd.rows; r++) {
 		pin_mode(rowPins[r],INPUT_PULLUP);
 	}
diff --git a/FingerprintDoorbell/src/main.cpp b/FingerprintDoorbell/src/main.cpp
index 188b2b6..9c792de 100644
--- a/FingerprintDoorbell/src/main.cpp
+++ b/FingerprintDoorbell/src/main.cpp
@@ -53,7 +53,7 @@ const int buzzerOutputPin = 8; // pin connected to the buzzer (when using hardwa
 const int doorOpenerOutputPin = 9; //USE 6 HERE pin connected to the door opener (when using hardware connection instead of mqtt to open the door)
 const int   doorbellOutputPin = 10; // pin connected to the doorbell (when using hardware connection instead of mqtt to ring the bell)
 const int KeyboardPin = 4;  //pin connected to an analog keyboard (see voltage ranges for the nubers in seperate array)
-const int KEY_POLLING_MS = 25;
+const int KEY_POLLING_MS = 50;
 const uint8_t NUM_PIN_MAX_DIGITS = {10};
 #ifdef CUSTOM_GPIOS
   const int   customOutput1 = 18; // not used internally, but can be set over MQTT
@@ -783,7 +783,9 @@ void keyboardPoller(void){
   static uint8_t pin[NUM_PIN_MAX_DIGITS] = {0};
   uint8_t key = keypad.getKey();
   if(key){
-    Serial.printf("KeyVal: %c\n", key);
+    //String keyStr(key);
+    //notifyClients("Key: "+keyStr);
+    //Serial.printf("KeyVal: %c\n", key);
     pin[pinpos++] = key;
     resetTimer = 0;
     io.digitalWrite(buzzerOutputPin, HIGH);
@@ -792,7 +794,7 @@ void keyboardPoller(void){
   }
   if(pinpos){
     resetTimer++;
-    if(resetTimer > 4000/KEY_POLLING_MS){
+    if(resetTimer > 2000/KEY_POLLING_MS){
       resetTimer = 0;
       pinpos = 0;
       Serial.println("RESET");
@@ -814,7 +816,7 @@ void keyboardPoller(void){
         openDoor(match);
       }else{
         pinOK = true;
-        PinStr = "#############";
+        PinStr = "************";
         for(uint8_t i=0;i<pinpos;i++){
           uint8_t coosenPinDigit = PinStr.charAt(i);
           if(pin[i] != coosenPinDigit){
diff --git a/FingerprintDoorbell/src/sunrise.hpp b/FingerprintDoorbell/src/sunrise.hpp
index 09e20dd..6956d96 100644
--- a/FingerprintDoorbell/src/sunrise.hpp
+++ b/FingerprintDoorbell/src/sunrise.hpp
@@ -88,7 +88,7 @@ uint32_t calculateSunrise(float lat, float lng,int localOffset, bool sunset = fa
         UT -= 24.0;
     }
     //10. convert UT value to local time zone of latitude/longitude
-    return (UT + localOffset + timeinfo.tm_isdst) * 60; // convert to minutes
+    return (UT + localOffset + timeinfo.tm_isdst - 1) * 60; // convert to minutes
     }
     uint32_t calculateSunset(float lat, float lng,int localOffset) {
         return calculateSunrise(lat, lng, localOffset, true);