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

Bug + new option to set shutterposition (#23893)

Browse Source 
* Bugfix + new ShutterSetPosition

Regression on Pulsetime
New function to set Position at any time without moving

* Update i18n.h

Added new option
This commit is contained in:
stefanbode 2025-09-10 11:47:34 +02:00 committed by GitHub
parent 1eb38f0b78
commit 7315b06969
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 36 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tasmota/include/i18n.h
View File

@ -770,6 +770,7 @@
#define D_CMND_SHUTTER_SETHALFWAY "SetHalfway" #define D_CMND_SHUTTER_SETHALFWAY "SetHalfway"
#define D_CMND_SHUTTER_SETCLOSE "SetClose" #define D_CMND_SHUTTER_SETCLOSE "SetClose"
#define D_CMND_SHUTTER_SETOPEN "SetOpen" #define D_CMND_SHUTTER_SETOPEN "SetOpen"
#define D_CMND_SHUTTER_SETPOSITION "SetPosition"
#define D_CMND_SHUTTER_INVERT "Invert" #define D_CMND_SHUTTER_INVERT "Invert"
#define D_CMND_SHUTTER_CLIBRATION "Calibration" #define D_CMND_SHUTTER_CLIBRATION "Calibration"
#define D_CMND_SHUTTER_MOTORDELAY "MotorDelay" #define D_CMND_SHUTTER_MOTORDELAY "MotorDelay"

57
tasmota/tasmota_xdrv_driver/xdrv_27_esp32_shutter.ino
View File

@ -130,7 +130,7 @@ const char kShutterCommands[] PROGMEM = D_PRFX_SHUTTER "|"
D_CMND_SHUTTER_UNITTEST "|" D_CMND_SHUTTER_UNITTEST "|"
#endif // SHUTTER_UNITTEST #endif // SHUTTER_UNITTEST
D_CMND_SHUTTER_TILTCONFIG "|" D_CMND_SHUTTER_SETTILT "|" D_CMND_SHUTTER_TILTINCDEC "|" D_CMND_SHUTTER_MOTORSTOP "|" D_CMND_SHUTTER_SETUP "|" D_CMND_SHUTTER_TILTCONFIG "|" D_CMND_SHUTTER_SETTILT "|" D_CMND_SHUTTER_TILTINCDEC "|" D_CMND_SHUTTER_MOTORSTOP "|" D_CMND_SHUTTER_SETUP "|"
D_CMD_SHUTTER_EXTRASTOPRELAY; D_CMD_SHUTTER_EXTRASTOPRELAY "|" D_CMND_SHUTTER_SETPOSITION;
void (* const ShutterCommand[])(void) PROGMEM = { void (* const ShutterCommand[])(void) PROGMEM = {
&CmndShutterOpen, &CmndShutterClose, &CmndShutterToggle, &CmndShutterToggleDir, &CmndShutterStop, &CmndShutterPosition, &CmndShutterOpen, &CmndShutterClose, &CmndShutterToggle, &CmndShutterToggleDir, &CmndShutterStop, &CmndShutterPosition,
@ -141,7 +141,8 @@ void (* const ShutterCommand[])(void) PROGMEM = {
#ifdef SHUTTER_UNITTEST #ifdef SHUTTER_UNITTEST
&CmndShutterUnitTest, &CmndShutterUnitTest,
#endif // SHUTTER_UNITTEST #endif // SHUTTER_UNITTEST
&CmndShutterTiltConfig, &CmndShutterSetTilt, &CmndShutterTiltIncDec, &CmndShutterMotorStop, &CmndShutterSetup, &CmndShutterExtraStopPulseRelay &CmndShutterTiltConfig, &CmndShutterSetTilt, &CmndShutterTiltIncDec, &CmndShutterMotorStop, &CmndShutterSetup, &CmndShutterExtraStopPulseRelay,
&CmndShutterSetPosition
}; };
const char JSON_SHUTTER_POS[] PROGMEM = "\"" D_PRFX_SHUTTER "%d\":{\"Position\":%d,\"Direction\":%d,\"Target\":%d,\"Tilt\":%d}"; const char JSON_SHUTTER_POS[] PROGMEM = "\"" D_PRFX_SHUTTER "%d\":{\"Position\":%d,\"Direction\":%d,\"Target\":%d,\"Tilt\":%d}";
@ -571,12 +572,15 @@ void ShutterInit(void)
ShutterGlobal.RelayShutterMask |= 3 << (ShutterSettings.shutter_startrelay[i] -1) ; ShutterGlobal.RelayShutterMask |= 3 << (ShutterSettings.shutter_startrelay[i] -1) ;
// All shutters must have same mode. Switch OR Pulse. N // All shutters must have same mode. Switch OR Pulse. N
switch (Settings->pulse_timer[i]) { //AddLog(LOG_LEVEL_DEBUG, PSTR("SHT: Testing Pulsetime on %d"), ShutterSettings.shutter_startrelay[i]);
switch (Settings->pulse_timer[ShutterSettings.shutter_startrelay[i]]) {
case 0: case 0:
Shutter[i].switch_mode = SHT_SWITCH; Shutter[i].switch_mode = SHT_SWITCH;
//AddLog(LOG_LEVEL_INFO, PSTR("SHT: Shutter %d is SWITCH"), i+1);
break; break;
default: default:
Shutter[i].switch_mode = SHT_PULSE; Shutter[i].switch_mode = SHT_PULSE;
//AddLog(LOG_LEVEL_INFO, PSTR("SHT: Shutter %d is PULSE"), i+1);
break; break;
} }
@ -885,7 +889,7 @@ void ShutterRelayChanged(void)
for (uint32_t i = 0; i < TasmotaGlobal.shutters_present; i++) { for (uint32_t i = 0; i < TasmotaGlobal.shutters_present; i++) {
power_t powerstate_local = (TasmotaGlobal.power >> (ShutterSettings.shutter_startrelay[i] - 1)) & 3; power_t powerstate_local = (TasmotaGlobal.power >> (ShutterSettings.shutter_startrelay[i] - 1)) & 3;
// SRC_IGNORE added because INTERLOCK function bite causes this as last source for changing the relay. // SRC_IGNORE added because INTERLOCK function bite causes this as last source for changing the relay.
//uint8 manual_relays_changed = ((ShutterGlobal.RelayCurrentMask >> (ShutterSettings.shutter_startrelay[i] -1)) & 3) && SRC_IGNORE != TasmotaGlobal.last_source && SRC_SHUTTER != TasmotaGlobal.last_source && SRC_PULSETIMER != TasmotaGlobal.last_source ; // uint8 manual_relays_changed = ((ShutterGlobal.RelayCurrentMask >> (ShutterSettings.shutter_startrelay[i] -1)) & 3) && SRC_IGNORE != TasmotaGlobal.last_source && SRC_SHUTTER != TasmotaGlobal.last_source && SRC_PULSETIMER != TasmotaGlobal.last_source ;
uint8 manual_relays_changed = ((ShutterGlobal.RelayCurrentMask >> (ShutterSettings.shutter_startrelay[i] - 1)) & 3) && SRC_SHUTTER != TasmotaGlobal.last_source && SRC_PULSETIMER != TasmotaGlobal.last_source ; uint8 manual_relays_changed = ((ShutterGlobal.RelayCurrentMask >> (ShutterSettings.shutter_startrelay[i] - 1)) & 3) && SRC_SHUTTER != TasmotaGlobal.last_source && SRC_PULSETIMER != TasmotaGlobal.last_source ;
//AddLog(LOG_LEVEL_DEBUG_MORE, PSTR("SHT: Shtr%d, Source %s, Powerstate %ld, RelayMask %d, ManualChange %d"), //AddLog(LOG_LEVEL_DEBUG_MORE, PSTR("SHT: Shtr%d, Source %s, Powerstate %ld, RelayMask %d, ManualChange %d"),
// i+1, GetTextIndexed(stemp1, sizeof(stemp1), TasmotaGlobal.last_source, kCommandSource), powerstate_local,ShutterGlobal.RelayCurrentMask,manual_relays_changed); // i+1, GetTextIndexed(stemp1, sizeof(stemp1), TasmotaGlobal.last_source, kCommandSource), powerstate_local,ShutterGlobal.RelayCurrentMask,manual_relays_changed);
@ -1171,6 +1175,7 @@ void ShutterStartInit(uint32_t i, int32_t direction, int32_t target_pos)
|| ( (-1 == direction) && (Shutter[i].real_position <= Shutter[i].min_realPositionChange)) ) || ( (-1 == direction) && (Shutter[i].real_position <= Shutter[i].min_realPositionChange)) )
&& abs(Shutter[i].tilt_real_pos-Shutter[i].tilt_target_pos) <= Shutter[i].min_TiltChange) { && abs(Shutter[i].tilt_real_pos-Shutter[i].tilt_target_pos) <= Shutter[i].min_TiltChange) {
ShutterGlobal.skip_relay_change = 1; ShutterGlobal.skip_relay_change = 1;
//AddLog(LOG_LEVEL_INFO, "SHT: Setting skip relay to 1");
} else { } else {
Shutter[i].pwm_velocity = 0; Shutter[i].pwm_velocity = 0;
ShutterWaitForMotorStart(i); ShutterWaitForMotorStart(i);
@ -2022,18 +2027,38 @@ void CmndShutterRelay(void)
ResponseAppend_P(PSTR("}")); ResponseAppend_P(PSTR("}"));
} }
void CmndShutterSetClose(void) void CmndShutterSetPosition(void)
{ {
int16_t index = XdrvMailbox.index - 1;
int16_t new_position = (ShutterSettings.shutter_options[index] & 1) ? 100 - XdrvMailbox.payload : XdrvMailbox.payload;
if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= TasmotaGlobal.shutters_present)) { if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= TasmotaGlobal.shutters_present)) {
Shutter[XdrvMailbox.index - 1].real_position = 0; Shutter[index].real_position = ShutterPercentToRealPosition(new_position, index);
Shutter[XdrvMailbox.index - 1].tilt_real_pos = Shutter[XdrvMailbox.index - 1].tilt_config[0]; switch (new_position) {
Shutter[XdrvMailbox.index - 1].lastdirection = -1; case 0:
ShutterStartInit(XdrvMailbox.index -1, 0, 0); Shutter[index].tilt_real_pos = Shutter[index].tilt_config[0];
ShutterSettings.shutter_position[XdrvMailbox.index - 1] = 0; Shutter[index].lastdirection = -1;
case 100:
Shutter[index].tilt_real_pos = Shutter[index].tilt_config[1];
Shutter[index].lastdirection = 1;
}
ShutterStartInit(index, 0, Shutter[index].real_position);
ShutterSettings.shutter_position[index] = new_position;
ResponseCmndIdxChar(D_CONFIGURATION_RESET); ResponseCmndIdxChar(D_CONFIGURATION_RESET);
} }
} }
void CmndShutterSetClose(void)
{
XdrvMailbox.payload = 0;
CmndShutterSetPosition();
}
void CmndShutterSetOpen(void)
{
XdrvMailbox.payload = 100;
CmndShutterSetPosition();
}
void CmndShutterSetHalfway(void) void CmndShutterSetHalfway(void)
{ {
if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= TasmotaGlobal.shutters_present)) { if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= TasmotaGlobal.shutters_present)) {
@ -2050,18 +2075,6 @@ void CmndShutterSetHalfway(void)
} }
} }
void CmndShutterSetOpen(void)
{
if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= TasmotaGlobal.shutters_present)) {
Shutter[XdrvMailbox.index - 1].real_position = Shutter[XdrvMailbox.index - 1].open_max;
Shutter[XdrvMailbox.index - 1].tilt_real_pos = Shutter[XdrvMailbox.index - 1].tilt_config[1];
Shutter[XdrvMailbox.index - 1].lastdirection = 1;
ShutterStartInit(XdrvMailbox.index -1, 0, Shutter[XdrvMailbox.index - 1].open_max);
ShutterSettings.shutter_position[XdrvMailbox.index - 1] = 100;
ResponseCmndIdxChar(D_CONFIGURATION_RESET);
}
}
void CmndShutterSetTilt(void) void CmndShutterSetTilt(void)
{ {
if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= TasmotaGlobal.shutters_present)) { if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= TasmotaGlobal.shutters_present)) {