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

Merge branch 'development' of https://github.com/arendst/Tasmota into development

This commit is contained in:
Theo Arends 2024-09-10 14:50:07 +02:00
parent 5675f00d70 05e59b048e
commit f0da077e78
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tasmota/tasmota_xdrv_driver/xdrv_27_esp32_shutter.ino
View File

@ -1,7 +1,7 @@
/* /*
xdrv_27_esp32_shutter.ino - Shutter/Blind support for Tasmota xdrv_27_esp32_shutter.ino - Shutter/Blind support for Tasmota
Copyright (C) 2023 Stefan Bode Copyright (C) 2024 Stefan Bode
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -1356,7 +1356,8 @@ void ShutterUpdatePosition(void)
// sending MQTT result to broker // sending MQTT result to broker
snprintf_P(scommand, sizeof(scommand),PSTR(D_SHUTTER "%d"), i + 1); snprintf_P(scommand, sizeof(scommand),PSTR(D_SHUTTER "%d"), i + 1);
GetTopic_P(stopic, STAT, TasmotaGlobal.mqtt_topic, scommand); GetTopic_P(stopic, STAT, TasmotaGlobal.mqtt_topic, scommand);
Response_P("%d", ShutterSettings.shutter_position[i]); uint32_t position = ShutterRealToPercentPosition(Shutter[i].real_position, i);
Response_P("%d", (ShutterSettings.shutter_options[i] & 1) ? 100 - position : position);
MqttPublish(stopic, Settings->flag.mqtt_power_retain); // CMND_POWERRETAIN MqttPublish(stopic, Settings->flag.mqtt_power_retain); // CMND_POWERRETAIN
} }
@ -2332,11 +2333,13 @@ bool Xdrv27(uint32_t function)
for (uint8_t i = 0; i < TasmotaGlobal.shutters_present; i++) { for (uint8_t i = 0; i < TasmotaGlobal.shutters_present; i++) {
ResponseAppend_P(","); ResponseAppend_P(",");
uint8_t position = ShutterRealToPercentPosition(Shutter[i].real_position, i); uint8_t position = ShutterRealToPercentPosition(Shutter[i].real_position, i);
position = (ShutterSettings.shutter_options[i] & 1) ? 100 - position : position;
uint8_t target = ShutterRealToPercentPosition(Shutter[i].target_position, i); uint8_t target = ShutterRealToPercentPosition(Shutter[i].target_position, i);
ResponseAppend_P(JSON_SHUTTER_POS, i + 1, (ShutterSettings.shutter_options[i] & 1) ? 100 - position : position, Shutter[i].direction,(ShutterSettings.shutter_options[i] & 1) ? 100 - target : target, Shutter[i].tilt_real_pos ); target = (ShutterSettings.shutter_options[i] & 1) ? 100 - target : target;
ResponseAppend_P(JSON_SHUTTER_POS, i + 1, position, Shutter[i].direction, target, Shutter[i].tilt_real_pos );
#ifdef USE_DOMOTICZ #ifdef USE_DOMOTICZ
if ((0 == TasmotaGlobal.tele_period) && (0 == i)) { if ((0 == TasmotaGlobal.tele_period) && (0 == i)) {
DomoticzSensor(DZ_SHUTTER, ShutterRealToPercentPosition(Shutter[i].real_position, i)); DomoticzSensor(DZ_SHUTTER, position);
} }
#endif // USE_DOMOTICZ #endif // USE_DOMOTICZ
} }

5
tasmota/tasmota_xsns_sensor/xsns_53_sml.ino
View File

@ -3246,14 +3246,15 @@ dddef_exit:
mmp->params = strtol(lp1, &lp1, 10); mmp->params = strtol(lp1, &lp1, 10);
if (*lp1 != ',') goto next_line; if (*lp1 != ',') goto next_line;
lp1++; lp1++;
mmp->prefix[SML_PREFIX_SIZE - 1] = 0;
for (uint32_t cnt = 0; cnt < SML_PREFIX_SIZE; cnt++) { for (uint32_t cnt = 0; cnt < SML_PREFIX_SIZE; cnt++) {
if (*lp1 == SCRIPT_EOL || *lp1 == ',') { if (!*lp1 || *lp1 == SCRIPT_EOL || *lp1 == ',') {
mmp->prefix[cnt] = 0; mmp->prefix[cnt] = 0;
break; break;
} }
mmp->prefix[cnt] = *lp1++; mmp->prefix[cnt] = *lp1++;
} }
mmp->prefix[SML_PREFIX_SIZE - 1] = 0;
if (*lp1 == ',') { if (*lp1 == ',') {
lp1++; lp1++;
// get TRX pin // get TRX pin