sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

NxWM: Fix background color in 48x48 play glyph

Browse Source
This commit is contained in:
Gregory Nutt 2014-07-13 18:21:46 -06:00
parent 758a6ee58a
commit db76c87a22
7 changed files with 143 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nxwm/src/glyph_calculator24x25.cxx
View File

@ -75,7 +75,7 @@ static const uint32_t g_calculatorNormalLut[BITMAP_NLUTCODES] =
0xfcfcfc, 0xb8bcbc, 0xf8f8f8, 0x6890c8, 0x384c80, 0xe8e8e8, 0x646464, 0x909090 /* Codes 0-7 */
};
static const uint32_t g_calculatorBrightlLut[BITMAP_NLUTCODES] =
static const uint32_t g_calculatorBrightLut[BITMAP_NLUTCODES] =
{
0xffffff, 0xc9cccc, 0xf9f9f9, 0x8dabd5, 0x69789f, 0xededed, 0x8a8a8a, 0xababab /* Codes 0-7 */
};
@ -89,7 +89,7 @@ static const uint16_t g_calculatorNormalLut[BITMAP_NLUTCODES] =
0xffff, 0xbdf7, 0xffdf, 0x6c99, 0x3a70, 0xef5d, 0x632c, 0x9492 /* Codes 0-7 */
};
static const uint16_t g_calculatorBrightlLut[BITMAP_NLUTCODES] =
static const uint16_t g_calculatorBrightLut[BITMAP_NLUTCODES] =
{
0xffff, 0xce79, 0xffdf, 0x8d5a, 0x6bd3, 0xef7d, 0x8c51, 0xad55 /* Codes 0-7 */
};
@ -109,7 +109,7 @@ static const uint8_t g_calculatorNormalLut[BITMAP_NLUTCODES] =
0xfc, 0xba, 0xf8, 0x8a, 0x4b, 0xe8, 0x64, 0x90 /* Codes 0-7 */
};
static const uint8_t g_calculatorBrightlLut[BITMAP_NLUTCODES] =
static const uint8_t g_calculatorBrightLut[BITMAP_NLUTCODES] =
{
0xff, 0xcb, 0xf9, 0xa6, 0x77, 0xed, 0x8a, 0xab /* Codes 0-7 */
};
@ -121,7 +121,7 @@ static const nxgl_mxpixel_t g_calculatorNormalLut[BITMAP_NLUTCODES] =
0xff, 0xb7, 0xff, 0x73, 0x2a, 0xff, 0x6d, 0x92 /* Codes 0-7 */
};
static const nxgl_mxpixel_t g_calculatorBrightlLut[BITMAP_NLUTCODES] =
static const nxgl_mxpixel_t g_calculatorBrightLut[BITMAP_NLUTCODES] =
{
0xff, 0xdb, 0xff, 0x97, 0x6e, 0xff, 0x92, 0xb6 /* Codes 0-7 */
};
@ -185,7 +185,7 @@ const struct NXWidgets::SRlePaletteBitmap NxWM::g_calculatorBitmap =
BITMAP_NROWS, // height - Height in rows
{ // lut - Pointer to the beginning of the Look-Up Table (LUT)
g_calculatorNormalLut, // Index 0: Unselected LUT
g_calculatorBrightlLut, // Index 1: Selected LUT
g_calculatorBrightLut, // Index 1: Selected LUT
},
g_calculatorRleEntries // data - Pointer to the beginning of the RLE data
};

22
nxwm/src/glyph_calculator47x49.cxx
View File

