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

fix Ecotracker emulation (#23926)

Browse Source
This commit is contained in:
gemu 2025-09-20 10:53:21 +02:00 committed by GitHub
parent 96c9c9788b
commit 40bf796ef3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 61 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
tasmota/tasmota_xdrv_driver/xdrv_10_scripter.ino
View File

@ -888,14 +888,25 @@ int32_t script_mdns(char *name, char *mac, char *xtype) {
strcpy(glob_script_mem.mdns.type, xtype); strcpy(glob_script_mem.mdns.type, xtype);
char shelly_mac[13]; char shelly_mac[13];
strcpy(glob_script_mem.mdns.shelly_name, name); if (*name == '-'){
if (*mac == '-') { strcpy(glob_script_mem.mdns.shelly_name, TasmotaGlobal.hostname);
uint8_t mac[6];
WiFi.macAddress(mac);
sprintf(shelly_mac, "%02x%02x%02x%02x%02x%02x", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
strcat(glob_script_mem.mdns.shelly_name, shelly_mac);
} else { } else {
strcat(glob_script_mem.mdns.shelly_name, mac); strcpy(glob_script_mem.mdns.shelly_name, name);
if (*mac == '-') {
uint8_t mac[6];
WiFi.macAddress(mac);
sprintf(shelly_mac, "%02x%02x%02x%02x%02x%02x", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
strcat(glob_script_mem.mdns.shelly_name, shelly_mac);
} else {
strcat(glob_script_mem.mdns.shelly_name, mac);
}
}
uint8_t emu_choice;
if (!strcmp(xtype, "everhome")) {
emu_choice = 1;
} else {
emu_choice = 0; //default = shelly
} }
if (!MDNS.begin(glob_script_mem.mdns.shelly_name)) { if (!MDNS.begin(glob_script_mem.mdns.shelly_name)) {
@ -905,35 +916,57 @@ int32_t script_mdns(char *name, char *mac, char *xtype) {
#ifdef ESP32 #ifdef ESP32
MDNS.addService("http", "tcp", 80); MDNS.addService("http", "tcp", 80);
MDNS.addService((const char*)glob_script_mem.mdns.type, "tcp", 80); MDNS.addService((const char*)glob_script_mem.mdns.type, "tcp", 80);
mdns_txt_item_t serviceTxtData[4] = {
{ "fw_id", glob_script_mem.mdns.shelly_fw_id }, if (emu_choice == 1) {
{ "arch", "esp8266" }, mdns_txt_item_t serviceTxtData[2] = {
{ "id", glob_script_mem.mdns.shelly_name }, { "name", glob_script_mem.mdns.shelly_name },
{ "gen", glob_script_mem.mdns.shelly_gen } { "id", glob_script_mem.mdns.shelly_name }
}; };
mdns_service_instance_name_set("_http", "_tcp", glob_script_mem.mdns.shelly_name); mdns_service_instance_name_set("_http", "_tcp", glob_script_mem.mdns.shelly_name);
mdns_service_txt_set("_http", "_tcp", serviceTxtData, 4); mdns_service_txt_set("_http", "_tcp", serviceTxtData, 2);
mdns_service_instance_name_set("_shelly", "_tcp", glob_script_mem.mdns.shelly_name); mdns_service_instance_name_set("_shelly", "_tcp", glob_script_mem.mdns.shelly_name);
mdns_service_txt_set("_shelly", "_tcp", serviceTxtData, 4); mdns_service_txt_set("_everhome", "_tcp", serviceTxtData, 2);
} else {
mdns_txt_item_t serviceTxtData[4] = {
{ "fw_id", glob_script_mem.mdns.shelly_fw_id },
{ "arch", "esp8266" },
{ "id", glob_script_mem.mdns.shelly_name },
{ "gen", glob_script_mem.mdns.shelly_gen }
};
mdns_service_instance_name_set("_http", "_tcp", glob_script_mem.mdns.shelly_name);
mdns_service_txt_set("_http", "_tcp", serviceTxtData, 4);
mdns_service_instance_name_set("_shelly", "_tcp", glob_script_mem.mdns.shelly_name);
mdns_service_txt_set("_shelly", "_tcp", serviceTxtData, 4);
}
#else #else
hMDNSService = MDNS.addService(0, "http", "tcp", 80); hMDNSService = MDNS.addService(0, "http", "tcp", 80);
hMDNSService2 = MDNS.addService(0, glob_script_mem.mdns.type, "tcp", 80); hMDNSService2 = MDNS.addService(0, glob_script_mem.mdns.type, "tcp", 80);
if (hMDNSService) { if (hMDNSService) {
MDNS.setServiceName(hMDNSService, glob_script_mem.mdns.shelly_name); MDNS.setServiceName(hMDNSService, glob_script_mem.mdns.shelly_name);
MDNS.addServiceTxt(hMDNSService, "fw_id", glob_script_mem.mdns.shelly_fw_id); if (emu_choice == 1) {
MDNS.addServiceTxt(hMDNSService, "arch", "esp8266"); MDNS.addServiceTxt(hMDNSService, "name", glob_script_mem.mdns.shelly_name);
MDNS.addServiceTxt(hMDNSService, "id", glob_script_mem.mdns.shelly_name); MDNS.addServiceTxt(hMDNSService, "id", glob_script_mem.mdns.shelly_name);
MDNS.addServiceTxt(hMDNSService, "gen", glob_script_mem.mdns.shelly_gen); } else {
MDNS.addServiceTxt(hMDNSService, "fw_id", glob_script_mem.mdns.shelly_fw_id);
MDNS.addServiceTxt(hMDNSService, "arch", "esp8266");
MDNS.addServiceTxt(hMDNSService, "id", glob_script_mem.mdns.shelly_name);
MDNS.addServiceTxt(hMDNSService, "gen", glob_script_mem.mdns.shelly_gen);
}
} }
if (hMDNSService2) { if (hMDNSService2) {
MDNS.setServiceName(hMDNSService2, glob_script_mem.mdns.shelly_name); MDNS.setServiceName(hMDNSService2, glob_script_mem.mdns.shelly_name);
MDNS.addServiceTxt(hMDNSService2, "fw_id", glob_script_mem.mdns.shelly_fw_id); if (emu_choice == 1) {
MDNS.addServiceTxt(hMDNSService2, "arch", "esp8266"); MDNS.addServiceTxt(hMDNSService2, "name", glob_script_mem.mdns.shelly_name);
MDNS.addServiceTxt(hMDNSService2, "id", glob_script_mem.mdns.shelly_name); MDNS.addServiceTxt(hMDNSService2, "id", glob_script_mem.mdns.shelly_name);
MDNS.addServiceTxt(hMDNSService2, "gen", glob_script_mem.mdns.shelly_gen); } else {
MDNS.addServiceTxt(hMDNSService2, "fw_id", glob_script_mem.mdns.shelly_fw_id);
MDNS.addServiceTxt(hMDNSService2, "arch", "esp8266");
MDNS.addServiceTxt(hMDNSService2, "id", glob_script_mem.mdns.shelly_name);
MDNS.addServiceTxt(hMDNSService2, "gen", glob_script_mem.mdns.shelly_gen);
}
} }
#endif #endif
AddLog(LOG_LEVEL_INFO, PSTR(D_LOG_UPNP "SCR: mDNS responder started: %s"),glob_script_mem.mdns.shelly_name); AddLog(LOG_LEVEL_INFO, PSTR(D_LOG_UPNP "SCR: mDNS started with service tcp and %s. Hostname: %s"), glob_script_mem.mdns.type, glob_script_mem.mdns.shelly_name);
return 0; return 0;
} }
#endif // USE_SCRIPT_MDNS #endif // USE_SCRIPT_MDNS
@ -1241,9 +1274,11 @@ char *script;
if ((*lp == 'm' || *lp == 'M') && *(lp + 1) == ':') { if ((*lp == 'm' || *lp == 'M') && *(lp + 1) == ':') {
uint8_t flg = *lp; uint8_t flg = *lp;
lp += 2; lp += 2;
pflg = 0;
if (*lp == 'p' && *(lp + 1) == ':') { if (*lp == 'p' && *(lp + 1) == ':') {
vtypes[vars].bits.is_permanent = 1; vtypes[vars].bits.is_permanent = 1;
lp += 2; lp += 2;
pflg = 1;
} }
if (flg == 'M') mfilt[numflt].numvals = 8; if (flg == 'M') mfilt[numflt].numvals = 8;
else mfilt[numflt].numvals = 5; else mfilt[numflt].numvals = 5;
@ -9802,7 +9837,6 @@ void Scripter_save_pvars(void) {
const char HTTP_BTN_MENU_RULES[] PROGMEM = const char HTTP_BTN_MENU_RULES[] PROGMEM =
"<p></p><form action='" WEB_HANDLE_SCRIPT "' method='get'><button>" D_CONFIGURE_SCRIPT "</button></form>"; "<p></p><form action='" WEB_HANDLE_SCRIPT "' method='get'><button>" D_CONFIGURE_SCRIPT "</button></form>";
const char HTTP_FORM_SCRIPT[] PROGMEM = const char HTTP_FORM_SCRIPT[] PROGMEM =
"<fieldset><legend><b>&nbsp;" D_SCRIPT "&nbsp;</b></legend>" "<fieldset><legend><b>&nbsp;" D_SCRIPT "&nbsp;</b></legend>"
"<form method='post' action='" WEB_HANDLE_SCRIPT "'>"; "<form method='post' action='" WEB_HANDLE_SCRIPT "'>";