diff --git a/firmware/firmware.ino b/firmware/firmware.ino
index 2fba37e..b3eea79 100755
--- a/firmware/firmware.ino
+++ b/firmware/firmware.ino
@@ -57,6 +57,8 @@ void setup() {
 #endif
 
   // Pin settings
+  pinMode(BAT_CHARGED_PIN, INPUT);
+  pinMode(BAT_CHARGING_PIN, INPUT);
   pinMode(STATUS_LED_PIN, OUTPUT);
   pinMode(ANEMOMETER_PIN, INPUT_PULLUP);
   pinMode(A0, INPUT);
@@ -69,9 +71,9 @@ void setup() {
   // Establish WiFi connection
   String wifiName = "oko-weather-" + DEVICE_NAME;
 
-  wifiManager.setMinimumSignalQuality(15);
-  wifiManager.setConnectTimeout(60); // the time in seconds to wait for the known wifi connection
-  wifiManager.setTimeout(60); // the time in seconds to wait for the user to configure the device
+  wifiManager.setMinimumSignalQuality(16);
+  wifiManager.setConnectTimeout(WIFI_AUTOCONNECT_TIMEOUT_S); // the time in seconds to wait for the known wifi connection
+  wifiManager.setTimeout(WIFI_CONFIG_PORTAL_TIMEOUT_S); // the time in seconds to wait for the user to configure the device
 
   if (!wifiManager.autoConnect(wifiName.c_str(), "DEADBEEF")) {
 #ifdef DEBUG