From e83160d3d265dad1a7fad6a7ebec500ccd5e6d25 Mon Sep 17 00:00:00 2001 From: Pavel Brychta Date: Tue, 26 May 2020 10:55:14 +0200 Subject: [PATCH] Prodlouzeni timeoutu pro STA pripojeni --- src/WiFiConfig.cpp | 18 +++++++++--------- src/WiFiConfig.h | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/WiFiConfig.cpp b/src/WiFiConfig.cpp index 9b8797f..e2ecb0b 100644 --- a/src/WiFiConfig.cpp +++ b/src/WiFiConfig.cpp @@ -88,10 +88,10 @@ #include #if defined(ESP8266) -#include +# include #else -#include -#include // duvod resetu (https://github.com/espressif/arduino-esp32/issues/449) +# include +# include // duvod resetu (https://github.com/espressif/arduino-esp32/issues/449) #endif #include "WiFiConfig.h" #include @@ -100,19 +100,19 @@ #include "embHTML.h" #ifdef DEBUG_ESP_PORT -#define DEBUG_MSG(_1, ...) DEBUG_ESP_PORT.printf_P(PSTR(_1), ##__VA_ARGS__) +# define DEBUG_MSG(_1, ...) DEBUG_ESP_PORT.printf_P(PSTR(_1), ##__VA_ARGS__) #else -#define DEBUG_MSG(...) +# define DEBUG_MSG(...) #endif #if defined(ESP8266) extern "C" { -#include "user_interface.h" +# include "user_interface.h" } -#define ESP_getChipId() (ESP.getChipId()) +# define ESP_getChipId() (ESP.getChipId()) #else -#include -#define ESP_getChipId() ((uint32_t)ESP.getEfuseMac()) +# include +# define ESP_getChipId() ((uint32_t)ESP.getEfuseMac()) #endif #define DNS_PORT 53 diff --git a/src/WiFiConfig.h b/src/WiFiConfig.h index a6fe359..da93e24 100644 --- a/src/WiFiConfig.h +++ b/src/WiFiConfig.h @@ -2,7 +2,7 @@ * @file WiFiConfig.h * @author Pavel Brychta, http://www.xpablo.cz * - * Copyright (c) 2015-19 Pavel Brychta. All rights reserved. + * Copyright (c) 2015-20 Pavel Brychta. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -76,15 +76,15 @@ typedef void (*wificonfig_cb)(wificonfigstate_t state); // definice callbacku typedef void (*storeparam_cb)(const char *newvalue); // callback pro ulozeni uzivatelskeho parametru #ifndef WIFI_STA_CONNECT_TIMEOUT -#define WIFI_STA_CONNECT_TIMEOUT 15000UL // delka cekani na pripojeni k AP [ms] +# define WIFI_STA_CONNECT_TIMEOUT 20000UL // delka cekani na pripojeni k AP [ms] #endif #ifndef SETUP_SSID -#define SETUP_SSID "ESPPBSetup_?" +# define SETUP_SSID "ESPPBSetup_?" #endif #ifndef SETUP_CHANNEL -#define SETUP_CHANNEL 3 +# define SETUP_CHANNEL 3 #endif /**