Choosing the most efficient accesspoint now

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;
 
@@ -82,10 +82,14 @@ bool Keypad::getKeys() {
 // Private : Hardware scan
 void Keypad::scanKeys() {
 	// Re-intialize the row pins. Allows sharing these pins with other hardware.
+	for (byte r=0; r<sizeKpd.rows; r++) {
+		pin_mode(rowPins[r],OUTPUT);
+		pin_write(rowPins[r],HIGH);
+	}
+	delayMicroseconds(1000);	// Let pins settle.
 	for (byte r=0; r<sizeKpd.rows; r++) {
 		pin_mode(rowPins[r],INPUT_PULLUP);
 	}
-	delayMicroseconds(1);	// Let pins settle.
 	// bitMap stores ALL the keys that are being pressed.
 	for (byte c=0; c<sizeKpd.columns; c++) {
 		pin_mode(columnPins[c],OUTPUT);

FingerprintDoorbell/src/main.cpp

@@ -40,7 +40,7 @@ Keypad keypad = Keypad( makeKeymap(keys), rowPins, colPins, ROWS, COLS );
 
 enum class Mode { scan, enroll, wificonfig, maintenance, cooldown };
 
-const char* VersionInfo = "0.5";
+const char* VersionInfo = "0.6";
 
 // ===================================================================================================================
 // Caution: below are not the credentials for connecting to your home network, they are for the Access Point mode!!!
@@ -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
@@ -121,7 +121,7 @@ String getLogMessagesAsHtml() {
 
 String getTimestampString(){
   struct tm timeinfo;
-  if(!getLocalTime(&timeinfo)){
+  if(!getLocalTime(&timeinfo, 1000)){
     Serial.println("Failed to obtain time");
     return "no time";
   }
@@ -251,14 +251,83 @@ bool checkPairingValid() {
   }
 }
 
+uint32_t WiFi_scanNetworks(void ){
+  uint32_t _numNetworks = 0;
+
+  int8_t res;
+  res = WiFi.scanNetworks();
+  if(res == WIFI_SCAN_FAILED){
+    addLogMessage(F("NetworkScanFailed"));
+  }else if(res == WIFI_SCAN_RUNNING){
+    while(WiFi.scanComplete() == WIFI_SCAN_RUNNING){
+      delay(100);
+    }
+    _numNetworks = WiFi.scanComplete();
+  }else if(res >=0 ) {
+    _numNetworks = res;
+  }
+  return _numNetworks;
+}
+
 
 bool initWifi() {
+  uint32_t _numNetworks = 0;
   // Connect to Wi-Fi
   WifiSettings wifiSettings = settingsManager.getWifiSettings();
   WiFi.mode(WIFI_STA);
   WiFi.config(INADDR_NONE, INADDR_NONE, INADDR_NONE, INADDR_NONE);
+  WiFi.setSortMethod(WIFI_CONNECT_AP_BY_SIGNAL);
+  WiFi.setScanMethod(WIFI_ALL_CHANNEL_SCAN);
+  WiFi.persistent(false);
+  WiFi.mode(WIFI_OFF);
+  WiFi.mode(WIFI_STA);
+  WiFi.disconnect(true); // delete old config
+  WiFi.begin();
+  delay(500); // 500ms seems to work in most cases, may depend on AP
+  WiFi.disconnect(true); // delete old config
+
   WiFi.setHostname(wifiSettings.hostname.c_str()); //define hostname
-  WiFi.begin(wifiSettings.ssid.c_str(), wifiSettings.password.c_str());
+  _numNetworks = WiFi_scanNetworks();  // scan in case this gets called before any scans
+
+  if (_numNetworks == 0) {
+    addLogMessage(F("No networks found"));
+    WiFi.begin(wifiSettings.ssid.c_str(), wifiSettings.password.c_str());
+  } else {
+#ifdef WM_DEBUG_LEVEL
+    DEBUG_WM(n, F("networks found"));
+#endif
+    int bestConnection = -1;
+    // Find best RSSI AP for given SSID
+    for (int i = 0; i < _numNetworks; i++) {
+      if (wifiSettings.ssid == WiFi.SSID(i)) {
+        addLogMessage(String(F("SSID ")) + wifiSettings.ssid + String(F(" found with RSSI: ")) +
+                  String(WiFi.RSSI(i)) + String(F("(")) +
+                  String(constrain((100.0 + WiFi.RSSI(i)) * 2, 0, 100)) +
+                  String(F(" %) and BSSID: ")) + WiFi.BSSIDstr(i) +
+                  String(F(" and channel: ")) + String(WiFi.channel(i)));
+        if (bestConnection == -1) {
+          bestConnection = i;
+        } else {
+          if (WiFi.RSSI(i) > WiFi.RSSI(bestConnection)) {
+            bestConnection = i;
+          }
+        }
+      }
+    }
+    if (bestConnection == -1) {
+      addLogMessage(String(F("No network found with SSID: "))+wifiSettings.ssid.c_str());
+      WiFi.begin(wifiSettings.ssid.c_str(), wifiSettings.password.c_str());
+    } else {
+      addLogMessage(String(F("Trying to connect to SSID ")) + wifiSettings.ssid + String(F(" found with RSSI: ")) +
+                  String(WiFi.RSSI(bestConnection)) + String(F("(")) +
+                  String(constrain((100.0 + WiFi.RSSI(bestConnection)) * 2, 0, 100)) +
+                  String(F(" %) and BSSID: ")) + WiFi.BSSIDstr(bestConnection) +
+                  String(F(" and channel: ")) + String(WiFi.channel(bestConnection)));
+      WiFi.begin(wifiSettings.ssid.c_str(), wifiSettings.password.c_str(), 0,
+                        WiFi.BSSID(bestConnection));
+    }
+  }
+  //WiFi.begin(wifiSettings.ssid.c_str(), wifiSettings.password.c_str());
   int counter = 0;
   while (WiFi.status() != WL_CONNECTED) {
     delay(1000);
@@ -270,7 +339,7 @@ bool initWifi() {
   Serial.println("Connected!");
   setenv("TZ", TZ_INFO, 1);             // Zeitzone  muss nach dem reset neu eingestellt werden
   tzset();
-  configTzTime(TZ_INFO, settingsManager.getAppSettings().ntpServer.c_str(), "pool.ntp.org"); // ESP32 Systemzeit mit NTP Synchronisieren
+  configTzTime(TZ_INFO, settingsManager.getAppSettings().ntpServer.c_str(),"nas.local","fritz.box"); // ESP32 Systemzeit mit NTP Synchronisieren
   // Print ESP32 Local IP Address
   Serial.println(WiFi.localIP());
 
@@ -719,7 +788,6 @@ void doScan()
       }
       break; 
     case ScanResult::matchFound:
-      notifyClients( String("Match Found: ") + match.matchId + " - " + match.matchName  + " with confidence of " + match.matchConfidence );
       if (match.scanResult != lastMatch.scanResult) {
         if (checkPairingValid()) {
           openDoor(match);
@@ -727,14 +795,15 @@ void doScan()
           notifyClients("Security issue! Match was not sent by MQTT because of invalid sensor pairing! This could potentially be an attack! If the sensor is new or has been replaced by you do a (re)pairing in settings page.");
         }
       }
+      notifyClients( String("Match Found: ") + match.matchId + " - " + match.matchName  + " with confidence of " + match.matchConfidence );
       break;
     case ScanResult::noMatchFound:
-      notifyClients(String("No Match Found (Code ") + match.returnCode + ")");
       if (match.scanResult != lastMatch.scanResult) {
         ringBell();
       } else {
         setCooldown(5000); // wait some time before next scan to let the LED blink
       }
+      notifyClients(String("No Match Found (Code ") + match.returnCode + ")");
       break;
     case ScanResult::error:
       notifyClients(String("ScanResult Error (Code ") + match.returnCode + ")");
@@ -783,7 +852,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 +863,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");
@@ -807,15 +878,25 @@ void keyboardPoller(void){
           pinOK= false;
         }
       }
-      pinpos = 0;
       if(pinOK){
         Serial.println("OPEN!!");
         Match match;
         match.matchName = "KEYPAD";
         openDoor(match);
       }else{
-        Serial.println("WRONG");
+        pinOK = true;
+        PinStr = "************";
+        for(uint8_t i=0;i<pinpos;i++){
+          uint8_t coosenPinDigit = PinStr.charAt(i);
+          if(pin[i] != coosenPinDigit){
+            pinOK= false;
+          }
+        }
+        if(pinOK){
+          ESP.restart();
+        }
       }
+      pinpos = 0;
     }
   }
 }

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);

README.md

@@ -66,11 +66,11 @@ Dieses Projekt nutzt einen **ESP32C3 Super Mini**, einen **R503 Fingerabdrucksen
 
 ## 📸 Pinouts und Datenblätter
 
-![ESP32C3 Super Mini Pinout](https://gitea.nas.el-wa.org/admin/Doorbell/src/branch/main/doku/azci_esp32-c3-super-mini-pinout.jpg)
+![ESP32C3 Super Mini Pinout](https://gitea.nas.el-wa.org/admin/Doorbell/raw/branch/main/doku/azci_esp32-c3-super-mini-pinout.jpg)
 
-![Keypad Pinout](https://gitea.nas.el-wa.org/admin/Doorbell/src/branch/main/doku/raspberry_pi_PID3845_pinout.jpg)
+![Keypad Pinout](https://gitea.nas.el-wa.org/admin/Doorbell/raw/branch/main/doku/raspberry_pi_PID3845_pinout.jpg)
 
-[R503 Datasheet](https://gitea.nas.el-wa.org/admin/Doorbell/src/branch/main/doku/R503_datasheet.pdf)
+[R503 Datasheet](https://gitea.nas.el-wa.org/admin/Doorbell/raw/branch/main/doku/R503_datasheet.pdf)
 
 ---