mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Save 8k from ESP32 safeboot

This commit is contained in:
Theo Arends 2024-11-11 15:44:26 +01:00
parent 1b9d206dd8
commit 08f99de2a5
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tasmota/tasmota_xdrv_driver/xdrv_02_9_mqtt.ino
View File

@ -45,7 +45,7 @@ WiFiClient EspClient; // Wifi Client - non-TLS
#endif // USE_MQTT_AZURE_IOT #endif // USE_MQTT_AZURE_IOT
const char kMqttCommands[] PROGMEM = "|" // No prefix const char kMqttCommands[] PROGMEM = "|" // No prefix
#ifndef FIRMWARE_MINIMAL_ONLY #ifndef FIRMWARE_MINIMAL
// SetOption synonyms // SetOption synonyms
D_SO_MQTTJSONONLY "|" D_SO_MQTTJSONONLY "|"
#ifdef USE_MQTT_TLS #ifdef USE_MQTT_TLS
@ -67,7 +67,7 @@ const char kMqttCommands[] PROGMEM = "|" // No prefix
D_CMND_FULLTOPIC "|" D_CMND_PREFIX "|" D_CMND_GROUPTOPIC "|" D_CMND_TOPIC "|" D_CMND_PUBLISH "|" D_CMND_MQTTLOG "|" D_CMND_FULLTOPIC "|" D_CMND_PREFIX "|" D_CMND_GROUPTOPIC "|" D_CMND_TOPIC "|" D_CMND_PUBLISH "|" D_CMND_MQTTLOG "|"
D_CMND_BUTTONTOPIC "|" D_CMND_SWITCHTOPIC "|" D_CMND_BUTTONRETAIN "|" D_CMND_SWITCHRETAIN "|" D_CMND_POWERRETAIN "|" D_CMND_BUTTONTOPIC "|" D_CMND_SWITCHTOPIC "|" D_CMND_BUTTONRETAIN "|" D_CMND_SWITCHRETAIN "|" D_CMND_POWERRETAIN "|"
D_CMND_SENSORRETAIN "|" D_CMND_INFORETAIN "|" D_CMND_STATERETAIN "|" D_CMND_STATUSRETAIN D_CMND_SENSORRETAIN "|" D_CMND_INFORETAIN "|" D_CMND_STATERETAIN "|" D_CMND_STATUSRETAIN
#endif // FIRMWARE_MINIMAL_ONLY #endif // FIRMWARE_MINIMAL
; ;
SO_SYNONYMS(kMqttSynonyms, SO_SYNONYMS(kMqttSynonyms,
@ -79,7 +79,7 @@ SO_SYNONYMS(kMqttSynonyms,
); );
void (* const MqttCommand[])(void) PROGMEM = { void (* const MqttCommand[])(void) PROGMEM = {
#ifndef FIRMWARE_MINIMAL_ONLY #ifndef FIRMWARE_MINIMAL
#if defined(USE_MQTT_TLS) #if defined(USE_MQTT_TLS)
&CmndMqttFingerprint, &CmndMqttFingerprint,
#endif #endif
@ -94,7 +94,7 @@ void (* const MqttCommand[])(void) PROGMEM = {
&CmndFullTopic, &CmndPrefix, &CmndGroupTopic, &CmndTopic, &CmndPublish, &CmndMqttlog, &CmndFullTopic, &CmndPrefix, &CmndGroupTopic, &CmndTopic, &CmndPublish, &CmndMqttlog,
&CmndButtonTopic, &CmndSwitchTopic, &CmndButtonRetain, &CmndSwitchRetain, &CmndPowerRetain, &CmndButtonTopic, &CmndSwitchTopic, &CmndButtonRetain, &CmndSwitchRetain, &CmndPowerRetain,
&CmndSensorRetain, &CmndInfoRetain, &CmndStateRetain, &CmndStatusRetain &CmndSensorRetain, &CmndInfoRetain, &CmndStateRetain, &CmndStatusRetain
#endif // FIRMWARE_MINIMAL_ONLY #endif // FIRMWARE_MINIMAL
}; };
struct MQTT { struct MQTT {
@ -2066,6 +2066,7 @@ void MqttSaveSettings(void) {
#endif #endif
ExecuteWebCommand((char*)cmnd.c_str()); ExecuteWebCommand((char*)cmnd.c_str());
} }
#endif // USE_WEBSERVER #endif // USE_WEBSERVER
/*********************************************************************************************\ /*********************************************************************************************\
@ -2089,7 +2090,7 @@ bool Xdrv02(uint32_t function)
case FUNC_WEB_ADD_HANDLER: case FUNC_WEB_ADD_HANDLER:
WebServer_on(PSTR("/" WEB_HANDLE_MQTT), HandleMqttConfiguration); WebServer_on(PSTR("/" WEB_HANDLE_MQTT), HandleMqttConfiguration);
break; break;
#endif // FIRMWARE_MINIMAL #endif // not FIRMWARE_MINIMAL
#endif // USE_WEBSERVER #endif // USE_WEBSERVER
case FUNC_COMMAND: case FUNC_COMMAND:
result = DecodeCommand(kMqttCommands, MqttCommand, kMqttSynonyms); result = DecodeCommand(kMqttCommands, MqttCommand, kMqttSynonyms);