Skip to content

Commit 25301dc

Browse files
mkalkbrennermkalkbrenner
committed
renamed color constants to avoid collisions with WS2812FX
1 parent 317a534 commit 25301dc

2 files changed

Lines changed: 40 additions & 40 deletions

File tree

‎src/dmdreader.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
#include <Arduino.h>
66

77
enum class Color : uint8_t {
8-
ORANGE,
9-
RED,
10-
YELLOW,
11-
GREEN,
12-
BLUE,
13-
PURPLE,
14-
PINK,
15-
WHITE
8+
DMD_ORANGE,
9+
DMD_RED,
10+
DMD_YELLOW,
11+
DMD_GREEN,
12+
DMD_BLUE,
13+
DMD_PURPLE,
14+
DMD_PINK,
15+
DMD_WHITE
1616
};
1717

1818
// DMD types

‎src/loopback_renderer.h‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -553,37 +553,37 @@ ConvertFunction get_optimized_converter(uint16_t width, uint16_t height,
553553
switch (get_resolution_from_dimensions(width, height)) {
554554
case Resolution::RES_128x16:
555555
switch (color) {
556-
case Color::ORANGE:
556+
case Color::DMD_ORANGE:
557557
return select_converter(convert_to_orange_128x16,
558558
convert_to_orange_128x16_capcom,
559559
convert_to_orange_128x16_gottlieb, dmd_type);
560-
case Color::RED:
560+
case Color::DMD_RED:
561561
return select_converter(convert_to_red_128x16,
562562
convert_to_red_128x16_capcom,
563563
convert_to_red_128x16_gottlieb, dmd_type);
564-
case Color::YELLOW:
564+
case Color::DMD_YELLOW:
565565
return select_converter(convert_to_yellow_128x16,
566566
convert_to_yellow_128x16_capcom,
567567
convert_to_yellow_128x16_gottlieb,
568568
dmd_type);
569-
case Color::GREEN:
569+
case Color::DMD_GREEN:
570570
return select_converter(convert_to_green_128x16,
571571
convert_to_green_128x16_capcom,
572572
convert_to_green_128x16_gottlieb, dmd_type);
573-
case Color::BLUE:
573+
case Color::DMD_BLUE:
574574
return select_converter(convert_to_blue_128x16,
575575
convert_to_blue_128x16_capcom,
576576
convert_to_blue_128x16_gottlieb, dmd_type);
577-
case Color::PURPLE:
577+
case Color::DMD_PURPLE:
578578
return select_converter(convert_to_purple_128x16,
579579
convert_to_purple_128x16_capcom,
580580
convert_to_purple_128x16_gottlieb,
581581
dmd_type);
582-
case Color::PINK:
582+
case Color::DMD_PINK:
583583
return select_converter(convert_to_pink_128x16,
584584
convert_to_pink_128x16_capcom,
585585
convert_to_pink_128x16_gottlieb, dmd_type);
586-
case Color::WHITE:
586+
case Color::DMD_WHITE:
587587
return select_converter(convert_to_white_128x16,
588588
convert_to_white_128x16_capcom,
589589
convert_to_white_128x16_gottlieb, dmd_type);
@@ -592,37 +592,37 @@ ConvertFunction get_optimized_converter(uint16_t width, uint16_t height,
592592

593593
case Resolution::RES_128x32:
594594
switch (color) {
595-
case Color::ORANGE:
595+
case Color::DMD_ORANGE:
596596
return select_converter(convert_to_orange_128x32,
597597
convert_to_orange_128x32_capcom,
598598
convert_to_orange_128x32_gottlieb, dmd_type);
599-
case Color::RED:
599+
case Color::DMD_RED:
600600
return select_converter(convert_to_red_128x32,
601601
convert_to_red_128x32_capcom,
602602
convert_to_red_128x32_gottlieb, dmd_type);
603-
case Color::YELLOW:
603+
case Color::DMD_YELLOW:
604604
return select_converter(convert_to_yellow_128x32,
605605
convert_to_yellow_128x32_capcom,
606606
convert_to_yellow_128x32_gottlieb,
607607
dmd_type);
608-
case Color::GREEN:
608+
case Color::DMD_GREEN:
609609
return select_converter(convert_to_green_128x32,
610610
convert_to_green_128x32_capcom,
611611
convert_to_green_128x32_gottlieb, dmd_type);
612-
case Color::BLUE:
612+
case Color::DMD_BLUE:
613613
return select_converter(convert_to_blue_128x32,
614614
convert_to_blue_128x32_capcom,
615615
convert_to_blue_128x32_gottlieb, dmd_type);
616-
case Color::PURPLE:
616+
case Color::DMD_PURPLE:
617617
return select_converter(convert_to_purple_128x32,
618618
convert_to_purple_128x32_capcom,
619619
convert_to_purple_128x32_gottlieb,
620620
dmd_type);
621-
case Color::PINK:
621+
case Color::DMD_PINK:
622622
return select_converter(convert_to_pink_128x32,
623623
convert_to_pink_128x32_capcom,
624624
convert_to_pink_128x32_gottlieb, dmd_type);
625-
case Color::WHITE:
625+
case Color::DMD_WHITE:
626626
return select_converter(convert_to_white_128x32,
627627
convert_to_white_128x32_capcom,
628628
convert_to_white_128x32_gottlieb, dmd_type);
@@ -631,37 +631,37 @@ ConvertFunction get_optimized_converter(uint16_t width, uint16_t height,
631631

632632
case Resolution::RES_192x64:
633633
switch (color) {
634-
case Color::ORANGE:
634+
case Color::DMD_ORANGE:
635635
return select_converter(convert_to_orange_192x64,
636636
convert_to_orange_192x64_capcom,
637637
convert_to_orange_192x64_gottlieb, dmd_type);
638-
case Color::RED:
638+
case Color::DMD_RED:
639639
return select_converter(convert_to_red_192x64,
640640
convert_to_red_192x64_capcom,
641641
convert_to_red_192x64_gottlieb, dmd_type);
642-
case Color::YELLOW:
642+
case Color::DMD_YELLOW:
643643
return select_converter(convert_to_yellow_192x64,
644644
convert_to_yellow_192x64_capcom,
645645
convert_to_yellow_192x64_gottlieb,
646646
dmd_type);
647-
case Color::GREEN:
647+
case Color::DMD_GREEN:
648648
return select_converter(convert_to_green_192x64,
649649
convert_to_green_192x64_capcom,
650650
convert_to_green_192x64_gottlieb, dmd_type);
651-
case Color::BLUE:
651+
case Color::DMD_BLUE:
652652
return select_converter(convert_to_blue_192x64,
653653
convert_to_blue_192x64_capcom,
654654
convert_to_blue_192x64_gottlieb, dmd_type);
655-
case Color::PURPLE:
655+
case Color::DMD_PURPLE:
656656
return select_converter(convert_to_purple_192x64,
657657
convert_to_purple_192x64_capcom,
658658
convert_to_purple_192x64_gottlieb,
659659
dmd_type);
660-
case Color::PINK:
660+
case Color::DMD_PINK:
661661
return select_converter(convert_to_pink_192x64,
662662
convert_to_pink_192x64_capcom,
663663
convert_to_pink_192x64_gottlieb, dmd_type);
664-
case Color::WHITE:
664+
case Color::DMD_WHITE:
665665
return select_converter(convert_to_white_192x64,
666666
convert_to_white_192x64_capcom,
667667
convert_to_white_192x64_gottlieb, dmd_type);
@@ -670,37 +670,37 @@ ConvertFunction get_optimized_converter(uint16_t width, uint16_t height,
670670

671671
case Resolution::RES_256x64:
672672
switch (color) {
673-
case Color::ORANGE:
673+
case Color::DMD_ORANGE:
674674
return select_converter(convert_to_orange_256x64,
675675
convert_to_orange_256x64_capcom,
676676
convert_to_orange_256x64_gottlieb, dmd_type);
677-
case Color::RED:
677+
case Color::DMD_RED:
678678
return select_converter(convert_to_red_256x64,
679679
convert_to_red_256x64_capcom,
680680
convert_to_red_256x64_gottlieb, dmd_type);
681-
case Color::YELLOW:
681+
case Color::DMD_YELLOW:
682682
return select_converter(convert_to_yellow_256x64,
683683
convert_to_yellow_256x64_capcom,
684684
convert_to_yellow_256x64_gottlieb,
685685
dmd_type);
686-
case Color::GREEN:
686+
case Color::DMD_GREEN:
687687
return select_converter(convert_to_green_256x64,
688688
convert_to_green_256x64_capcom,
689689
convert_to_green_256x64_gottlieb, dmd_type);
690-
case Color::BLUE:
690+
case Color::DMD_BLUE:
691691
return select_converter(convert_to_blue_256x64,
692692
convert_to_blue_256x64_capcom,
693693
convert_to_blue_256x64_gottlieb, dmd_type);
694-
case Color::PURPLE:
694+
case Color::DMD_PURPLE:
695695
return select_converter(convert_to_purple_256x64,
696696
convert_to_purple_256x64_capcom,
697697
convert_to_purple_256x64_gottlieb,
698698
dmd_type);
699-
case Color::PINK:
699+
case Color::DMD_PINK:
700700
return select_converter(convert_to_pink_256x64,
701701
convert_to_pink_256x64_capcom,
702702
convert_to_pink_256x64_gottlieb, dmd_type);
703-
case Color::WHITE:
703+
case Color::DMD_WHITE:
704704
return select_converter(convert_to_white_256x64,
705705
convert_to_white_256x64_capcom,
706706
convert_to_white_256x64_gottlieb, dmd_type);

0 commit comments

Comments
 (0)