3 Commits

Author SHA1 Message Date
Yurii
1a03117257 chore: bump version 2024-02-05 19:58:11 +03:00
Yurii
b421780f7b fix: change channel to 6 for Wifi AP 2024-02-05 19:57:26 +03:00
Yurii
987c101394 fix: set wifi sleep if use ble 2024-02-05 19:55:40 +03:00
4 changed files with 7 additions and 7 deletions

View File

@@ -162,7 +162,7 @@ namespace Network {
#ifdef ARDUINO_ARCH_ESP8266 #ifdef ARDUINO_ARCH_ESP8266
WiFi.setSleepMode(WIFI_NONE_SLEEP); WiFi.setSleepMode(WIFI_NONE_SLEEP);
#elif defined(ARDUINO_ARCH_ESP32) #elif defined(ARDUINO_ARCH_ESP32)
WiFi.setSleep(WIFI_PS_NONE); WiFi.setSleep(USE_BLE ? WIFI_PS_MIN_MODEM : WIFI_PS_NONE);
#endif #endif
WiFi.softAPdisconnect(); WiFi.softAPdisconnect();
@@ -309,12 +309,14 @@ namespace Network {
Log.sinfoln(FPSTR(L_NETWORK), F("No STA credentials, start AP")); Log.sinfoln(FPSTR(L_NETWORK), F("No STA credentials, start AP"));
WiFi.mode(WIFI_AP_STA); WiFi.mode(WIFI_AP_STA);
this->delayCallback(250);
WiFi.softAP(this->apName, this->apPassword, this->apChannel); WiFi.softAP(this->apName, this->apPassword, this->apChannel);
} else if (!this->isApEnabled() && millis() - this->disconnectedTime > this->failedConnectTimeout) { } else if (!this->isApEnabled() && millis() - this->disconnectedTime > this->failedConnectTimeout) {
Log.sinfoln(FPSTR(L_NETWORK), F("Disconnected for a long time, start AP")); Log.sinfoln(FPSTR(L_NETWORK), F("Disconnected for a long time, start AP"));
WiFi.mode(WIFI_AP_STA); WiFi.mode(WIFI_AP_STA);
this->delayCallback(250);
WiFi.softAP(this->apName, this->apPassword, this->apChannel); WiFi.softAP(this->apName, this->apPassword, this->apChannel);
} else if (this->isConnecting() && millis() - this->prevReconnectingTime > this->resetConnectionTimeout) { } else if (this->isConnecting() && millis() - this->prevReconnectingTime > this->resetConnectionTimeout) {

View File

@@ -15,7 +15,7 @@ extra_configs = secrets.default.ini
[env] [env]
framework = arduino framework = arduino
lib_deps = lib_deps =
bblanchon/ArduinoJson@^7.0.2 bblanchon/ArduinoJson@^7.0.3
;ihormelnyk/OpenTherm Library@^1.1.4 ;ihormelnyk/OpenTherm Library@^1.1.4
https://github.com/Laxilef/opentherm_library/archive/refs/heads/fix_start_bit.zip https://github.com/Laxilef/opentherm_library/archive/refs/heads/fix_start_bit.zip
arduino-libraries/ArduinoMqttClient@^0.1.8 arduino-libraries/ArduinoMqttClient@^0.1.8
@@ -51,7 +51,7 @@ monitor_speed = 115200
monitor_filters = direct monitor_filters = direct
board_build.flash_mode = dio board_build.flash_mode = dio
board_build.filesystem = littlefs board_build.filesystem = littlefs
version = 1.4.0-rc.13 version = 1.4.0-rc.14
; Defaults ; Defaults
[esp8266_defaults] [esp8266_defaults]
@@ -65,8 +65,6 @@ extra_scripts =
build_flags = ${env.build_flags} build_flags = ${env.build_flags}
board_build.ldscript = eagle.flash.1m256.ld board_build.ldscript = eagle.flash.1m256.ld
;board_build.ldscript = eagle.flash.4m1m.ld ;board_build.ldscript = eagle.flash.4m1m.ld
platform_packages =
framework-arduinoespressif8266 @ https://github.com/esp8266/Arduino.git
[esp32_defaults] [esp32_defaults]
platform = espressif32 platform = espressif32

View File

@@ -12,7 +12,7 @@ struct NetworkSettings {
struct { struct {
char ssid[33] = AP_SSID_DEFAULT; char ssid[33] = AP_SSID_DEFAULT;
char password[65] = AP_PASSWORD_DEFAULT; char password[65] = AP_PASSWORD_DEFAULT;
byte channel = 1; byte channel = 6;
} ap; } ap;
struct { struct {

View File

@@ -1,5 +1,5 @@
#define PROJECT_NAME "OpenTherm Gateway" #define PROJECT_NAME "OpenTherm Gateway"
#define PROJECT_VERSION "1.4.0-rc.13" #define PROJECT_VERSION "1.4.0-rc.14"
#define PROJECT_REPO "https://github.com/Laxilef/OTGateway" #define PROJECT_REPO "https://github.com/Laxilef/OTGateway"
#define EMERGENCY_TIME_TRESHOLD 120000 #define EMERGENCY_TIME_TRESHOLD 120000