jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-25 19:56:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support for 3 pulse relay shutters OPEN/CLOSE/STOP (#20758)

Browse Source 
* new option on dedicated STOP relay.

* added new stoprelay shutter

* fix

* new option stoprelay

* fix
This commit is contained in:
stefanbode 2024-02-23 22:54:39 +01:00 committed by GitHub
parent 87f17404c0
commit ae01d4ccd5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tasmota/include/i18n.h
View File

@ -755,6 +755,7 @@
#define D_CMND_SHUTTER_TILTINCDEC "TiltChange" #define D_CMND_SHUTTER_TILTINCDEC "TiltChange"
#define D_CMND_SHUTTER_MOTORSTOP "MotorStop" #define D_CMND_SHUTTER_MOTORSTOP "MotorStop"
#define D_CMND_SHUTTER_SETUP "Setup" #define D_CMND_SHUTTER_SETUP "Setup"
#define D_CMD_SHUTTER_EXTRASTOPRELAY "StopRelay"
// Commands xdrv_32_hotplug.ino // Commands xdrv_32_hotplug.ino
#define D_CMND_HOTPLUG "HotPlug" #define D_CMND_HOTPLUG "HotPlug"

23
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) 2024 Stefan Bode Copyright (C) 2023 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
@ -95,7 +95,7 @@ struct SHUTTERSETTINGS {
uint16_t shutter_opentime[MAX_SHUTTERS_ESP32]; uint16_t shutter_opentime[MAX_SHUTTERS_ESP32];
uint16_t shutter_closetime[MAX_SHUTTERS_ESP32]; uint16_t shutter_closetime[MAX_SHUTTERS_ESP32];
int16_t shuttercoeff[5][MAX_SHUTTERS_ESP32]; int16_t shuttercoeff[5][MAX_SHUTTERS_ESP32];
uint8_t shutter_options[MAX_SHUTTERS_ESP32]; uint8_t shutter_options[MAX_SHUTTERS_ESP32]; // bit1:INVERT bit2: LOCK bit3: ExtraEndStop bit4: INVert WebButtons bit5: extraStopRelay
uint8_t shutter_set50percent[MAX_SHUTTERS_ESP32]; uint8_t shutter_set50percent[MAX_SHUTTERS_ESP32];
uint8_t shutter_position[MAX_SHUTTERS_ESP32]; uint8_t shutter_position[MAX_SHUTTERS_ESP32];
uint8_t shutter_startrelay[MAX_SHUTTERS_ESP32]; uint8_t shutter_startrelay[MAX_SHUTTERS_ESP32];
@ -132,7 +132,8 @@ const char kShutterCommands[] PROGMEM = D_PRFX_SHUTTER "|"
D_CMND_SHUTTER_SETHALFWAY "|" D_CMND_SHUTTER_SETCLOSE "|" D_CMND_SHUTTER_SETOPEN "|" D_CMND_SHUTTER_INVERT "|" D_CMND_SHUTTER_CLIBRATION "|" D_CMND_SHUTTER_SETHALFWAY "|" D_CMND_SHUTTER_SETCLOSE "|" D_CMND_SHUTTER_SETOPEN "|" D_CMND_SHUTTER_INVERT "|" D_CMND_SHUTTER_CLIBRATION "|"
D_CMND_SHUTTER_MOTORDELAY "|" D_CMND_SHUTTER_FREQUENCY "|" D_CMND_SHUTTER_BUTTON "|" D_CMND_SHUTTER_LOCK "|" D_CMND_SHUTTER_ENABLEENDSTOPTIME "|" D_CMND_SHUTTER_INVERTWEBBUTTONS "|" D_CMND_SHUTTER_MOTORDELAY "|" D_CMND_SHUTTER_FREQUENCY "|" D_CMND_SHUTTER_BUTTON "|" D_CMND_SHUTTER_LOCK "|" D_CMND_SHUTTER_ENABLEENDSTOPTIME "|" D_CMND_SHUTTER_INVERTWEBBUTTONS "|"
D_CMND_SHUTTER_STOPOPEN "|" D_CMND_SHUTTER_STOPCLOSE "|" D_CMND_SHUTTER_STOPTOGGLE "|" D_CMND_SHUTTER_STOPTOGGLEDIR "|" D_CMND_SHUTTER_STOPPOSITION "|" D_CMND_SHUTTER_INCDEC "|" D_CMND_SHUTTER_STOPOPEN "|" D_CMND_SHUTTER_STOPCLOSE "|" D_CMND_SHUTTER_STOPTOGGLE "|" D_CMND_SHUTTER_STOPTOGGLEDIR "|" D_CMND_SHUTTER_STOPPOSITION "|" D_CMND_SHUTTER_INCDEC "|"
D_CMND_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_UNITTEST "|" D_CMND_SHUTTER_TILTCONFIG "|" D_CMND_SHUTTER_SETTILT "|" D_CMND_SHUTTER_TILTINCDEC "|" D_CMND_SHUTTER_MOTORSTOP "|" D_CMND_SHUTTER_SETUP "|"
D_CMD_SHUTTER_EXTRASTOPRELAY;
void (* const ShutterCommand[])(void) PROGMEM = { void (* const ShutterCommand[])(void) PROGMEM = {
&CmndShutterOpen, &CmndShutterClose, &CmndShutterToggle, &CmndShutterToggleDir, &CmndShutterStop, &CmndShutterPosition, &CmndShutterOpen, &CmndShutterClose, &CmndShutterToggle, &CmndShutterToggleDir, &CmndShutterStop, &CmndShutterPosition,
@ -140,7 +141,7 @@ void (* const ShutterCommand[])(void) PROGMEM = {
&CmndShutterSetHalfway, &CmndShutterSetClose, &CmndShutterSetOpen, &CmndShutterInvert, &CmndShutterCalibration , &CmndShutterMotorDelay, &CmndShutterSetHalfway, &CmndShutterSetClose, &CmndShutterSetOpen, &CmndShutterInvert, &CmndShutterCalibration , &CmndShutterMotorDelay,
&CmndShutterFrequency, &CmndShutterButton, &CmndShutterLock, &CmndShutterEnableEndStopTime, &CmndShutterInvertWebButtons, &CmndShutterFrequency, &CmndShutterButton, &CmndShutterLock, &CmndShutterEnableEndStopTime, &CmndShutterInvertWebButtons,
&CmndShutterStopOpen, &CmndShutterStopClose, &CmndShutterStopToggle, &CmndShutterStopToggleDir, &CmndShutterStopPosition, &CmndShutterIncDec, &CmndShutterStopOpen, &CmndShutterStopClose, &CmndShutterStopToggle, &CmndShutterStopToggleDir, &CmndShutterStopPosition, &CmndShutterIncDec,
&CmndShutterUnitTest,&CmndShutterTiltConfig,&CmndShutterSetTilt,&CmndShutterTiltIncDec,&CmndShutterMotorStop,&CmndShutterSetup &CmndShutterUnitTest,&CmndShutterTiltConfig,&CmndShutterSetTilt,&CmndShutterTiltIncDec,&CmndShutterMotorStop,&CmndShutterSetup,&CmndShutterExtraStopPulseRelay
}; };
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}";
@ -804,7 +805,11 @@ void ShutterPowerOff(uint8_t i)
case SRC_PULSETIMER: case SRC_PULSETIMER:
case SRC_SHUTTER: case SRC_SHUTTER:
case SRC_WEBGUI: case SRC_WEBGUI:
ExecuteCommandPowerShutter(cur_relay, 1, SRC_SHUTTER); if (ShutterSettings.shutter_options[i] & 16) { // There is a special STOP Relay
ExecuteCommandPowerShutter(ShutterSettings.shutter_startrelay[i] + 2, 1, SRC_SHUTTER);
} else {
ExecuteCommandPowerShutter(cur_relay, 1, SRC_SHUTTER);
}
// switch off direction relay to make it power less // switch off direction relay to make it power less
if (((1 << (ShutterSettings.shutter_startrelay[i])) & TasmotaGlobal.power) && ShutterSettings.shutter_startrelay[i] + 1 != cur_relay) { if (((1 << (ShutterSettings.shutter_startrelay[i])) & TasmotaGlobal.power) && ShutterSettings.shutter_startrelay[i] + 1 != cur_relay) {
ExecuteCommandPowerShutter(ShutterSettings.shutter_startrelay[i] + 1, 0, SRC_SHUTTER); ExecuteCommandPowerShutter(ShutterSettings.shutter_startrelay[i] + 1, 0, SRC_SHUTTER);
@ -1703,6 +1708,11 @@ void CmndShutterEnableEndStopTime(void)
ShutterOptionsSetHelper(4); ShutterOptionsSetHelper(4);
} }
void CmndShutterExtraStopPulseRelay(void)
{
ShutterOptionsSetHelper(16);
}
void CmndShutterFrequency(void) void CmndShutterFrequency(void)
{ {
if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload <= 20000)) { if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload <= 20000)) {
@ -1824,8 +1834,7 @@ void CmndShutterPosition(void)
} }
} }
// special handling fo UP,DOWN,TOGGLE,STOP and similar commands command // special handling fo UP,DOWN,TOGGLE,STOP and similar commands
//
if ( XdrvMailbox.data_len > 0 ) { if ( XdrvMailbox.data_len > 0 ) {
// set len to 0 to avoid loop // set len to 0 to avoid loop
uint32_t data_len_save = XdrvMailbox.data_len; uint32_t data_len_save = XdrvMailbox.data_len;