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

general cleanup

Browse Source
This commit is contained in:
proddy
2021-03-01 22:20:52 +01:00
parent 3eb8ac9194
commit a092d83fad
9 changed files with 44 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/WebStatusService.cpp
View File

@@ -39,57 +39,55 @@ void WebStatusService::WiFiEvent(WiFiEvent_t event, WiFiEventInfo_t info) {
EMSESP::logger().info(F("WiFi Connected with IP=%s, hostname=%s"), WiFi.localIP().toString().c_str(), WiFi.getHostname());
#endif
// Lower WiFi tx power to free up current for bus-powered
/*
WIFI_POWER_19_5dBm = 78,// 19.5dBm <-- default
WIFI_POWER_19dBm = 76,// 19dBm
WIFI_POWER_18_5dBm = 74,// 18.5dBm
WIFI_POWER_17dBm = 68,// 17dBm
WIFI_POWER_15dBm = 60,// 15dBm
WIFI_POWER_13dBm = 52,// 13dBm
WIFI_POWER_11dBm = 44,// 11dBm
WIFI_POWER_8_5dBm = 34,// 8.5dBm
WIFI_POWER_7dBm = 28,// 7dBm
WIFI_POWER_5dBm = 20,// 5dBm
WIFI_POWER_2dBm = 8,// 2dBm
WIFI_POWER_MINUS_1dBm = -4// -1dBm
*/
/*
// Lower WiFi tx power to free up current for bus-powered
// WIFI_POWER_19_5dBm = 78,// 19.5dBm <-- default
// WIFI_POWER_19dBm = 76,// 19dBm
// WIFI_POWER_18_5dBm = 74,// 18.5dBm
// WIFI_POWER_17dBm = 68,// 17dBm
// WIFI_POWER_15dBm = 60,// 15dBm
// WIFI_POWER_13dBm = 52,// 13dBm
// WIFI_POWER_11dBm = 44,// 11dBm
// WIFI_POWER_8_5dBm = 34,// 8.5dBm
// WIFI_POWER_7dBm = 28,// 7dBm
// WIFI_POWER_5dBm = 20,// 5dBm
// WIFI_POWER_2dBm = 8,// 2dBm
// WIFI_POWER_MINUS_1dBm = -4// -1dBm
wifi_power_t a1 = WiFi.getTxPower();
// bool ok = WiFi.setTxPower(WIFI_POWER_17dBm); // lower power
bool ok = WiFi.setTxPower(WIFI_POWER_19_5dBm);
wifi_power_t a2 = WiFi.getTxPower();
LOG_INFO("Adjusting Wifi Tx power from %d to %d (%s)", a1, a2, ok ? "ok" : "failed");
*/
*/
EMSESP::system_.init_network(); // send out heartbeat MQTT as soon as we have a connection
EMSESP::system_.network_init(); // send out heartbeat MQTT as soon as we have a connection
break;
case SYSTEM_EVENT_ETH_START:
EMSESP::logger().info(F("Ethernet Started"));
ETH.setHostname(emsesp::System::hostname().c_str());
ETH.setHostname(EMSESP::system_.hostname().c_str());
break;
case SYSTEM_EVENT_ETH_GOT_IP:
// prevent double calls
if (!System::ethernet_connected()) {
if (!EMSESP::system_.ethernet_connected()) {
#ifndef EMSESP_STANDALONE
EMSESP::logger().info(F("Ethernet Connected with IP=%s, speed %d Mbps"), ETH.localIP().toString().c_str(), ETH.linkSpeed());
#endif
EMSESP::system_.init_network(); // send out heartbeat MQTT as soon as we have a connection
System::ethernet_connected(true);
EMSESP::system_.network_init(); // send out heartbeat MQTT as soon as we have a connection
EMSESP::system_.ethernet_connected(true);
}
break;
case SYSTEM_EVENT_ETH_DISCONNECTED:
EMSESP::logger().info(F("Ethernet Disconnected"));
System::ethernet_connected(false);
EMSESP::system_.ethernet_connected(false);
break;
case SYSTEM_EVENT_ETH_STOP:
EMSESP::logger().info(F("Ethernet Stopped"));
System::ethernet_connected(false);
EMSESP::system_.ethernet_connected(false);
break;
default: