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

Merge branch 'development' into prerelease-14.5.0

Browse Source
This commit is contained in:
Theo Arends 2025-02-18 12:17:11 +01:00
commit d436a4034b
5 changed files with 101 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -23,6 +23,8 @@ All notable changes to this project will be documented in this file.
### Fixed
- Berry parser error in rare case (#22997)
- ESP32 TasMesh broker MAC address all zeros (#23005)
- Wrong RMT channels for ESP32S3, now depends on `soc_caps.h` (#23021)
- HASPmota exception when clicking on a checkbox (#23022)
## [14.4.1.3] 20250204
### Added

2
RELEASENOTES.md
View File

@ -178,10 +178,12 @@ The latter links can be used for OTA upgrades too like ``OtaUrl https://ota.tasm
- LoraWan decoding of Dragino LDS02 and MerryIoT DW10 [#22880](https://github.com/arendst/Tasmota/issues/22880)
- ESP32 TasMesh broker MAC address all zeros [#23005](https://github.com/arendst/Tasmota/issues/23005)
- ESP32-Cx compilation fails on Windows [#22832](https://github.com/arendst/Tasmota/issues/22832)
- Wrong RMT channels for ESP32S3, now depends on `soc_caps.h` [#23021](https://github.com/arendst/Tasmota/issues/23021)
- Sonoff SPM `PowerOnState` overrules `SSPMPowerOnState` in mixed 4Relay setup with 4Relay version 1.0.0
- Webcam compilation with `define USE_WEBCAM` but without `define ENABLE_RTSPSERVER` [#22686](https://github.com/arendst/Tasmota/issues/22686)
- Berry Zigbee fix wrong attributes [#22684](https://github.com/arendst/Tasmota/issues/22684)
- Berry walrus operator [#22685](https://github.com/arendst/Tasmota/issues/22685)
- Berry parser error in rare case [#22997](https://github.com/arendst/Tasmota/issues/22997)
- LVGL updated `Antiburn.tapp` [#22699](https://github.com/arendst/Tasmota/issues/22699)
- HASPmota exception when clicking on a checkbox [#23022](https://github.com/arendst/Tasmota/issues/23022)
- Matter Air Quality sensor [#22708](https://github.com/arendst/Tasmota/issues/22708)

16
lib/libesp32_lvgl/lv_haspmota/src/embedded/lv_haspmota.be
View File

@ -1051,7 +1051,7 @@ class lvh_obj : lvh_root
style_modifier = self.digits_to_style(suffix_digits)
end
end
# print(f">>>: getmember {k=} {style_modifier=}")
#print(f">>>: member {k=} {style_modifier=}")
# if attribute name is in ignore list, abort
if self._attr_ignore.find(k) != nil return end
@ -2537,7 +2537,19 @@ end
#@ solidify:lvh_btn,weak
class lvh_btn : lvh_obj static var _lv_class = lv.button end
#@ solidify:lvh_checkbox,weak
class lvh_checkbox : lvh_obj static var _lv_class = lv.checkbox end
class lvh_checkbox : lvh_obj
static var _lv_class = lv.checkbox
static var _lv_part2_selector = lv.PART_INDICATOR
# static var _EVENTS = EVENTS_ALL
# map val to toggle
def set_val(t)
self._val = t
return self.set_toggle(t)
end
def get_val()
return self.get_toggle()
end
end
# class lvh_textarea : lvh_obj static var _lv_class = lv.textarea end
# special case for scr (which is actually lv_obj)
#@ solidify:lvh_scr,weak

66
lib/libesp32_lvgl/lv_haspmota/src/solidify/solidified_lv_haspmota.h
View File

@ -11145,6 +11145,65 @@ be_local_class(lvh_btn,
extern const bclass be_class_lvh_checkbox;
/********************************************************************
** Solidified function: set_val
********************************************************************/
be_local_closure(class_lvh_checkbox_set_val, /* name */
be_nested_proto(
5, /* nstack */
2, /* argc */
2, /* varg */
0, /* has upvals */
NULL, /* no upvals */
0, /* has sup protos */
NULL, /* no sub protos */
1, /* has constants */
( &(const bvalue[ 2]) { /* constants */
/* K0 */ be_nested_str_weak(_val),
/* K1 */ be_nested_str_weak(set_toggle),
}),
be_str_weak(set_val),
&be_const_str_solidified,
( &(const binstruction[ 5]) { /* code */
0x90020001, // 0000 SETMBR R0 K0 R1
0x8C080101, // 0001 GETMET R2 R0 K1
0x5C100200, // 0002 MOVE R4 R1
0x7C080400, // 0003 CALL R2 2
0x80040400, // 0004 RET 1 R2
})
)
);
/*******************************************************************/
/********************************************************************
** Solidified function: get_val
********************************************************************/
be_local_closure(class_lvh_checkbox_get_val, /* name */
be_nested_proto(
3, /* nstack */
1, /* argc */
2, /* varg */
0, /* has upvals */
NULL, /* no upvals */
0, /* has sup protos */
NULL, /* no sub protos */
1, /* has constants */
( &(const bvalue[ 1]) { /* constants */
/* K0 */ be_nested_str_weak(get_toggle),
}),
be_str_weak(get_val),
&be_const_str_solidified,
( &(const binstruction[ 3]) { /* code */
0x8C040100, // 0000 GETMET R1 R0 K0
0x7C040200, // 0001 CALL R1 1
0x80040200, // 0002 RET 1 R1
})
)
);
/*******************************************************************/
/********************************************************************
** Solidified class: lvh_checkbox
********************************************************************/
@ -11152,9 +11211,12 @@ extern const bclass be_class_lvh_obj;
be_local_class(lvh_checkbox,
0,
&be_class_lvh_obj,
be_nested_map(1,
be_nested_map(4,
( (struct bmapnode*) &(const bmapnode[]) {
{ be_const_key_weak(_lv_class, -1), be_const_class(be_class_lv_checkbox) },
{ be_const_key_weak(get_val, 1), be_const_closure(class_lvh_checkbox_get_val_closure) },
{ be_const_key_weak(set_val, -1), be_const_closure(class_lvh_checkbox_set_val_closure) },
{ be_const_key_weak(_lv_part2_selector, -1), be_const_int(131072) },
{ be_const_key_weak(_lv_class, 0), be_const_class(be_class_lv_checkbox) },
})),
be_str_weak(lvh_checkbox)
);

33
tasmota/include/tasmota.h
View File

@ -93,24 +93,29 @@ const uint16_t VL53LXX_MAX_SENSORS = 8; // Max number of VL53L0X sensors
const uint8_t MAX_SR04 = 3; // Max number of SR04 ultrasonic sensors
#ifdef ESP32
// SPI
const uint8_t MAX_SPI = 2; // Max number of Hardware SPI controllers (ESP32 = 2)
const uint8_t MAX_I2S = 2; // Max number of Hardware I2S controllers (ESP32 = 2)
#if CONFIG_IDF_TARGET_ESP32
const uint8_t MAX_RMT = 8; // Max number or RMT channels (ESP32 only)
#elif CONFIG_IDF_TARGET_ESP32S2
const uint8_t MAX_RMT = 4; // Max number or RMT channels (ESP32S2 only)
#elif CONFIG_IDF_TARGET_ESP32S3
const uint8_t MAX_RMT = 1; // Max number or RMT channels (ESP32S3 only)
#elif CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6
const uint8_t MAX_RMT = 2; // Max number or RMT channels (ESP32C3 only)
#else
const uint8_t MAX_RMT = 0; // Max number or RMT channels (0 if unknown)
#endif
#else
// I2S
#ifdef SOC_I2S_SUPPORTED
const uint8_t MAX_I2S = SOC_I2S_NUM;
#else // SOC_I2S_SUPPORTED
const uint8_t MAX_I2S = 0;
#endif // SOC_I2S_SUPPORTED
// RMT
#ifdef SOC_RMT_SUPPORTED
const uint8_t MAX_RMT = (SOC_RMT_GROUPS) * (SOC_RMT_TX_CANDIDATES_PER_GROUP);
#else // SOC_RMT_SUPPORTED
const uint8_t MAX_RMT = 0;
#endif // SOC_RMT_SUPPORTED
#else // ESP32 - now ESP8266
const uint8_t MAX_SPI = 1; // Max number of Hardware SPI controllers
const uint8_t MAX_I2S = 0; // Max number of Hardware I2S controllers (ESP8266 = 0, no choice)
const uint8_t MAX_RMT = 0; // No RMT channel on ESP8266
#endif
#endif // ESP32
// Changes to the following MAX_ defines need to be in line with enum SettingsTextIndex
const uint8_t MAX_MQTT_PREFIXES = 3; // Max number of MQTT prefixes (cmnd, stat, tele)