mgeppert/Tasmota
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Fix compile

Browse Source
This commit is contained in:
Theo Arends 2025-10-24 17:00:28 +02:00
parent 9fae98982e
commit e42d061bdf
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tasmota/tasmota_xdrv_driver/xdrv_84_esp32_hosted.ino
View File

@ -110,6 +110,7 @@ void HostedMCUStatus(void) {
void HostedMCUEverySecond(void) { void HostedMCUEverySecond(void) {
if (!CommandsReady()) { return; } if (!CommandsReady()) { return; }
#ifdef ESP_HOSTED_NEW_OTA
if (Hosted.ota_file_state_flag) { if (Hosted.ota_file_state_flag) {
Hosted.ota_file_state_flag--; Hosted.ota_file_state_flag--;
if (Hosted.ota_file_state_flag <= 0) { if (Hosted.ota_file_state_flag <= 0) {
@ -178,7 +179,8 @@ void HostedMCUEverySecond(void) {
MqttPublishPrefixTopicRulesProcess_P(STAT, PSTR(D_CMND_HOSTEDLOAD)); MqttPublishPrefixTopicRulesProcess_P(STAT, PSTR(D_CMND_HOSTEDLOAD));
} }
} }
else if (Hosted.ota_http_state_flag) { #endif // ESP_HOSTED_NEW_OTA
if (Hosted.ota_http_state_flag) {
Hosted.ota_http_state_flag--; Hosted.ota_http_state_flag--;
/* /*
if (2 == Hosted.ota_http_state_flag) { if (2 == Hosted.ota_http_state_flag) {
@ -277,10 +279,18 @@ void HostedMCUEverySecond(void) {
\*********************************************************************************************/ \*********************************************************************************************/
const char kHostedCommands[] PROGMEM = "Hosted|" // Prefix const char kHostedCommands[] PROGMEM = "Hosted|" // Prefix
"|Load|Ota"; "|"
#ifdef ESP_HOSTED_NEW_OTA
"Load|"
#endif // ESP_HOSTED_NEW_OTA
"Ota";
void (* const HostedCommand[])(void) PROGMEM = { void (* const HostedCommand[])(void) PROGMEM = {
&CmndHosted, &CmndHostedLoad, &CmndHostedOta }; &CmndHosted,
#ifdef ESP_HOSTED_NEW_OTA
&CmndHostedLoad,
#endif // ESP_HOSTED_NEW_OTA
&CmndHostedOta };
void CmndHosted(void) { void CmndHosted(void) {
Response_P(PSTR("{\"Hosted\":{\"Host\":\"%s\",\"Hosted\":\"%s\",\"MCU\":\"%s\"}}"), Response_P(PSTR("{\"Hosted\":{\"Host\":\"%s\",\"Hosted\":\"%s\",\"MCU\":\"%s\"}}"),
@ -288,6 +298,7 @@ void CmndHosted(void) {
); );
} }
#ifdef ESP_HOSTED_NEW_OTA
void CmndHostedLoad(void) { void CmndHostedLoad(void) {
/* /*
Expect files in folder /coprocessor/v2.0.17/network_adapter_esp32c6.bin Expect files in folder /coprocessor/v2.0.17/network_adapter_esp32c6.bin
@ -296,6 +307,8 @@ void CmndHostedLoad(void) {
Or allow user to enter required version like: Or allow user to enter required version like:
HostedLoad v2.0.17 HostedLoad v2.0.17
*/ */
// if (GetHostedMCUFwVersion() < 0x00020600) { return; }
Hosted.ota_url = (char*)calloc(200, sizeof(char)); Hosted.ota_url = (char*)calloc(200, sizeof(char));
if (!Hosted.ota_url) { return; } // Unable to allocate memory if (!Hosted.ota_url) { return; } // Unable to allocate memory
if (XdrvMailbox.data_len > 15) { if (XdrvMailbox.data_len > 15) {
@ -312,6 +325,7 @@ void CmndHostedLoad(void) {
Response_P(PSTR("{\"%s\":\"" D_JSON_VERSION " %s " D_JSON_FROM " %s\"}"), Response_P(PSTR("{\"%s\":\"" D_JSON_VERSION " %s " D_JSON_FROM " %s\"}"),
XdrvMailbox.command, GetHostedFwVersion(ESP_HOSTED).c_str(), Hosted.ota_url); XdrvMailbox.command, GetHostedFwVersion(ESP_HOSTED).c_str(), Hosted.ota_url);
} }
#endif // ESP_HOSTED_NEW_OTA
void CmndHostedOta(void) { void CmndHostedOta(void) {
/* /*