Michel2/ESPEasy
1
0
Fork 0
mirror of https://github.com/letscontrolit/ESPEasy.git synced 2026-07-27 19:57:38 +00:00
Code Issues Releases Activity

[UI] Disable the Interfaces/Modbus subtab for now, as it's still TODO

Browse Source
This commit is contained in:
Ton Huisman
2026-03-17 22:58:15 +01:00
parent faa37ad218
commit 715609b947
5 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/src/CustomBuild/define_plugin_sets.h
+8
View File
@@ -3753,6 +3753,14 @@ To create/register a plugin, you have to :
#define FEATURE_MODBUS 0
#endif
#ifndef FEATURE_MODBUS_INTERFACES_TAB // TODO Temporary, until P183 finished
#ifdef USES_P183
#define FEATURE_MODBUS_INTERFACES_TAB 1
#else
#define FEATURE_MODBUS_INTERFACES_TAB 0
#endif
#endif
#ifndef FEATURE_CAN
#define FEATURE_CAN 0
#endif // ifndef FEATURE_CAN
src/src/WebServer/ESPEasy_WebServer.cpp
+1 -1
View File
@@ -281,7 +281,7 @@ void WebServerInit()
#if FEATURE_SPI
web_server.on(F("/interfaces_spi"), handle_interfaces_spi);
#endif // if FEATURE_SPI
#if FEATURE_MODBUS
#if FEATURE_MODBUS && FEATURE_MODBUS_INTERFACES_TAB
web_server.on(F("/interfaces_modbus"), handle_interfaces_modbus);
#endif // if FEATURE_MODBUS
#if FEATURE_CAN
src/src/WebServer/InterfacesPage.cpp
+6 -6
View File
@@ -44,7 +44,7 @@ void handle_interfaces_spi() {
}
#endif // if FEATURE_SPI
#if FEATURE_MODBUS
#if FEATURE_MODBUS && FEATURE_MODBUS_INTERFACES_TAB
void handle_interfaces_modbus() {
navMenuIndex = MENU_INDEX_INTERFACES_MODBUS;
handle_interfaces();
@@ -83,7 +83,7 @@ void handle_interfaces() {
navMenuIndex = MENU_INDEX_INTERFACES_I2C;
#elif FEATURE_SPI
navMenuIndex = MENU_INDEX_INTERFACES_SPI;
#elif FEATURE_MODBUS
#elif FEATURE_MODBUS && FEATURE_MODBUS_INTERFACES_TAB
navMenuIndex = MENU_INDEX_INTERFACES_MODBUS;
#elif FEATURE_CAN
navMenuIndex = MENU_INDEX_INTERFACES_CAN;
@@ -118,7 +118,7 @@ void handle_interfaces() {
}
#endif
#if FEATURE_MODBUS
#if FEATURE_MODBUS && FEATURE_MODBUS_INTERFACES_TAB
if (navMenuIndex == MENU_INDEX_INTERFACES_MODBUS) {
interfaces_show_MODBUS();
}
@@ -169,7 +169,7 @@ void save_interfaces() {
if ((navMenuIndex == MENU_INDEX_INTERFACES_SPI) && save_SPI(error)) { updated = true; }
#endif
#if FEATURE_MODBUS
#if FEATURE_MODBUS && FEATURE_MODBUS_INTERFACES_TAB
if ((navMenuIndex == MENU_INDEX_INTERFACES_MODBUS) && save_MODBUS(error)) { updated = true; }
#endif // if FEATURE_MODBUS
@@ -335,7 +335,7 @@ bool save_SPI(String& error) {
#endif
#if FEATURE_MODBUS
#if FEATURE_MODBUS && FEATURE_MODBUS_INTERFACES_TAB
bool save_MODBUS(String& error) {
return false; // TODO
}
@@ -541,7 +541,7 @@ void interfaces_show_SPI() {
}
#endif
#if FEATURE_MODBUS
#if FEATURE_MODBUS && FEATURE_MODBUS_INTERFACES_TAB
void interfaces_show_MODBUS() {
addRowLabel(F("TODO")); // TODO
}
src/src/WebServer/InterfacesPage.h
+1 -1
View File
@@ -21,7 +21,7 @@ bool save_SPI(String& error);
void interfaces_show_SPI();
#endif
#if FEATURE_MODBUS
#if FEATURE_MODBUS && FEATURE_MODBUS_INTERFACES_TAB
void handle_interfaces_modbus();
bool save_MODBUS(String& error);
void interfaces_show_MODBUS();
src/src/WebServer/WebTemplateParser.cpp
+5 -5
View File
@@ -122,7 +122,7 @@ const __FlashStringHelper* getGpMenuIcon(uint8_t index) {
#if FEATURE_SPI
case MENU_INDEX_INTERFACES_SPI: return ICON("SPI");
#endif // if FEATURE_SPI
#if FEATURE_MODBUS
#if FEATURE_MODBUS && FEATURE_MODBUS_INTERFACES_TAB
case MENU_INDEX_INTERFACES_MODBUS: return ICON("Modbus");
#endif // if FEATURE_MODBUS
#if FEATURE_CAN
@@ -156,13 +156,13 @@ const __FlashStringHelper* getGpMenuLabel(uint8_t index) {
#if FEATURE_SPI
case MENU_INDEX_INTERFACES_SPI:
#endif // if FEATURE_SPI
#if FEATURE_MODBUS
#if FEATURE_MODBUS && FEATURE_MODBUS_INTERFACES_TAB
case MENU_INDEX_INTERFACES_MODBUS:
#endif // if FEATURE_MODBUS
#if FEATURE_CAN
case MENU_INDEX_INTERFACES_CAN:
#endif // if FEATURE_CAN
#if FEATURE_I2C || FEATURE_SPI || FEATURE_MODBUS || FEATURE_CAN
#if FEATURE_I2C || FEATURE_SPI || (FEATURE_MODBUS && FEATURE_MODBUS_INTERFACES_TAB) || FEATURE_CAN
break; // No label, only an 'icon', for the second-level menu
#endif // if FEATURE_I2C || FEATURE_SPI || FEATURE_MODBUS || FEATURE_CAN
#if FEATURE_WRMBUS
@@ -193,7 +193,7 @@ const __FlashStringHelper* getGpMenuURL(uint8_t index) {
#if FEATURE_SPI
case MENU_INDEX_INTERFACES_SPI: return F("/interfaces_spi");
#endif // if FEATURE_SPI
#if FEATURE_MODBUS
#if FEATURE_MODBUS && FEATURE_MODBUS_INTERFACES_TAB
case MENU_INDEX_INTERFACES_MODBUS: return F("/interfaces_modbus");
#endif // if FEATURE_MODBUS
#if FEATURE_CAN
@@ -223,7 +223,7 @@ bool GpMenuVisible(uint8_t index) {
case MENU_INDEX_INTERFACES: return MENU_INDEX_INTERFACES_VISIBLE;
case MENU_INDEX_INTERFACES_I2C: return (1 == FEATURE_I2C);
case MENU_INDEX_INTERFACES_SPI: return (1 == FEATURE_SPI);
case MENU_INDEX_INTERFACES_MODBUS: return (1 == FEATURE_MODBUS);
case MENU_INDEX_INTERFACES_MODBUS: return (1 == FEATURE_MODBUS && 1 == FEATURE_MODBUS_INTERFACES_TAB);
#if defined(FEATURE_CAN)
case MENU_INDEX_INTERFACES_CAN: return (1 == FEATURE_CAN);
#endif // if defined(FEATURE_CAN)