oneil1987/TX-Ultimate-Easy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'v2025.8.2dev' of https://github.com/edwardtfn/TX-Ultimate-Easy into v2025.8.2dev

Browse Source
This commit is contained in:
Edward Firmo
2025-08-06 19:05:56 +02:00
parent 7f8e0c7edc 36d9ad196c
commit 671a10da81
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_leds.yaml
View File

@@ -570,7 +570,7 @@ script:
- lambda: |- - lambda: |-
auto attrs_pair = tx_ultimate_easy::unpack_dual_light_attributes(*attr_global_ptr); auto attrs_pair = tx_ultimate_easy::unpack_dual_light_attributes(*attr_global_ptr);
tx_ultimate_easy::LightAttributes attrs = (group_index == 1) ? attrs_pair.first : attrs_pair.second; tx_ultimate_easy::LightAttributes attrs = (group_index == 1) ? attrs_pair.first : attrs_pair.second;
auto call = light_ptr->make_call(); auto call = light_ptr->make_call();
call.set_brightness(attrs.brightness / 100.0f); call.set_brightness(attrs.brightness / 100.0f);
call.set_rgb(attrs.red / 255.0f, attrs.green / 255.0f, attrs.blue / 255.0f); call.set_rgb(attrs.red / 255.0f, attrs.green / 255.0f, attrs.blue / 255.0f);
@@ -610,10 +610,10 @@ script:
.green = uint8_t(current.get_green() * 255.0f), .green = uint8_t(current.get_green() * 255.0f),
.blue = uint8_t(current.get_blue() * 255.0f) .blue = uint8_t(current.get_blue() * 255.0f)
}; };
// Unpack existing dual attributes // Unpack existing dual attributes
auto existing = tx_ultimate_easy::unpack_dual_light_attributes(*attr_global_ptr); auto existing = tx_ultimate_easy::unpack_dual_light_attributes(*attr_global_ptr);
// Update the appropriate group // Update the appropriate group
if (group_index == 1) { if (group_index == 1) {
*attr_global_ptr = tx_ultimate_easy::pack_dual_light_attributes(new_attrs, existing.second); *attr_global_ptr = tx_ultimate_easy::pack_dual_light_attributes(new_attrs, existing.second);

2
components/tx_ultimate_easy/tx_ultimate_easy_light.h
View File

@@ -13,6 +13,8 @@
namespace esphome { namespace esphome {
namespace tx_ultimate_easy { namespace tx_ultimate_easy {
// Log tag
static const char *TAG = "tx_ultimate_easy.light";
/** /**
* @brief Light attributes structure for storing color and brightness data. * @brief Light attributes structure for storing color and brightness data.

2
components/tx_ultimate_easy/tx_ultimate_easy_touch.h
View File

@@ -32,7 +32,7 @@ namespace esphome {
constexpr int VALID_DATA_BYTE_3 = 0x02; constexpr int VALID_DATA_BYTE_3 = 0x02;
// Log tag // Log tag
static const char *TAG = "tx_ultimate_easy"; static const char *TAG = "tx_ultimate_easy.touch";
struct TouchPoint { struct TouchPoint {
uint8_t button = 0; uint8_t button = 0;