mirror of
https://github.com/arendst/Tasmota.git
synced 2025-07-24 11:16:34 +00:00
Change image defines
6.4.1.15 20190208 * Change image name BE_MINIMAL to FIRMWARE_MINIMAL (#5106) * Change image names USE_xyz to FIRMWARE_xyz (#5106)
This commit is contained in:
Theo Arends
parent
bfcc357573
commit
ae277f59cf
@ -130,12 +130,12 @@ board_build.flash_mode = dout
|
||||
|
||||
platform = ${core_active.platform}
|
||||
build_flags = ${core_active.build_flags}
|
||||
; -DUSE_CLASSIC
|
||||
; -DBE_MINIMAL
|
||||
; -DUSE_SENSORS
|
||||
; -DUSE_BASIC
|
||||
; -DUSE_KNX_NO_EMULATION
|
||||
; -DUSE_DISPLAYS
|
||||
; -DFIRMWARE_CLASSIC
|
||||
; -DFIRMWARE_MINIMAL
|
||||
; -DFIRMWARE_SENSORS
|
||||
; -DFIRMWARE_BASIC
|
||||
; -DFIRMWARE_KNX_NO_EMULATION
|
||||
; -DFIRMWARE_DISPLAYS
|
||||
; -DUSE_CONFIG_OVERRIDE
|
||||
|
||||
; *** Fix espressif8266@1.7.0 induced undesired all warnings
|
||||
@ -184,7 +184,7 @@ board = ${common.board}
|
||||
board_build.flash_mode = ${common.board_build.flash_mode}
|
||||
board_build.f_cpu = ${common.board_build.f_cpu}
|
||||
build_unflags = ${common.build_unflags}
|
||||
build_flags = ${common.build_flags} -DBE_MINIMAL
|
||||
build_flags = ${common.build_flags} -DFIRMWARE_MINIMAL
|
||||
monitor_speed = ${common.monitor_speed}
|
||||
upload_port = ${common.upload_port}
|
||||
upload_resetmethod = ${common.upload_resetmethod}
|
||||
@ -198,7 +198,7 @@ board = ${common.board}
|
||||
board_build.flash_mode = ${common.board_build.flash_mode}
|
||||
board_build.f_cpu = ${common.board_build.f_cpu}
|
||||
build_unflags = ${common.build_unflags}
|
||||
build_flags = ${common.build_flags} -DUSE_BASIC
|
||||
build_flags = ${common.build_flags} -DFIRMWARE_BASIC
|
||||
monitor_speed = ${common.monitor_speed}
|
||||
upload_port = ${common.upload_port}
|
||||
upload_resetmethod = ${common.upload_resetmethod}
|
||||
@ -212,7 +212,7 @@ board = ${common.board}
|
||||
board_build.flash_mode = ${common.board_build.flash_mode}
|
||||
board_build.f_cpu = ${common.board_build.f_cpu}
|
||||
build_unflags = ${common.build_unflags}
|
||||
build_flags = ${common.build_flags} -DUSE_CLASSIC
|
||||
build_flags = ${common.build_flags} -DFIRMWARE_CLASSIC
|
||||
monitor_speed = ${common.monitor_speed}
|
||||
upload_port = ${common.upload_port}
|
||||
upload_resetmethod = ${common.upload_resetmethod}
|
||||
@ -226,7 +226,7 @@ board = ${common.board}
|
||||
board_build.flash_mode = ${common.board_build.flash_mode}
|
||||
board_build.f_cpu = ${common.board_build.f_cpu}
|
||||
build_unflags = ${common.build_unflags}
|
||||
build_flags = ${common.build_flags} -DUSE_KNX_NO_EMULATION
|
||||
build_flags = ${common.build_flags} -DFIRMWARE_KNX_NO_EMULATION
|
||||
monitor_speed = ${common.monitor_speed}
|
||||
upload_port = ${common.upload_port}
|
||||
upload_resetmethod = ${common.upload_resetmethod}
|
||||
@ -240,7 +240,7 @@ board = ${common.board}
|
||||
board_build.flash_mode = ${common.board_build.flash_mode}
|
||||
board_build.f_cpu = ${common.board_build.f_cpu}
|
||||
build_unflags = ${common.build_unflags}
|
||||
build_flags = ${common.build_flags} -DUSE_SENSORS
|
||||
build_flags = ${common.build_flags} -DFIRMWARE_SENSORS
|
||||
monitor_speed = ${common.monitor_speed}
|
||||
upload_port = ${common.upload_port}
|
||||
upload_resetmethod = ${common.upload_resetmethod}
|
||||
@ -254,7 +254,7 @@ board = ${common.board}
|
||||
board_build.flash_mode = ${common.board_build.flash_mode}
|
||||
board_build.f_cpu = ${common.board_build.f_cpu}
|
||||
build_unflags = ${common.build_unflags}
|
||||
build_flags = ${common.build_flags} -DUSE_DISPLAYS
|
||||
build_flags = ${common.build_flags} -DFIRMWARE_DISPLAYS
|
||||
monitor_speed = ${common.monitor_speed}
|
||||
upload_port = ${common.upload_port}
|
||||
upload_resetmethod = ${common.upload_resetmethod}
|
||||
|
||||
@ -1,4 +1,8 @@
|
||||
/* 6.4.1.14 20190203
|
||||
/* 6.4.1.15 20190208
|
||||
* Change image name BE_MINIMAL to FIRMWARE_MINIMAL (#5106)
|
||||
* Change image names USE_xyz to FIRMWARE_xyz (#5106)
|
||||
*
|
||||
* 6.4.1.14 20190203
|
||||
* Add SetOption32 until SetOption49 diagnostic information to Status 3 report as replacement for second property value in SetOption property name
|
||||
* Add Resolution property to Status 3 report providing previous SetOption second value property
|
||||
* Fix IR local echo
|
||||
|
||||
@ -429,12 +429,12 @@
|
||||
* See RELEASENOTES.md for selected features
|
||||
\*********************************************************************************************/
|
||||
|
||||
//#define USE_CLASSIC // Create sonoff-classic with initial configuration tools WPS, SmartConfig and WifiManager
|
||||
//#define USE_BASIC // Create sonoff-basic with no sensors
|
||||
//#define USE_SENSORS // Create sonoff-sensors with useful sensors enabled
|
||||
//#define USE_KNX_NO_EMULATION // Create sonoff-knx with KNX but without Emulation
|
||||
//#define USE_DISPLAYS // Create sonoff-display with display drivers enabled
|
||||
//#define BE_MINIMAL // Create sonoff-minimal as intermediate firmware for OTA-MAGIC
|
||||
//#define FIRMWARE_CLASSIC // Create sonoff-classic with initial configuration tools WPS, SmartConfig and WifiManager
|
||||
//#define FIRMWARE_BASIC // Create sonoff-basic with no sensors
|
||||
//#define FIRMWARE_SENSORS // Create sonoff-sensors with useful sensors enabled
|
||||
//#define FIRMWARE_KNX_NO_EMULATION // Create sonoff-knx with KNX but without Emulation
|
||||
//#define FIRMWARE_DISPLAYS // Create sonoff-display with display drivers enabled
|
||||
//#define FIRMWARE_MINIMAL // Create sonoff-minimal as intermediate firmware for OTA-MAGIC
|
||||
|
||||
/*********************************************************************************************\
|
||||
* No user configurable items below
|
||||
|
||||
@ -391,7 +391,7 @@ void SettingsSave(uint8_t rotate)
|
||||
* stop_flash_rotate 0 = Allow flash slot rotation (SetOption12 0)
|
||||
* stop_flash_rotate 1 = Allow only eeprom flash slot use (SetOption12 1)
|
||||
*/
|
||||
#ifndef BE_MINIMAL
|
||||
#ifndef FIRMWARE_MINIMAL
|
||||
if ((GetSettingsCrc() != settings_crc) || rotate) {
|
||||
if (1 == rotate) { // Use eeprom flash slot only and disable flash rotate from now on (upgrade)
|
||||
stop_flash_rotate = 1;
|
||||
@ -441,7 +441,7 @@ void SettingsSave(uint8_t rotate)
|
||||
|
||||
settings_crc = Settings.cfg_crc;
|
||||
}
|
||||
#endif // BE_MINIMAL
|
||||
#endif // FIRMWARE_MINIMAL
|
||||
RtcSettingsSave();
|
||||
}
|
||||
|
||||
@ -487,12 +487,12 @@ void SettingsLoad(void)
|
||||
AddLog(LOG_LEVEL_DEBUG);
|
||||
}
|
||||
|
||||
#ifndef BE_MINIMAL
|
||||
#ifndef FIRMWARE_MINIMAL
|
||||
if (!settings_location || (Settings.cfg_holder != (uint16_t)CFG_HOLDER)) { // Init defaults if cfg_holder differs from user settings in my_user_config.h
|
||||
SettingsDefault();
|
||||
}
|
||||
settings_crc = GetSettingsCrc();
|
||||
#endif // BE_MINIMAL
|
||||
#endif // FIRMWARE_MINIMAL
|
||||
|
||||
RtcSettingsLoad();
|
||||
}
|
||||
@ -504,7 +504,7 @@ void SettingsErase(uint8_t type)
|
||||
1 = Erase SDK parameter area at end of linker memory model (0x0FDxxx - 0x0FFFFF) solving possible wifi errors
|
||||
*/
|
||||
|
||||
#ifndef BE_MINIMAL
|
||||
#ifndef FIRMWARE_MINIMAL
|
||||
bool result;
|
||||
|
||||
uint32_t _sectorStart = (ESP.getSketchSize() / SPI_FLASH_SEC_SIZE) + 1;
|
||||
@ -533,7 +533,7 @@ void SettingsErase(uint8_t type)
|
||||
}
|
||||
OsWatchLoop();
|
||||
}
|
||||
#endif // BE_MINIMAL
|
||||
#endif // FIRMWARE_MINIMAL
|
||||
}
|
||||
|
||||
// Copied from 2.4.0 as 2.3.0 is incomplete
|
||||
|
||||
@ -1957,7 +1957,7 @@ void Every250mSeconds(void)
|
||||
ota_retry_counter--;
|
||||
if (ota_retry_counter) {
|
||||
strlcpy(mqtt_data, GetOtaUrl(log_data, sizeof(log_data)), sizeof(mqtt_data));
|
||||
#ifndef BE_MINIMAL
|
||||
#ifndef FIRMWARE_MINIMAL
|
||||
if (RtcSettings.ota_loader) {
|
||||
char *bch = strrchr(mqtt_data, '/'); // Only consider filename after last backslash prevent change of urls having "-" in it
|
||||
char *pch = strrchr((bch != NULL) ? bch : mqtt_data, '-'); // Change from filename-DE.bin into filename-minimal.bin
|
||||
@ -1969,7 +1969,7 @@ void Every250mSeconds(void)
|
||||
snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s-" D_JSON_MINIMAL "%s"), mqtt_data, ech); // Minimal filename must be filename-minimal
|
||||
}
|
||||
}
|
||||
#endif // BE_MINIMAL
|
||||
#endif // FIRMWARE_MINIMAL
|
||||
snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_UPLOAD "%s"), mqtt_data);
|
||||
AddLog(LOG_LEVEL_DEBUG);
|
||||
#if defined(ARDUINO_ESP8266_RELEASE_2_3_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_1) || defined(ARDUINO_ESP8266_RELEASE_2_4_2)
|
||||
@ -1980,14 +1980,14 @@ void Every250mSeconds(void)
|
||||
ota_result = (HTTP_UPDATE_FAILED != ESPhttpUpdate.update(OTAclient, mqtt_data));
|
||||
#endif
|
||||
if (!ota_result) {
|
||||
#ifndef BE_MINIMAL
|
||||
#ifndef FIRMWARE_MINIMAL
|
||||
int ota_error = ESPhttpUpdate.getLastError();
|
||||
// snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_UPLOAD "Ota error %d"), ota_error);
|
||||
// AddLog(LOG_LEVEL_DEBUG);
|
||||
if ((HTTP_UE_TOO_LESS_SPACE == ota_error) || (HTTP_UE_BIN_FOR_WRONG_FLASH == ota_error)) {
|
||||
RtcSettings.ota_loader = 1; // Try minimal image next
|
||||
}
|
||||
#endif // BE_MINIMAL
|
||||
#endif // FIRMWARE_MINIMAL
|
||||
ota_state_flag = 2; // Upgrade failed - retry
|
||||
}
|
||||
}
|
||||
@ -2584,10 +2584,10 @@ void setup(void)
|
||||
snprintf_P(log_data, sizeof(log_data), PSTR(D_PROJECT " %s %s " D_VERSION " %s%s-" ARDUINO_ESP8266_RELEASE),
|
||||
PROJECT, Settings.friendlyname[0], my_version, my_image);
|
||||
AddLog(LOG_LEVEL_INFO);
|
||||
#ifdef BE_MINIMAL
|
||||
#ifdef FIRMWARE_MINIMAL
|
||||
snprintf_P(log_data, sizeof(log_data), PSTR(D_WARNING_MINIMAL_VERSION));
|
||||
AddLog(LOG_LEVEL_INFO);
|
||||
#endif // BE_MINIMAL
|
||||
#endif // FIRMWARE_MINIMAL
|
||||
|
||||
RtcInit();
|
||||
|
||||
|
||||
@ -55,7 +55,7 @@ void KNX_CB_Action(message_t const &msg, void *arg);
|
||||
* Provide an image with useful supported sensors enabled
|
||||
\*********************************************************************************************/
|
||||
|
||||
#ifdef USE_SENSORS
|
||||
#ifdef FIRMWARE_SENSORS
|
||||
|
||||
#undef CODE_IMAGE
|
||||
#define CODE_IMAGE 3
|
||||
@ -139,14 +139,14 @@ void KNX_CB_Action(message_t const &msg, void *arg);
|
||||
#define USE_RF_SENSOR // Add support for RF sensor receiver (434MHz or 868MHz) (+0k8 code)
|
||||
// #define USE_THEO_V2 // Add support for decoding Theo V2 sensors as documented on https://sidweb.nl using 434MHz RF sensor receiver (+1k4 code)
|
||||
#define USE_ALECTO_V2 // Add support for decoding Alecto V2 sensors like ACH2010, WS3000 and DKW2012 using 868MHz RF sensor receiver (+1k7 code)
|
||||
#endif // USE_SENSORS
|
||||
#endif // FIRMWARE_SENSORS
|
||||
|
||||
/*********************************************************************************************\
|
||||
* [sonoff-classic.bin]
|
||||
* Provide an image close to version 5.12.0 but still within 499k program space to allow one time OTA
|
||||
\*********************************************************************************************/
|
||||
|
||||
#ifdef USE_CLASSIC
|
||||
#ifdef FIRMWARE_CLASSIC
|
||||
|
||||
#undef CODE_IMAGE
|
||||
#define CODE_IMAGE 2
|
||||
@ -200,14 +200,14 @@ void KNX_CB_Action(message_t const &msg, void *arg);
|
||||
#undef USE_RF_SENSOR // Disable support for RF sensor receiver (434MHz or 868MHz) (+0k8 code)
|
||||
#undef DEBUG_THEO // Disable debug code
|
||||
#undef USE_DEBUG_DRIVER // Disable debug code
|
||||
#endif // USE_CLASSIC
|
||||
#endif // FIRMWARE_CLASSIC
|
||||
|
||||
/*********************************************************************************************\
|
||||
* [sonoff-knx.bin]
|
||||
* Provide a dedicated KNX image allowing enough code and memory space
|
||||
\*********************************************************************************************/
|
||||
|
||||
#ifdef USE_KNX_NO_EMULATION
|
||||
#ifdef FIRMWARE_KNX_NO_EMULATION
|
||||
|
||||
#undef CODE_IMAGE
|
||||
#define CODE_IMAGE 4
|
||||
@ -216,14 +216,14 @@ void KNX_CB_Action(message_t const &msg, void *arg);
|
||||
#define USE_KNX // Enable KNX IP Protocol Support (+23k code, +3k3 mem)
|
||||
#endif
|
||||
#undef USE_EMULATION // Disable Belkin WeMo and Hue Bridge emulation for Alexa (-16k code, -2k mem)
|
||||
#endif // USE_KNX_NO_EMULATION
|
||||
#endif // FIRMWARE_KNX_NO_EMULATION
|
||||
|
||||
/*********************************************************************************************\
|
||||
* [sonoff-display.bin]
|
||||
* Provide an image with display drivers enabled
|
||||
\*********************************************************************************************/
|
||||
|
||||
#ifdef USE_DISPLAYS
|
||||
#ifdef FIRMWARE_DISPLAYS
|
||||
|
||||
#undef CODE_IMAGE
|
||||
#define CODE_IMAGE 6
|
||||
@ -250,7 +250,7 @@ void KNX_CB_Action(message_t const &msg, void *arg);
|
||||
|
||||
#undef USE_ARILUX_RF // Remove support for Arilux RF remote controller (-0k8 code, 252 iram (non 2.3.0))
|
||||
#undef USE_RF_FLASH // Remove support for flashing the EFM8BB1 chip on the Sonoff RF Bridge. C2CK must be connected to GPIO4, C2D to GPIO5 on the PCB (-3k code)
|
||||
#endif // USE_DISPLAYS
|
||||
#endif // FIRMWARE_DISPLAYS
|
||||
|
||||
/*********************************************************************************************\
|
||||
* Mandatory define for DS18x20 if changed by above image selections
|
||||
@ -266,13 +266,13 @@ void KNX_CB_Action(message_t const &msg, void *arg);
|
||||
* Provide an image without sensors
|
||||
\*********************************************************************************************/
|
||||
|
||||
#ifdef USE_BASIC
|
||||
#ifdef FIRMWARE_BASIC
|
||||
|
||||
#undef CODE_IMAGE
|
||||
#define CODE_IMAGE 5
|
||||
|
||||
#undef APP_SLEEP
|
||||
#define APP_SLEEP 1 // Default to sleep = 1 for USE_BASIC
|
||||
#define APP_SLEEP 1 // Default to sleep = 1 for FIRMWARE_BASIC
|
||||
|
||||
//#undef USE_ENERGY_SENSOR // Disable energy sensors
|
||||
#undef USE_ARDUINO_OTA // Disable support for Arduino OTA
|
||||
@ -327,14 +327,14 @@ void KNX_CB_Action(message_t const &msg, void *arg);
|
||||
#undef USE_RF_SENSOR // Disable support for RF sensor receiver (434MHz or 868MHz) (+0k8 code)
|
||||
#undef DEBUG_THEO // Disable debug code
|
||||
#undef USE_DEBUG_DRIVER // Disable debug code
|
||||
#endif // USE_BASIC
|
||||
#endif // FIRMWARE_BASIC
|
||||
|
||||
/*********************************************************************************************\
|
||||
* [sonoff-minimal.bin]
|
||||
* Provide the smallest image possible while still enabling a webserver for intermediate image load
|
||||
\*********************************************************************************************/
|
||||
|
||||
#ifdef BE_MINIMAL
|
||||
#ifdef FIRMWARE_MINIMAL
|
||||
|
||||
#undef CODE_IMAGE
|
||||
#define CODE_IMAGE 1
|
||||
@ -392,7 +392,7 @@ void KNX_CB_Action(message_t const &msg, void *arg);
|
||||
#undef USE_RF_SENSOR // Disable support for RF sensor receiver (434MHz or 868MHz) (+0k8 code)
|
||||
#undef DEBUG_THEO // Disable debug code
|
||||
#undef USE_DEBUG_DRIVER // Disable debug code
|
||||
#endif // BE_MINIMAL
|
||||
#endif // FIRMWARE_MINIMAL
|
||||
|
||||
/*********************************************************************************************\
|
||||
* Mandatory defines satisfying possible disabled defines
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
#ifndef _SONOFF_VERSION_H_
|
||||
#define _SONOFF_VERSION_H_
|
||||
|
||||
#define VERSION 0x0604010E
|
||||
#define VERSION 0x0604010F
|
||||
|
||||
#define D_PROGRAMNAME "Sonoff-Tasmota"
|
||||
#define D_AUTHOR "Theo Arends"
|
||||
|
||||
@ -126,16 +126,16 @@ void GetFeatures(void)
|
||||
#ifdef USE_CONFIG_OVERRIDE
|
||||
feature_drv2 |= 0x00000001; // user_config(_override).h
|
||||
#endif
|
||||
#ifdef BE_MINIMAL
|
||||
#ifdef FIRMWARE_MINIMAL
|
||||
feature_drv2 |= 0x00000002; // user_config(_override).h
|
||||
#endif
|
||||
#ifdef USE_SENSORS
|
||||
#ifdef FIRMWARE_SENSORS
|
||||
feature_drv2 |= 0x00000004; // user_config(_override).h
|
||||
#endif
|
||||
#ifdef USE_CLASSIC
|
||||
#ifdef FIRMWARE_CLASSIC
|
||||
feature_drv2 |= 0x00000008; // user_config(_override).h
|
||||
#endif
|
||||
#ifdef USE_KNX_NO_EMULATION
|
||||
#ifdef FIRMWARE_KNX_NO_EMULATION
|
||||
feature_drv2 |= 0x00000010; // user_config(_override).h
|
||||
#endif
|
||||
#ifdef USE_DISPLAY_MODES1TO5
|
||||
|
||||
@ -501,12 +501,12 @@ void WifiCheck(uint8_t param)
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef BE_MINIMAL
|
||||
#ifdef FIRMWARE_MINIMAL
|
||||
if (1 == RtcSettings.ota_loader) {
|
||||
RtcSettings.ota_loader = 0;
|
||||
ota_state_flag = 3;
|
||||
}
|
||||
#endif // BE_MINIMAL
|
||||
#endif // FIRMWARE_MINIMAL
|
||||
|
||||
#ifdef USE_DISCOVERY
|
||||
if (Settings.flag3.mdns_enabled) {
|
||||
|
||||
@ -208,7 +208,7 @@ const char HTTP_HEAD_STYLE[] PROGMEM =
|
||||
"</head>"
|
||||
"<body>"
|
||||
"<div style='text-align:left;display:inline-block;min-width:340px;'>"
|
||||
#ifdef BE_MINIMAL
|
||||
#ifdef FIRMWARE_MINIMAL
|
||||
"<div style='text-align:center;color:red;'><h3>" D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "</h3></div>"
|
||||
#endif
|
||||
"<div style='text-align:center;'><noscript>" D_NOSCRIPT "<br/></noscript>"
|
||||
@ -227,7 +227,7 @@ const char HTTP_MSG_SLIDER2[] PROGMEM =
|
||||
const char HTTP_MSG_RSTRT[] PROGMEM =
|
||||
"<br/><div style='text-align:center;'>" D_DEVICE_WILL_RESTART "</div><br/>";
|
||||
const char HTTP_BTN_MENU1[] PROGMEM =
|
||||
#ifndef BE_MINIMAL
|
||||
#ifndef FIRMWARE_MINIMAL
|
||||
"<br/><form action='cn' method='get'><button>" D_CONFIGURATION "</button></form>"
|
||||
"<br/><form action='in' method='get'><button>" D_INFORMATION "</button></form>"
|
||||
#endif
|
||||
@ -401,7 +401,7 @@ void StartWebserver(int type, IPAddress ipweb)
|
||||
WebServer->on("/ay", HandleAjaxStatusRefresh);
|
||||
WebServer->on("/cm", HandleHttpCommand);
|
||||
WebServer->onNotFound(HandleNotFound);
|
||||
#ifndef BE_MINIMAL
|
||||
#ifndef FIRMWARE_MINIMAL
|
||||
WebServer->on("/cn", HandleConfiguration);
|
||||
WebServer->on("/md", HandleModuleConfiguration);
|
||||
WebServer->on("/wi", HandleWifiConfiguration);
|
||||
@ -416,7 +416,7 @@ void StartWebserver(int type, IPAddress ipweb)
|
||||
#endif // USE_EMULATION
|
||||
XdrvCall(FUNC_WEB_ADD_HANDLER);
|
||||
XsnsCall(FUNC_WEB_ADD_HANDLER);
|
||||
#endif // Not BE_MINIMAL
|
||||
#endif // Not FIRMWARE_MINIMAL
|
||||
}
|
||||
reset_web_log_flag = false;
|
||||
WebServer->begin(); // Web server start
|
||||
@ -601,7 +601,7 @@ void HandleRoot(void)
|
||||
}
|
||||
|
||||
if (HTTP_MANAGER == webserver_state) {
|
||||
#ifndef BE_MINIMAL
|
||||
#ifndef FIRMWARE_MINIMAL
|
||||
if ((Settings.web_password[0] != 0) && !(WebServer->hasArg("USER1")) && !(WebServer->hasArg("PASS1"))) {
|
||||
HandleWifiLogin();
|
||||
} else {
|
||||
@ -619,7 +619,7 @@ void HandleRoot(void)
|
||||
HandleWifiLogin();
|
||||
}
|
||||
}
|
||||
#endif // Not BE_MINIMAL
|
||||
#endif // Not FIRMWARE_MINIMAL
|
||||
} else {
|
||||
char stemp[10];
|
||||
String page = FPSTR(HTTP_HEAD);
|
||||
@ -673,12 +673,12 @@ void HandleRoot(void)
|
||||
page += F("</tr></table>");
|
||||
}
|
||||
|
||||
#ifndef BE_MINIMAL
|
||||
#ifndef FIRMWARE_MINIMAL
|
||||
mqtt_data[0] = '\0';
|
||||
XdrvCall(FUNC_WEB_ADD_MAIN_BUTTON);
|
||||
XsnsCall(FUNC_WEB_ADD_MAIN_BUTTON);
|
||||
page += String(mqtt_data);
|
||||
#endif // Not BE_MINIMAL
|
||||
#endif // Not FIRMWARE_MINIMAL
|
||||
|
||||
if (HTTP_ADMIN == webserver_state) {
|
||||
page += FPSTR(HTTP_BTN_MENU1);
|
||||
@ -773,7 +773,7 @@ bool HttpCheckPriviledgedAccess(bool autorequestauth = true)
|
||||
|
||||
/*-------------------------------------------------------------------------------------------*/
|
||||
|
||||
#ifndef BE_MINIMAL
|
||||
#ifndef FIRMWARE_MINIMAL
|
||||
|
||||
void HandleConfiguration(void)
|
||||
{
|
||||
@ -1407,7 +1407,7 @@ void HandleInformation(void)
|
||||
page += FPSTR(HTTP_BTN_MAIN);
|
||||
ShowPage(page);
|
||||
}
|
||||
#endif // Not BE_MINIMAL
|
||||
#endif // Not FIRMWARE_MINIMAL
|
||||
|
||||
/*-------------------------------------------------------------------------------------------*/
|
||||
|
||||
|
||||
@ -123,8 +123,8 @@ a_features = [[
|
||||
"USE_TIMERS","USE_SUNRISE","USE_TIMERS_WEB","USE_RULES",
|
||||
"USE_KNX","USE_WPS","USE_SMARTCONFIG","MQTT_ARDUINOMQTT"
|
||||
],[
|
||||
"USE_CONFIG_OVERRIDE","BE_MINIMAL","USE_SENSORS","USE_CLASSIC",
|
||||
"USE_KNX_NO_EMULATION","USE_DISPLAY_MODES1TO5","USE_DISPLAY_GRAPH","USE_DISPLAY_LCD",
|
||||
"USE_CONFIG_OVERRIDE","FIRMWARE_MINIMAL","FIRMWARE_SENSORS","FIRMWARE_CLASSIC",
|
||||
"FIRMWARE_KNX_NO_EMULATION","USE_DISPLAY_MODES1TO5","USE_DISPLAY_GRAPH","USE_DISPLAY_LCD",
|
||||
"USE_DISPLAY_SSD1306","USE_DISPLAY_MATRIX","USE_DISPLAY_ILI9341","USE_DISPLAY_EPAPER",
|
||||
"USE_DISPLAY_SH1106","USE_MP3_PLAYER","USE_PCA9685","USE_TUYA_DIMMER",
|
||||
"USE_RC_SWITCH","USE_ARMTRONIX_DIMMERS","","",
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user