From aee922524e210b31b6d3e55bd05e78c0e8cfe1c4 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sun, 13 Jul 2014 12:09:56 -0600 Subject: [PATCH] NxWM: Add a larger calibration icon --- nxwm/images/calibration48x42.png | Bin 0 -> 575 bytes nxwm/src/glyph_calculator47x49.cxx | 8 +- nxwm/src/glyph_calibration48x42.cxx | 314 ++++++++++++++++++++++++++++ nxwm/src/glyph_cmd49x43.cxx | 26 +-- 4 files changed, 331 insertions(+), 17 deletions(-) create mode 100755 nxwm/images/calibration48x42.png create mode 100644 nxwm/src/glyph_calibration48x42.cxx diff --git a/nxwm/images/calibration48x42.png b/nxwm/images/calibration48x42.png new file mode 100755 index 0000000000000000000000000000000000000000..194500bbeb958e97c9b74d472468f919f85b5da9 GIT binary patch literal 575 zcmV-F0>J%=P)Px#32;bRa{vGf6951U69E94oEQKA00(qQO+^RZ2MrM)E7+**s{jB2(Md!>R9M69 zSkaM#AQS|LGDsm70%cJM7D6G|2l?2UcN{(l-C3*Fogh%n_)y!YOFV+{KMwX3Oj$QB(zUA=-D*T=r^g--jR3;`n76g95X zAssZvL*wbYlqYb^?c`B_ZATBfz8 z|A2gBOs>-reGoT~#{-W?fm8)V=LkCn-Ih6W4>TCmFfrx5Z(qP$R{L7^97B>9HJRm> zbjK};o4hcYi>c}|*42GgWYw|IxJmn=(`5@!P9!aTX>p03TE9?8G9qc|ON&d@m{R=G z(U=yU?Q=i6M5^0uZ%XPsE$-r}XDx#rihdKO*?=yk#rsMY>Z#e`1zeI{2q6#B+#IiU zoo^G=F)di>p_|5-Thx8-vX-<+DLLob0ZA!`G;}E~Cb{ej=nJSPhx*c@$Qw3?{s}{> zFD<^JZr+}ffP@h1y0V`;KHOz}9~D~G8TM8G^o8?t7#iVbgr`5p&=c%XuS + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name NuttX, NxWidgets, nor the names of its contributors + * me be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ********************************************************************************************/ + +/******************************************************************************************** + * Included Files + ********************************************************************************************/ + +#include + +#include +#include +#include + +#include +#include +#include + +#include "crlepalettebitmap.hxx" + +#include "nxwmconfig.hxx" +#include "nxwmglyphs.hxx" + +/******************************************************************************************** + * Pre-Processor Definitions + ********************************************************************************************/ + +#define BITMAP_NROWS 42 +#define BITMAP_NCOLUMNS 48 +#define BITMAP_NLUTCODES 7 + +#define DARK_CALIB_ICON 1 + +/******************************************************************************************** + * Private Bitmap Data + ********************************************************************************************/ + +using namespace NxWM; + +/* RGB24 (8-8-8) Colors */ + +#if CONFIG_NXWIDGETS_BPP == 24 || CONFIG_NXWIDGETS_BPP == 32 +# ifdef DARK_CALIB_ICON + +static const uint32_t g_calibrationNormalLut[BITMAP_NLUTCODES] = +{ + CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + 0xbdbdbd, 0xababab, 0x818181, 0x3f3f3f, 0xab6c15, 0x813f15 /* Codes 1-6 */ +}; + +static const uint32_t g_calibrationBrightlLut[BITMAP_NLUTCODES] = +{ + CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + 0xfcfcfc, 0xe4e4e4, 0xacacac, 0x545454, 0xe4901c, 0xac541c /* Codes 1-6 */ +}; + +# else /* DARK_CALIB_ICON */ + +static const uint32_t g_calibrationNormalLut[BITMAP_NLUTCODES] = +{ + CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + 0xfcfcfc, 0xe4e4e4, 0xacacac, 0x545454, 0xe4901c, 0xac541c /* Codes 1-6 */ +}; + +static const uint32_t g_calibrationBrightlLut[BITMAP_NLUTCODES] = +{ + CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + 0xffffff, 0xffffff, 0xd7d7d7, 0x696969, 0xffb423, 0xd76923 /* Codes 1-6 */ +}; +# endif /* DARK_CALIB_ICON */ + +/* RGB16 (565) Colors */ + +#elif CONFIG_NXWIDGETS_BPP == 16 +# ifdef DARK_CALIB_ICON + +static const uint16_t g_calibrationNormalLut[BITMAP_NLUTCODES] = +{ + CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + 0x0000, 0xbdf7, 0xad55, 0x8410, 0x39e7, 0xab62, 0x81e2, /* Codes 1-6 */ +}; + +static const uint16_t g_calibrationBrightlLut[BITMAP_NLUTCODES] = +{ + CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + 0xffff, 0xe73c, 0xad75, 0x52aa, 0xe483, 0xaaa3 /* Codes 1-6 */ +}; + +# else /* DARK_CALIB_ICON */ + +static const uint16_t g_calibrationNormalLut[BITMAP_NLUTCODES] = +{ + CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + 0xffff, 0xe73c, 0xad75, 0x52aa, 0xe483, 0xaaa3 /* Codes 1-6 */ +}; + +static const uint16_t g_calibrationBrightlLut[BITMAP_NLUTCODES] = +{ + CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + 0xffff, 0xffff, 0xd6ba, 0x6b4d, 0xfda4, 0xd344 /* Codes 1-6 */ +}; + +# endif /* DARK_CALIB_ICON */ + +/* 8-bit color lookups. NOTE: This is really dumb! The lookup index is 8-bits and it used + * to lookup an 8-bit value. There is no savings in that! It would be better to just put + * the 8-bit color/greyscale value in the run-length encoded image and save the cost of these + * pointless lookups. But these pointless lookups do make the logic compatible with the + * 16- and 24-bit types. + */ + +#elif CONFIG_NXWIDGETS_BPP == 8 +# ifdef CONFIG_NXWIDGETS_GREYSCALE + +/* 8-bit Greyscale */ + +# ifdef DARK_CALIB_ICON + +static const uint8_t g_calibrationNormalLut[BITMAP_NLUTCODES] = +{ + CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + 0xbd, 0xab, 0x81, 0x3f, 0x74, 0x4d /* Codes 1-6 */ +}; + +static const uint8_t g_calibrationBrightlLut[BITMAP_NLUTCODES] = +{ + CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + 0xfc, 0xe4, 0xac, 0x54, 0x9b, 0x67 /* Codes 1-6 */ +}; + +# else /* DARK_CALIB_ICON */ + +static const uint8_t g_calibrationNormalLut[BITMAP_NLUTCODES] = +{ + CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + 0xfc, 0xe4, 0xac, 0x54, 0x9b, 0x67 /* Codes 1-6 */ +}; + +static const uint8_t g_calibrationBrightlLut[BITMAP_NLUTCODES] = +{ + CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + 0xff, 0xff, 0xd7, 0x69, 0xb9, 0x81 /* Codes 1-6 */ +}; + +# endif /* DARK_CALIB_ICON */ + +# else /* CONFIG_NXWIDGETS_GREYSCALE */ + +/* RGB8 (332) Colors */ + +# ifdef DARK_CALIB_ICON + +static const nxgl_mxpixel_t g_calibrationNormalLut[BITMAP_NLUTCODES] = +{ + CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + 0xb6, 0xb6, 0x92, 0x24, 0xac, 0x84 /* Codes 1-6 */ +}; + +static const nxgl_mxpixel_t g_calibrationBrightlLut[BITMAP_NLUTCODES] = +{ + CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + 0xff, 0xff, 0xb6, 0x49, 0xf0, 0xa8 /* Codes 1-6 */ +}; + +# else /* DARK_CALIB_ICON */ + +static const nxgl_mxpixel_t g_calibrationNormalLut[BITMAP_NLUTCODES] = +{ + CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + 0xff, 0xff, 0xb6, 0x49, 0xf0, 0xa8 /* Codes 1-6 */ +}; + +static const nxgl_mxpixel_t g_calibrationBrightlLut[BITMAP_NLUTCODES] = +{ + CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + 0xff, 0xff, 0xdb, 0x6d, 0xf4, 0xcc /* Codes 1-6 */ +}; + +# endif /* DARK_CALIB_ICON */ +# endif /* CONFIG_NXWIDGETS_GREYSCALE */ +#else +# error Unsupported pixel format +#endif + +static const struct NXWidgets::SRlePaletteBitmapEntry g_calibrationRleEntries[] = +{ + { 22, 0}, { 1, 1}, { 2, 2}, { 1, 3}, { 12, 0}, { 2, 1}, { 2, 0}, /* Row 0 */ + { 28, 0}, { 1, 1}, { 2, 2}, { 1, 3}, { 10, 0}, /* Row 1 */ + { 1, 0}, { 1, 2}, { 2, 1}, { 1, 3}, { 2, 0}, { 1, 2}, { 26, 0}, { 1, 1}, /* Row 2 */ + { 2, 2}, { 1, 3}, { 4, 0}, + { 6, 0}, { 2, 1}, { 2, 4}, { 4, 1}, { 26, 0}, { 1, 1}, { 1, 2}, /* Row 3 */ + { 1, 2}, { 1, 3}, { 8, 0}, { 1, 2}, { 2, 1}, { 1, 3}, { 2, 4}, { 1, 1}, /* Row 4 */ + { 3, 3}, { 22, 0}, + { 4, 0}, { 1, 1}, { 2, 2}, { 1, 3}, { 6, 0}, { 1, 2}, { 1, 1}, { 2, 3}, /* Row 5 */ + { 2, 4}, { 2, 2}, { 1, 3}, { 19, 0}, + { 10, 0}, { 1, 1}, { 2, 2}, { 1, 3}, { 4, 0}, { 1, 2}, { 2, 1}, { 1, 3}, /* Row 6 */ + { 4, 0}, { 2, 2}, { 14, 0}, + { 16, 0}, { 2, 1}, { 2, 2}, { 2, 0}, { 1, 2}, { 1, 1}, { 2, 3}, { 1, 4}, /* Row 7 */ + { 5, 0}, { 1, 1}, { 1, 2}, { 8, 0}, + { 22, 0}, { 2, 1}, { 2, 2}, { 3, 1}, { 1, 3}, { 1, 4}, { 7, 0}, { 1, 1}, /* Row 8 */ + { 1, 2}, { 2, 0}, + { 26, 0}, { 1, 2}, { 1, 1}, { 4, 2}, { 2, 3}, { 1, 4}, { 7, 0}, /* Row 9 */ + { 2, 0}, { 1, 1}, { 1, 2}, { 26, 0}, { 1, 2}, { 3, 1}, { 4, 2}, { 4, 0}, /* Row 10 */ + { 8, 0}, { 1, 1}, { 1, 2}, { 16, 0}, { 1, 1}, { 1, 3}, { 6, 0}, { 2, 1}, /* Row 11 */ + { 2, 3}, { 1, 4}, { 1, 0}, { 2, 1}, + { 1, 2}, { 1, 3}, { 11, 0}, { 1, 1}, { 2, 2}, { 1, 4}, { 11, 0}, { 1, 2}, /* Row 12 */ + { 2, 0}, { 2, 1}, { 2, 3}, { 3, 0}, { 1, 2}, { 2, 1}, { 1, 3}, + { 1, 4}, { 3, 0}, { 1, 1}, { 2, 2}, { 1, 3}, { 10, 0}, { 2, 1}, { 3, 2}, /* Row 13 */ + { 1, 4}, { 10, 0}, { 4, 1}, { 2, 4}, { 1, 3}, { 1, 1}, + { 2, 1}, { 2, 3}, { 1, 4}, { 5, 0}, { 1, 1}, { 2, 2}, { 1, 3}, { 9, 0}, /* Row 14 */ + { 1, 1}, { 2, 2}, { 2, 0}, { 2, 2}, { 1, 4}, { 9, 0}, { 2, 3}, + { 1, 3}, { 1, 1}, { 2, 4}, { 2, 1}, { 1, 3}, { 1, 4}, { 8, 0}, { 1, 1}, /* Row 15 */ + { 2, 2}, { 1, 3}, { 8, 0}, { 1, 2}, { 1, 1}, { 1, 2}, { 4, 0}, { 2, 2}, + { 1, 4}, { 4, 0}, + { 7, 0}, { 1, 3}, { 2, 2}, { 1, 3}, { 11, 0}, { 1, 1}, { 2, 2}, { 1, 3}, /* Row 16 */ + { 8, 0}, { 1, 1}, { 1, 2}, { 6, 0}, + { 2, 2}, { 12, 0}, { 2, 2}, { 12, 0}, { 1, 1}, { 2, 2}, { 1, 3}, { 7, 0}, /* Row 17 */ + { 1, 2}, { 1, 1}, { 1, 0}, + { 7, 0}, { 1, 2}, { 1, 4}, { 11, 0}, { 1, 1}, { 1, 2}, { 12, 0}, { 1, 1}, /* Row 18 */ + { 2, 2}, { 1, 3}, { 4, 0}, + { 3, 0}, { 1, 1}, { 1, 2}, { 8, 0}, { 2, 2}, { 11, 0}, { 1, 1}, { 1, 2}, /* Row 19 */ + { 12, 0}, { 1, 1}, { 1, 2}, + { 1, 2}, { 1, 3}, { 6, 0}, { 1, 2}, { 1, 1}, { 1, 2}, { 8, 0}, { 1, 1}, /* Row 20 */ + { 1, 2}, { 1, 4}, { 9, 0}, { 1, 1}, { 2, 2}, { 1, 4}, { 7, 0}, + { 4, 0}, { 1, 1}, { 2, 2}, { 1, 3}, { 6, 0}, { 2, 1}, { 10, 0}, { 1, 1}, /* Row 21 */ + { 1, 2}, { 8, 0}, { 2, 1}, { 3, 2}, { 1, 4}, + { 10, 0}, { 1, 1}, { 2, 2}, { 1, 3}, { 6, 0}, { 1, 1}, { 1, 2}, { 10, 0}, /* Row 22 */ + { 1, 1}, { 1, 2}, { 7, 0}, { 1, 1}, + { 2, 2}, { 2, 0}, { 2, 2}, { 1, 4}, { 9, 0}, { 1, 1}, { 2, 2}, { 1, 3}, /* Row 23 */ + { 6, 0}, { 1, 1}, { 1, 2}, { 2, 0}, { 4, 5}, { 2, 6}, { 2, 0}, { 1, 1}, + { 1, 2}, { 2, 0}, + { 4, 0}, { 1, 2}, { 1, 1}, { 1, 2}, { 4, 0}, { 2, 2}, { 1, 4}, { 8, 0}, /* Row 24 */ + { 1, 1}, { 2, 2}, { 1, 3}, { 6, 0}, { 1, 1}, { 1, 2}, { 2, 0}, { 4, 5}, + { 2, 6}, + { 2, 0}, { 1, 1}, { 1, 2}, { 6, 0}, { 1, 1}, { 1, 2}, { 6, 0}, { 2, 2}, /* Row 25 */ + { 8, 0}, { 1, 1}, { 2, 2}, { 1, 3}, { 6, 0}, { 1, 1}, { 1, 2}, { 2, 0}, + { 4, 5}, { 2, 6}, { 2, 0}, { 1, 1}, { 1, 2}, { 5, 0}, { 1, 2}, { 1, 1}, /* Row 26 */ + { 8, 0}, { 1, 2}, { 1, 4}, { 7, 0}, { 1, 1}, { 2, 2}, { 1, 3}, { 4, 0}, + { 2, 0}, { 1, 1}, { 1, 2}, { 2, 0}, { 4, 5}, { 2, 6}, { 2, 0}, { 1, 1}, /* Row 27 */ + { 1, 2}, { 5, 0}, { 1, 1}, { 1, 2}, { 8, 0}, { 2, 2}, { 7, 0}, { 1, 1}, + { 1, 2}, + { 1, 2}, { 1, 3}, { 4, 0}, { 4, 1}, { 10, 2}, { 4, 3}, { 2, 0}, { 1, 2}, /* Row 28 */ + { 1, 1}, { 1, 2}, { 1, 0}, { 4, 5}, { 2, 6}, { 1, 0}, { 1, 1}, { 1, 2}, + { 1, 4}, { 2, 0}, + { 4, 0}, { 1, 1}, { 2, 2}, { 1, 3}, { 4, 0}, { 4, 1}, { 10, 2}, { 4, 3}, /* Row 29 */ + { 2, 0}, { 2, 1}, { 2, 0}, { 4, 5}, { 2, 6}, + { 2, 0}, { 1, 1}, { 1, 2}, { 6, 0}, { 1, 1}, { 2, 2}, { 1, 3}, { 24, 0}, /* Row 30 */ + { 1, 1}, { 1, 2}, { 2, 0}, + { 4, 5}, { 2, 6}, { 2, 0}, { 1, 1}, { 1, 2}, { 6, 0}, { 1, 1}, { 2, 2}, /* Row 31 */ + { 1, 3}, { 22, 0}, + { 2, 0}, { 1, 1}, { 1, 2}, { 2, 0}, { 4, 5}, { 2, 6}, { 2, 0}, { 1, 1}, /* Row 32 */ + { 1, 2}, { 6, 0}, { 1, 1}, { 2, 2}, { 1, 3}, { 16, 0}, + { 8, 0}, { 1, 1}, { 1, 2}, { 2, 0}, { 4, 5}, { 2, 6}, { 2, 0}, { 1, 1}, /* Row 33 */ + { 1, 2}, { 6, 0}, { 1, 1}, { 2, 2}, { 1, 3}, { 10, 0}, + { 14, 0}, { 1, 1}, { 1, 2}, { 2, 0}, { 4, 5}, { 2, 6}, { 2, 0}, { 1, 1}, /* Row 34 */ + { 1, 2}, { 6, 0}, { 1, 1}, { 2, 2}, { 1, 3}, { 4, 0}, + { 20, 0}, { 1, 1}, { 1, 2}, { 2, 0}, { 4, 5}, { 2, 6}, { 2, 0}, { 1, 1}, /* Row 35 */ + { 1, 2}, { 6, 0}, { 1, 1}, { 1, 2}, + { 1, 2}, { 1, 3}, { 22, 0}, { 4, 1}, { 10, 2}, { 4, 3}, /* Row 36 */ + { 4, 0}, { 1, 1}, { 2, 2}, { 1, 3}, { 22, 0}, { 4, 1}, { 8, 2}, /* Row 37 */ + { 2, 2}, { 4, 3}, { 4, 0}, { 1, 1}, { 2, 2}, { 1, 3}, { 28, 0}, /* Row 38 */ + { 16, 0}, { 1, 1}, { 2, 2}, { 1, 3}, { 22, 0}, /* Row 39 */ + { 22, 0}, { 1, 1}, { 2, 2}, { 1, 3}, { 16, 0}, /* Row 40 */ + { 26, 0}, { 1, 2}, { 1, 1}, { 4, 2}, { 1, 3}, { 1, 4}, { 8, 0} /* Row 41 */ +}; + +/******************************************************************************************** + * Public Bitmap Structure Definitions + ********************************************************************************************/ + +const struct NXWidgets::SRlePaletteBitmap NxWM::g_calibrationBitmap = +{ + CONFIG_NXWIDGETS_BPP, // bpp - Bits per pixel + CONFIG_NXWIDGETS_FMT, // fmt - Color format + BITMAP_NLUTCODES, // nlut - Number of colors in the lLook-Up Table (LUT) + BITMAP_NCOLUMNS, // width - Width in pixels + BITMAP_NROWS, // height - Height in rows + { // lut - Pointer to the beginning of the Look-Up Table (LUT) + g_calibrationNormalLut, // Index 0: Unselected LUT + g_calibrationBrightlLut, // Index 1: Selected LUT + }, + g_calibrationRleEntries // data - Pointer to the beginning of the RLE data +}; diff --git a/nxwm/src/glyph_cmd49x43.cxx b/nxwm/src/glyph_cmd49x43.cxx index b5a44f932..62fa24673 100644 --- a/nxwm/src/glyph_cmd49x43.cxx +++ b/nxwm/src/glyph_cmd49x43.cxx @@ -60,7 +60,7 @@ #define BITMAP_NCOLUMNS 49 #define BITMAP_NLUTCODES 11 -#define __DARK_ICON 1 +#define DARK_CMD_ICON 1 /******************************************************************************************** * Private Bitmap Data @@ -71,7 +71,7 @@ using namespace NxWM; /* RGB24 (8-8-8) Colors */ #if CONFIG_NXWIDGETS_BPP == 24 || CONFIG_NXWIDGETS_BPP == 32 -# ifdef __DARK_ICON +# ifdef DARK_CMD_ICON static const uint32_t g_cmdNormalLut[BITMAP_NLUTCODES] = { @@ -85,7 +85,7 @@ static const uint32_t g_cmdBrightlLut[BITMAP_NLUTCODES] = 0xfcfcfc, 0x545454, 0x000000 /* Codes 8-10 */ }; -# else /* __DARK_ICON */ +# else /* DARK_CMD_ICON */ static const uint32_t g_cmdNormalLut[BITMAP_NLUTCODES] = { @@ -98,12 +98,12 @@ static const uint32_t g_cmdBrightlLut[BITMAP_NLUTCODES] = 0xfafafa, 0x8c8c8c, 0x464646, 0xd7d7d7, 0x0023d7, 0xff0000, 0x0023ff, 0xff0000, /* Codes 0-7 */ 0xffffff, 0x696969, 0x000000 /* Codes 8-10 */ }; -# endif /* __DARK_ICON */ +# endif /* DARK_CMD_ICON */ /* RGB16 (565) Colors */ #elif CONFIG_NXWIDGETS_BPP == 16 -# ifdef __DARK_ICON +# ifdef DARK_CMD_ICON static const uint16_t g_cmdNormalLut[BITMAP_NLUTCODES] = { @@ -117,7 +117,7 @@ static const uint16_t g_cmdBrightlLut[BITMAP_NLUTCODES] = 0x0000 /* Codes 10-10 */ }; -# else /* __DARK_ICON */ +# else /* DARK_CMD_ICON */ static const uint16_t g_cmdNormalLut[BITMAP_NLUTCODES] = { @@ -131,7 +131,7 @@ static const uint16_t g_cmdBrightlLut[BITMAP_NLUTCODES] = 0x0000 /* Codes 10-10 */ }; -# endif /* __DARK_ICON */ +# endif /* DARK_CMD_ICON */ /* 8-bit color lookups. NOTE: This is really dumb! The lookup index is 8-bits and it used * to lookup an 8-bit value. There is no savings in that! It would be better to just put @@ -145,7 +145,7 @@ static const uint16_t g_cmdBrightlLut[BITMAP_NLUTCODES] = /* 8-bit Greyscale */ -# ifdef __DARK_ICON +# ifdef DARK_CMD_ICON static const uint8_t g_cmdNormalLut[BITMAP_NLUTCODES] = { @@ -157,7 +157,7 @@ static const uint8_t g_cmdBrightlLut[BITMAP_NLUTCODES] = 0xc8, 0x70, 0x38, 0xac, 0x24, 0x44, 0x2a, 0x4b, 0xfc, 0x54, 0x00 /* Codes 0-10 */ }; -# else /* __DARK_ICON */ +# else /* DARK_CMD_ICON */ static const uint8_t g_cmdNormalLut[BITMAP_NLUTCODES] = { @@ -169,13 +169,13 @@ static const uint8_t g_cmdBrightlLut[BITMAP_NLUTCODES] = 0xfa, 0x8c, 0x46, 0xd7, 0x2d, 0x4c, 0x31, 0x4c, 0xff, 0x69, 0x00 /* Codes 0-10 */ }; -# endif /* __DARK_ICON */ +# endif /* DARK_CMD_ICON */ # else /* CONFIG_NXWIDGETS_GREYSCALE */ /* RGB8 (332) Colors */ -# ifdef __DARK_ICON +# ifdef DARK_CMD_ICON static const nxgl_mxpixel_t g_cmdNormalLut[BITMAP_NLUTCODES] = { @@ -187,7 +187,7 @@ static const nxgl_mxpixel_t g_cmdBrightlLut[BITMAP_NLUTCODES] = 0xdb, 0x6d, 0x24, 0xb6, 0x02, 0xe0, 0x03, 0xe0, 0xff, 0x49, 0x00 /* Codes 0-10 */ }; -# else /* __DARK_ICON */ +# else /* DARK_CMD_ICON */ static const nxgl_mxpixel_t g_cmdNormalLut[BITMAP_NLUTCODES] = { @@ -199,7 +199,7 @@ static const nxgl_mxpixel_t g_cmdBrightlLut[BITMAP_NLUTCODES] = 0xff, 0x92, 0x49, 0xdb, 0x07, 0xe0, 0x07, 0xe0, 0xff, 0x6d, 0x00 /* Codes 0-10 */ }; -# endif /* __DARK_ICON */ +# endif /* DARK_CMD_ICON */ # endif /* CONFIG_NXWIDGETS_GREYSCALE */ #else # error Unsupported pixel format