jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-04-24 23:07:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Shutter esp32 support up to 16 shutters (#18295)

Browse Source 
* Updates to support ESP32 shutter compiler option

* New ESP32 shutter driver

* Update xdrv_27_ESP32_shutter.ino

* Update xdrv_27_shutter.ino

* Update support_command.ino

* Update xdrv_27_shutter.ino

Fix compile error

* Update xdrv_27_ESP32_shutter.ino

Fix compile error

* Update xdrv_27_shutter.ino

Fix compile error

---------

Co-authored-by: Theo Arends <11044339+arendst@users.noreply.github.com>
This commit is contained in:
stefanbode 2023-03-29 15:43:19 +02:00 committed by GitHub
parent b321fab868
commit 5c14a3169b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2099 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tasmota/tasmota_support/support_command.ino
View File

@ -917,24 +917,8 @@ void CmndStatus(void)
}
#ifdef USE_SHUTTER
if (Settings->flag3.shutter_mode) {
if ((0 == payload) || (13 == payload)) {
Response_P(PSTR("{\"" D_CMND_STATUS D_STATUS13_SHUTTER "\":{"));
for (uint32_t i = 0; i < MAX_SHUTTERS; i++) {
if (0 == Settings->shutter_startrelay[i]) { break; }
if (i > 0) { ResponseAppend_P(PSTR(",")); }
ResponseAppend_P(PSTR("\"" D_STATUS13_SHUTTER "%d\":{\"Relay1\":%d,\"Relay2\":%d,\"Open\":%d,\"Close\":%d,"
"\"50perc\":%d,\"Delay\":%d,\"Opt\":\"%s\","
"\"Calib\":[%d,%d,%d,%d,%d],"
"\"Mode\":\"%d\"}"),
i, Settings->shutter_startrelay[i], Settings->shutter_startrelay[i] +1, Settings->shutter_opentime[i], Settings->shutter_closetime[i],
Settings->shutter_set50percent[i], Settings->shutter_motordelay[i], GetBinary8(Settings->shutter_options[i], 4).c_str(),
Settings->shuttercoeff[0][i], Settings->shuttercoeff[1][i], Settings->shuttercoeff[2][i], Settings->shuttercoeff[3][i], Settings->shuttercoeff[4][i],
Settings->shutter_mode);
}
ResponseJsonEndEnd();
CmndStatusResponse(13);
}
if ((0 == payload) || (13 == payload)) {
if (ShutterStatus()) { CmndStatusResponse(13); }
}
#endif

2052
tasmota/tasmota_xdrv_driver/xdrv_27_ESP32_shutter.ino Normal file
View File

File diff suppressed because one or more lines are too long

50
tasmota/tasmota_xdrv_driver/xdrv_27_shutter.ino
View File

@ -1,7 +1,7 @@
/*
xdrv_27_Shutter[i].ino - Shutter/Blind support for Tasmota
xdrv_27_Shutter.ino - Shutter/Blind support for Tasmota
Copyright (C) 2022 Stefan Bode
Copyright (C) 2023 Stefan Bode
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
@ -17,6 +17,22 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
// Start temporarly extra tests for overriding USE_SHUTTER_ESP32 ****
// Remove once tests complete
#ifdef ESP8266
#define USE_SHUTTER_ESP8266
#endif
#ifdef ESP32
#ifndef USE_SHUTTER_ESP32
#define USE_SHUTTER_ESP8266
#endif // No USE_SHUTTER_ESP32
#endif // ESP32
#ifdef USE_SHUTTER_ESP8266
// End **************************************************************
//#ifdef ESP8266
#ifdef USE_SHUTTER
/*********************************************************************************************\
* Shutter or Blind support using two consecutive relays
@ -126,6 +142,27 @@ struct SHUTTERGLOBAL {
#define SHT_DIV_ROUND(__A, __B) (((__A) + (__B)/2) / (__B))
bool ShutterStatus(void) {
if (Settings->flag3.shutter_mode) { // SetOption80 - (Shutter) Enable shutter support (1)
Response_P(PSTR("{\"" D_CMND_STATUS D_STATUS13_SHUTTER "\":{"));
for (uint32_t i = 0; i < MAX_SHUTTERS; i++) {
if (0 == Settings->shutter_startrelay[i]) { break; }
if (i > 0) { ResponseAppend_P(PSTR(",")); }
ResponseAppend_P(PSTR("\"" D_STATUS13_SHUTTER "%d\":{\"Relay1\":%d,\"Relay2\":%d,\"Open\":%d,\"Close\":%d,"
"\"50perc\":%d,\"Delay\":%d,\"Opt\":\"%s\","
"\"Calib\":[%d,%d,%d,%d,%d],"
"\"Mode\":\"%d\"}"),
i, Settings->shutter_startrelay[i], Settings->shutter_startrelay[i] +1, Settings->shutter_opentime[i], Settings->shutter_closetime[i],
Settings->shutter_set50percent[i], Settings->shutter_motordelay[i], GetBinary8(Settings->shutter_options[i], 4).c_str(),
Settings->shuttercoeff[0][i], Settings->shuttercoeff[1][i], Settings->shuttercoeff[2][i], Settings->shuttercoeff[3][i], Settings->shuttercoeff[4][i],
Settings->shutter_mode);
}
ResponseJsonEndEnd();
return true;
}
return false;
}
void ShutterLogPos(uint32_t i)
{
@ -877,7 +914,7 @@ bool ShutterButtonIsSimultaneousHold(uint32_t button_index, uint32_t shutter_ind
return ((-1 != min_shutterbutton_hold_timer) && (min_shutterbutton_hold_timer > (Button.hold_timer[button_index]>>1)));
}
void ShutterButtonHandler(void)
bool ShutterButtonHandler(void)
{
uint8_t buttonState = SHT_NOT_PRESSED;
uint8_t button = XdrvMailbox.payload;
@ -1002,14 +1039,14 @@ void ShutterButtonHandler(void)
char scmnd[20];
snprintf_P(scmnd, sizeof(scmnd), PSTR(D_CMND_WIFICONFIG " 2"));
ExecuteCommand(scmnd, SRC_BUTTON);
return;
return true;
} else if ((buttonState == SHT_PRESSED_EXT_HOLD_SIMULTANEOUS) || ((shutter_index_num_buttons==1) && (buttonState == SHT_PRESSED_EXT_HOLD))){
// no SetOption1 (0) checked above
// simultaneous or stand alone button extended hold detected
char scmnd[20];
snprintf_P(scmnd, sizeof(scmnd), PSTR(D_CMND_RESET " 1"));
ExecuteCommand(scmnd, SRC_BUTTON);
return;
return true;
}
}
if (buttonState <= SHT_PRESSED_IMMEDIATE) {
@ -1068,6 +1105,7 @@ void ShutterButtonHandler(void)
ResponseJsonEnd();
MqttPublishPrefixTopicRulesProcess_P(RESULT_OR_STAT, PSTR(D_PRFX_SHUTTER));
}
return true;
}
void ShutterSetPosition(uint32_t device, uint32_t position)
@ -1941,3 +1979,5 @@ void CmndShutterUnitTest(void) {
#else
void CmndShutterUnitTest(void) {}
#endif
#endif // ESP8266