@ -79,7 +79,7 @@ static const uint32_t g_calculatorNormalLut[BITMAP_NLUTCODES] =
0x2a2a6c, 0x2a5481, 0x818181, 0x3f3f3f, 0x6c6c6c /* Codes 8-12 */
};
static const uint32_t g_calculatorBrightlLut[BITMAP_NLUTCODES] =
static const uint32_t g_calculatorBrightLut[BITMAP_NLUTCODES] =
{
0xe4e4e4, 0xc8c8c8, 0xfcfcfc, 0x707070, 0x7090c8, 0x70acc8, 0x385490, 0x5490c8, /* Codes 0-7 */
0x383890, 0x3870ac, 0xacacac, 0x545454, 0x909090 /* Codes 8-12 */
@ -93,7 +93,7 @@ static const uint32_t g_calculatorNormalLut[BITMAP_NLUTCODES] =
0x383890, 0x3870ac, 0xacacac, 0x545454, 0x909090 /* Codes 8-12 */
};
static const uint32_t g_calculatorBrightlLut[BITMAP_NLUTCODES] =
static const uint32_t g_calculatorBrightLut[BITMAP_NLUTCODES] =
{
0xffffff, 0xfafafa, 0xffffff, 0x8c8c8c, 0x8cb4fa, 0x8cd7fa, 0x4669b4, 0x69b4fa, /* Codes 0-7 */
0x4646b4, 0x468cd7, 0xd7d7d7, 0x696969, 0xb4b4b4 /* Codes 8-12 */
@ -111,7 +111,7 @@ static const uint16_t g_calculatorNormalLut[BITMAP_NLUTCODES] =
0x8410, 0x39e7, 0x6b6d, /* Codes 10-12 */
};
static const uint16_t g_calculatorBrightlLut[BITMAP_NLUTCODES] =
static const uint16_t g_calculatorBrightLut[BITMAP_NLUTCODES] =
{
0xe73c, 0xce59, 0xffff, 0x738e, 0x7499, 0x7579, 0x3ab2, 0x5499, 0x39d2, 0x3b95, /* Codes 0-9 */
0xad75, 0x52aa, 0x9492 /* Codes 10-12 */
@ -125,7 +125,7 @@ static const uint16_t g_calculatorNormalLut[BITMAP_NLUTCODES] =
0xad75, 0x52aa, 0x9492 /* Codes 10-12 */
};
static const uint16_t g_calculatorBrightlLut[BITMAP_NLUTCODES] =
static const uint16_t g_calculatorBrightLut[BITMAP_NLUTCODES] =
{
0xffff, 0xffdf, 0xffff, 0x8c71, 0x8dbf, 0x8ebf, 0x4356, 0x6dbf, 0x4236, 0x447a, /* Codes 0-9 */
0xd6ba, 0x6b4d, 0xb5b6 /* Codes 10-12 */
@ -152,7 +152,7 @@ static const uint8_t g_calculatorNormalLut[BITMAP_NLUTCODES] =
0xab, 0x96, 0xbd, 0x54, 0x69, 0x75, 0x3d, 0x63, 0x31, 0x4c, 0x81, 0x3f, 0x6c /* Codes 0-12 */
};
static const uint8_t g_calculatorBrightlLut[BITMAP_NLUTCODES] =
static const uint8_t g_calculatorBrightLut[BITMAP_NLUTCODES] =
{
0xe4, 0xc8, 0xfc, 0x70, 0x8c, 0x9d, 0x52, 0x84, 0x42, 0x66, 0xac, 0x54, 0x90 /* Codes 0-12 */
};
@ -164,7 +164,7 @@ static const uint8_t g_calculatorNormalLut[BITMAP_NLUTCODES] =
0xe4, 0xc8, 0xfc, 0x70, 0x8c, 0x9d, 0x52, 0x84, 0x42, 0x66, 0xac, 0x54, 0x90 /* Codes 0-12 */
};
static const uint8_t g_calculatorBrightlLut[BITMAP_NLUTCODES] =
static const uint8_t g_calculatorBrightLut[BITMAP_NLUTCODES] =
{
0xff, 0xfa, 0xff, 0x8c, 0xb0, 0xc4, 0x67, 0xa5, 0x52, 0x7f, 0xd7, 0x69, 0xb4 /* Codes 0-12 */
};
@ -182,7 +182,7 @@ static const nxgl_mxpixel_t g_calculatorNormalLut[BITMAP_NLUTCODES] =
0xb6, 0x92, 0xb6, 0x49, 0x4e, 0x52, 0x25, 0x2e, 0x25, 0x2a, 0x92, 0x24, 0x6d /* Codes 0-12 */
};
static const nxgl_mxpixel_t g_calculatorBrightlLut[BITMAP_NLUTCODES] =
static const nxgl_mxpixel_t g_calculatorBrightLut[BITMAP_NLUTCODES] =
{
0xff, 0xdb, 0xff, 0x6d, 0x73, 0x77, 0x2a, 0x53, 0x26, 0x2e, 0xb6, 0x49, 0x92 /* Codes 0-12 */
};
@ -194,7 +194,7 @@ static const nxgl_mxpixel_t g_calculatorNormalLut[BITMAP_NLUTCODES] =
0xff, 0xdb, 0xff, 0x6d, 0x73, 0x77, 0x2a, 0x53, 0x26, 0x2e, 0xb6, 0x49, 0x92 /* Codes 0-12 */
};
static const nxgl_mxpixel_t g_calculatorBrightlLut[BITMAP_NLUTCODES] =
static const nxgl_mxpixel_t g_calculatorBrightLut[BITMAP_NLUTCODES] =
{
0xff, 0xff, 0xff, 0x92, 0x97, 0x9b, 0x4e, 0x77, 0x4a, 0x53, 0xdb, 0x6d, 0xb6 /* Codes 0-12 */
};
@ -367,10 +367,10 @@ const struct NXWidgets::SRlePaletteBitmap NxWM::g_calculatorBitmap =
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)
{ // lut - Pointer to the beginning of the Look-Up Table (LUT)
g_calculatorNormalLut, // Index 0: Unselected LUT
g_calculatorBrightlLut, // Index 1: Selected LUT
g_calculatorBrightLut, // Index 1: Selected LUT
},
g_calculatorRleEntries // data - Pointer to the beginning of the RLE data
g_calculatorRleEntries // data - Pointer to the beginning of the RLE data
};

176
nxwm/src/glyph_calibration48x42.cxx
View File

