jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-29 13:46:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Theo Arends 2024-02-29 13:36:10 +01:00
commit 89aa392a46
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -35,6 +35,7 @@ All notable changes to this project will be documented in this file.
- HASPmota fix and improve demo with pixel-perfect fonts (#20734) - HASPmota fix and improve demo with pixel-perfect fonts (#20734)
- NeoPool webUI pH alarms (4 & 5) completed (#20743) - NeoPool webUI pH alarms (4 & 5) completed (#20743)
- Matter reduce memory usage when reading with wildcards (#20809) - Matter reduce memory usage when reading with wildcards (#20809)
- Prevent shutter MQTT broadcast with activated ShutterLock
### Fixed ### Fixed
- ESP32 PWM activity on unconfigured PWM GPIOs (#20732) - ESP32 PWM activity on unconfigured PWM GPIOs (#20732)

4
boards/esp32_solo1.json
View File

@ -24,7 +24,7 @@
"frameworks": [ "frameworks": [
"arduino" "arduino"
], ],
"name": "Espressif Generic ESP32 >= 4M Flash, Tasmota 2880k Code/OTA, 320k FS", "name": "Espressif Generic ESP32-solo1 >= 4M Flash, Tasmota 2880k Code/OTA, 320k FS",
"upload": { "upload": {
"arduino": { "arduino": {
"flash_extra_images": [ "flash_extra_images": [
@ -43,6 +43,6 @@
"download": { "download": {
"speed": 230400 "speed": 230400
}, },
"url": "https://en.wikipedia.org/wiki/ESP32", "url": "https://www.espressif.com/sites/default/files/documentation/esp32-solo-1_datasheet_en.pdf",
"vendor": "Espressif" "vendor": "Espressif"
} }

6
tasmota/tasmota_xdrv_driver/xdrv_27_esp32_shutter.ino
View File

@ -294,7 +294,7 @@ bool ShutterButtonHandlerMulti(void)
// reset button to default // reset button to default
Button.press_counter[button_index] = 0; Button.press_counter[button_index] = 0;
CmndShutterPosition(); CmndShutterPosition();
} }
@ -303,7 +303,7 @@ bool ShutterButtonHandlerMulti(void)
char scommand[CMDSZ]; char scommand[CMDSZ];
char stopic[TOPSZ]; char stopic[TOPSZ];
for (uint32_t i = 0; i < MAX_SHUTTERS_ESP32; i++) { for (uint32_t i = 0; i < MAX_SHUTTERS_ESP32; i++) {
if ((i==shutter_index) || (ShutterSettings.shutter_button[button_index].mqtt_all)) { if (((i==shutter_index) || (ShutterSettings.shutter_button[button_index].mqtt_all)) && 0 == (ShutterSettings.shutter_options[i] & 2) ) {
snprintf_P(scommand, sizeof(scommand),PSTR("ShutterPosition%d"), i+1); snprintf_P(scommand, sizeof(scommand),PSTR("ShutterPosition%d"), i+1);
GetGroupTopic_P(stopic, scommand, SET_MQTT_GRP_TOPIC); GetGroupTopic_P(stopic, scommand, SET_MQTT_GRP_TOPIC);
Response_P("%d", position); Response_P("%d", position);
@ -318,7 +318,7 @@ bool ShutterButtonHandlerMulti(void)
ResponseAppend_P(JSON_SHUTTER_BUTTON, shutter_index+1, Shutter[shutter_index].button_simu_pressed ? 0 : button_index+1, button_press_counter); ResponseAppend_P(JSON_SHUTTER_BUTTON, shutter_index+1, Shutter[shutter_index].button_simu_pressed ? 0 : button_index+1, button_press_counter);
ResponseJsonEnd(); ResponseJsonEnd();
MqttPublishPrefixTopicRulesProcess_P(RESULT_OR_STAT, PSTR(D_PRFX_SHUTTER)); MqttPublishPrefixTopicRulesProcess_P(RESULT_OR_STAT, PSTR(D_PRFX_SHUTTER));
// reset simu pressed record // reset simu pressed record
Shutter[shutter_index].button_simu_pressed = 0; Shutter[shutter_index].button_simu_pressed = 0;

2
tasmota/tasmota_xdrv_driver/xdrv_27_shutter.ino
View File

@ -1092,7 +1092,7 @@ bool ShutterButtonHandler(void)
char scommand[CMDSZ]; char scommand[CMDSZ];
char stopic[TOPSZ]; char stopic[TOPSZ];
for (uint32_t i = 0; i < MAX_SHUTTERS; i++) { for (uint32_t i = 0; i < MAX_SHUTTERS; i++) {
if ((i==shutter_index) || (Settings->shutter_button[button_index] & (0x01<<30))) { if ( ((i==shutter_index) || (Settings->shutter_button[button_index] & (0x01<<30))) && 0 == (Settings->shutter_options[i] & 2) ) {
snprintf_P(scommand, sizeof(scommand),PSTR("ShutterPosition%d"), i+1); snprintf_P(scommand, sizeof(scommand),PSTR("ShutterPosition%d"), i+1);
GetGroupTopic_P(stopic, scommand, SET_MQTT_GRP_TOPIC); GetGroupTopic_P(stopic, scommand, SET_MQTT_GRP_TOPIC);
Response_P("%d", position); Response_P("%d", position);