diff --git a/firmware/doom/src/main.cpp b/firmware/doom/src/main.cpp index da121b2c..31f213ca 100644 --- a/firmware/doom/src/main.cpp +++ b/firmware/doom/src/main.cpp @@ -216,7 +216,7 @@ void drawTask(void* arg) { lilka::display.endWrite(); lilka::display.setTextBound(0, 0, LILKA_DISPLAY_WIDTH, LILKA_DISPLAY_HEIGHT); lilka::display.setCursor(32, 16); - lilka::display.setTextColor(lilka::display.color565(255, 255, 255), lilka::display.color565(0, 0, 0)); + lilka::display.setTextColor(lilka::colors::White, lilka::colors::Black); lilka::display.setFont(FONT_6x12); lilka::display.print(" FPS: "); lilka::display.print(1000 / delta); @@ -285,7 +285,7 @@ extern "C" void DG_printf(const char* format, ...) { lilka::display.setFont(u8g2_font_6x12_t_cyrillic); if (hadNewLine) { hadNewLine = false; - lilka::display.fillRect(0, bottom, 240, 280 - bottom, lilka::display.color565(0, 0, 0)); + lilka::display.fillRect(0, bottom, 240, 280 - bottom, lilka::colors::Black); lilka::display.setCursor(0, bottom + 10); } lilka::display.setTextBound(0, bottom, 240, 280 - bottom); diff --git a/firmware/keira/src/apps/demos/ball.cpp b/firmware/keira/src/apps/demos/ball.cpp index 4e4a285c..39a7da4e 100644 --- a/firmware/keira/src/apps/demos/ball.cpp +++ b/firmware/keira/src/apps/demos/ball.cpp @@ -40,8 +40,8 @@ void BallApp::run() { xVelo = 500; } - canvas->fillScreen(canvas->color565(0, 0, 0)); - canvas->fillCircle(x, y, radius, canvas->color565(255, 200, 0)); + canvas->fillScreen(lilka::colors::Black); + canvas->fillCircle(x, y, radius, lilka::colors::Chrome_yellow); // Calculate FPS canvas->setCursor(16, 32); canvas->println("FPS: " + String(1000 / (millis() - prevRenderTime))); diff --git a/firmware/keira/src/apps/demos/disk.cpp b/firmware/keira/src/apps/demos/disk.cpp index 19ac3005..680acb9c 100644 --- a/firmware/keira/src/apps/demos/disk.cpp +++ b/firmware/keira/src/apps/demos/disk.cpp @@ -34,7 +34,7 @@ void DiskApp::run() { return; } - canvas->fillScreen(canvas->color565(0, 0, 0)); + canvas->fillScreen(lilka::colors::Black); canvas->drawCircle(x, y, radius, 0xFFFF); canvas->setCursor(16, 32); canvas->println("FPS: " + String(1000 / (millis() - prevRenderTime))); diff --git a/firmware/keira/src/apps/demos/letris.cpp b/firmware/keira/src/apps/demos/letris.cpp index f4e913f4..c9f27f71 100644 --- a/firmware/keira/src/apps/demos/letris.cpp +++ b/firmware/keira/src/apps/demos/letris.cpp @@ -16,13 +16,13 @@ const bool shapesData[7][4][4] = { }; const uint16_t colors[7] = { - lilka::display.color565(255, 0, 0), - lilka::display.color565(0, 255, 0), - lilka::display.color565(0, 0, 255), - lilka::display.color565(255, 255, 0), - lilka::display.color565(255, 0, 255), - lilka::display.color565(0, 255, 255), - lilka::display.color565(200, 200, 200), + lilka::colors::Red, + lilka::colors::Green, + lilka::colors::Blue, + lilka::colors::Yellow, + lilka::colors::Fuchsia, + lilka::colors::Aqua, + lilka::colors::Light_gray, }; const uint8_t colorCount = sizeof(colors) / sizeof(colors[0]); @@ -71,7 +71,7 @@ class Shape { (this->y + yy) * BLOCK_SIZE + 2, BLOCK_SIZE - 4, BLOCK_SIZE - 4, - lilka::display.color565(0, 0, 0) + lilka::colors::Black ); } else if (drawEmptyBlocks) { canvas->fillRect( @@ -79,7 +79,7 @@ class Shape { (this->y + yy) * BLOCK_SIZE, BLOCK_SIZE, BLOCK_SIZE, - lilka::display.color565(0, 0, 0) + lilka::colors::Black ); } } @@ -196,7 +196,7 @@ void LetrisApp::run() { int16_t xMargin = (canvas->width() - letris_splash_width) / 2; while (!lilka::controller.getState().a.justPressed) { float time = millis() / 1000.0; - canvas->fillScreen(canvas->color565(0, 0, 0)); + canvas->fillScreen(lilka::colors::Black); float yShifts[letris_splash_width]; for (uint16_t x = 0; x < letris_splash_width; x++) { yShifts[x] = cos(time + ((float)x) / 32.0) * 8; @@ -215,10 +215,10 @@ void LetrisApp::run() { } // Очищаємо екран - canvas->fillScreen(canvas->color565(32, 32, 32)); + canvas->fillScreen(lilka::colors::Graygrey); queueDraw(); // Ми робимо це двічі, щоб очистити обидва буфери (основний та задній) - canvas->fillScreen(canvas->color565(32, 32, 32)); + canvas->fillScreen(lilka::colors::Graygrey); queueDraw(); // Головний цикл гри diff --git a/firmware/keira/src/apps/demos/scan_i2c.cpp b/firmware/keira/src/apps/demos/scan_i2c.cpp index 9f113cb9..b7ff9f95 100644 --- a/firmware/keira/src/apps/demos/scan_i2c.cpp +++ b/firmware/keira/src/apps/demos/scan_i2c.cpp @@ -13,7 +13,7 @@ void ScanI2CApp::run() { buffer.fillScreen(0); buffer.setFont(FONT_9x15); - buffer.fillScreen(canvas->color565(0, 0, 0)); + buffer.fillScreen(lilka::colors::Black); buffer.setTextBound(4, 0, canvas->width() - 8, canvas->height()); buffer.setCursor(4, 20); buffer.println("I2C init: SDA=" + String(LILKA_P3) + ", SCL=" + String(LILKA_P4)); diff --git a/firmware/keira/src/apps/demos/transform.cpp b/firmware/keira/src/apps/demos/transform.cpp index ce3f098e..25dcac6d 100644 --- a/firmware/keira/src/apps/demos/transform.cpp +++ b/firmware/keira/src/apps/demos/transform.cpp @@ -6,7 +6,7 @@ TransformApp::TransformApp() : App("Transform") { } void TransformApp::run() { - lilka::Image* face = lilka::resources.loadImage("/sd/face.bmp", canvas->color565(0, 0, 0), 32, 32); + lilka::Image* face = lilka::resources.loadImage("/sd/face.bmp", lilka::colors::Black, 32, 32); if (!face) { lilka::Alert alert("Помилка", "Не вдалось завантажити face.bmp з SD-карти."); @@ -26,7 +26,7 @@ void TransformApp::run() { int angle = 0; while (1) { - canvas->fillScreen(canvas->color565(0, 64, 0)); + canvas->fillScreen(lilka::colors::Myrtle_green); // canvas->drawImage(face, x, y); lilka::Transform transform = lilka::Transform().rotate(angle).scale(sin(angle / 24.0), cos(angle / 50.0)); // lilka::Transform transform = lilka::Transform().rotate(30).scale(1.5, 1); diff --git a/firmware/keira/src/apps/demos/user_spi.cpp b/firmware/keira/src/apps/demos/user_spi.cpp index bbfe2aa0..defead5f 100644 --- a/firmware/keira/src/apps/demos/user_spi.cpp +++ b/firmware/keira/src/apps/demos/user_spi.cpp @@ -10,7 +10,7 @@ void UserSPIApp::run() { buffer.fillScreen(0); buffer.setFont(FONT_9x15); - buffer.fillScreen(buffer.color565(0, 0, 0)); + buffer.fillScreen(lilka::colors::Black); buffer.setTextBound(4, 0, canvas->width() - 8, canvas->height()); buffer.setCursor(4, 20); buffer.println("SPI2 begin"); diff --git a/firmware/keira/src/apps/launcher.cpp b/firmware/keira/src/apps/launcher.cpp index 8e8a4ab1..4076020c 100644 --- a/firmware/keira/src/apps/launcher.cpp +++ b/firmware/keira/src/apps/launcher.cpp @@ -41,11 +41,11 @@ LauncherApp::LauncherApp() : App("Menu") { void LauncherApp::run() { lilka::Menu menu("Головне меню"); - menu.addItem("Додатки", &demos, lilka::display.color565(255, 200, 200)); - menu.addItem("Браузер SD-карти", &sdcard, lilka::display.color565(255, 255, 200)); - menu.addItem("Браузер SPIFFS", &memory, lilka::display.color565(200, 255, 200)); - menu.addItem("Розробка", &dev, lilka::display.color565(255, 224, 128)); - menu.addItem("Налаштування", &settings, lilka::display.color565(255, 200, 224)); + menu.addItem("Додатки", &demos, lilka::colors::Pink); + menu.addItem("Браузер SD-карти", &sdcard, lilka::colors::Arylide_yellow); + menu.addItem("Браузер SPIFFS", &memory, lilka::colors::Dark_sea_green); + menu.addItem("Розробка", &dev, lilka::colors::Jasmine); + menu.addItem("Налаштування", &settings, lilka::colors::Orchid); while (1) { while (!menu.isFinished()) { @@ -122,15 +122,15 @@ const uint16_t get_file_color(const String& filename) { String lowerCasedFileName = filename; lowerCasedFileName.toLowerCase(); if (lowerCasedFileName.endsWith(".rom") || lowerCasedFileName.endsWith(".nes")) { - return lilka::display.color565(255, 128, 128); + return lilka::colors::Candy_pink; } else if (lowerCasedFileName.endsWith(".bin")) { - return lilka::display.color565(128, 255, 128); + return lilka::colors::Mint_green; } else if (lowerCasedFileName.endsWith(".lua")) { - return lilka::display.color565(128, 128, 255); + return lilka::colors::Maya_blue; } else if (lowerCasedFileName.endsWith(".js")) { - return lilka::display.color565(255, 200, 128); + return lilka::colors::Butterscotch; } else { - return lilka::display.color565(200, 200, 200); + return lilka::colors::Light_gray; } } @@ -161,7 +161,7 @@ void LauncherApp::sdBrowserMenu(String path) { String filename = entries[i].name; const menu_icon_t* icon = entries[i].type == lilka::EntryType::ENT_DIRECTORY ? &folder : get_file_icon(filename); - uint16_t color = entries[i].type == lilka::EntryType::ENT_DIRECTORY ? lilka::display.color565(255, 255, 200) + uint16_t color = entries[i].type == lilka::EntryType::ENT_DIRECTORY ? lilka::colors::Arylide_yellow : get_file_color(filename); menu.addItem(filename, icon, color); } diff --git a/firmware/keira/src/apps/lua/luarunner.cpp b/firmware/keira/src/apps/lua/luarunner.cpp index e37279fa..b95f7a5d 100644 --- a/firmware/keira/src/apps/lua/luarunner.cpp +++ b/firmware/keira/src/apps/lua/luarunner.cpp @@ -347,7 +347,7 @@ void LuaLiveRunnerApp::run() { } canvas->setFont(FONT_10x20); canvas->setCursor(8, 48); - canvas->fillScreen(canvas->color565(0, 0, 0)); + canvas->fillScreen(lilka::colors::Black); canvas->setTextBound(8, 0, canvas->width() - 16, canvas->height()); canvas->print("Очікування коду\nз UART...\n\n"); canvas->print("Натисніть [A]\n"); @@ -379,7 +379,7 @@ void LuaLiveRunnerApp::run() { // canvas->print(String("Зчитано: ") + code.length() + " Б"); // } if (line.length() == 0) { - canvas->fillScreen(canvas->color565(0, 128, 0)); + canvas->fillScreen(lilka::colors::Green); canvas->print("Запуск..."); queueDraw(); break; @@ -454,7 +454,7 @@ void LuaReplApp::run() { canvas->setFont(FONT_10x20); canvas->setCursor(8, 48); - canvas->fillScreen(canvas->color565(0, 0, 0)); + canvas->fillScreen(lilka::colors::Black); canvas->setTextBound(8, 0, canvas->width() - 16, canvas->height()); canvas->print("Lua REPL\n\n"); canvas->print("Під'єднайтесь до\nЛілки через серійний\nтермінал та починайте\nвводити команди!"); diff --git a/firmware/keira/src/apps/nes/driver.cpp b/firmware/keira/src/apps/nes/driver.cpp index 4ccd9300..ee338a0b 100644 --- a/firmware/keira/src/apps/nes/driver.cpp +++ b/firmware/keira/src/apps/nes/driver.cpp @@ -95,10 +95,10 @@ void Driver::customBlit(bitmap_t* bmp, int numDirties, rect_t* dirtyRects) { // Serial.println("Draw 1 took " + String(micros() - last_render) + "us"); if (last_frame_duration > 0) { - canvas->fillRect(80, canvas->height() - 20, 80, 20, canvas->color565(0, 0, 0)); + canvas->fillRect(80, canvas->height() - 20, 80, 20, lilka::colors::Black); canvas->setCursor(80, canvas->height() - 4); canvas->setTextSize(1); - canvas->setTextColor(canvas->color565(128, 128, 128)); + canvas->setTextColor(lilka::colors::Graygrey); canvas->print("FPS: "); canvas->print(1000000 / last_frame_duration); } diff --git a/firmware/keira/src/apps/statusbar.cpp b/firmware/keira/src/apps/statusbar.cpp index f380a01d..42cef7e8 100644 --- a/firmware/keira/src/apps/statusbar.cpp +++ b/firmware/keira/src/apps/statusbar.cpp @@ -21,10 +21,10 @@ const uint16_t* icons[] = {wifi_offline, wifi_0, wifi_1, wifi_2, wifi_3}; void StatusBarApp::run() { lilka::Canvas iconCanvas(240, 24); while (1) { - canvas->fillScreen(lilka::display.color565(0, 0, 0)); + canvas->fillScreen(lilka::colors::Black); ClockService* clockService = ServiceManager::getInstance()->getService("clock"); - canvas->setTextColor(lilka::display.color565(255, 255, 255), lilka::display.color565(0, 0, 0)); + canvas->setTextColor(lilka::colors::White, lilka::colors::Black); canvas->setFont(FONT_9x15); canvas->setCursor(24, 17); struct tm timeinfo = clockService->getTime(); @@ -47,7 +47,7 @@ int16_t StatusBarApp::drawIcons(lilka::Canvas* iconCanvas) { int16_t xOffset = 0; - iconCanvas->fillScreen(lilka::display.color565(0, 0, 0)); + iconCanvas->fillScreen(lilka::colors::Black); iconCanvas->setFont(FONT_9x15); // Draw RAM usage @@ -57,8 +57,8 @@ int16_t StatusBarApp::drawIcons(lilka::Canvas* iconCanvas) { int16_t barWidth = 24 - padding * 2; int16_t barHeight = 10; int16_t barWidthUsed = barWidth * (totalRAM - freeRAM) / totalRAM; - iconCanvas->fillRect(xOffset + padding, padding, barWidthUsed, barHeight, lilka::display.color565(255, 128, 128)); - iconCanvas->draw16bitRGBBitmapWithTranColor(xOffset, 0, ram, lilka::display.color565(0, 0, 0), 24, 24); + iconCanvas->fillRect(xOffset + padding, padding, barWidthUsed, barHeight, lilka::colors::Red); + iconCanvas->draw16bitRGBBitmapWithTranColor(xOffset, 0, ram, lilka::colors::Black, 24, 24); xOffset += 4 + 24; // Draw WiFi signal strength @@ -78,9 +78,7 @@ int16_t StatusBarApp::drawIcons(lilka::Canvas* iconCanvas) { // Draw battery int level = lilka::battery.readLevel(); if (level == -1) { - iconCanvas->draw16bitRGBBitmapWithTranColor( - xOffset, 0, battery_absent, lilka::display.color565(255, 0, 255), 16, 24 - ); + iconCanvas->draw16bitRGBBitmapWithTranColor(xOffset, 0, battery_absent, lilka::colors::Fuchsia, 16, 24); xOffset += 4 + 16; } else { int16_t x1 = 4, y1 = 6; @@ -88,11 +86,9 @@ int16_t StatusBarApp::drawIcons(lilka::Canvas* iconCanvas) { int filledHeight = fullHeight * level / 100; if (filledHeight < 1) filledHeight = 1; int emptyHeight = fullHeight - filledHeight; - int16_t color = level > 50 - ? lilka::display.color565(0, 255, 0) - : (level > 20 ? lilka::display.color565(255, 255, 0) : lilka::display.color565(255, 0, 0)); + int16_t color = level > 50 ? lilka::colors::Green : (level > 20 ? lilka::colors::Yellow : lilka::colors::Red); iconCanvas->draw16bitRGBBitmapWithTranColor( - xOffset, 0, level > 10 ? battery : battery_danger, lilka::display.color565(255, 0, 255), 16, 24 + xOffset, 0, level > 10 ? battery : battery_danger, lilka::colors::Fuchsia, 16, 24 ); iconCanvas->fillRect(xOffset + x1, y1 + emptyHeight, width, filledHeight, color); xOffset += 4 + 16; diff --git a/firmware/keira/src/apps/wifi_config.cpp b/firmware/keira/src/apps/wifi_config.cpp index ace08e13..15b1ea1e 100644 --- a/firmware/keira/src/apps/wifi_config.cpp +++ b/firmware/keira/src/apps/wifi_config.cpp @@ -21,7 +21,7 @@ void WiFiConfigApp::run() { static_cast(ServiceManager::getInstance()->getService("network")); // TODO: use dynamic_cast and assert networkService != nullptr - buffer.fillScreen(buffer.color565(0, 0, 0)); + buffer.fillScreen(lilka::colors::Black); buffer.setCursor(8, 24); canvas->drawCanvas(&buffer); queueDraw(); @@ -83,8 +83,7 @@ void WiFiConfigApp::run() { menu.addItem( networks[i], icons[signalStrength], - networkService->getPassword(networks[i]).length() ? lilka::display.color565(0, 255, 0) - : lilka::display.color565(255, 255, 255) + networkService->getPassword(networks[i]).length() ? lilka::colors::Green : lilka::colors::White ); } menu.addItem("<< Назад"); @@ -134,7 +133,7 @@ void WiFiConfigApp::run() { } networkService->connect(ssid, password); - buffer.fillScreen(buffer.color565(0, 0, 0)); + buffer.fillScreen(lilka::colors::Black); buffer.setCursor(8, 24); buffer.println("Під'єднуємось..."); canvas->drawCanvas(&buffer); diff --git a/sdk/lib/lilka/examples/main.cpp b/sdk/lib/lilka/examples/main.cpp index 9a967286..1fe0d513 100644 --- a/sdk/lib/lilka/examples/main.cpp +++ b/sdk/lib/lilka/examples/main.cpp @@ -7,9 +7,9 @@ void setup() { void loop() { // Заповнити екран чорним кольором - lilka::display.fillScreen(lilka::display.color565(0, 255, 0)); + lilka::display.fillScreen(lilka::colors::Green); - lilka::Image* image = lilka::resources.loadImage("/sd/hello.bmp", lilka::display.color565(255, 0, 255)); + lilka::Image* image = lilka::resources.loadImage("/sd/hello.bmp", lilka::display.lilka::colors::Fuchsia); lilka::display.drawImage(image, 32, 64); delay(1000); @@ -21,12 +21,12 @@ void loop() { // Розпочати відтворення звуку на частоті 440 Гц lilka::buzzer.play(440); // Заповнити екран червоним кольором - lilka::display.fillScreen(lilka::display.color565(255, 0, 0)); + lilka::display.fillScreen(lilka::colors::Red); } else if (state.a.justReleased) { // Якщо кнопка "A" щойно була відпущена... // Зупинити відтворення звуку lilka::buzzer.stop(); // Заповнити екран зеленим кольором - lilka::display.fillScreen(lilka::display.color565(0, 255, 0)); + lilka::display.fillScreen(lilka::colors::Green); } } } diff --git a/sdk/lib/lilka/src/lilka/alert.cpp b/sdk/lib/lilka/src/lilka/alert.cpp index b5f38f0c..d8a76010 100644 --- a/sdk/lib/lilka/src/lilka/alert.cpp +++ b/sdk/lib/lilka/src/lilka/alert.cpp @@ -41,9 +41,9 @@ void Alert::draw(Arduino_GFX* canvas) { int width = right - left; int xMargin = 4; - canvas->setTextColor(canvas->color565(255, 255, 255)); + canvas->setTextColor(lilka::colors::White); - canvas->fillRect(left, top, width, mid - top, canvas->color565(32, 32, 128)); + canvas->fillRect(left, top, width, mid - top, lilka::colors::Midnight_blue); canvas->setFont(FONT_6x13); canvas->setTextSize(2); canvas->setTextBound(left + xMargin, top, width - xMargin * 2, mid - top); diff --git a/sdk/lib/lilka/src/lilka/colors565.h b/sdk/lib/lilka/src/lilka/colors565.h new file mode 100644 index 00000000..3b0d9217 --- /dev/null +++ b/sdk/lib/lilka/src/lilka/colors565.h @@ -0,0 +1,1088 @@ +#pragma once +namespace lilka { +namespace colors { +typedef enum { + Absolute_zero = 0x0257, + Acid_green = 0xADE3, + Aero = 0x7DDC, + Aero_blue = 0xBF3A, + African_violet = 0xB437, + Air_force_blue = 0x5C54, + Air_superiority_blue = 0x7517, + Alabaster = 0xEF5B, + Alice_blue = 0xEFBF, + Alloy_orange = 0xC302, + Almond = 0xEEF9, + Amaranth = 0xE16A, + Amaranth_mp = 0x996D, + Amaranth_pink = 0xECF7, + Amaranth_purple = 0xA94A, + Amaranth_red = 0xD105, + Amazon = 0x3BCB, + Amber = 0xFDE0, + Amber_saeece = 0xFBE0, + Amethyst = 0x9B39, + Android_green = 0xA627, + Antique_brass = 0xCCAE, + Antique_bronze = 0x62E4, + Antique_fuchsia = 0x92F0, + Antique_ruby = 0x80E5, + Antique_white = 0xF75A, + Ao_english = 0x0400, + Apple_green = 0x8DA0, + Apricot = 0xFE76, + Aqua = 0x07FF, + Aquamarine = 0x7FFA, + Arctic_lime = 0xCFE2, + Argentinian_blue = 0x6D9D, + Army_green = 0x4AA4, + Artichoke = 0x8CAF, + Artichoke_green_pantone = 0x4B68, + Arylide_yellow = 0xE6AD, + Ash_gray = 0xB5F6, + Asparagus = 0x854D, + Atomic_tangerine = 0xFCCC, + Auburn = 0xA145, + Aureolin = 0xFF60, + Avocado = 0x5400, + Azure = 0x041F, + Azure_web = 0xEFFF, + Azure_x11web_color = 0xEFFF, + Baby_blue = 0x8E7D, + Baby_blue_eyes = 0xA65D, + Baby_pink = 0xF618, + Baby_powder = 0xFFFE, + Baker_miller_pink = 0xFC95, + Banana_mania = 0xF736, + Barbie_pink = 0xD8D0, + Barn_red = 0x7840, + Battleship_gray = 0x8430, + Battleship_grey = 0x8430, + Bdazzled_blue = 0x32D2, + Bean = 0x3860, + Beau_blue = 0xBE9C, + Beaver = 0x9C0E, + Beige = 0xF7BB, + Berkeley_blue = 0x018C, + Big_dip_oruby = 0x9928, + Bisque = 0xFF18, + Bistre = 0x3964, + Bistre_brown = 0x9383, + Bitter_lemon = 0xCEE2, + Bitter_lime = 0xBFE0, + Bittersweet = 0xFB6B, + Bittersweet_shimmer = 0xBA8A, + Black = 0x0000, + Black_bean = 0x3860, + Black_chocolate = 0x18C2, + Black_coffee = 0x3986, + Black_coral = 0x530D, + Black_olive = 0x39E7, + Black_shadows = 0xBD76, + Blanched_almond = 0xFF59, + Blast_off_bronze = 0xA38C, + Bleu_de_france = 0x347C, + Blizzard_blue = 0xAF3D, + Blond = 0xF777, + Blood_red = 0x6000, + Blue = 0x001F, + Blue_bell = 0xA519, + Blue_cmyk_pigment_blue = 0x31B3, + Blue_computer_web_color = 0x001F, + Blue_crayola = 0x23BF, + Blue_gray = 0x64D9, + Blue_green = 0x14D7, + Blue_green_color_wheel = 0x0A68, + Blue_jeans = 0x5D7D, + Blue_munsell = 0x0495, + Blue_ncs = 0x0437, + Blue_pantone = 0x00D4, + Blue_pigment = 0x31B3, + Blue_ryb = 0x025F, + Blue_sapphire = 0x1310, + Blue_violet = 0x897B, + Blue_violet_color_wheel = 0x48CF, + Blue_violet_crayola = 0x7337, + Blue_yonder = 0x5394, + Bluetiful = 0x3B5C, + Blush = 0xDAF0, + Bole = 0x7A27, + Bone = 0xE6D8, + Bottle_green = 0x0349, + Brandeis_blue = 0x039F, + Brandy = 0x8208, + Brick_red = 0xCA0A, + Bright_green = 0x67E0, + Bright_lilac = 0xD49D, + Bright_maroon = 0xC109, + Bright_navy_blue = 0x1BBA, + Bright_yellow_crayola = 0xFD44, + Brilliant_rose = 0xFAB4, + Brink_pink = 0xFB0F, + British_racing_green = 0x0204, + Bronze = 0xCBE6, + Brown = 0x9260, + Brown_sugar = 0xAB69, + Brunswick_green = 0x1A68, + Bubblegum_pink = 0xF412, + Bud_green = 0x7DAC, + Buff = 0xDD0D, + Burgundy = 0x8004, + Burlywood = 0xDDB0, + Burnished_brown = 0xA3CE, + Burnt_orange = 0xBAA0, + Burnt_sienna = 0xE3AA, + Burnt_umber = 0x89A4, + Butterscotch = 0xDCA8, + Byzantine = 0xB9B4, + Byzantium = 0x714C, + Cadet = 0x534E, + Cadet_blue = 0x64F3, + Cadet_blue_crayola = 0xAD98, + Cadet_gray = 0x9515, + Cadet_grey = 0x9515, + Cadmium_green = 0x0347, + Cadmium_orange = 0xEC25, + Cadmium_red = 0xE004, + Cadmium_yellow = 0xFFA0, + Cafe_au_lait = 0xA3CB, + Cafe_noir = 0x49A4, + Cambridge_blue = 0xA615, + Camel = 0xBCCD, + Cameo_pink = 0xEDD9, + Canary = 0xFFF3, + Canary_yellow = 0xFFF3, + Candy_apple_red = 0xF840, + Candy_pink = 0xE38F, + Cantaloupe_melon = 0xFDD6, + Capri = 0x05FF, + Caput_mortuum = 0x5944, + Cardinal = 0xC0E7, + Caribbean_current = 0x036D, + Caribbean_green = 0x0653, + Carmine = 0x9003, + Carmine_mp = 0xD008, + Carnation_pink = 0xFD38, + Carnelian = 0xB0E3, + Carolina_blue = 0x551A, + Carrot_orange = 0xEC84, + Castleton_green = 0x02A8, + Catawba = 0x71A8, + Cedar_chest = 0xC2C9, + Celadon = 0xAF15, + Celadon_blue = 0x03D4, + Celadon_green = 0x342F, + Celeste = 0xB7FF, + Celestial_blue = 0x4CB9, + Celtic_blue = 0x2359, + Cerise = 0xD98C, + Cerulean = 0x03D4, + Cerulean_blue = 0x2A97, + Cerulean_crayola = 0x255A, + Cerulean_frost = 0x6CD8, + Cg_blue = 0x03D4, + Cg_red = 0xD9E6, + Champagne = 0xF739, + Champagne_pink = 0xEEF9, + Charcoal = 0x3A2A, + Charleston_green = 0x2165, + Charm_pink = 0xE475, + Chartreuse_traditional = 0xDFE0, + Chartreuse_web = 0x7FE0, + Chefchaouen_blue = 0x4C7C, + Cherry_blossom_pink = 0xFDB8, + Chestnut = 0x9226, + Chilean_pink = 0xE617, + Chili_red = 0xD9E5, + China_pink = 0xDB74, + China_rose = 0xA28D, + Chinese_red = 0xA9C4, + Chinese_violet = 0x8311, + Chinese_yellow = 0xFD80, + Chocolate = 0x7A00, + Chocolate_cosmos = 0x5883, + Chocolate_traditional = 0x7A00, + Chocolate_web = 0xD344, + Chrome_yellow = 0xFD20, + Cinereous = 0x940F, + Cinnabar = 0xE266, + Cinnamon_satin = 0xCB0F, + Citrine = 0xE661, + Citron = 0x9D44, + Claret = 0x78C6, + Cobalt_blue = 0x0255, + Cocoa_brown = 0xD344, + Coffee = 0x6A67, + Columbia_blue = 0xB6DD, + Congo_pink = 0xF40F, + Cool_gray = 0x9497, + Cool_grey = 0x8C95, + Copper = 0xB386, + Copper_crayola = 0xDC4D, + Copper_penny = 0xAB6D, + Copper_red = 0xCB6A, + Copper_rose = 0x9B2C, + Coquelicot = 0xF9C0, + Coral = 0xFBEA, + Coral_pink = 0xF40F, + Cordovan = 0x8A08, + Corn = 0xFF4B, + Cornell_red = 0xB0E3, + Cornflower_blue = 0x64BD, + Cornsilk = 0xFFBB, + Cosmic_cobalt = 0x3171, + Cosmic_latte = 0xFFBC, + Cotton_candy = 0xFDDA, + Coyote_brown = 0x8307, + Cream = 0xFFF9, + Crimson = 0xD8A7, + Crimson_ua = 0x98E6, + Crystal = 0xA6BB, + Cultured = 0xF7BE, + Cyan = 0x07FF, + Cyan_additive_secondary = 0x07FF, + Cyan_process = 0x05BD, + Cyan_subtractive_primary = 0x05BD, + Cyber_grape = 0x5A0F, + Cyber_yellow = 0xFE80, + Cyclamen = 0xF374, + Dark_blue = 0x0011, + Dark_blue_gray = 0x6333, + Dark_brown = 0x5A06, + Dark_byzantium = 0x59CA, + Dark_cornflower_blue = 0x2A11, + Dark_cyan = 0x0451, + Dark_electric_blue = 0x534F, + Dark_goldenrod = 0xB421, + Dark_green = 0x0184, + Dark_green_x11 = 0x0320, + Dark_jungle_green = 0x1924, + Dark_khaki = 0xBDAD, + Dark_lava = 0x49E6, + Dark_liver = 0x526A, + Dark_liver_horses = 0x51E7, + Dark_magenta = 0x8811, + Dark_moss_green = 0x4AE4, + Dark_olive_green = 0x5346, + Dark_orange = 0xFC60, + Dark_orchid = 0x9999, + Dark_pastel_green = 0x05E7, + Dark_purple = 0x30C6, + Dark_red = 0x8800, + Dark_salmon = 0xE4AF, + Dark_sea_green = 0x8DD1, + Dark_sienna = 0x38A2, + Dark_sky_blue = 0x8DFA, + Dark_slate_blue = 0x49F1, + Dark_slate_gray = 0x328A, + Dark_spring_green = 0x1B88, + Dark_turquoise = 0x0679, + Dark_violet = 0x901A, + Dartmouth_green = 0x0387, + Davys_gray = 0x52AA, + Davys_grey = 0x52AA, + Deep_cerise = 0xD990, + Deep_champagne = 0xF6B4, + Deep_chestnut = 0xB269, + Deep_jungle_green = 0x0269, + Deep_pink = 0xF8B2, + Deep_saffron = 0xFCC6, + Deep_sky_blue = 0x05FF, + Deep_space_sparkle = 0x4B2D, + Deep_taupe = 0x7AEC, + Delft_blue = 0x218B, + Denim = 0x1B17, + Denim_blue = 0x2236, + Desert = 0xBCCD, + Desert_sand = 0xEE55, + Dim_gray = 0x6B4D, + Dodger_blue = 0x249F, + Dogwood_rose = 0xD0CD, + Drab = 0x9383, + Duck_blue = 0x03B2, + Duke_blue = 0x0013, + Dutch_white = 0xEEF7, + Earth_yellow = 0xDD4C, + Ebony = 0x52EA, + Ecru = 0xC590, + Eerie_black = 0x18E3, + Eggplant = 0x620A, + Eggshell = 0xEF5A, + Egyptian_blue = 0x11B4, + Eigengrau = 0x18A4, + Electric_blue = 0x7FDF, + Electric_green = 0x07E0, + Electric_indigo = 0x681F, + Electric_lime = 0xCFE0, + Electric_purple = 0xB81F, + Electric_violet = 0x881F, + Emerald = 0x562F, + Eminence = 0x6990, + English_green = 0x1A68, + English_lavender = 0xB412, + English_red = 0xAA6A, + English_vermillion = 0xCA49, + English_violet = 0x51EB, + Erin = 0x07E8, + Eton_blue = 0x9634, + Fairy_tale = 0xEE19, + Fallow = 0xBCCD, + Falu_red = 0x80C3, + Fandango = 0xB1B1, + Fandango_pink = 0xDA90, + Fashion_fuchsia = 0xF014, + Fawn = 0xE54E, + Feldgrau = 0x4AEA, + Fern = 0x75CF, + Fern_green = 0x53C8, + Field_drab = 0x6AA4, + Fiery_rose = 0xFAAE, + Fire_brick = 0xB104, + Fire_engine_red = 0xC905, + Fire_opal = 0xE2E9, + Firebrick = 0xB104, + Flame = 0xDAC4, + Flax = 0xEED0, + Flirt = 0xA00D, + Floral_white = 0xFFDD, + Fluorescent_blue = 0x1F9D, + Forest_green = 0x2444, + Forest_green_crayola = 0x652E, + Forest_green_traditional = 0x0224, + Forest_green_web = 0x2444, + French_beige = 0xA3CB, + French_bistre = 0x8369, + French_blue = 0x0397, + French_fuchsia = 0xFA12, + French_lilac = 0x8311, + French_lime = 0x9FE7, + French_mauve = 0xD39A, + French_pink = 0xFB73, + French_raspberry = 0xC169, + French_rose = 0xF251, + French_sky_blue = 0x75BF, + French_violet = 0x8839, + Frostbite = 0xE1B4, + Fuchsia = 0xF81F, + Fuchsia_crayola = 0xBAB7, + Fuchsia_purple = 0xC9CF, + Fuchsia_rose = 0xC22E, + Fulvous = 0xE420, + Fuzzy_wuzzy = 0x8204, + Gainsboro = 0xDEDB, + Gamboge = 0xE4C2, + Garnet = 0x71A6, + Generic_viridian = 0x03EC, + Ghost_white = 0xF7BF, + Giants_orange = 0xFAC4, + Glaucous = 0x6416, + Glossy_grape = 0xAC96, + Go_green = 0x054C, + Gold = 0xA3E0, + Gold_crayola = 0xE5F1, + Gold_fusion = 0x83A9, + Gold_golden = 0xFEA0, + Gold_metallic = 0xD567, + Gold_web_golden = 0xFEA0, + Golden_brown = 0x9B23, + Golden_poppy = 0xFE00, + Golden_yellow = 0xFEE0, + Goldenrod = 0xDD24, + Granite_gray = 0x6B2D, + Granny_smith_apple = 0xA713, + Grape = 0x6974, + Gray_green = 0x5B8D, + Gray_web = 0x8410, + Gray_x11_gray = 0xBDF7, + Graygrey = 0x8410, + Green = 0x07E0, + Green_blue = 0x1336, + Green_blue_crayola = 0x2C38, + Green_crayola = 0x1D4F, + Green_cyan = 0x04CC, + Green_earth = 0xDEF2, + Green_htmlcss_color = 0x0400, + Green_lizard = 0xA786, + Green_munsell = 0x054E, + Green_ncs = 0x04ED, + Green_pantone = 0x0568, + Green_pigment = 0x052A, + Green_ryb = 0x6566, + Green_sheen = 0x6D74, + Green_web = 0x0400, + Green_x11_color_wheel = 0x07E0, + Green_yellow = 0xAFE6, + Green_yellow_crayola = 0xEF32, + Greenish_yellow = 0xEF4C, + Grullo = 0xACD0, + Gunmetal = 0x29A7, + Han_blue = 0x4379, + Han_purple = 0x50DE, + Hansa_yellow = 0xE6AD, + Harlequin = 0x47E0, + Harvest_gold = 0xDC80, + Heat_wave = 0xFBC0, + Heliotrope = 0xDB9F, + Heliotrope_gray = 0xACD5, + Hollywood_cerise = 0xF014, + Honeydew = 0xEFFD, + Honolulu_blue = 0x03B6, + Hookers_green = 0x4BCD, + Hot_magenta = 0xF8F9, + Hot_pink = 0xFB56, + Hunter_green = 0x32E7, + Hunyadi_yellow = 0xE548, + Ice_blue = 0x9FFF, + Iceberg = 0x753A, + Icterine = 0xFFAB, + Illuminating_emerald = 0x348E, + Imperial_red = 0xE947, + Inchworm = 0xB74B, + Independence = 0x4A8D, + India_green = 0x1441, + Indian_red = 0xCAEB, + Indian_yellow = 0xE54B, + Indigo = 0x4810, + Indigo_dye = 0x020D, + International_klein_blue = 0x1051, + International_orange = 0xFA80, + International_orange_aerospace = 0xFA80, + International_orange_engineering = 0xB8A1, + International_orange_golden_gate_bridge = 0xB9A5, + Iris = 0x5A99, + Irresistible = 0xB22D, + Isabelline = 0xF77D, + Islamic_green = 0x0480, + Italian_sky_blue = 0xB7FF, + Ivory = 0xFFFD, + Jade = 0x054D, + Japanese_carmine = 0x9946, + Japanese_violet = 0x598A, + Jasmine = 0xF6EF, + Jasper = 0xCAA8, + Jazzberry_jam = 0xA06B, + Jet = 0x31A6, + Jonquil = 0xF643, + Jordy_blue = 0x8DDD, + June_bud = 0xBECB, + Jungle_green = 0x2D50, + Kelly_green = 0x4DC3, + Keppel = 0x3D73, + Key_lime = 0xE791, + Khaki = 0xC572, + Khaki_web = 0xC572, + Khaki_x11_light_khaki = 0xEF31, + Kobe = 0x8963, + Kobi = 0xE4F8, + Kobicha = 0x6A24, + Kombu_green = 0x3206, + Ksu_purple = 0x5151, + Languid_lavender = 0xD65B, + Lapis_lazuli = 0x2B13, + Laser_lemon = 0xFFEC, + Laurel_green = 0xADD3, + Lava = 0xC884, + Lavender = 0xB3FB, + Lavender_blue = 0xCE5F, + Lavender_blush = 0xFF7E, + Lavender_floral = 0xB3FB, + Lavender_gray = 0xC619, + Lavender_pink = 0xFD7A, + Lavender_web = 0xE73E, + Lawn_green = 0x7FC0, + Lemon = 0xFFA0, + Lemon_chiffon = 0xFFD9, + Lemon_crayola = 0xFFE0, + Lemon_curry = 0xCD04, + Lemon_glacier = 0xFFE0, + Lemon_meringue = 0xF757, + Lemon_yellow = 0xFF8A, + Lemon_yellow_crayola = 0xFFF3, + Liberty = 0x52D4, + Licorice = 0x1882, + Light_blue = 0xAEBC, + Light_coral = 0xEC10, + Light_cornflower_blue = 0x965C, + Light_cyan = 0xDFFF, + Light_deep_pink = 0xFAF9, + Light_french_beige = 0xC56F, + Light_goldenrod_yellow = 0xF7DA, + Light_gray = 0xD69A, + Light_green = 0x9772, + Light_hot_pink = 0xFD9B, + Light_orange = 0xFEB6, + Light_periwinkle = 0xC65B, + Light_pink = 0xFDB7, + Light_red = 0xFBEF, + Light_salmon = 0xFD0F, + Light_sea_green = 0x2595, + Light_sky_blue = 0x867E, + Light_slate_gray = 0x7453, + Light_steel_blue = 0xAE1B, + Light_yellow = 0xFFFB, + Lilac = 0xC518, + Lilac_luster = 0xACD5, + Lime_color_wheel = 0xBFE0, + Lime_green = 0x3666, + Lime_web_x11_green = 0x07E0, + Lincoln_green = 0x1AC1, + Linen = 0xF77C, + Lion = 0xBCCD, + Liseran_purple = 0xDB74, + Little_boy_blue = 0x6D1B, + Liver = 0x6A69, + Liver_chestnut = 0x93AA, + Liver_dogs = 0xB365, + Liver_organ = 0x6964, + Livid = 0x64D9, + Lust = 0xE104, + Macaroni_and_cheese = 0xFDF1, + Madder = 0xA004, + Madder_lake = 0xC9A7, + Magenta = 0xF81F, + Magenta_additive_secondary = 0xF81F, + Magenta_crayola = 0xF2B4, + Magenta_dye = 0xC90F, + Magenta_haze = 0x9A2E, + Magenta_pantone = 0xCA0F, + Magenta_process = 0xF812, + Magenta_subtractive_primary = 0xF812, + Magic_mint = 0xAF79, + Magnolia = 0xEF3A, + Mahogany = 0xBA00, + Maize = 0xFF4B, + Maize_crayola = 0xEE29, + Majorelle_blue = 0x629B, + Malachite = 0x0ECA, + Manatee = 0x94D5, + Mandarin = 0xF3C9, + Mango = 0xFDE0, + Mango_tango = 0xFC08, + Mantis = 0x760C, + Mardi_gras = 0x8810, + Marengo = 0x4ACC, + Marigold = 0xE504, + Maroon = 0x8000, + Maroon_crayola = 0xC109, + Maroon_web = 0x8000, + Maroon_x11 = 0xA98C, + Mauve = 0xDD7F, + Mauve_mallow = 0xDD7F, + Mauve_taupe = 0x92ED, + Mauvelous = 0xECD5, + Maximum_blue = 0x4D59, + Maximum_blue_green = 0x35F7, + Maximum_blue_purple = 0xAD5C, + Maximum_green = 0x5C66, + Maximum_green_yellow = 0xD72A, + Maximum_purple = 0x71B0, + Maximum_red = 0xD104, + Maximum_red_purple = 0xA1CF, + Maximum_yellow = 0xF7C7, + Maximum_yellow_red = 0xEDC9, + May_green = 0x4C88, + Maya_blue = 0x761F, + Medium_aquamarine = 0x66F5, + Medium_blue = 0x0019, + Medium_candy_apple_red = 0xD825, + Medium_carmine = 0xAA06, + Medium_champagne = 0xF735, + Medium_gray = 0xBDF7, + Medium_orchid = 0xBABA, + Medium_purple = 0x939B, + Medium_sea_green = 0x3D8E, + Medium_slate_blue = 0x7B5D, + Medium_spring_green = 0x07D3, + Medium_turquoise = 0x4E99, + Medium_violet_red = 0xC0B0, + Mellow_apricot = 0xF5AF, + Mellow_yellow = 0xF6EF, + Melon = 0xFDD5, + Metallic_gold = 0xD567, + Metallic_seaweed = 0x0BF1, + Metallic_sunburst = 0x9BE7, + Mexican_pink = 0xE00F, + Middle_blue = 0x7E9C, + Middle_blue_green = 0x8ED9, + Middle_blue_purple = 0x8B97, + Middle_green = 0x4C6B, + Middle_green_yellow = 0xADEC, + Middle_grey = 0x8C30, + Middle_purple = 0xD416, + Middle_red = 0xE46E, + Middle_red_purple = 0xA2AA, + Middle_yellow = 0xFF40, + Middle_yellow_red = 0xED8E, + Midnight = 0x712E, + Midnight_blue = 0x18CE, + Midnight_green = 0x026A, + Midnight_green_eagle_green = 0x024A, + Mikado_yellow = 0xFE01, + Mimi_pink = 0xFEDC, + Mindaro = 0xE7D1, + Ming = 0x3BAF, + Minion_yellow = 0xF6EA, + Mint = 0x4591, + Mint_cream = 0xF7FE, + Mint_green = 0x97D2, + Misty_moss = 0xBD8E, + Misty_rose = 0xFF1B, + Mode_beige = 0x9383, + Moonstone = 0x3D57, + Morning_blue = 0x8D13, + Moss_green = 0x8CCB, + Mountain_meadow = 0x35D1, + Mountbatten_pink = 0x9BD1, + Msu_green = 0x1A27, + Mulberry = 0xC271, + Mulberry_crayola = 0xC293, + Mustard = 0xFECB, + Myrtle_green = 0x33CE, + Mystic = 0xD290, + Mystic_maroon = 0xAA2F, + Nadeshiko_pink = 0xF578, + Naples_yellow = 0xF6CB, + Navajo_white = 0xFEF5, + Navy_blue = 0x0010, + Navy_blue_crayola = 0x1BBA, + Ndhu_green = 0x12E6, + Neon_blue = 0x4A7F, + Neon_carrot = 0xFD08, + Neon_fuchsia = 0xFA0C, + Neon_green = 0x3FE2, + New_york_pink = 0xD40F, + Nickel = 0x73AE, + Non_photo_blue = 0xA6FD, + Northwestern_purple = 0x4950, + Nyanza = 0xE7FB, + Ocean_blue = 0x5216, + Ocean_green = 0x4DF2, + Ochre = 0xCBA4, + Old_burgundy = 0x4186, + Old_gold = 0xCDA7, + Old_lace = 0xFFBC, + Old_lavender = 0x7B4F, + Old_mauve = 0x6989, + Old_rose = 0xBC10, + Old_silver = 0x8430, + Olive = 0x8400, + Olive_drab_3 = 0x6C64, + Olive_drab_7 = 0x39A4, + Olive_green = 0xB58B, + Olive_ral = 0x39E7, + Olivine = 0x9DCE, + Onyx = 0x31C7, + Opal = 0xA617, + Opera_mauve = 0xB434, + Orange = 0xFBE0, + Orange_color_wheel = 0xFC00, + Orange_crayola = 0xFBA7, + Orange_gs = 0xE300, + Orange_pantone = 0xFAC0, + Orange_peel = 0xFCE0, + Orange_red = 0xFB44, + Orange_red_crayola = 0xFAA9, + Orange_soda = 0xF2C7, + Orange_web = 0xFD20, + Orange_web_color = 0xFD20, + Orange_yellow = 0xF5E4, + Orange_yellow_crayola = 0xF6AD, + Orchid = 0xDB9A, + Orchid_crayola = 0xDCFA, + Orchid_pink = 0xEDF9, + Ou_crimson_red = 0x80A3, + Outer_space = 0x4249, + Outer_space_crayola = 0x29C7, + Outrageous_orange = 0xFB69, + Oxblood = 0x4800, + Oxford_blue = 0x0109, + Pacific_blue = 0x1D58, + Pakistan_green = 0x0320, + Palatinate = 0x712D, + Palatinate_purple = 0x694C, + Pale_aqua = 0xBE9C, + Pale_azure = 0x869E, + Pale_cerulean = 0x9E1B, + Pale_dogwood = 0xEE78, + Pale_green = 0x97D2, + Pale_pink = 0xF659, + Pale_purple = 0xF73E, + Pale_purple_pantone = 0xF73E, + Pale_silver = 0xC5F7, + Pale_spring_bud = 0xEF57, + Pansy_purple = 0x78C9, + Paolo_veronese_green = 0x04CF, + Papaya_whip = 0xFF7A, + Paradise_pink = 0xE1EC, + Parchment = 0xEF5A, + Paris_green = 0x562F, + Pastel_pink = 0xDD34, + Patriarch = 0x8010, + Paynes_grey = 0x534F, + Peach = 0xFF36, + Peach_crayola = 0xFE54, + Peach_puff = 0xFED6, + Pear = 0xCF06, + Pearly_purple = 0xB354, + Periwinkle = 0xCE5F, + Periwinkle_crayola = 0xC67C, + Permanent_geranium_lake = 0xD965, + Persian_blue = 0x19D7, + Persian_green = 0x0532, + Persian_indigo = 0x308F, + Persian_orange = 0xD48B, + Persian_pink = 0xF3F7, + Persian_plum = 0x70E3, + Persian_red = 0xC9A6, + Persian_rose = 0xF954, + Persimmon = 0xEAC0, + Peru = 0xCC28, + Pewter_blue = 0x8D56, + Phlox = 0xD81F, + Phthalo_blue = 0x0091, + Phthalo_green = 0x11A4, + Picotee_blue = 0x3150, + Picton_blue = 0x459C, + Pictorial_carmine = 0xC069, + Piggy_pink = 0xFEFC, + Pine_green = 0x03CD, + Pine_tree = 0x2984, + Pink = 0xFDF9, + Pink_flamingo = 0xFBBF, + Pink_gs = 0xF5F7, + Pink_lace = 0xFEFE, + Pink_lavender = 0xDD99, + Pink_pantone = 0xD252, + Pink_sherbet = 0xF474, + Pistachio = 0x962E, + Platinum = 0xE71B, + Plum = 0x8A30, + Plum_crayola = 0x818F, + Plum_web = 0xDD1B, + Plump_purple = 0x5A36, + Polished_pine = 0x5D32, + Polynesian_blue = 0x2272, + Pomp_and_power = 0x8311, + Popstar = 0xBA8C, + Portland_orange = 0xFAC7, + Powder_blue = 0xAEFC, + Princeton_orange = 0xEBE5, + Process_yellow = 0xFF60, + Prune = 0x70E3, + Prussian_blue = 0x018A, + Psychedelic_purple = 0xD81F, + Puce = 0xCC53, + Pullman_brown_ups_brown = 0x6203, + Pumpkin = 0xFBA3, + Purple = 0x8010, + Purple_htmlcss_color = 0x8010, + Purple_mountain_majesty = 0x93D6, + Purple_munsell = 0x9818, + Purple_navy = 0x4A90, + Purple_pizzazz = 0xFA7B, + Purple_plum = 0x9A96, + Purple_web = 0x8010, + Purple_x11 = 0x991D, + Purple_x11_color = 0x991D, + Purpureus = 0x9A75, + Queen_blue = 0x4352, + Queen_pink = 0xE65A, + Quick_silver = 0xA534, + Quinacridone_magenta = 0x988A, + Radical_red = 0xF9AB, + Raisin_black = 0x2104, + Rajah = 0xFD4C, + Raspberry = 0xE06B, + Raspberry_glace = 0x92ED, + Raspberry_rose = 0xB22D, + Raw_sienna = 0xD44B, + Raw_umber = 0x8328, + Razzle_dazzle_rose = 0xF9B9, + Razzmatazz = 0xE12D, + Razzmic_berry = 0x8A70, + Rebecca_purple = 0x61B3, + Red = 0xF800, + Red_brown = 0xA145, + Red_cmyk_pigment_red = 0xE8E4, + Red_crayola = 0xE909, + Red_munsell = 0xE807, + Red_ncs = 0xC006, + Red_orange = 0xFAA9, + Red_orange_color_wheel = 0xFA20, + Red_orange_crayola = 0xFB44, + Red_pantone = 0xE947, + Red_pigment = 0xE8E4, + Red_purple = 0xE00F, + Red_rgb = 0xF800, + Red_ryb = 0xF942, + Red_salsa = 0xF9C9, + Red_violet = 0xC0B0, + Red_violet_color_wheel = 0x9168, + Red_violet_crayola = 0xBA31, + Redwood = 0xA2CA, + Resolution_blue = 0x0130, + Rhythm = 0x73B2, + Rich_black = 0x0208, + Rich_black_fogra29 = 0x0062, + Rich_black_fogra39 = 0x0000, + Rifle_green = 0x4267, + Robin_egg_blue = 0x0659, + Rocket_metallic = 0x8BF1, + Rojo = 0xE005, + Rojo_spanish_red = 0xA880, + Roman_silver = 0x8452, + Rose = 0xF80F, + Rose_bonbon = 0xF213, + Rose_dust = 0x9AED, + Rose_ebony = 0x6A49, + Rose_madder = 0xE127, + Rose_pink = 0xFB39, + Rose_pompadour = 0xEBD3, + Rose_quartz = 0xACD5, + Rose_red = 0xC0EA, + Rose_taupe = 0x92EB, + Rose_vale = 0xAA6A, + Rosewood = 0x6001, + Rosso_corsa = 0xD000, + Rosy_brown = 0xBC71, + Royal_blue_dark = 0x012C, + Royal_blue_light = 0x435B, + Royal_blue_traditional = 0x012C, + Royal_blue_web_color = 0x435B, + Royal_purple = 0x7A95, + Royal_yellow = 0xF6CB, + Ruber = 0xCA2E, + Rubine_red = 0xC80A, + Ruby = 0xD88C, + Ruby_red = 0x9884, + Ruddy_blue = 0x755B, + Rufous = 0xA0E1, + Russet = 0x8223, + Russian_green = 0x6C8D, + Russian_violet = 0x30C9, + Rust = 0xB202, + Rusty_red = 0xD968, + Sacramento_state_green = 0x01C5, + Saddle_brown = 0x8A22, + Safety_orange = 0xFBC0, + Safety_orange_blaze_orange = 0xFB20, + Safety_yellow = 0xEE80, + Saffron = 0xF606, + Sage = 0xBDB1, + Salmon = 0xF40E, + Salmon_pink = 0xFC94, + Sand = 0xC590, + Sand_dune = 0x9383, + Sandy_brown = 0xF52C, + Sap_green = 0x53E5, + Sapphire = 0x092D, + Sapphire_blue = 0x0334, + Sapphire_crayola = 0x0334, + Satin_sheen_gold = 0xCD06, + Savoy_blue = 0x4B19, + Scarlet = 0xF920, + Schauss_pink = 0xFC95, + School_bus_yellow = 0xFEA0, + Screamin_green = 0x67EC, + Sea_green = 0x344B, + Sea_green_crayola = 0x07F9, + Seal_brown = 0x5921, + Seashell = 0xFFBD, + Selective_yellow = 0xFDC0, + Sepia = 0x7202, + Sgbus_green = 0x56E6, + Shadow = 0x8BCB, + Shadow_blue = 0x7454, + Shamrock_green = 0x04EC, + Sheen_green = 0x8E80, + Shimmering_blush = 0xD432, + Shiny_shamrock = 0x652F, + Shocking_pink = 0xF897, + Shocking_pink_crayola = 0xFB7F, + Shocking_pink_crayola_formerly_known_as_ultra_pink = 0xFB7F, + Sienna = 0x8963, + Silver = 0xBDF7, + Silver_chalice = 0xAD55, + Silver_crayola = 0xC5F7, + Silver_lake_blue = 0x5C57, + Silver_metallic = 0xAD55, + Silver_pink = 0xC575, + Silver_sand = 0xBE18, + Sinopia = 0xCA01, + Sizzling_red = 0xF9CA, + Sizzling_sunrise = 0xFEC0, + Skobeloff = 0x03CE, + Sky_blue = 0x867D, + Sky_blue_crayola = 0x86DD, + Sky_magenta = 0xCB95, + Slate_blue = 0x6AD9, + Slate_gray = 0x7412, + Slimy_green = 0x2CA3, + Smitten = 0xC210, + Smokey_topaz = 0x8142, + Smoky_black = 0x1061, + Snow = 0xFFDE, + Solid_pink = 0x89C8, + Sonic_silver = 0x73AE, + Space_cadet = 0x214A, + Spanish_bistre = 0x83A6, + Spanish_blue = 0x0397, + Spanish_carmine = 0xC809, + Spanish_gray = 0x94D2, + Spanish_green = 0x048A, + Spanish_orange = 0xE300, + Spanish_pink = 0xF5F7, + Spanish_red = 0xE005, + Spanish_sky_blue = 0x07FF, + Spanish_violet = 0x4950, + Spanish_viridian = 0x03EB, + Spring_bud = 0xA7C0, + Spring_frost = 0x87E5, + Spring_green = 0x07EF, + Spring_green_crayola = 0xEF57, + St_patricks_blue = 0x214F, + Star_command_blue = 0x03D6, + Steel_blue = 0x4C16, + Steel_pink = 0xC9B9, + Steel_teal = 0x6451, + Stil_de_grain_yellow = 0xF6CB, + Stone_gray = 0x9470, + Straw = 0xE6CD, + Strawberry = 0xF28A, + Strawberry_blonde = 0xFC8C, + Sugar_plum = 0x926E, + Sunglow = 0xFE46, + Sunray = 0xE54B, + Sunset = 0xF6B4, + Super_pink = 0xCB55, + Sweet_brown = 0xA1C6, + Syracuse_orange = 0xD220, + Tan = 0xD591, + Tan_crayola = 0xD4CD, + Tang_blue = 0x02D9, + Tangerine = 0xEC20, + Tango_pink = 0xE38F, + Tart_orange = 0xFA69, + Taupe = 0x49E6, + Taupe_gray = 0x8C31, + Tea_green = 0xCF77, + Tea_rose = 0xF40F, + Tea_rose_red = 0xF618, + Teal = 0x0410, + Teal_blue = 0x3BB1, + Telemagenta = 0xC9AE, + Tenne = 0xCAA0, + Terra_cotta = 0xDB8B, + Thistle = 0xD5FA, + Thulian_pink = 0xDB74, + Tickle_me_pink = 0xFC55, + Tiffany_blue = 0x86B9, + Tigers_eye = 0xB343, + Timberwolf = 0xDEBA, + Titanium_yellow = 0xEF20, + Tomato = 0xFB09, + Tropical_rainforest = 0x03AB, + True_blue = 0x2B58, + Trypan_blue = 0x1836, + Tufts_blue = 0x447B, + Tumbleweed = 0xDD51, + Turkey_red = 0xA880, + Turquoise = 0x46F9, + Turquoise_blue = 0x07FD, + Turquoise_green = 0x9EB6, + Turtle_green = 0x8CCB, + Tuscan = 0xF6B4, + Tuscan_brown = 0x6A67, + Tuscan_red = 0x7A49, + Tuscan_tan = 0xA3CB, + Tuscany = 0xBCD3, + Twilight_lavender = 0x8A4D, + Tyrian_purple = 0x6007, + Ua_blue = 0x01B5, + Ua_red = 0xD009, + Ultra_pink = 0xFB7F, + Ultra_red = 0xFB70, + Ultra_violet = 0x62B2, + Ultramarine = 0x401F, + Ultramarine_blue = 0x433E, + Umber = 0x6289, + Unbleached_silk = 0xFEF9, + United_nations_blue = 0x4C9B, + University_of_pennsylvania_blue = 0x010B, + University_of_pennsylvania_red = 0x9800, + Unmellow_yellow = 0xFFEC, + Up_forest_green = 0x0224, + Up_maroon = 0x7882, + Upsdell_red = 0xA905, + Uranian_blue = 0xAEDE, + Usafa_blue = 0x0292, + Ut_orange = 0xFC00, + Van_dyke_brown = 0x6205, + Vanilla = 0xF735, + Vanilla_ice = 0xF475, + Vegas_gold = 0xC58B, + Venetian_red = 0xC043, + Verdigris = 0x4595, + Vermilion = 0xE206, + Veronica = 0x991D, + Violet = 0x781F, + Violet_blue = 0x3256, + Violet_blue_crayola = 0x7378, + Violet_color_wheel = 0x781F, + Violet_crayola = 0x91EF, + Violet_gs = 0x4950, + Violet_jtc = 0x598A, + Violet_red = 0xF2B2, + Violet_ryb = 0x8015, + Violet_web = 0xEC1D, + Violet_web_color = 0xEC1D, + Viridian = 0x440D, + Viridian_green = 0x04B2, + Vista_blue = 0x7CFA, + Vivid_burgundy = 0x98E6, + Vivid_sky_blue = 0x065F, + Vivid_tangerine = 0xFD11, + Vivid_violet = 0x981F, + Volt = 0xCFE0, + Walnut_brown = 0x5A89, + Warm_black = 0x0208, + Wenge = 0x62AA, + Wheat = 0xF6F6, + White = 0xFFFF, + White_smoke = 0xF7BE, + Wild_blue_yonder = 0xA579, + Wild_orchid = 0xD394, + Wild_strawberry = 0xFA34, + Wild_watermelon = 0xFB70, + Windsor_tan = 0xA2A0, + Wine = 0x7187, + Wine_dregs = 0x6989, + Winter_sky = 0xF80F, + Wintergreen_dream = 0x544F, + Wisteria = 0xC51B, + Wood_brown = 0xBCCD, + Xanadu = 0x742F, + Xanthic = 0xEF61, + Xanthous = 0xED86, + Yale_blue = 0x01AD, + Yale_blue_site_blue = 0x01AD, + Yellow = 0xFFE0, + Yellow_crayola = 0xFF30, + Yellow_green = 0x9E66, + Yellow_green_color_wheel = 0x3583, + Yellow_green_crayola = 0xC710, + Yellow_munsell = 0xEE40, + Yellow_ncs = 0xFE80, + Yellow_orange = 0xFD68, + Yellow_orange_color_wheel = 0xFCA1, + Yellow_pantone = 0xFEE0, + Yellow_process = 0xFF60, + Yellow_rgb_x11_yellow = 0xFFE0, + Yellow_ryb = 0xFFE6, + Yellow_sunshine = 0xFFA0, + Yinmn_blue = 0x3292, + Zaffre = 0x00B4, + Zomp = 0x3D31, +} RGB565_Colors; +} // namespace colors +} // namespace lilka \ No newline at end of file diff --git a/sdk/lib/lilka/src/lilka/display.cpp b/sdk/lib/lilka/src/lilka/display.cpp index 8ee48563..aa7fe515 100644 --- a/sdk/lib/lilka/src/lilka/display.cpp +++ b/sdk/lib/lilka/src/lilka/display.cpp @@ -395,12 +395,12 @@ uint16_t RLEDecoder::next() { // Read the next value from the RLE stream if (pos >= length) { // End of stream - return display.color565(255, 255, 0); + return lilka::colors::Yellow; } count = data[pos++]; if (count == 0) { // This is bullshit. The count should never be zero. The user has messed up the data. I don't want to deal with this. /AD - return display.color565(255, 255, 255); + return lilka::colors::Black; } uint8_t lo = data[pos++]; uint8_t hi = data[pos++]; diff --git a/sdk/lib/lilka/src/lilka/display.h b/sdk/lib/lilka/src/lilka/display.h index 9bc6ffa6..70633151 100644 --- a/sdk/lib/lilka/src/lilka/display.h +++ b/sdk/lib/lilka/src/lilka/display.h @@ -2,7 +2,7 @@ #define LILKA_DISPLAY_H #include "config.h" - +#include "colors565.h" #include #include @@ -45,9 +45,9 @@ typedef struct int_vector_t { /// } /// /// void loop() { -/// lilka::display.fillScreen(lilka::display.color565(255, 0, 0)); // Заповнити екран червоним кольором +/// lilka::display.fillScreen(lilka::colors::Red); // Заповнити екран червоним кольором /// lilka::display.setCursor(32, 32); -/// lilka::display.setTextColor(lilka::display.color565(0, 255, 0)); // Зелений текст +/// lilka::display.setTextColor(lilka::colors::Green); // Зелений текст /// lilka::display.print("Привіт, Лілка!"); /// } /// @endcode @@ -125,7 +125,7 @@ class Display : public Arduino_ST7789 { /// Наприклад: /// @code /// lilka::display.setCursor(0, 32); - /// lilka::display.setTextColor(lilka::display.color565(0, 0, 0)); // Білий текст + /// lilka::display.setTextColor(lilka::colors::Black); // Чорний текст /// lilka::display.print("Привіт,j "); /// lilka::display.print(String("Лілка!\n")); /// lilka::display.print(42); @@ -230,7 +230,7 @@ class Display : public Arduino_ST7789 { /// Приклад використання: /// @code /// // Завантажити зображення з файлу "image.bmp", використовуючи білий колір як прозорий. - /// lilka::Image *image = lilka::resources.loadImage("image.bmp", lilka::display.color565(255, 255, 255)); + /// lilka::Image *image = lilka::resources.loadImage("image.bmp", lilka::colors::White); /// lilka::display.draw16bitRGBBitmapWithTranColor( /// 0, 0, image->pixels, image->transparentColor, image->width, image->height /// ); @@ -279,9 +279,9 @@ class Display : public Arduino_ST7789 { /// lilka::Canvas canvas; // Створити новий Canvas зі стандартним розміром (розмір дисплею) /// int y = 100; /// while (1) { -/// canvas.fillScreen(lilka::display.color565(0, 0, 0)); // Заповнити буфер чорним кольором +/// canvas.fillScreen(lilka::colors::Black); // Заповнити буфер чорним кольором /// canvas.setCursor(32, y); -/// canvas.setTextColor(lilka::display.color565(0, 0, 0)); // Білий текст +/// canvas.setTextColor(lilka::colors::Black); // Чорний текст /// canvas.print("Привіт, Лілка!"); /// lilka::display.renderCanvas(&canvas); // Відобразити буфер на екрані - жодного мерехтіння! /// y++; @@ -343,7 +343,7 @@ class Image { /// } /// lilka::Image *rotatedImage = new lilka::Image(image->width, image->height); /// // Повертаємо на 30 градусів, заповнюючи пікселі, які виходять за межі зображення, білим кольором: - /// image->rotate(30, rotatedImage, lilka::display.color565(255, 255, 255)); + /// image->rotate(30, rotatedImage, lilka::colors::White); /// // Звільнюємо пам'ять /// delete image; /// delete rotatedImage; diff --git a/sdk/lib/lilka/src/lilka/inputdialog.cpp b/sdk/lib/lilka/src/lilka/inputdialog.cpp index 7ca0e99b..8719cc8a 100644 --- a/sdk/lib/lilka/src/lilka/inputdialog.cpp +++ b/sdk/lib/lilka/src/lilka/inputdialog.cpp @@ -125,8 +125,8 @@ void InputDialog::draw(Arduino_GFX* canvas) { int16_t kbHeight = canvas->height() / 2; int16_t kbWidth = canvas->width(); - canvas->fillRect(0, 0, canvas->width(), canvas->height(), canvas->color565(0, 0, 0)); - canvas->setTextColor(canvas->color565(255, 255, 255)); + canvas->fillRect(0, 0, canvas->width(), canvas->height(), lilka::colors::Black); + canvas->setTextColor(lilka::colors::White); canvas->setFont(FONT_10x20); canvas->setTextBound(4, 4, canvas->width() - 8, canvas->height() - 8); @@ -160,7 +160,7 @@ void InputDialog::draw(Arduino_GFX* canvas) { // Draw rect if key is focused if (y == cy && x == cx) { canvas->fillRect( - x * buttonWidth, kbTop + y * buttonHeight, buttonWidth, buttonHeight, canvas->color565(255, 64, 0) + x * buttonWidth, kbTop + y * buttonHeight, buttonWidth, buttonHeight, lilka::colors::Orange_red ); } uint8_t key = layerKeys[y * LILKA_KB_COLS + x]; @@ -183,7 +183,7 @@ void InputDialog::draw(Arduino_GFX* canvas) { x * buttonWidth + (buttonWidth / 2) - iconWidth / 2, kbTop + y * buttonHeight + (buttonHeight / 2) - iconHeight / 2, const_cast(icon), - canvas->color565(0, 0, 0), + lilka::colors::Black, iconWidth, iconHeight ); diff --git a/sdk/lib/lilka/src/lilka/menu.cpp b/sdk/lib/lilka/src/lilka/menu.cpp index e64b56f0..329da300 100644 --- a/sdk/lib/lilka/src/lilka/menu.cpp +++ b/sdk/lib/lilka/src/lilka/menu.cpp @@ -11,7 +11,7 @@ Menu::Menu(String title) { this->scroll = 0; this->setCursor(0); this->done = false; - this->iconImage = new Image(24, 24, display.color565(0, 0, 0), 12, 12); + this->iconImage = new Image(24, 24, colors::Black, 12, 12); this->iconCanvas = new Canvas(24, 24); this->lastCursorMove = millis(); this->button = Button::COUNT; @@ -82,10 +82,10 @@ void Menu::update() { void Menu::draw(Arduino_GFX* canvas) { // uint8_t desiredCursorY = cursor * 24 + 96 - 20; - canvas->fillScreen(canvas->color565(0, 0, 0)); + canvas->fillScreen(lilka::colors::Black); int8_t angleShift = sin(millis() / 1000.0) * 16; // Draw triangle in top-left - canvas->fillTriangle(0, 0, 48 - angleShift, 0, 0, 48 + angleShift, canvas->color565(0, 0, 255)); + canvas->fillTriangle(0, 0, 48 - angleShift, 0, 0, 48 + angleShift, lilka::colors::Blue); // Draw triangle in top-right canvas->fillTriangle( canvas->width(), @@ -94,11 +94,11 @@ void Menu::draw(Arduino_GFX* canvas) { 0, canvas->width(), 48 - angleShift, - canvas->color565(255, 255, 0) + lilka::colors::Yellow ); canvas->setCursor(32, 40); canvas->setTextBound(0, 0, canvas->width(), canvas->height()); - canvas->setTextColor(canvas->color565(255, 255, 255)); + canvas->setTextColor(lilka::colors::White); canvas->setFont(FONT_6x13); canvas->setTextSize(2); canvas->println(title); @@ -106,12 +106,12 @@ void Menu::draw(Arduino_GFX* canvas) { canvas->setTextSize(1); canvas->setFont(FONT_10x20); - canvas->fillRect(0, (cursor * 24 + 80 - 20) - scroll * 24, canvas->width(), 24, canvas->color565(255, 64, 0)); + canvas->fillRect(0, (cursor * 24 + 80 - 20) - scroll * 24, canvas->width(), 24, lilka::colors::Orange_red); uint16_t menu_size = items.size(); for (int i = scroll; i < MIN(scroll + MENU_HEIGHT, menu_size); i++) { - // canvas->fillRect(0, 96 + i * 24 - 20, LILKA_DISPLAY_WIDTH, 24, i == cursor ? canvas->color565(255, 64, 0) : - // canvas->color565(0, 0, 0)); + // canvas->fillRect(0, 96 + i * 24 - 20, LILKA_DISPLAY_WIDTH, 24, i == cursor ? lilka::colors::Orange_red : + // lilka::colors::Black); int16_t screenI = i - scroll; const menu_icon_t* icon = items[i].icon; canvas->setTextBound(0, 80 + screenI * 24 - 20, canvas->width(), 24); @@ -130,14 +130,14 @@ void Menu::draw(Arduino_GFX* canvas) { memcpy(iconImage->pixels, *icon, sizeof(menu_icon_t)); // Transform t = Transform().rotate(millis() * 30); Transform t = Transform().rotate(sin((millis() - lastCursorMove) * PI / 1000) * 30); - iconCanvas->fillScreen(canvas->color565(0, 0, 0)); + iconCanvas->fillScreen(lilka::colors::Black); iconCanvas->drawImageTransformed(iconImage, 12, 12, t); canvas->draw16bitRGBBitmapWithTranColor( - 0, 80 + screenI * 24 - 20, iconCanvas->getFramebuffer(), canvas->color565(0, 0, 0), 24, 24 + 0, 80 + screenI * 24 - 20, iconCanvas->getFramebuffer(), lilka::colors::Black, 24, 24 ); } else { canvas->draw16bitRGBBitmapWithTranColor( - 0, 80 + screenI * 24 - 20, const_cast(*icon), canvas->color565(0, 0, 0), 24, 24 + 0, 80 + screenI * 24 - 20, const_cast(*icon), lilka::colors::Black, 24, 24 ); } } @@ -145,7 +145,7 @@ void Menu::draw(Arduino_GFX* canvas) { if (items[i].color && cursor != i) { canvas->setTextColor(items[i].color); } else { - canvas->setTextColor(canvas->color565(255, 255, 255)); + canvas->setTextColor(lilka::colors::White); } // gfx->print(i == cursor ? "> " : " "); canvas->println(items[i].title); @@ -170,7 +170,7 @@ void Menu::draw(Arduino_GFX* canvas) { canvas->fillRect(canvas->width() - 8, top, 8, height, canvas->color565(96, 96, 96)); int barHeight = height * MENU_HEIGHT / menu_size; int barTop = top + scroll * height / menu_size; - canvas->fillRect(canvas->width() - 8, barTop, 8, barHeight, canvas->color565(255, 255, 255)); + canvas->fillRect(canvas->width() - 8, barTop, 8, barHeight, lilka::colors::White); } } diff --git a/sdk/lib/lilka/src/lilka/progressdialog.cpp b/sdk/lib/lilka/src/lilka/progressdialog.cpp index 7a933769..b03fbcb3 100644 --- a/sdk/lib/lilka/src/lilka/progressdialog.cpp +++ b/sdk/lib/lilka/src/lilka/progressdialog.cpp @@ -34,9 +34,9 @@ void ProgressDialog::draw(Arduino_GFX* canvas) { int width = right - left; int xMargin = 4; - canvas->setTextColor(canvas->color565(255, 255, 255)); + canvas->setTextColor(lilka::colors::White); - canvas->fillRect(left, top, width, mid - top, canvas->color565(32, 32, 128)); + canvas->fillRect(left, top, width, mid - top, lilka::colors::Midnight_blue); canvas->setFont(FONT_6x13); canvas->setTextSize(2); canvas->setTextBound(left + xMargin, top, width - xMargin * 2, mid - top); @@ -56,7 +56,7 @@ void ProgressDialog::draw(Arduino_GFX* canvas) { sprintf(buf, "%d%%", progress); canvas->getTextBounds(buf, 0, 0, &x, &y, &w, &h); - // canvas->fillRect(x, y, w, h, canvas->color565(0, 0, 0)); + // canvas->fillRect(x, y, w, h, lilka::colors::Black); // canvas->println(buf); int barMargin = 8; @@ -65,18 +65,14 @@ void ProgressDialog::draw(Arduino_GFX* canvas) { int center = (left + right) / 2; canvas->fillRect( - left + barMargin, - bottom - barMargin - barHeight, - width - barMargin * 2, - barHeight, - canvas->color565(128, 64, 64) + left + barMargin, bottom - barMargin - barHeight, width - barMargin * 2, barHeight, lilka::colors::Persian_plum ); canvas->fillRect( left + barMargin, bottom - barMargin - barHeight, (width - barMargin * 2) * progress / 100, barHeight, - canvas->color565(255, 128, 0) + lilka::colors::Dark_orange ); canvas->setCursor(center - w / 2, bottom - barMargin - barHeight - barMargin); canvas->setTextBound(0, 0, canvas->width(), canvas->height()); diff --git a/sdk/lib/lilka/src/lilka/resources.h b/sdk/lib/lilka/src/lilka/resources.h index a9377e40..899a7b6b 100644 --- a/sdk/lib/lilka/src/lilka/resources.h +++ b/sdk/lib/lilka/src/lilka/resources.h @@ -22,7 +22,7 @@ class Resources { /// Приклад: /// /// \code - /// lilka::Image *image = lilka::resources.loadImage("image.bmp", lilka::display.color565(255, 255, 0)); // + /// lilka::Image *image = lilka::resources.loadImage("image.bmp", lilka::colors::Yellow); // /// Жовтий колір буде прозорим if (!image) { /// Serial.println("Failed to load image"); /// return;