@ -79,7 +79,7 @@ static const uint32_t g_calibrationNormalLut[BITMAP_NLUTCODES] =
0xbdbdbd, 0xababab, 0x818181, 0x3f3f3f, 0xab6c15, 0x813f15 /* Codes 1-6 */
};
static const uint32_t g_calibrationBrightlLut[BITMAP_NLUTCODES] =
static const uint32_t g_calibrationBrightLut[BITMAP_NLUTCODES] =
{
CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */
0xfcfcfc, 0xe4e4e4, 0xacacac, 0x545454, 0xe4901c, 0xac541c /* Codes 1-6 */
@ -93,7 +93,7 @@ static const uint32_t g_calibrationNormalLut[BITMAP_NLUTCODES] =
0xfcfcfc, 0xe4e4e4, 0xacacac, 0x545454, 0xe4901c, 0xac541c /* Codes 1-6 */
};
static const uint32_t g_calibrationBrightlLut[BITMAP_NLUTCODES] =
static const uint32_t g_calibrationBrightLut[BITMAP_NLUTCODES] =
{
CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */
0xffffff, 0xffffff, 0xd7d7d7, 0x696969, 0xffb423, 0xd76923 /* Codes 1-6 */
@ -111,7 +111,7 @@ static const uint16_t g_calibrationNormalLut[BITMAP_NLUTCODES] =
0xbdf7, 0xad55, 0x8410, 0x39e7, 0xab62, 0x81e2 /* Codes 1-6 */
};
static const uint16_t g_calibrationBrightlLut[BITMAP_NLUTCODES] =
static const uint16_t g_calibrationBrightLut[BITMAP_NLUTCODES] =
{
CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */
0xffff, 0xe73c, 0xad75, 0x52aa, 0xe483, 0xaaa3 /* Codes 1-6 */
@ -125,7 +125,7 @@ static const uint16_t g_calibrationNormalLut[BITMAP_NLUTCODES] =
0xffff, 0xe73c, 0xad75, 0x52aa, 0xe483, 0xaaa3 /* Codes 1-6 */
};
static const uint16_t g_calibrationBrightlLut[BITMAP_NLUTCODES] =
static const uint16_t g_calibrationBrightLut[BITMAP_NLUTCODES] =
{
CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */
0xffff, 0xffff, 0xd6ba, 0x6b4d, 0xfda4, 0xd344 /* Codes 1-6 */
@ -153,7 +153,7 @@ static const uint8_t g_calibrationNormalLut[BITMAP_NLUTCODES] =
0xbd, 0xab, 0x81, 0x3f, 0x74, 0x4d /* Codes 1-6 */
};
static const uint8_t g_calibrationBrightlLut[BITMAP_NLUTCODES] =
static const uint8_t g_calibrationBrightLut[BITMAP_NLUTCODES] =
{
CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */
0xfc, 0xe4, 0xac, 0x54, 0x9b, 0x67 /* Codes 1-6 */
@ -167,7 +167,7 @@ static const uint8_t g_calibrationNormalLut[BITMAP_NLUTCODES] =
0xfc, 0xe4, 0xac, 0x54, 0x9b, 0x67 /* Codes 1-6 */
};
static const uint8_t g_calibrationBrightlLut[BITMAP_NLUTCODES] =
static const uint8_t g_calibrationBrightLut[BITMAP_NLUTCODES] =
{
CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */
0xff, 0xff, 0xd7, 0x69, 0xb9, 0x81 /* Codes 1-6 */
@ -187,7 +187,7 @@ static const nxgl_mxpixel_t g_calibrationNormalLut[BITMAP_NLUTCODES] =
0xb6, 0xb6, 0x92, 0x24, 0xac, 0x84 /* Codes 1-6 */
};
static const nxgl_mxpixel_t g_calibrationBrightlLut[BITMAP_NLUTCODES] =
static const nxgl_mxpixel_t g_calibrationBrightLut[BITMAP_NLUTCODES] =
{
CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */
0xff, 0xff, 0xb6, 0x49, 0xf0, 0xa8 /* Codes 1-6 */
@ -201,7 +201,7 @@ static const nxgl_mxpixel_t g_calibrationNormalLut[BITMAP_NLUTCODES] =
0xff, 0xff, 0xb6, 0x49, 0xf0, 0xa8 /* Codes 1-6 */
};
static const nxgl_mxpixel_t g_calibrationBrightlLut[BITMAP_NLUTCODES] =
static const nxgl_mxpixel_t g_calibrationBrightLut[BITMAP_NLUTCODES] =
{
CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */
0xff, 0xff, 0xdb, 0x6d, 0xf4, 0xcc /* Codes 1-6 */
@ -215,84 +215,86 @@ static const nxgl_mxpixel_t g_calibrationBrightlLut[BITMAP_NLUTCODES] =
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 */
{22, 0}, { 1, 1}, { 2, 2}, { 1, 3}, {12, 0}, { 2, 1}, { 8, 0}, /* Row 0 */
{22, 0}, { 1, 1}, { 2, 2}, { 1, 3}, {11, 0}, { 1, 2}, { 2, 1}, { 1, 3}, /* Row 1 */
{ 2, 0}, { 1, 2}, { 4, 0},
{22, 0}, { 1, 1}, { 2, 2}, { 1, 3}, {10, 0}, { 2, 1}, { 2, 4}, { 4, 1}, /* Row 2 */
{ 4, 0},
{22, 0}, { 1, 1}, { 2, 2}, { 1, 3}, { 8, 0}, { 1, 2}, { 2, 1}, { 1, 3}, /* Row 3 */
{ 2, 4}, { 1, 1}, { 3, 3}, { 4, 0},
{22, 0}, { 1, 1}, { 2, 2}, { 1, 3}, { 6, 0}, { 1, 2}, { 1, 1}, { 2, 3}, /* Row 4 */
{ 2, 4}, { 2, 2}, { 1, 3}, { 7, 0},
{22, 0}, { 1, 1}, { 2, 2}, { 1, 3}, { 4, 0}, { 1, 2}, { 2, 1}, { 1, 3}, /* Row 5 */
{ 4, 0}, { 2, 2}, { 8, 0},
{22, 0}, { 2, 1}, { 2, 2}, { 2, 0}, { 1, 2}, { 1, 1}, { 2, 3}, { 1, 4}, /* Row 6 */
{ 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 7 */
{ 1, 2}, { 8, 0},
{20, 0}, { 1, 2}, { 1, 1}, { 4, 2}, { 2, 3}, { 1, 4}, { 9, 0}, { 1, 1}, /* Row 8 */
{ 1, 2}, { 8, 0},
{18, 0}, { 1, 2}, { 3, 1}, { 4, 2}, {12, 0}, { 1, 1}, { 1, 2}, { 8, 0}, /* Row 9 */
{ 8, 0}, { 1, 1}, { 1, 3}, { 6, 0}, { 2, 1}, { 2, 3}, { 1, 4}, { 1, 0}, /* Row 10 */
{ 2, 1}, { 1, 2}, { 1, 3}, {11, 0}, { 1, 1}, { 2, 2}, { 1, 4}, { 7, 0},
{ 4, 0}, { 1, 2}, { 2, 0}, { 2, 1}, { 2, 3}, { 3, 0}, { 1, 2}, { 2, 1}, /* Row 11 */
{ 1, 3}, { 1, 4}, { 3, 0}, { 1, 1}, { 2, 2}, { 1, 3}, {10, 0}, { 2, 1},
{ 3, 2}, { 1, 4}, { 6, 0},
{ 4, 0}, { 4, 1}, { 2, 4}, { 1, 3}, { 3, 1}, { 2, 3}, { 1, 4}, { 5, 0}, /* Row 12 */
{ 1, 1}, { 2, 2}, { 1, 3}, { 9, 0}, { 1, 1}, { 2, 2}, { 2, 0}, { 2, 2},
{ 1, 4}, { 5, 0},
{ 4, 0}, { 3, 3}, { 1, 1}, { 2, 4}, { 2, 1}, { 1, 3}, { 1, 4}, { 8, 0}, /* Row 13 */
{ 1, 1}, { 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 14 */
{ 8, 0}, { 1, 1}, { 1, 2}, { 6, 0}, { 2, 2}, { 4, 0},
{ 8, 0}, { 2, 2}, {12, 0}, { 1, 1}, { 2, 2}, { 1, 3}, { 7, 0}, { 1, 2}, /* Row 15 */
{ 1, 1}, { 8, 0}, { 1, 2}, { 1, 4}, { 3, 0},
{ 8, 0}, { 1, 1}, { 1, 2}, {12, 0}, { 1, 1}, { 2, 2}, { 1, 3}, { 7, 0}, /* Row 16 */
{ 1, 1}, { 1, 2}, { 8, 0}, { 2, 2}, { 3, 0},
{ 8, 0}, { 1, 1}, { 1, 2}, {12, 0}, { 1, 1}, { 2, 2}, { 1, 3}, { 6, 0}, /* Row 17 */
{ 1, 2}, { 1, 1}, { 1, 2}, { 8, 0}, { 1, 1}, { 1, 2}, { 1, 4}, { 2, 0},
{ 7, 0}, { 1, 1}, { 2, 2}, { 1, 4}, {11, 0}, { 1, 1}, { 2, 2}, { 1, 3}, /* Row 18 */
{ 6, 0}, { 2, 1}, {10, 0}, { 1, 1}, { 1, 2}, { 2, 0},
{ 6, 0}, { 2, 1}, { 3, 2}, { 1, 4}, {10, 0}, { 1, 1}, { 2, 2}, { 1, 3}, /* Row 19 */
{ 6, 0}, { 1, 1}, { 1, 2}, {10, 0}, { 1, 1}, { 1, 2}, { 2, 0},
{ 5, 0}, { 1, 1}, { 2, 2}, { 2, 0}, { 2, 2}, { 1, 4}, { 9, 0}, { 1, 1}, /* Row 20 */
{ 2, 2}, { 1, 3}, { 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 21 */
{ 1, 1}, { 2, 2}, { 1, 3}, { 6, 0}, { 1, 1}, { 1, 2}, { 2, 0}, { 4, 5},
{ 2, 6}, { 2, 0}, { 1, 1}, { 1, 2}, { 2, 0},
{ 4, 0}, { 1, 1}, { 1, 2}, { 6, 0}, { 2, 2}, { 8, 0}, { 1, 1}, { 2, 2}, /* Row 22 */
{ 1, 3}, { 6, 0}, { 1, 1}, { 1, 2}, { 2, 0}, { 4, 5}, { 2, 6}, { 2, 0},
{ 1, 1}, { 1, 2}, { 2, 0},
{ 3, 0}, { 1, 2}, { 1, 1}, { 8, 0}, { 1, 2}, { 1, 4}, { 7, 0}, { 1, 1}, /* Row 23 */
{ 2, 2}, { 1, 3}, { 6, 0}, { 1, 1}, { 1, 2}, { 2, 0}, { 4, 5}, { 2, 6},
{ 2, 0}, { 1, 1}, { 1, 2}, { 2, 0},
{ 3, 0}, { 1, 1}, { 1, 2}, { 8, 0}, { 2, 2}, { 7, 0}, { 1, 1}, { 2, 2}, /* Row 24 */
{ 1, 3}, { 4, 0}, { 4, 1}, {10, 2}, { 4, 3},
{ 2, 0}, { 1, 2}, { 1, 1}, { 1, 2}, { 1, 0}, { 4, 5}, { 2, 6}, { 1, 0}, /* Row 25 */
{ 1, 1}, { 1, 2}, { 1, 4}, { 6, 0}, { 1, 1}, { 2, 2}, { 1, 3}, { 4, 0},
{ 4, 1}, {10, 2}, { 4, 3},
{ 2, 0}, { 2, 1}, { 2, 0}, { 4, 5}, { 2, 6}, { 2, 0}, { 1, 1}, { 1, 2}, /* Row 26 */
{ 6, 0}, { 1, 1}, { 2, 2}, { 1, 3}, {22, 0},
{ 2, 0}, { 1, 1}, { 1, 2}, { 2, 0}, { 4, 5}, { 2, 6}, { 2, 0}, { 1, 1}, /* Row 27 */
{ 1, 2}, { 6, 0}, { 1, 1}, { 2, 2}, { 1, 3}, {22, 0},
{ 2, 0}, { 1, 1}, { 1, 2}, { 2, 0}, { 4, 5}, { 2, 6}, { 2, 0}, { 1, 1}, /* Row 28 */
{ 1, 2}, { 6, 0}, { 1, 1}, { 2, 2}, { 1, 3}, {22, 0},
{ 2, 0}, { 1, 1}, { 1, 2}, { 2, 0}, { 4, 5}, { 2, 6}, { 2, 0}, { 1, 1}, /* Row 29 */
{ 1, 2}, { 6, 0}, { 1, 1}, { 2, 2}, { 1, 3}, {22, 0},
{ 2, 0}, { 1, 1}, { 1, 2}, { 2, 0}, { 4, 5}, { 2, 6}, { 2, 0}, { 1, 1}, /* Row 30 */
{ 1, 2}, { 6, 0}, { 1, 1}, { 2, 2}, { 1, 3}, {22, 0},
{ 2, 0}, { 1, 1}, { 1, 2}, { 2, 0}, { 4, 5}, { 2, 6}, { 2, 0}, { 1, 1}, /* Row 31 */
{ 1, 2}, { 6, 0}, { 1, 1}, { 2, 2}, { 1, 3}, {22, 0},
{ 4, 1}, {10, 2}, { 4, 3}, { 4, 0}, { 1, 1}, { 2, 2}, { 1, 3}, {22, 0}, /* Row 32 */
{ 4, 1}, {10, 2}, { 4, 3}, { 4, 0}, { 1, 1}, { 2, 2}, { 1, 3}, {22, 0}, /* Row 33 */
{22, 0}, { 1, 1}, { 2, 2}, { 1, 3}, {22, 0}, /* Row 34 */
{22, 0}, { 1, 1}, { 2, 2}, { 1, 3}, {22, 0}, /* Row 35 */
{20, 0}, { 1, 2}, { 1, 1}, { 4, 2}, { 1, 3}, { 1, 4}, {20, 0}, /* Row 36 */
{20, 0}, { 1, 2}, { 1, 1}, { 4, 2}, { 1, 3}, { 1, 4}, {20, 0}, /* Row 37 */
{10, 0}, { 1, 2}, { 7, 1}, {12, 2}, { 7, 3}, { 1, 4}, {10, 0}, /* Row 38 */
{10, 0}, { 1, 2}, { 7, 1}, {12, 2}, { 7, 3}, { 1, 4}, {10, 0}, /* Row 39 */
{ 8, 0}, { 1, 2}, { 7, 1}, {16, 2}, { 7, 3}, { 1, 4}, { 8, 0}, /* Row 40 */
{ 8, 0}, { 1, 2}, { 7, 1}, {16, 2}, { 7, 3}, { 1, 4}, { 8, 0} /* Row 41 */
};
/********************************************************************************************
@ -308,7 +310,7 @@ const struct NXWidgets::SRlePaletteBitmap NxWM::g_calibrationBitmap =
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_calibrationBrightLut, // Index 1: Selected LUT
},
g_calibrationRleEntries // data - Pointer to the beginning of the RLE data
};

12
nxwm/src/glyph_cmd25x22.cxx
View File

@ -75,7 +75,7 @@ static const uint32_t g_cmdNormalLut[BITMAP_NLUTCODES] =
0x909090, 0x000000, 0xb4fcfc, 0xb4d8fc, 0x6cb4fc, 0x6c6c6c, 0xfcfcfc, 0x484848
};
static const uint32_t g_cmdBrightlLut[BITMAP_NLUTCODES] =
static const uint32_t g_cmdBrightLut[BITMAP_NLUTCODES] =
{
0xababab, 0x3f3f3f, 0xc6fcfc, 0xc6e1fc, 0x90c6fc, 0x909090, 0xfcfcfc, 0x757575
};
@ -88,7 +88,7 @@ static const uint16_t g_cmdNormalLut[BITMAP_NLUTCODES] =
0x9492, 0x0000, 0xb7ff, 0xb6df, 0x6dbf, 0x6b6d, 0xffff, 0x4a49
};
static const uint16_t g_cmdBrightlLut[BITMAP_NLUTCODES] =
static const uint16_t g_cmdBrightLut[BITMAP_NLUTCODES] =
{
0xad55, 0x39e7, 0xc7ff, 0xc71f, 0x963f, 0x9492, 0xffff, 0x73ae
};
@ -110,7 +110,7 @@ static const uint8_t g_cmdNormalLut[BITMAP_NLUTCODES] =
0x90, 0x00, 0xe6, 0xd1, 0xa6, 0x6c, 0xfc, 0x48
};
static const uint8_t g_cmdBrightlLut[BITMAP_NLUTCODES] =
static const uint8_t g_cmdBrightLut[BITMAP_NLUTCODES] =
{
0xab, 0x3f, 0xeb, 0xdc, 0xbc, 0x90, 0xfc, 0x75
};
@ -124,7 +124,7 @@ static const nxgl_mxpixel_t g_cmdNormalLut[BITMAP_NLUTCODES] =
0x92, 0x00, 0xbf, 0xbb, 0x77, 0x6d, 0xff, 0x49
};
static const nxgl_mxpixel_t g_cmdBrightlLut[BITMAP_NLUTCODES] =
static const nxgl_mxpixel_t g_cmdBrightLut[BITMAP_NLUTCODES] =
{
0xb6, 0x24, 0xdf, 0xdf, 0x9b, 0x92, 0xff, 0x6d
};
@ -175,7 +175,7 @@ const struct NXWidgets::SRlePaletteBitmap NxWM::g_cmdBitmap =
BITMAP_NROWS, // height - Height in rows
{ // lut - Pointer to the beginning of the Look-Up Table (LUT)
g_cmdNormalLut, // Index 0: Unselected LUT
g_cmdBrightlLut, // Index 1: Selected LUT
g_cmdBrightLut, // Index 1: Selected LUT
},
g_cmdRleEntries // data - Pointer to the beginning of the RLE data
g_cmdRleEntries // data - Pointer to the beginning of the RLE data
};

22
nxwm/src/glyph_cmd49x43.cxx
View File

@ -79,7 +79,7 @@ static const uint32_t g_cmdNormalLut[BITMAP_NLUTCODES] =
0xbdbdbd, 0x3f3f3f /* Codes 8-9 */
};
static const uint32_t g_cmdBrightlLut[BITMAP_NLUTCODES] =
static const uint32_t g_cmdBrightLut[BITMAP_NLUTCODES] =
{
0xc8c8c8, 0x707070, 0x383838, 0xacacac, 0x001cac, 0xe40000, 0x001ce4, 0xfc0000, /* Codes 0-7 */
0xfcfcfc, 0x545454 /* Codes 8-9 */
@ -93,7 +93,7 @@ static const uint32_t g_cmdNormalLut[BITMAP_NLUTCODES] =
0xfcfcfc, 0x545454 /* Codes 8-9 */
};
static const uint32_t g_cmdBrightlLut[BITMAP_NLUTCODES] =
static const uint32_t g_cmdBrightLut[BITMAP_NLUTCODES] =
{
0xfafafa, 0x8c8c8c, 0x464646, 0xd7d7d7, 0x0023d7, 0xff0000, 0x0023ff, 0xff0000, /* Codes 0-7 */
0xffffff, 0x696969 /* Codes 8-9 */
@ -110,7 +110,7 @@ static const uint16_t g_cmdNormalLut[BITMAP_NLUTCODES] =
0x94b2, 0x52aa, 0x2945, 0x8410, 0x00b0, 0xa800, 0x00b5, 0xb800, 0xbdf7, 0x39e7 /* Codes 0-9 */
};
static const uint16_t g_cmdBrightlLut[BITMAP_NLUTCODES] =
static const uint16_t g_cmdBrightLut[BITMAP_NLUTCODES] =
{
0xce59, 0x738e, 0x39c7, 0xad75, 0x00f5, 0xe000, 0x00fc, 0xf800, 0xffff, 0x52aa /* Codes 0-9 */
};
@ -122,7 +122,7 @@ static const uint16_t g_cmdNormalLut[BITMAP_NLUTCODES] =
0xce59, 0x738e, 0x39c7, 0xad75, 0x00f5, 0xe000, 0x00fc, 0xf800, 0xffff, 0x52aa /* Codes 0-9 */
};
static const uint16_t g_cmdBrightlLut[BITMAP_NLUTCODES] =
static const uint16_t g_cmdBrightLut[BITMAP_NLUTCODES] =
{
0xffdf, 0x8c71, 0x4228, 0xd6ba, 0x011a, 0xf800, 0x011f, 0xf800, 0xffff, 0x6b4d /* Codes 0-9 */
};
@ -148,7 +148,7 @@ static const uint8_t g_cmdNormalLut[BITMAP_NLUTCODES] =
0x96, 0x54, 0x2a, 0x81, 0x1b, 0x33, 0x1f, 0x38, 0xbd, 0x3f /* Codes 0-9 */
};
static const uint8_t g_cmdBrightlLut[BITMAP_NLUTCODES] =
static const uint8_t g_cmdBrightLut[BITMAP_NLUTCODES] =
{
0xc8, 0x70, 0x38, 0xac, 0x24, 0x44, 0x2a, 0x4b, 0xfc, 0x54 /* Codes 0-9 */
};
@ -160,7 +160,7 @@ static const uint8_t g_cmdNormalLut[BITMAP_NLUTCODES] =
0xc8, 0x70, 0x38, 0xac, 0x24, 0x44, 0x2a, 0x4b, 0xfc, 0x54 /* Codes 0-9 */
};
static const uint8_t g_cmdBrightlLut[BITMAP_NLUTCODES] =
static const uint8_t g_cmdBrightLut[BITMAP_NLUTCODES] =
{
0xfa, 0x8c, 0x46, 0xd7, 0x2d, 0x4c, 0x31, 0x4c, 0xff, 0x69 /* Codes 0-9 */
};
@ -178,7 +178,7 @@ static const nxgl_mxpixel_t g_cmdNormalLut[BITMAP_NLUTCODES] =
0x92, 0x49, 0x24, 0x92, 0x02, 0xa0, 0x02, 0xa0, 0xb6, 0x24 /* Codes 0-9 */
};
static const nxgl_mxpixel_t g_cmdBrightlLut[BITMAP_NLUTCODES] =
static const nxgl_mxpixel_t g_cmdBrightLut[BITMAP_NLUTCODES] =
{
0xdb, 0x6d, 0x24, 0xb6, 0x02, 0xe0, 0x03, 0xe0, 0xff, 0x49 /* Codes 0-9 */
};
@ -190,7 +190,7 @@ static const nxgl_mxpixel_t g_cmdNormalLut[BITMAP_NLUTCODES] =
0xdb, 0x6d, 0x24, 0xb6, 0x02, 0xe0, 0x03, 0xe0, 0xff, 0x49 /* Codes 0-9 */
};
static const nxgl_mxpixel_t g_cmdBrightlLut[BITMAP_NLUTCODES] =
static const nxgl_mxpixel_t g_cmdBrightLut[BITMAP_NLUTCODES] =
{
0xff, 0x92, 0x49, 0xdb, 0x07, 0xe0, 0x07, 0xe0, 0xff, 0x6d /* Codes 0-9 */
};
@ -272,9 +272,9 @@ const struct NXWidgets::SRlePaletteBitmap NxWM::g_cmdBitmap =
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)
{ // lut - Pointer to the beginning of the Look-Up Table (LUT)
g_cmdNormalLut, // Index 0: Unselected LUT
g_cmdBrightlLut, // Index 1: Selected LUT
g_cmdBrightLut, // Index 1: Selected LUT
},
g_cmdRleEntries // data - Pointer to the beginning of the RLE data
g_cmdRleEntries // data - Pointer to the beginning of the RLE data
};

