@@ -743,8 +743,8 @@ void DaliLoop(void) {
743743 Dali->color [2 ] = Dali->dtr [2 ]; // Blue
744744 }
745745 else if (DALI_209_SET_TEMPORARY_RGB_DIMLEVEL == Dali->command ) {
746- Dali->color [3 ] = Dali->dtr [1 ]; // Warm White (Amber)
747- Dali->color [4 ] = Dali->dtr [0 ]; // Cold White
746+ Dali->color [3 ] = Dali->dtr [0 ]; // Cold White
747+ Dali->color [4 ] = Dali->dtr [1 ]; // Warm White (Amber)
748748 }
749749 else if (DALI_209_ACTIVATE == Dali->command ) {
750750 uint32_t channels = Dali->Settings .light_type -8 ;
@@ -832,7 +832,7 @@ bool DaliSetChannels(void) {
832832 Dali->light_sync = false ;
833833 } else {
834834 uint8_t *cur_col = (uint8_t *)XdrvMailbox.data ;
835- // cur_col[0] = Red, cur_col[1] = Green, cur_col[2] = Blue, cur_col[3] = Warm = Amber , cur_col[4] = Cold = White
835+ // cur_col[0] = Red, cur_col[1] = Green, cur_col[2] = Blue, cur_col[3] = Cold = White , cur_col[4] = Warm = Amber
836836 for (uint32_t i = 0 ; i < 5 ; i++) {
837837 if (255 == cur_col[i]) { cur_col[i] = 254 ; } // Max Dali value
838838 }
@@ -866,8 +866,8 @@ bool DaliSetChannels(void) {
866866 DaliSendData (adr, DALI_209_SET_TEMPORARY_RGB_DIMLEVEL);
867867
868868 if (channels > 3 ) {
869- DaliSendData (DALI_102_SET_DTR0, cur_col[4 ]); // DALI White
870- DaliSendData (DALI_102_SET_DTR1, (channels > 4 ) ? cur_col[3 ] : 255 ); // DALI Amber
869+ DaliSendData (DALI_102_SET_DTR0, cur_col[3 ]); // DALI White
870+ DaliSendData (DALI_102_SET_DTR1, (channels > 4 ) ? cur_col[4 ] : 255 ); // DALI Amber
871871 DaliSendData (DALI_102_SET_DTR2, 255 ); // DALI Freecolour - no change
872872 DaliSendData (DALI_102_ENABLE_DEVICE_TYPE_X, DALI_209_DEVICE_TYPE); // Enable Extended command
873873 DaliSendData (adr, DALI_209_SET_TEMPORARY_WAF_DIMLEVEL);
@@ -885,8 +885,8 @@ bool DaliSetChannels(void) {
885885 DaliSendData (adr, DALI_209_SET_TEMPORARY_RGB_DIMLEVEL);
886886
887887 if (channels > 3 ) {
888- if (!DaliSetDTR (0 , adr, cur_col[4 ])) { return true ; } // DALI While
889- if (!DaliSetDTR (1 , adr, (channels > 4 ) ? cur_col[3 ] : 255 )) { return true ; } // DALI Amber
888+ if (!DaliSetDTR (0 , adr, cur_col[3 ])) { return true ; } // DALI While
889+ if (!DaliSetDTR (1 , adr, (channels > 4 ) ? cur_col[4 ] : 255 )) { return true ; } // DALI Amber
890890 if (!DaliSetDTR (2 , adr, 255 )) { return true ; } // DALI Freecolour - no change
891891 DaliSendData (DALI_102_ENABLE_DEVICE_TYPE_X, DALI_209_DEVICE_TYPE); // Enable Extended command
892892 DaliSendData (adr, DALI_209_SET_TEMPORARY_WAF_DIMLEVEL);
0 commit comments