andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2026-09-13 13:44:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

move eth_10mbit to Network Settings

Browse Source
This commit is contained in:
proddy
2026-09-03 12:22:52 +02:00
parent c711d1c6de
commit 13c6ed9e06
15 changed files with 83 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ESP32React/NetworkSettingsService.cpp
+2
View File
@@ -24,6 +24,7 @@ void NetworkSettings::read(NetworkSettings & settings, JsonObject root) {
root["enableCORS"] = settings.enableCORS;
root["CORSOrigin"] = settings.CORSOrigin;
root["tx_power"] = settings.tx_power;
root["eth_10mbit"] = settings.eth_10mbit;
// extended settings
JsonUtils::writeIP(root, "local_ip", settings.localIP);
@@ -51,6 +52,7 @@ StateUpdateResult NetworkSettings::update(JsonObject root, NetworkSettings & set
settings.enableMDNS = root["enableMDNS"] | true;
settings.enableCORS = root["enableCORS"];
settings.CORSOrigin = root["CORSOrigin"] | "*";
settings.eth_10mbit = root["eth_10mbit"];
// extended settings
JsonUtils::readIP(root, "local_ip", settings.localIP);
src/ESP32React/NetworkSettingsService.h
+1
View File
@@ -39,6 +39,7 @@ class NetworkSettings {
bool enableMDNS = true;
bool enableCORS = false;
String CORSOrigin = "*";
bool eth_10mbit = false; // force 10BASE-T half-duplex, no auto-negotiation
// optional configuration for static IP address
IPAddress localIP;
src/core/network.cpp
+2 -2
View File
@@ -49,15 +49,15 @@ void Network::begin() {
nosleep_ = settings.nosleep;
tx_power_ = settings.tx_power;
bssid_ = settings.bssid;
eth_10mbit_ = settings.eth_10mbit;
});
// read Ethernet settings
// read Ethernet hardware settings
EMSESP::webSettingsService.read([&](WebSettings & settings) {
phy_type_ = settings.phy_type;
eth_power_ = settings.eth_power;
eth_phy_addr_ = settings.eth_phy_addr;
eth_clock_mode_ = settings.eth_clock_mode;
eth_10mbit_ = settings.eth_10mbit;
});
// get Access Point settings
src/web/WebSettingsService.cpp
-3
View File
@@ -79,7 +79,6 @@ void WebSettings::read(WebSettings & settings, JsonObject root) {
root["eth_power"] = settings.eth_power;
root["eth_phy_addr"] = settings.eth_phy_addr;
root["eth_clock_mode"] = settings.eth_clock_mode;
root["eth_10mbit"] = settings.eth_10mbit;
root["modbus_enabled"] = settings.modbus_enabled;
root["modbus_port"] = settings.modbus_port;
root["modbus_max_clients"] = settings.modbus_max_clients;
@@ -121,7 +120,6 @@ StateUpdateResult WebSettings::update(JsonObject root, WebSettings & settings) {
settings.eth_power = root["eth_power"];
settings.eth_phy_addr = root["eth_phy_addr"];
settings.eth_clock_mode = root["eth_clock_mode"];
settings.eth_10mbit = root["eth_10mbit"];
settings.led_type = root["led_type"]; // 1 = RGB-LED
reset_flags();
@@ -147,7 +145,6 @@ StateUpdateResult WebSettings::update(JsonObject root, WebSettings & settings) {
if (settings.phy_type != PHY_type::PHY_TYPE_NONE) {
check_flag(original_settings.eth_power, settings.eth_power, ChangeFlags::RESTART);
check_flag(original_settings.eth_clock_mode, settings.eth_clock_mode, ChangeFlags::RESTART);
check_flag(original_settings.eth_10mbit, settings.eth_10mbit, ChangeFlags::RESTART);
if (settings.eth_power != -1) { // Ethernet Power -1 means disabled
EMSESP::system_.remove_gpio(settings.eth_power, true);
}
src/web/WebSettingsService.h
-1
View File
@@ -119,7 +119,6 @@ class WebSettings {
int8_t eth_power; // -1 means disabled
uint8_t eth_phy_addr;
uint8_t eth_clock_mode;
bool eth_10mbit; // force 10BASE-T half-duplex, no auto-negotiation
bool developer_mode; // developer mode
bool disable_reset; // disable reset