Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Berry add light_pixels values to 'tasmota.settings' #22762

Merged
merged 2 commits into from
Jan 4, 2025
Merged

Berry add light_pixels values to 'tasmota.settings' #22762

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c635b1
Berry add light_pixels values to 'tasmota.settings'
s-hadinger Jan 4, 2025
e0d58e9
fix compilation
s-hadinger Jan 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -859,6 +859,7 @@ All notable changes to this project will be documented in this file.
- Berry provide lightweight options for `tasmota.wifi/eth/memory/rtc` (#20448)
- Berry `tasmota.webcolor` (#20454)
- Support for pipsolar inverter (#20408)
- Berry add light_pixels values to `tasmota.settings`

### Changed
- Renamed button "Consoles" to "Tools"
Expand Down
2 changes: 1 addition & 1 deletion tasmota/include/tasmota_types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -789,7 +789,7 @@ typedef struct {

uint8_t free_eb0[20]; // EB0 20 bytes

uint16_t light_pixels_height : 15; // EC4 Pixels height minus 1, default 0 (0 means 1 line)
uint16_t light_pixels_height_1 : 15;// EC4 Pixels height minus 1, default 0 (0 means 1 line)
uint16_t light_pixels_alternate : 1;// EC4 Indicates alternate lines in Pixels Matrix
uint8_t shift595_device_count; // EC6
uint8_t sta_config; // EC7
Expand Down
8 changes: 6 additions & 2 deletions tasmota/tasmota_xdrv_driver/xdrv_52_3_berry_tasmota_global.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,15 @@ extern "C" {

extern const be_ctypes_structure_t be_tasmota_settings_struct = {
sizeof(TSettings), /* size in bytes */
6, /* number of elements */
10, /* number of elements */
nullptr,
(const be_ctypes_structure_item_t[6]) {
(const be_ctypes_structure_item_t[10]) {
// Warning: fields below need to be in alphabetical order
{ "bootcount", offsetof(TSettings, bootcount), 0, 0, ctypes_u16, 0 },
{ "light_pixels", 0x496, 0, 15, ctypes_bf, 0 },
{ "light_pixels_alternate", 0xEC5, 7, 1, ctypes_bf, 0 },
{ "light_pixels_height_1", 0xEC4, 0, 15, ctypes_bf, 0 },
{ "light_pixels_reverse", 0x497, 7, 1, ctypes_bf, 0 },
{ "mqttlog_level", offsetof(TSettings, mqttlog_level), 0, 0, ctypes_u8, 0 },
{ "seriallog_level", offsetof(TSettings, seriallog_level), 0, 0, ctypes_u8, 0 },
{ "sleep", offsetof(TSettings, sleep), 0, 0, ctypes_u8, 0 },
Expand Down
6 changes: 3 additions & 3 deletions tasmota/tasmota_xlgt_light/xlgt_01_ws2812_esp32.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -792,21 +792,21 @@ void CmndLed(void)
void CmndPixels(void)
{
uint32_t parm[4] = { Settings->light_pixels, Settings->light_pixels_reverse,
(uint32_t) Settings->light_pixels_height + 1, Settings->light_pixels_alternate };
(uint32_t) Settings->light_pixels_height_1 + 1, Settings->light_pixels_alternate };
if (ParseParameters(4, parm) > 0) {
if ((parm[0] > 0) && (parm[0] <= WS2812_MAX_LEDS)) {
Ws2812Clear(); // Clear all known pixels
Ws2812CanShowWait();
Settings->light_pixels = parm[0];
Settings->light_pixels_reverse = parm[1];
Settings->light_pixels_height = (parm[2] > 0) ? parm[2] - 1 : 1;
Settings->light_pixels_height_1 = (parm[2] > 0) ? parm[2] - 1 : 1;
Settings->light_pixels_alternate = parm[3];
Ws2812ChangePixelCount();
Light.update = true;
}
}
Response_P(PSTR("{\"Pixels\":%i,\"PixelsReverse\":%i,\"PixelsHeight\":%i,\"PixelsAlternate\":%i}"),
Settings->light_pixels, Settings->light_pixels_reverse, Settings->light_pixels_height + 1, Settings->light_pixels_alternate);
Settings->light_pixels, Settings->light_pixels_reverse, Settings->light_pixels_height_1 + 1, Settings->light_pixels_alternate);
}

void CmndStepPixels(void)
Expand Down
Loading