From 3dac0ab8a154e017d78596489b67b2ef945c68c3 Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Wed, 26 Aug 2026 12:11:20 +0200 Subject: [PATCH] [Settings] Remove no longer used Fixed IP Octed setting --- docs/source/Tools/Tools.rst | 12 ------------ src/src/CustomBuild/ESPEasyDefaults.h | 1 - src/src/DataStructs/SettingsStruct.h | 2 +- src/src/DataStructs_templ/SettingsStruct.cpp | 1 - src/src/Helpers/ESPEasy_FactoryDefault.cpp | 4 ++-- src/src/WebServer/AdvancedConfigPage.cpp | 4 ++-- 6 files changed, 5 insertions(+), 19 deletions(-) diff --git a/docs/source/Tools/Tools.rst b/docs/source/Tools/Tools.rst index 7145a6c9c..d499d1bd4 100644 --- a/docs/source/Tools/Tools.rst +++ b/docs/source/Tools/Tools.rst @@ -411,18 +411,6 @@ See for more detailed information "Controller - ESPEasy P2P Networking" Special and Experimental Settings --------------------------------- -Fixed IP Octet -^^^^^^^^^^^^^^ - -Sets the last byte(octet) of the IP address to this value, regardless of what IP is given using DHCP (all other settings received via DHCP will be used) - -So if you receive 192.168.1.234 from your DHCP server and this value is set to "10", -then the used IP in your node is 192.168.1.10. -But since you're receiving more information from the DHCP server, -like subnet mask / gateway / DNS, it may still be useful. -This allows a somewhat static IP in your network (N.B. use it with an 'octet' outside the range of the DHCP IPs) while still having set to DHCP. -So if you take the node to another network which does use 192.168.52.x then you will know it will be on 192.168.52.10 (when setting this value to "10") - WD I2C Address ^^^^^^^^^^^^^^ diff --git a/src/src/CustomBuild/ESPEasyDefaults.h b/src/src/CustomBuild/ESPEasyDefaults.h index 3cc809d56..d385cf73d 100644 --- a/src/src/CustomBuild/ESPEasyDefaults.h +++ b/src/src/CustomBuild/ESPEasyDefaults.h @@ -634,7 +634,6 @@ #define DEFAULT_USE_GLOBAL_SYNC false // (true|false) -#define DEFAULT_IP_OCTET 0 // #define DEFAULT_WD_IC2_ADDRESS 0 // #define DEFAULT_USE_SSDP false // (true|false) #define DEFAULT_CON_FAIL_THRES 0 // diff --git a/src/src/DataStructs/SettingsStruct.h b/src/src/DataStructs/SettingsStruct.h index 570a1503d..7d912abd3 100644 --- a/src/src/DataStructs/SettingsStruct.h +++ b/src/src/DataStructs/SettingsStruct.h @@ -550,7 +550,7 @@ public: uint8_t Gateway[4] = {0}; uint8_t Subnet[4] = {0}; uint8_t DNS[4] = {0}; - uint8_t IP_Octet = 0; + uint8_t IP_Octet_unused = 0; // No longer applicable after 2026-Network rewrite-merged uint8_t Unit = 0; char Name[26] = {0}; char NTPHost[64] = {0}; diff --git a/src/src/DataStructs_templ/SettingsStruct.cpp b/src/src/DataStructs_templ/SettingsStruct.cpp index d12ad749f..040986039 100644 --- a/src/src/DataStructs_templ/SettingsStruct.cpp +++ b/src/src/DataStructs_templ/SettingsStruct.cpp @@ -693,7 +693,6 @@ void SettingsStruct_tmpl::clearMisc() { PID = ESP_PROJECT_PID; Version = VERSION; Build = get_build_nr(); - IP_Octet = 0; Delay = DEFAULT_DELAY; Pin_i2c_sda = DEFAULT_PIN_I2C_SDA; Pin_i2c_scl = DEFAULT_PIN_I2C_SCL; diff --git a/src/src/Helpers/ESPEasy_FactoryDefault.cpp b/src/src/Helpers/ESPEasy_FactoryDefault.cpp index 6c9e69c2d..84dd039e0 100644 --- a/src/src/Helpers/ESPEasy_FactoryDefault.cpp +++ b/src/src/Helpers/ESPEasy_FactoryDefault.cpp @@ -277,7 +277,7 @@ void ResetFactory(bool formatFS) Settings.Version = VERSION; Settings.Build = get_build_nr(); - // Settings.IP_Octet = DEFAULT_IP_OCTET; + // Settings.IP_Octet_unused = DEFAULT_IP_OCTET; // Settings.Delay = DEFAULT_DELAY; Settings.Pin_i2c_sda = gpio_settings.i2c_sda; Settings.Pin_i2c_scl = gpio_settings.i2c_scl; @@ -324,7 +324,7 @@ void ResetFactory(bool formatFS) /* Settings.GlobalSync_unused = DEFAULT_USE_GLOBAL_SYNC; - Settings.IP_Octet = DEFAULT_IP_OCTET; + // Settings.IP_Octet_unused = DEFAULT_IP_OCTET; Settings.WDI2CAddress = DEFAULT_WD_IC2_ADDRESS; Settings.UseSSDP = DEFAULT_USE_SSDP; Settings.ConnectionFailuresThreshold = DEFAULT_CON_FAIL_THRES; diff --git a/src/src/WebServer/AdvancedConfigPage.cpp b/src/src/WebServer/AdvancedConfigPage.cpp index cb3a355b1..e541fc26f 100644 --- a/src/src/WebServer/AdvancedConfigPage.cpp +++ b/src/src/WebServer/AdvancedConfigPage.cpp @@ -44,7 +44,7 @@ void handle_advanced() { if (!webArg(F("edit")).isEmpty()) { - Settings.IP_Octet = webArg(F("ip")).toInt(); + // Settings.IP_Octet_unused = webArg(F("ip")).toInt(); // No longer applicable after 2026-Network rewrite-merged strncpy_webserver_arg(Settings.NTPHost, F("ntphost")); Settings.TimeZone = getFormItemInt(F("timezone")); TimeChangeRule dst_start(getFormItemInt(F("dststartweek")), getFormItemInt(F("dststartdow")), getFormItemInt(F("dststartmonth")), getFormItemInt(F("dststarthour")), Settings.TimeZone); @@ -298,7 +298,7 @@ void handle_advanced() { addFormNumericBox(F("Webserver port"), F("webport"), Settings.WebserverPort, 0, 65535); addFormNote(F("Requires reboot to activate")); - addFormNumericBox(F("Fixed IP Octet"), F("ip"), Settings.IP_Octet, 0, 255); + // addFormNumericBox(F("Fixed IP Octet"), F("ip"), Settings.IP_Octet_unused, 0, 255); // No longer applicable after 2026-Network rewrite-merged addFormNumericBox(F("WD I2C Address"), F("wdi2caddress"), Settings.WDI2CAddress, 0, 127); addHtml(F(" (decimal)"));