20
nxwm/src/glyph_play24x24.cxx
View File

@ -79,7 +79,7 @@ static const uint32_t g_playNormalLut[BITMAP_NLUTCODES] =
0x00bd00, 0x008100, 0x006300, 0x003600 /* Codes 1-4 */
};
static const uint32_t g_playBrightlLut[BITMAP_NLUTCODES] =
static const uint32_t g_playBrightLut[BITMAP_NLUTCODES] =
{
CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */
0x00fc00, 0x00ac00, 0x008400, 0x004800 /* Codes 1-4 */
@ -93,7 +93,7 @@ static const uint32_t g_playNormalLut[BITMAP_NLUTCODES] =
0x00fc00, 0x00ac00, 0x008400, 0x004800 /* Codes 1-4 */
};
static const uint32_t g_playBrightlLut[BITMAP_NLUTCODES] =
static const uint32_t g_playBrightLut[BITMAP_NLUTCODES] =
{
CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */
0x00fc00, 0x00c000, 0x00a200, 0x007500 /* Codes 1-4 */
@ -111,7 +111,7 @@ static const uint16_t g_playNormalLut[BITMAP_NLUTCODES] =
0x05e0, 0x0400, 0x0300, 0x01a0 /* Codes 1-4 */
};
static const uint16_t g_playBrightlLut[BITMAP_NLUTCODES] =
static const uint16_t g_playBrightLut[BITMAP_NLUTCODES] =
{
CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */
0x07e0, 0x0560, 0x0420, 0x0240 /* Codes 1-4 */
@ -125,7 +125,7 @@ static const uint16_t g_playNormalLut[BITMAP_NLUTCODES] =
0x07e0, 0x0560, 0x0420, 0x0240 /* Codes 1-4 */
};
static const uint16_t g_playBrightlLut[BITMAP_NLUTCODES] =
static const uint16_t g_playBrightLut[BITMAP_NLUTCODES] =
{
CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */
0x07e0, 0x0600, 0x0500, 0x03a0 /* Codes 1-4 */
@ -153,7 +153,7 @@ static const uint8_t g_playNormalLut[BITMAP_NLUTCODES] =
0x6e, 0x4b, 0x3a, 0x1f /* Codes 1-4 */
};
static const uint8_t g_playBrightlLut[BITMAP_NLUTCODES] =
static const uint8_t g_playBrightLut[BITMAP_NLUTCODES] =
{
CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */
0x93, 0x64, 0x4d, 0x2a /* Codes 1-4 */
@ -167,7 +167,7 @@ static const uint8_t g_playNormalLut[BITMAP_NLUTCODES] =
0x93, 0x64, 0x4d, 0x2a /* Codes 1-4 */
};
static const uint8_t g_playBrightlLut[BITMAP_NLUTCODES] =
static const uint8_t g_playBrightLut[BITMAP_NLUTCODES] =
{
CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */
0x93, 0x70, 0x5f, 0x44 /* Codes 1-4 */
@ -185,7 +185,7 @@ static const nxgl_mxpixel_t g_playNormalLut[BITMAP_NLUTCODES] =
0x14, 0x10, 0x0c, 0x04 /* Codes 1-4 */
};
static const nxgl_mxpixel_t g_playBrightlLut[BITMAP_NLUTCODES] =
static const nxgl_mxpixel_t g_playBrightLut[BITMAP_NLUTCODES] =
{
CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */
0x1c, 0x14, 0x10, 0x08 /* Codes 1-4 */
@ -199,7 +199,7 @@ static const nxgl_mxpixel_t g_playNormalLut[BITMAP_NLUTCODES] =
0x1c, 0x14, 0x10, 0x08 /* Codes 1-4 */
};
static const nxgl_mxpixel_t g_playBrightlLut[BITMAP_NLUTCODES] =
static const nxgl_mxpixel_t g_playBrightLut[BITMAP_NLUTCODES] =
{
CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */
0x1c, 0x18, 0x14, 0x0c /* Codes 1-4 */
@ -252,7 +252,7 @@ const struct NXWidgets::SRlePaletteBitmap NxWM::g_playBitmap =
BITMAP_NROWS, // height - Height in rows
{ // lut - Pointer to the beginning of the Look-Up Table (LUT)
g_playNormalLut, // Index 0: Unselected LUT
g_playBrightlLut, // Index 1: Selected LUT
g_playBrightLut, // Index 1: Selected LUT
},
g_playRleEntries // data - Pointer to the beginning of the RLE data
g_playRleEntries // data - Pointer to the beginning of the RLE data
};

