andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-06 15:59:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1980 from proddy/dev

Browse Source 
turn off wifi nosleep
This commit is contained in:
Proddy
2024-09-05 23:37:02 +02:00
committed by GitHub
parent 2885629d8d d3fe0422d0
commit 2450bf966b
6 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
interface/package.json
View File

@@ -48,7 +48,7 @@
"@trivago/prettier-plugin-sort-imports": "^4.3.0", "@trivago/prettier-plugin-sort-imports": "^4.3.0",
"@types/babel__core": "^7", "@types/babel__core": "^7",
"@types/formidable": "^3", "@types/formidable": "^3",
"@types/node": "^22.5.3", "@types/node": "^22.5.4",
"@types/react": "^18.3.5", "@types/react": "^18.3.5",
"@types/react-dom": "^18.3.0", "@types/react-dom": "^18.3.0",
"@types/react-router-dom": "^5.3.3", "@types/react-router-dom": "^5.3.3",

10
interface/yarn.lock
View File

@@ -1486,12 +1486,12 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@types/node@npm:^22.5.3": "@types/node@npm:^22.5.4":
version: 22.5.3 version: 22.5.4
resolution: "@types/node@npm:22.5.3" resolution: "@types/node@npm:22.5.4"
dependencies: dependencies:
undici-types: "npm:~6.19.2" undici-types: "npm:~6.19.2"
checksum: 10c0/a068e31dd424a0eadfba7d9a5c5b415b76cfd729f3caa299674ad257f59df85c5fe77f1d0a343e811864c790baefb9003d7627618ee3cf85400af338481ba29f checksum: 10c0/b445daa7eecd761ad4d778b882d6ff7bcc3b4baad2086ea9804db7c5d4a4ab0298b00d7f5315fc640a73b5a1d52bbf9628e09c9fec0cf44dbf9b4df674a8717d
languageName: node languageName: node
linkType: hard linkType: hard
@@ -1719,7 +1719,7 @@ __metadata:
"@trivago/prettier-plugin-sort-imports": "npm:^4.3.0" "@trivago/prettier-plugin-sort-imports": "npm:^4.3.0"
"@types/babel__core": "npm:^7" "@types/babel__core": "npm:^7"
"@types/formidable": "npm:^3" "@types/formidable": "npm:^3"
"@types/node": "npm:^22.5.3" "@types/node": "npm:^22.5.4"
"@types/react": "npm:^18.3.5" "@types/react": "npm:^18.3.5"
"@types/react-dom": "npm:^18.3.0" "@types/react-dom": "npm:^18.3.0"
"@types/react-router-dom": "npm:^5.3.3" "@types/react-router-dom": "npm:^5.3.3"

5
lib/framework/NetworkSettingsService.cpp
View File

@@ -131,7 +131,7 @@ void NetworkSettingsService::setWiFiPowerOnRSSI() {
// 802.11ax - wifi6 // 802.11ax - wifi6
int max_tx_pwr = MAX_TX_PWR_DBM_n; // assume wifi4 int max_tx_pwr = MAX_TX_PWR_DBM_n; // assume wifi4
int threshold = WIFI_SENSITIVITY_n + 70; // Margin in dBm * 10 on top of threshold int threshold = WIFI_SENSITIVITY_n + 120; // Margin in dBm * 10 on top of threshold
// Assume AP sends with max set by ETSI standard. // Assume AP sends with max set by ETSI standard.
// 2.4 GHz: 100 mWatt (20 dBm) // 2.4 GHz: 100 mWatt (20 dBm)
@@ -421,10 +421,11 @@ StateUpdateResult NetworkSettings::update(JsonObject root, NetworkSettings & set
settings.staticIPConfig = root["static_ip_config"] | false; settings.staticIPConfig = root["static_ip_config"] | false;
settings.bandwidth20 = root["bandwidth20"] | false; settings.bandwidth20 = root["bandwidth20"] | false;
settings.tx_power = static_cast<uint8_t>(root["tx_power"] | 0); settings.tx_power = static_cast<uint8_t>(root["tx_power"] | 0);
settings.nosleep = root["nosleep"] | false; settings.nosleep = root["nosleep"] | true;
settings.enableMDNS = root["enableMDNS"] | true; settings.enableMDNS = root["enableMDNS"] | true;
settings.enableCORS = root["enableCORS"] | false; settings.enableCORS = root["enableCORS"] | false;
settings.CORSOrigin = root["CORSOrigin"] | "*"; settings.CORSOrigin = root["CORSOrigin"] | "*";
// extended settings // extended settings
JsonUtils::readIP(root, "local_ip", settings.localIP); JsonUtils::readIP(root, "local_ip", settings.localIP);
JsonUtils::readIP(root, "gateway_ip", settings.gatewayIP); JsonUtils::readIP(root, "gateway_ip", settings.gatewayIP);

4
src/modbus.cpp
View File

@@ -383,7 +383,7 @@ ModbusMessage Modbus::handleWrite(const ModbusMessage & request) {
const auto & dev = *dev_it; const auto & dev = *dev_it;
LOG_DEBUG("found device '%s' of type %d", dev->name(), dev->device_type()); LOG_DEBUG("found device '%s' of type %d", dev->name().c_str(), dev->device_type());
// binary search in modbus infos // binary search in modbus infos
auto key = EntityModbusInfoKey(dev->device_type(), tag_type, register_offset); auto key = EntityModbusInfoKey(dev->device_type(), tag_type, register_offset);
@@ -512,7 +512,7 @@ int Modbus::getRegisterCount(const DeviceValue & dv) {
num_registers = 1; num_registers = 1;
else if (num_values <= (1L << 16)) else if (num_values <= (1L << 16))
num_registers = 2; num_registers = 2;
else if (num_values <= (1L << 32)) else if (num_values <= (1L << 32)) // TODO: fix, this will always be true for compilers with 32 bit longs
num_registers = 4; num_registers = 4;
else else
LOG_ERROR("num_registers is too big to be encoded with modbus registers"); LOG_ERROR("num_registers is too big to be encoded with modbus registers");

6
src/system.cpp
View File

@@ -1226,6 +1226,12 @@ bool System::check_upgrade(bool factory_settings) {
}); });
} }
// force WiFi sleep to off (was default on < 3.7.0-dev-33)
EMSESP::esp8266React.getNetworkSettingsService()->update([&](NetworkSettings & networkSettings) {
networkSettings.nosleep = true;
return StateUpdateResult::CHANGED;
});
// Network Settings Wifi tx_power is now using the value * 4. // Network Settings Wifi tx_power is now using the value * 4.
EMSESP::esp8266React.getNetworkSettingsService()->update([&](NetworkSettings & networkSettings) { EMSESP::esp8266React.getNetworkSettingsService()->update([&](NetworkSettings & networkSettings) {
if (networkSettings.tx_power == 20) { if (networkSettings.tx_power == 20) {

2
src/version.h
View File

@@ -1 +1 @@
#define EMSESP_APP_VERSION "3.7.0-dev.33" #define EMSESP_APP_VERSION "3.7.0-dev.34"