From a77b7b40bd4be9b75267988971c002c95b532671 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Boh=C3=A1=C4=8Dek?= Date: Tue, 15 Jun 2021 23:42:56 +0200 Subject: [PATCH] fix: struct constants --- image-viewer/include/display_utils.h | 6 ++++-- image-viewer/src/cursor.c | 2 ++ image-viewer/src/display_utils.c | 7 +++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/image-viewer/include/display_utils.h b/image-viewer/include/display_utils.h index 4e6729b..a8d8c88 100644 --- a/image-viewer/include/display_utils.h +++ b/image-viewer/include/display_utils.h @@ -40,8 +40,10 @@ typedef struct { display_data_t data; } display_t; -const display_pixel_t BLACK_PIXEL = { .bits = 0 }; -const display_pixel_t WHITE_PIXEL = { .bits = 0xFFFF }; +extern const display_pixel_t BLACK_PIXEL; +extern const display_pixel_t WHITE_PIXEL; + +extern const raw_pixel_t DISPLAY_PIXEL_MAX; display_pixel_t raw_pixel_onebit_convert_to_display(raw_pixel_onebit_t pixel, raw_pixel_onebit_t max); diff --git a/image-viewer/src/cursor.c b/image-viewer/src/cursor.c index 69f9976..2823de2 100644 --- a/image-viewer/src/cursor.c +++ b/image-viewer/src/cursor.c @@ -2,6 +2,8 @@ #include "display_utils.h" #include "image.h" +const display_pixel_t CURSOR_COLOR = {.fields = {.r = (uint8_t)DISPLAY_MAX_RED, .g = 0, .b = 0}}; + cursor_t cursor_create() { cursor_t cursor = { .x = 0, diff --git a/image-viewer/src/display_utils.c b/image-viewer/src/display_utils.c index 2eef162..cbd0f9c 100644 --- a/image-viewer/src/display_utils.c +++ b/image-viewer/src/display_utils.c @@ -1,6 +1,13 @@ #include "display_utils.h" #include "mzapo_parlcd.h" +const display_pixel_t BLACK_PIXEL = {.bits = 0}; +const display_pixel_t WHITE_PIXEL = {.bits = 0xFFFF}; + +const raw_pixel_t DISPLAY_PIXEL_MAX = {.red = (uint16_t)DISPLAY_MAX_RED, + .green = (uint16_t)DISPLAY_MAX_GREEN, + .blue = (uint16_t)DISPLAY_MAX_BLUE}; + display_pixel_t raw_pixel_onebit_convert_to_display(raw_pixel_onebit_t pixel, raw_pixel_onebit_t max) { display_pixel_t new = { -- 2.48.1