Skip to content

Commit fc83eed

Browse files
Merge remote-tracking branch 'Tasmota/development' into work
2 parents 301a76d + f2a3b4a commit fc83eed

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

CHANGELOG.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ All notable changes to this project will be documented in this file.
99
- Support for Analog Gauges (#24153)
1010
- Support for MakeSkyBlue Solar Charger Energy Monitor (#24151)
1111
- Berry `tasmota.micros()` to get time in microseconds (#24192)
12+
- Support for AGS02MA TVOC sensor (#24109)
1213

1314
### Breaking Changed
1415

@@ -20,7 +21,8 @@ All notable changes to this project will be documented in this file.
2021
- ESP32-P4 Hosted MCU updated to v2.6.6 solving WiFi boot issues (#24146)
2122
- ESP32-Solo1 using pre-compiled Arduino libraries (#24146)
2223
- PCA9685 V2 driver PWMTO fading logic and overflow (#24159)
23-
- Fix RGBW handling in TasmotaLED and xlgt_01_ws2812_esp32 (#24172)
24+
- RGBW handling in TasmotaLED and xlgt_01_ws2812_esp32 (#24172)
25+
- ArtNet single light color mapping using `ChannelRemap` (#24058)
2426

2527
### Removed
2628

RELEASENOTES.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ The latter links can be used for OTA upgrades too like ``OtaUrl https://ota.tasm
117117
- Support for ESP32-P4 rev.3 [#24146](https://github.com/arendst/Tasmota/issues/24118)
118118
- Support for Analog Gauges [#24153](https://github.com/arendst/Tasmota/issues/24153)
119119
- Support for MakeSkyBlue Solar Charger Energy Monitor [#24151](https://github.com/arendst/Tasmota/issues/24151)
120+
- Support for AGS02MA TVOC sensor [#24109](https://github.com/arendst/Tasmota/issues/24109)
120121
- Commands `DaliSend` and `DaliQuery` allow extended commands with prefix for DeviceType defaulting to DT6
121122
- ESP8266 GPIOViewer memory map if enabled with `#define GV_USE_ESPINFO`
122123
- HostedMCU file update using command `HostedLoad <version>|<filename>`
@@ -148,7 +149,8 @@ The latter links can be used for OTA upgrades too like ``OtaUrl https://ota.tasm
148149
- TuyaMCU v1 soft lock when WIFI_SELECT / WIFI_RESET is initiated [#24063](https://github.com/arendst/Tasmota/issues/24063)
149150
- PCA9685 V2 driver PWMTO fading logic and overflow [#24159](https://github.com/arendst/Tasmota/issues/24159)
150151
- DALI protocol errors
151-
- Fix RGBW handling in TasmotaLED and xlgt_01_ws2812_esp32 [#24172](https://github.com/arendst/Tasmota/issues/24172)
152+
- RGBW handling in TasmotaLED and xlgt_01_ws2812_esp32 [#24172](https://github.com/arendst/Tasmota/issues/24172)
153+
- ArtNet single light color mapping using `ChannelRemap` [#24058](https://github.com/arendst/Tasmota/issues/24058)
152154
- TLS fix ECDSA and add `SetOption165 1` to enable ECDSA in addition to RSA [#24000](https://github.com/arendst/Tasmota/issues/24000)
153155
- ESP32-P4 Hosted MCU updated to v2.6.6 solving WiFi boot issues [#24146](https://github.com/arendst/Tasmota/issues/24118)
154156
- ESP32-Solo1 using pre-compiled Arduino libraries [#24146](https://github.com/arendst/Tasmota/issues/24118)

tasmota/tasmota_xdrv_driver/xdrv_04_light_artnet.ino

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,8 +212,13 @@ void ArtNetProcessPacket(uint8_t * buf, size_t len) {
212212
color[2] = changeUIntScale(b8, 0, 255, 0, b_dimmer);
213213
color[3] = changeUIntScale(w8, 0, 255, 0, w_dimmer);
214214
color[4] = changeUIntScale(ww8, 0, 255, 0, ww_dimmer);
215+
215216
// AddLog(LOG_LEVEL_DEBUG_MORE, PSTR("DMX: %02X-%02X-%02X univ=%i rows=%i max_univ=%i"), buf[idx+1], buf[idx], buf[idx+2], universe, row, artnet_conf.univ + artnet_conf.rows);
216-
LightSetOutputs(color);
217+
uint16_t mapped_color[LST_MAX] = {0};
218+
for (uint32_t i = 0; i < LST_MAX; i++) {
219+
mapped_color[i] = color[Light.color_remap[i]];
220+
}
221+
LightSetOutputs(mapped_color);
217222
}
218223
// AddLog(LOG_LEVEL_DEBUG_MORE, PSTR("DMX: ok universe=%i datalen=%i"), universe, datalen);
219224
artnet_conf.packet_accepted++;

0 commit comments

Comments
 (0)