diff --git a/badge.ino b/badge.ino index e53f41698399bc548c2fa7b84e0975a085687d75..b57689aa493c4e8844348f0503e1a694d877b4e6 100644 --- a/badge.ino +++ b/badge.ino @@ -19,7 +19,15 @@ Adafruit_ST7789 tft = Adafruit_ST7789(TFT_CS, TFT_DC, TFT_MOSI, TFT_SCLK, TFT_RS Adafruit_NeoPixel pixels(NUM_LEDS, LED_PIN, NEO_GRB + NEO_KHZ800); -uint32_t ledColors[6][NUM_LEDS] = { +#define COUNT_FLAGS 6 +#define BI 0 +#define ENBY 1 +#define TRANS 2 +#define PAN 3 +#define PRIDE 4 +#define ACE 5 + +uint32_t ledColors[COUNT_FLAGS][NUM_LEDS] = { {0xD60270, 0xD60270, 0xD60270, 0xD60270, 0xD60270, 0x9B4F96, 0x9B4F96, 0x0038A8, 0x0038A8, 0x0038A8, 0x0038A8, 0x0038A8}, {0xFCF434, 0xFCF434, 0xFCF434, 0xFFFFFF, 0xFFFFFF, 0xFFFFFF, 0x9C59D1, 0x9C59D1, 0x9C59D1, 0x2C2C2C, 0x2C2C2C, 0x2C2C2C}, {0x5BCEFA, 0x5BCEFA, 0x5BCEFA, 0xF5A9B8, 0xF5A9B8, 0xFFFFFF, 0xFFFFFF, 0xF5A9B8, 0xF5A9B8, 0x5BCEFA, 0x5BCEFA, 0x5BCEFA}, @@ -28,19 +36,11 @@ uint32_t ledColors[6][NUM_LEDS] = { {0x000000, 0x000000, 0x000000, 0xA3A3A3, 0xA3A3A3, 0xA3A3A3, 0xFFFFFF, 0xFFFFFF, 0xFFFFFF, 0x800080, 0x800080, 0x800080} }; - -#define BI 0 -#define ENBY 1 -#define TRANS 2 -#define PAN 3 -#define PRIDE 4 -#define ACE 5 - int current_flag = 0; void setup(void) { Serial.begin(9600); - Serial.print(F("Welcome to FOSS-AG-Display-Badge!")); + Serial.print(F("Welcome to FOSS-AG-Pride!")); tft.init(240, 320); // Init ST7789 320x240 //tft.initR(INITR_BLACKTAB); // initialize a ST7735S chip, black tab @@ -98,7 +98,7 @@ void loop() { } current_flag++; - if (current_flag == 6) { + if (current_flag == COUNT_FLAGS) { current_flag = 0; } @@ -154,4 +154,4 @@ void ace() { tft.fillRect(0, tft.height()/4, tft.width(), tft.height()/4, 0xA514); tft.fillRect(0, (tft.height()/4)*2, tft.width(), tft.height()/4, 0xFFFF); tft.fillRect(0, (tft.height()/4)*3, tft.width(), tft.height()/4, 0x8010); -} +} \ No newline at end of file