22
nxwm/src/glyph_play48x48.cxx
View File

@ -79,7 +79,7 @@ static const uint32_t g_playNormalLut[BITMAP_NLUTCODES] =
0x008400, 0x006600, 0x004e00, 0x003600 /* Codes 3-6 */
};
static const uint32_t g_playBrightlLut[BITMAP_NLUTCODES] =
static const uint32_t g_playBrightLut[BITMAP_NLUTCODES] =
{
0x00d800, 0x00fc00, CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Codes 0-2 */
0x00b000, 0x008800, 0x006800, 0x004800 /* Codes 3-6 */
@ -93,7 +93,7 @@ static const uint32_t g_playNormalLut[BITMAP_NLUTCODES] =
0x00b000, 0x008800, 0x006800, 0x004800 /* Codes 3-6 */
};
static const uint32_t g_playBrightlLut[BITMAP_NLUTCODES] =
static const uint32_t g_playBrightLut[BITMAP_NLUTCODES] =
{
0x00ff00, 0x00ff00, CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Codes 0-2 */
0x00dc00, 0x00aa00, 0x008200, 0x005a00 /* Codes 3-6 */
@ -112,7 +112,7 @@ static const uint16_t g_playNormalLut[BITMAP_NLUTCODES] =
0x0420, 0x0320, 0x0260, 0x01a0 /* Codes 3-6 */
};
static const uint16_t g_playBrightlLut[BITMAP_NLUTCODES] =
static const uint16_t g_playBrightLut[BITMAP_NLUTCODES] =
{
0x06c0, 0x07e0, CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Codes 0-2 */
0x0580, 0x0440, 0x0340, 0x0240 /* Codes 3-6 */
@ -126,7 +126,7 @@ static const uint16_t g_playNormalLut[BITMAP_NLUTCODES] =
0x0580, 0x0440, 0x0340, 0x0240 /* Codes 3-6 */
};
static const uint16_t g_playBrightlLut[BITMAP_NLUTCODES] =
static const uint16_t g_playBrightLut[BITMAP_NLUTCODES] =
{
0x07e0, 0x07e0, CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Codes 0-2 */
0x06e0, 0x0540, 0x0400, 0x02c0 /* Codes 3-6 */
@ -154,7 +154,7 @@ static const uint8_t g_playNormalLut[BITMAP_NLUTCODES] =
0x4d, 0x3b, 0x2d, 0x1f /* Codes 3-6 */
};
static const uint8_t g_playBrightlLut[BITMAP_NLUTCODES] =
static const uint8_t g_playBrightLut[BITMAP_NLUTCODES] =
{
0x7e, 0x93, CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Codes 0-2 */
0x67, 0x4f, 0x3d, 0x2a /* Codes 3-6 */
@ -168,7 +168,7 @@ static const uint8_t g_playNormalLut[BITMAP_NLUTCODES] =
0x67, 0x4f, 0x3d, 0x2a /* Codes 3-6 */
};
static const uint8_t g_playBrightlLut[BITMAP_NLUTCODES] =
static const uint8_t g_playBrightLut[BITMAP_NLUTCODES] =
{
0x95, 0x95, CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Codes 0-2 */
0x81, 0x63, 0x4c, 0x34 /* Codes 3-6 */
@ -187,7 +187,7 @@ static const nxgl_mxpixel_t g_playNormalLut[BITMAP_NLUTCODES] =
0x10, 0x0c, 0x08, 0x04 /* Codes 3-6 */
};
static const nxgl_mxpixel_t g_playBrightlLut[BITMAP_NLUTCODES] =
static const nxgl_mxpixel_t g_playBrightLut[BITMAP_NLUTCODES] =
{
0x18, 0x1c, CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Codes 0-2 */
0x14, 0x10, 0x0c, 0x08 /* Codes 3-6 */
@ -201,7 +201,7 @@ static const nxgl_mxpixel_t g_playNormalLut[BITMAP_NLUTCODES] =
0x14, 0x10, 0x0c, 0x08 /* Codes 3-6 */
};
static const nxgl_mxpixel_t g_playBrightlLut[BITMAP_NLUTCODES] =
static const nxgl_mxpixel_t g_playBrightLut[BITMAP_NLUTCODES] =
{
0x1c, 0x1c, CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Codes 0-2 */
0x18, 0x14, 0x10, 0x08 /* Codes 3-6 */
@ -276,9 +276,9 @@ const struct NXWidgets::SRlePaletteBitmap NxWM::g_playBitmap =
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)
{ // lut - Pointer to the beginning of the Look-Up Table (LUT)
g_playNormalLut, // Index 0: Unselected LUT
g_playBrightlLut, // Index 1: Selected LUT
g_playBrightLut, // Index 1: Selected LUT
},
g_playRleEntries // data - Pointer to the beginning of the RLE data
g_playRleEntries // data - Pointer to the beginning of the RLE data
};