From 316c1d0912d8df5b3c27d13c82748e8694bd5323 Mon Sep 17 00:00:00 2001 From: proddy Date: Thu, 5 Sep 2024 23:34:51 +0200 Subject: [PATCH 1/4] package update --- interface/package.json | 2 +- interface/yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/interface/package.json b/interface/package.json index aa983b863..8c4de3df6 100644 --- a/interface/package.json +++ b/interface/package.json @@ -48,7 +48,7 @@ "@trivago/prettier-plugin-sort-imports": "^4.3.0", "@types/babel__core": "^7", "@types/formidable": "^3", - "@types/node": "^22.5.3", + "@types/node": "^22.5.4", "@types/react": "^18.3.5", "@types/react-dom": "^18.3.0", "@types/react-router-dom": "^5.3.3", diff --git a/interface/yarn.lock b/interface/yarn.lock index 5040021b2..8d0cca047 100644 --- a/interface/yarn.lock +++ b/interface/yarn.lock @@ -1486,12 +1486,12 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:^22.5.3": - version: 22.5.3 - resolution: "@types/node@npm:22.5.3" +"@types/node@npm:^22.5.4": + version: 22.5.4 + resolution: "@types/node@npm:22.5.4" dependencies: undici-types: "npm:~6.19.2" - checksum: 10c0/a068e31dd424a0eadfba7d9a5c5b415b76cfd729f3caa299674ad257f59df85c5fe77f1d0a343e811864c790baefb9003d7627618ee3cf85400af338481ba29f + checksum: 10c0/b445daa7eecd761ad4d778b882d6ff7bcc3b4baad2086ea9804db7c5d4a4ab0298b00d7f5315fc640a73b5a1d52bbf9628e09c9fec0cf44dbf9b4df674a8717d languageName: node linkType: hard @@ -1719,7 +1719,7 @@ __metadata: "@trivago/prettier-plugin-sort-imports": "npm:^4.3.0" "@types/babel__core": "npm:^7" "@types/formidable": "npm:^3" - "@types/node": "npm:^22.5.3" + "@types/node": "npm:^22.5.4" "@types/react": "npm:^18.3.5" "@types/react-dom": "npm:^18.3.0" "@types/react-router-dom": "npm:^5.3.3" From 42572977d4f00644304ffb8adc028ca9750dd5ff Mon Sep 17 00:00:00 2001 From: proddy Date: Thu, 5 Sep 2024 23:35:04 +0200 Subject: [PATCH 2/4] turn off wifi nosleep --- lib/framework/NetworkSettingsService.cpp | 7 ++++--- src/system.cpp | 6 ++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lib/framework/NetworkSettingsService.cpp b/lib/framework/NetworkSettingsService.cpp index b41912808..9f9ce28d7 100644 --- a/lib/framework/NetworkSettingsService.cpp +++ b/lib/framework/NetworkSettingsService.cpp @@ -130,8 +130,8 @@ void NetworkSettingsService::setWiFiPowerOnRSSI() { // 802.11ac - wifi5 // 802.11ax - wifi6 - 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 max_tx_pwr = MAX_TX_PWR_DBM_n; // assume wifi4 + int threshold = WIFI_SENSITIVITY_n + 120; // Margin in dBm * 10 on top of threshold // Assume AP sends with max set by ETSI standard. // 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.bandwidth20 = root["bandwidth20"] | false; settings.tx_power = static_cast(root["tx_power"] | 0); - settings.nosleep = root["nosleep"] | false; + settings.nosleep = root["nosleep"] | true; settings.enableMDNS = root["enableMDNS"] | true; settings.enableCORS = root["enableCORS"] | false; settings.CORSOrigin = root["CORSOrigin"] | "*"; + // extended settings JsonUtils::readIP(root, "local_ip", settings.localIP); JsonUtils::readIP(root, "gateway_ip", settings.gatewayIP); diff --git a/src/system.cpp b/src/system.cpp index 7c151874f..018d111ff 100644 --- a/src/system.cpp +++ b/src/system.cpp @@ -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. EMSESP::esp8266React.getNetworkSettingsService()->update([&](NetworkSettings & networkSettings) { if (networkSettings.tx_power == 20) { From 07f5a8090edff8e262f2600f3bda03a1d3ac5c2a Mon Sep 17 00:00:00 2001 From: proddy Date: Thu, 5 Sep 2024 23:35:12 +0200 Subject: [PATCH 3/4] fix compile error --- src/modbus.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modbus.cpp b/src/modbus.cpp index 142135674..dbdd9814b 100644 --- a/src/modbus.cpp +++ b/src/modbus.cpp @@ -383,7 +383,7 @@ ModbusMessage Modbus::handleWrite(const ModbusMessage & request) { 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 auto key = EntityModbusInfoKey(dev->device_type(), tag_type, register_offset); @@ -512,7 +512,7 @@ int Modbus::getRegisterCount(const DeviceValue & dv) { num_registers = 1; else if (num_values <= (1L << 16)) 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; else LOG_ERROR("num_registers is too big to be encoded with modbus registers"); From 795fbabe02291f1f44ede8b092daf664ac7f3e7d Mon Sep 17 00:00:00 2001 From: proddy Date: Thu, 5 Sep 2024 23:36:06 +0200 Subject: [PATCH 4/4] 3.7.0-dev.34 --- src/version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.h b/src/version.h index 639371d84..e21a13fc9 100644 --- a/src/version.h +++ b/src/version.h @@ -1 +1 @@ -#define EMSESP_APP_VERSION "3.7.0-dev.33" +#define EMSESP_APP_VERSION "3.7.0-dev.34"