pablo2048/WiFiConfig
1
0
Fork 0
Code Issues 4 Pull Requests Releases 10 Wiki Activity

Prodlouzeni timeoutu pro STA pripojeni

Browse Source
This commit is contained in:
Pavel Brychta 2020-05-26 10:55:14 +02:00
parent baef6c322e
commit e83160d3d2
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/WiFiConfig.cpp
View File

@ -88,10 +88,10 @@
#include <DNSServer.h> #include <DNSServer.h>
#if defined(ESP8266) #if defined(ESP8266)
#include <ESP8266WebServer.h> # include <ESP8266WebServer.h>
#else #else
#include <WebServer.h> # include <WebServer.h>
#include <rom/rtc.h> // duvod resetu (https://github.com/espressif/arduino-esp32/issues/449) # include <rom/rtc.h> // duvod resetu (https://github.com/espressif/arduino-esp32/issues/449)
#endif #endif
#include "WiFiConfig.h" #include "WiFiConfig.h"
#include <EEPROM.h> #include <EEPROM.h>
@ -100,19 +100,19 @@
#include "embHTML.h" #include "embHTML.h"
#ifdef DEBUG_ESP_PORT #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 #else
#define DEBUG_MSG(...) # define DEBUG_MSG(...)
#endif #endif
#if defined(ESP8266) #if defined(ESP8266)
extern "C" { extern "C" {
#include "user_interface.h" # include "user_interface.h"
} }
#define ESP_getChipId() (ESP.getChipId()) # define ESP_getChipId() (ESP.getChipId())
#else #else
#include <esp_wifi.h> # include <esp_wifi.h>
#define ESP_getChipId() ((uint32_t)ESP.getEfuseMac()) # define ESP_getChipId() ((uint32_t)ESP.getEfuseMac())
#endif #endif
#define DNS_PORT 53 #define DNS_PORT 53

8
src/WiFiConfig.h
View File

@ -2,7 +2,7 @@
* @file WiFiConfig.h * @file WiFiConfig.h
* @author Pavel Brychta, http://www.xpablo.cz * @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 * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * 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 typedef void (*storeparam_cb)(const char *newvalue); // callback pro ulozeni uzivatelskeho parametru
#ifndef WIFI_STA_CONNECT_TIMEOUT #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 #endif
#ifndef SETUP_SSID #ifndef SETUP_SSID
#define SETUP_SSID "ESPPBSetup_?" # define SETUP_SSID "ESPPBSetup_?"
#endif #endif
#ifndef SETUP_CHANNEL #ifndef SETUP_CHANNEL
#define SETUP_CHANNEL 3 # define SETUP_CHANNEL 3
#endif #endif
/** /**