apps/graphics/nxglyphs/include: Lots more problems with autogenerated files.

This commit is contained in:
Gregory Nutt 2019-04-10 09:15:05 -06:00
parent f09bc1a01b
commit 0ff0a97ae4
7 changed files with 258 additions and 258 deletions

View File

@ -6,60 +6,60 @@
#include <nuttx/nx/nxcursor.h> #include <nuttx/nx/nxcursor.h>
#if CONFIG_NXWIDGETS_BPP == 8 #if CONFIG_NXWIDGETS_BPP == 8
# define FGCOLOR1 RGB8WHITE # define FGCOLOR1 RGB8_WHITE
# define FGCOLOR2 RGB8BLACK # define FGCOLOR2 RGB8_BLACK
# define FGCOLOR3 RGB8GRAY # define FGCOLOR3 RGB8_GRAY
#elif CONFIG_NXWIDGETS_BPP == 16 #elif CONFIG_NXWIDGETS_BPP == 16
# define FGCOLOR1 RGB16WHITE # define FGCOLOR1 RGB16_WHITE
# define FGCOLOR2 RGB18BLACK # define FGCOLOR2 RGB16_BLACK
# define FGCOLOR3 RGB16GRAY # define FGCOLOR3 RGB16_GRAY
#elif CONFIG_NXWIDGETS_BPP == 24 || CONFIG_NXWIDGETS_BPP == 32 #elif CONFIG_NXWIDGETS_BPP == 24 || CONFIG_NXWIDGETS_BPP == 32
# define FGCOLOR1 RGB24WHITE # define FGCOLOR1 RGB24_WHITE
# define FGCOLOR2 RGB24BLACK # define FGCOLOR2 RGB24_BLACK
# define FGCOLOR3 RGB24GRAY # define FGCOLOR3 RGB24_GRAY
#else #else
# error "Pixel depth not supported (CONFIG_NXWIDGETS_BPP)" # error "Pixel depth not supported (CONFIG_NXWIDGETS_BPP)"
#endif #endif
static const uint8_t g_arrow1Image[] = static const uint8_t g_arrow1Image[] =
{ {
0x2c 0x00 0x00 0x00 0x00 0x00 0x00 0x00 /* Row 0 */ 0x2c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* Row 0 */
0xaa 0xc0 0x00 0x00 0x00 0x00 0x00 0x00 /* Row 1 */ 0xaa, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* Row 1 */
0xea 0xac 0x00 0x00 0x00 0x00 0x00 0x00 /* Row 2 */ 0xea, 0xac, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* Row 2 */
0x2a 0xaa 0xb0 0x00 0x00 0x00 0x00 0x00 /* Row 3 */ 0x2a, 0xaa, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, /* Row 3 */
0x3a 0x7a 0xab 0x00 0x00 0x00 0x00 0x00 /* Row 4 */ 0x3a, 0x7a, 0xab, 0x00, 0x00, 0x00, 0x00, 0x00, /* Row 4 */
0x0a 0xd5 0x7a 0xa8 0x00 0x00 0x00 0x00 /* Row 5 */ 0x0a, 0xd5, 0x7a, 0xa8, 0x00, 0x00, 0x00, 0x00, /* Row 5 */
0x0e 0x95 0x57 0xaa 0x80 0x00 0x00 0x00 /* Row 6 */ 0x0e, 0x95, 0x57, 0xaa, 0x80, 0x00, 0x00, 0x00, /* Row 6 */
0x02 0x95 0x55 0x7a 0xab 0x00 0x00 0x00 /* Row 7 */ 0x02, 0x95, 0x55, 0x7a, 0xab, 0x00, 0x00, 0x00, /* Row 7 */
0x02 0x95 0x55 0x55 0xaa 0xb0 0x00 0x00 /* Row 8 */ 0x02, 0x95, 0x55, 0x55, 0xaa, 0xb0, 0x00, 0x00, /* Row 8 */
0x03 0xb5 0x55 0x55 0x5e 0xaa 0x00 0x00 /* Row 9 */ 0x03, 0xb5, 0x55, 0x55, 0x5e, 0xaa, 0x00, 0x00, /* Row 9 */
0x00 0xa5 0x55 0x55 0x55 0x7a 0xa8 0x00 /* Row 10 */ 0x00, 0xa5, 0x55, 0x55, 0x55, 0x7a, 0xa8, 0x00, /* Row 10 */
0x00 0xed 0x55 0x55 0x55 0x55 0xab 0x00 /* Row 11 */ 0x00, 0xed, 0x55, 0x55, 0x55, 0x55, 0xab, 0x00, /* Row 11 */
0x00 0x29 0x55 0x55 0x55 0x5e 0xa8 0x00 /* Row 12 */ 0x00, 0x29, 0x55, 0x55, 0x55, 0x5e, 0xa8, 0x00, /* Row 12 */
0x00 0x2b 0x55 0x55 0x55 0x6a 0x80 0x00 /* Row 13 */ 0x00, 0x2b, 0x55, 0x55, 0x55, 0x6a, 0x80, 0x00, /* Row 13 */
0x00 0x2a 0x55 0x55 0x57 0xaa 0x00 0x00 /* Row 14 */ 0x00, 0x2a, 0x55, 0x55, 0x57, 0xaa, 0x00, 0x00, /* Row 14 */
0x00 0x0a 0x55 0x55 0x5e 0x80 0x00 0x00 /* Row 15 */ 0x00, 0x0a, 0x55, 0x55, 0x5e, 0x80, 0x00, 0x00, /* Row 15 */
0x00 0x0a 0x95 0x55 0x56 0xa0 0x00 0x00 /* Row 16 */ 0x00, 0x0a, 0x95, 0x55, 0x56, 0xa0, 0x00, 0x00, /* Row 16 */
0x00 0x02 0x95 0x55 0x55 0xa8 0x00 0x00 /* Row 17 */ 0x00, 0x02, 0x95, 0x55, 0x55, 0xa8, 0x00, 0x00, /* Row 17 */
0x00 0x02 0xb5 0x57 0x55 0xea 0x00 0x00 /* Row 18 */ 0x00, 0x02, 0xb5, 0x57, 0x55, 0xea, 0x00, 0x00, /* Row 18 */
0x00 0x03 0xa5 0x5e 0x95 0x7a 0x80 0x00 /* Row 19 */ 0x00, 0x03, 0xa5, 0x5e, 0x95, 0x7a, 0x80, 0x00, /* Row 19 */
0x00 0x00 0xa5 0x5a 0xad 0x56 0xa0 0x00 /* Row 20 */ 0x00, 0x00, 0xa5, 0x5a, 0xad, 0x56, 0xa0, 0x00, /* Row 20 */
0x00 0x00 0xed 0x68 0xab 0x55 0xa8 0x00 /* Row 21 */ 0x00, 0x00, 0xed, 0x68, 0xab, 0x55, 0xa8, 0x00, /* Row 21 */
0x00 0x00 0x29 0xe8 0x2a 0x55 0x6a 0x00 /* Row 22 */ 0x00, 0x00, 0x29, 0xe8, 0x2a, 0x55, 0x6a, 0x00, /* Row 22 */
0x00 0x00 0x29 0xa8 0x0a 0x95 0x7a 0x80 /* Row 23 */ 0x00, 0x00, 0x29, 0xa8, 0x0a, 0x95, 0x7a, 0x80, /* Row 23 */
0x00 0x00 0x0a 0xa0 0x02 0xa5 0x5e 0xa0 /* Row 24 */ 0x00, 0x00, 0x0a, 0xa0, 0x02, 0xa5, 0x5e, 0xa0, /* Row 24 */
0x00 0x00 0x0a 0x80 0x00 0xab 0x5a 0x80 /* Row 25 */ 0x00, 0x00, 0x0a, 0x80, 0x00, 0xab, 0x5a, 0x80, /* Row 25 */
0x00 0x00 0x0a 0x80 0x00 0x2a 0xea 0x00 /* Row 26 */ 0x00, 0x00, 0x0a, 0x80, 0x00, 0x2a, 0xea, 0x00, /* Row 26 */
0x00 0x00 0x03 0x00 0x00 0x0a 0xa8 0x00 /* Row 27 */ 0x00, 0x00, 0x03, 0x00, 0x00, 0x0a, 0xa8, 0x00, /* Row 27 */
0x00 0x00 0x00 0x00 0x00 0x02 0xa0 0x00 /* Row 28 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xa0, 0x00, /* Row 28 */
0x00 0x00 0x00 0x00 0x00 0x00 0x80 0x00 /* Row 29 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, /* Row 29 */
} };
const struct nx_cursorimage_s g_arrow1Cursor = const struct nx_cursorimage_s g_arrow1Cursor =
{ {
.size = .size =
{ {
.w = 30 .w = 30,
.h = 30 .h = 30
}, },
.color1 = .color1 =

View File

@ -6,60 +6,60 @@
#include <nuttx/nx/nxcursor.h> #include <nuttx/nx/nxcursor.h>
#if CONFIG_NXWIDGETS_BPP == 8 #if CONFIG_NXWIDGETS_BPP == 8
# define FGCOLOR1 RGB8WHITE # define FGCOLOR1 RGB8_WHITE
# define FGCOLOR2 RGB8BLACK # define FGCOLOR2 RGB8_BLACK
# define FGCOLOR3 RGB8GRAY # define FGCOLOR3 RGB8_GRAY
#elif CONFIG_NXWIDGETS_BPP == 16 #elif CONFIG_NXWIDGETS_BPP == 16
# define FGCOLOR1 RGB16WHITE # define FGCOLOR1 RGB16_WHITE
# define FGCOLOR2 RGB18BLACK # define FGCOLOR2 RGB16_BLACK
# define FGCOLOR3 RGB16GRAY # define FGCOLOR3 RGB16_GRAY
#elif CONFIG_NXWIDGETS_BPP == 24 || CONFIG_NXWIDGETS_BPP == 32 #elif CONFIG_NXWIDGETS_BPP == 24 || CONFIG_NXWIDGETS_BPP == 32
# define FGCOLOR1 RGB24WHITE # define FGCOLOR1 RGB24_WHITE
# define FGCOLOR2 RGB24BLACK # define FGCOLOR2 RGB24_BLACK
# define FGCOLOR3 RGB24GRAY # define FGCOLOR3 RGB24_GRAY
#else #else
# error "Pixel depth not supported (CONFIG_NXWIDGETS_BPP)" # error "Pixel depth not supported (CONFIG_NXWIDGETS_BPP)"
#endif #endif
static const uint8_t g_arrow2Image[] = static const uint8_t g_arrow2Image[] =
{ {
0x2c 0x00 0x00 0x00 0x00 0x00 0x00 0x00 /* Row 0 */ 0x2c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* Row 0 */
0xaa 0xc0 0x00 0x00 0x00 0x00 0x00 0x00 /* Row 1 */ 0xaa, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* Row 1 */
0x2a 0xac 0x00 0x00 0x00 0x00 0x00 0x00 /* Row 2 */ 0x2a, 0xac, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* Row 2 */
0x2b 0xaa 0xc0 0x00 0x00 0x00 0x00 0x00 /* Row 3 */ 0x2b, 0xaa, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, /* Row 3 */
0x3a 0x7a 0xac 0x00 0x00 0x00 0x00 0x00 /* Row 4 */ 0x3a, 0x7a, 0xac, 0x00, 0x00, 0x00, 0x00, 0x00, /* Row 4 */
0x0a 0xd5 0x6a 0xa0 0x00 0x00 0x00 0x00 /* Row 5 */ 0x0a, 0xd5, 0x6a, 0xa0, 0x00, 0x00, 0x00, 0x00, /* Row 5 */
0x0e 0x95 0x56 0xab 0x00 0x00 0x00 0x00 /* Row 6 */ 0x0e, 0x95, 0x56, 0xab, 0x00, 0x00, 0x00, 0x00, /* Row 6 */
0x02 0x95 0x55 0x6a 0xa0 0x00 0x00 0x00 /* Row 7 */ 0x02, 0x95, 0x55, 0x6a, 0xa0, 0x00, 0x00, 0x00, /* Row 7 */
0x03 0x95 0x55 0x56 0xaa 0x00 0x00 0x00 /* Row 8 */ 0x03, 0x95, 0x55, 0x56, 0xaa, 0x00, 0x00, 0x00, /* Row 8 */
0x00 0xa5 0x55 0x55 0x7a 0xac 0x00 0x00 /* Row 9 */ 0x00, 0xa5, 0x55, 0x55, 0x7a, 0xac, 0x00, 0x00, /* Row 9 */
0x00 0xed 0x55 0x55 0x55 0xea 0xb0 0x00 /* Row 10 */ 0x00, 0xed, 0x55, 0x55, 0x55, 0xea, 0xb0, 0x00, /* Row 10 */
0x00 0x29 0x55 0x55 0x55 0x5e 0xab 0x00 /* Row 11 */ 0x00, 0x29, 0x55, 0x55, 0x55, 0x5e, 0xab, 0x00, /* Row 11 */
0x00 0x29 0x55 0x55 0x55 0x55 0x6a 0xb0 /* Row 12 */ 0x00, 0x29, 0x55, 0x55, 0x55, 0x55, 0x6a, 0xb0, /* Row 12 */
0x00 0x2a 0x55 0x55 0x55 0x55 0x6a 0xb0 /* Row 13 */ 0x00, 0x2a, 0x55, 0x55, 0x55, 0x55, 0x6a, 0xb0, /* Row 13 */
0x00 0x0a 0x55 0x55 0x55 0x56 0xaa 0x00 /* Row 14 */ 0x00, 0x0a, 0x55, 0x55, 0x55, 0x56, 0xaa, 0x00, /* Row 14 */
0x00 0x0e 0x95 0x55 0x57 0xaa 0x80 0x00 /* Row 15 */ 0x00, 0x0e, 0x95, 0x55, 0x57, 0xaa, 0x80, 0x00, /* Row 15 */
0x00 0x02 0x95 0x55 0x7a 0xac 0x00 0x00 /* Row 16 */ 0x00, 0x02, 0x95, 0x55, 0x7a, 0xac, 0x00, 0x00, /* Row 16 */
0x00 0x02 0xb5 0x55 0xea 0x00 0x00 0x00 /* Row 17 */ 0x00, 0x02, 0xb5, 0x55, 0xea, 0x00, 0x00, 0x00, /* Row 17 */
0x00 0x00 0xa5 0x55 0xac 0x00 0x00 0x00 /* Row 18 */ 0x00, 0x00, 0xa5, 0x55, 0xac, 0x00, 0x00, 0x00, /* Row 18 */
0x00 0x00 0xa5 0x57 0xa0 0x00 0x00 0x00 /* Row 19 */ 0x00, 0x00, 0xa5, 0x57, 0xa0, 0x00, 0x00, 0x00, /* Row 19 */
0x00 0x00 0x2d 0x56 0x80 0x00 0x00 0x00 /* Row 20 */ 0x00, 0x00, 0x2d, 0x56, 0x80, 0x00, 0x00, 0x00, /* Row 20 */
0x00 0x00 0x29 0x56 0x80 0x00 0x00 0x00 /* Row 21 */ 0x00, 0x00, 0x29, 0x56, 0x80, 0x00, 0x00, 0x00, /* Row 21 */
0x00 0x00 0x3b 0x56 0xc0 0x00 0x00 0x00 /* Row 22 */ 0x00, 0x00, 0x3b, 0x56, 0xc0, 0x00, 0x00, 0x00, /* Row 22 */
0x00 0x00 0x0a 0x5a 0x00 0x00 0x00 0x00 /* Row 23 */ 0x00, 0x00, 0x0a, 0x5a, 0x00, 0x00, 0x00, 0x00, /* Row 23 */
0x00 0x00 0x0a 0x5a 0x00 0x00 0x00 0x00 /* Row 24 */ 0x00, 0x00, 0x0a, 0x5a, 0x00, 0x00, 0x00, 0x00, /* Row 24 */
0x00 0x00 0x0e 0xa8 0x00 0x00 0x00 0x00 /* Row 25 */ 0x00, 0x00, 0x0e, 0xa8, 0x00, 0x00, 0x00, 0x00, /* Row 25 */
0x00 0x00 0x02 0xa8 0x00 0x00 0x00 0x00 /* Row 26 */ 0x00, 0x00, 0x02, 0xa8, 0x00, 0x00, 0x00, 0x00, /* Row 26 */
0x00 0x00 0x03 0xa8 0x00 0x00 0x00 0x00 /* Row 27 */ 0x00, 0x00, 0x03, 0xa8, 0x00, 0x00, 0x00, 0x00, /* Row 27 */
0x00 0x00 0x00 0xa0 0x00 0x00 0x00 0x00 /* Row 28 */ 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x00, /* Row 28 */
0x00 0x00 0x00 0xe0 0x00 0x00 0x00 0x00 /* Row 29 */ 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, 0x00, 0x00, /* Row 29 */
} };
const struct nx_cursorimage_s g_arrow2Cursor = const struct nx_cursorimage_s g_arrow2Cursor =
{ {
.size = .size =
{ {
.w = 30 .w = 30,
.h = 30 .h = 30
}, },
.color1 = .color1 =

View File

@ -6,60 +6,60 @@
#include <nuttx/nx/nxcursor.h> #include <nuttx/nx/nxcursor.h>
#if CONFIG_NXWIDGETS_BPP == 8 #if CONFIG_NXWIDGETS_BPP == 8
# define FGCOLOR1 RGB8WHITE # define FGCOLOR1 RGB8_WHITE
# define FGCOLOR2 RGB8BLACK # define FGCOLOR2 RGB8_BLACK
# define FGCOLOR3 RGB8GRAY # define FGCOLOR3 RGB8_GRAY
#elif CONFIG_NXWIDGETS_BPP == 16 #elif CONFIG_NXWIDGETS_BPP == 16
# define FGCOLOR1 RGB16WHITE # define FGCOLOR1 RGB16_WHITE
# define FGCOLOR2 RGB18BLACK # define FGCOLOR2 RGB16_BLACK
# define FGCOLOR3 RGB16GRAY # define FGCOLOR3 RGB16_GRAY
#elif CONFIG_NXWIDGETS_BPP == 24 || CONFIG_NXWIDGETS_BPP == 32 #elif CONFIG_NXWIDGETS_BPP == 24 || CONFIG_NXWIDGETS_BPP == 32
# define FGCOLOR1 RGB24WHITE # define FGCOLOR1 RGB24_WHITE
# define FGCOLOR2 RGB24BLACK # define FGCOLOR2 RGB24_BLACK
# define FGCOLOR3 RGB24GRAY # define FGCOLOR3 RGB24_GRAY
#else #else
# error "Pixel depth not supported (CONFIG_NXWIDGETS_BPP)" # error "Pixel depth not supported (CONFIG_NXWIDGETS_BPP)"
#endif #endif
static const uint8_t g_grabImage[] = static const uint8_t g_grabImage[] =
{ {
0x00 0x00 0x02 0xc0 0x00 0x00 0x00 /* Row 0 */ 0x00, 0x00, 0x02, 0xc0, 0x00, 0x00, 0x00, /* Row 0 */
0x00 0x00 0x3a 0xa0 0x00 0x00 0x00 /* Row 1 */ 0x00, 0x00, 0x3a, 0xa0, 0x00, 0x00, 0x00, /* Row 1 */
0x00 0x3a 0xeb 0xa8 0xc0 0x00 0x00 /* Row 2 */ 0x00, 0x3a, 0xeb, 0xa8, 0xc0, 0x00, 0x00, /* Row 2 */
0x00 0xea 0xad 0x6a 0xa8 0x00 0x00 /* Row 3 */ 0x00, 0xea, 0xad, 0x6a, 0xa8, 0x00, 0x00, /* Row 3 */
0x00 0xad 0xad 0x6a 0xab 0x00 0x00 /* Row 4 */ 0x00, 0xad, 0xad, 0x6a, 0xab, 0x00, 0x00, /* Row 4 */
0x00 0xa5 0xad 0x69 0x5a 0x00 0x00 /* Row 5 */ 0x00, 0xa5, 0xad, 0x69, 0x5a, 0x00, 0x00, /* Row 5 */
0x00 0xa5 0xad 0x69 0x5a 0xec 0x00 /* Row 6 */ 0x00, 0xa5, 0xad, 0x69, 0x5a, 0xec, 0x00, /* Row 6 */
0x00 0xa5 0xad 0x69 0x5a 0xaa 0x00 /* Row 7 */ 0x00, 0xa5, 0xad, 0x69, 0x5a, 0xaa, 0x00, /* Row 7 */
0x00 0xa5 0xad 0x69 0x5a 0xba 0xc0 /* Row 8 */ 0x00, 0xa5, 0xad, 0x69, 0x5a, 0xba, 0xc0, /* Row 8 */
0x3a 0xa5 0xe5 0x69 0x5a 0x5e 0x80 /* Row 9 */ 0x3a, 0xa5, 0xe5, 0x69, 0x5a, 0x5e, 0x80, /* Row 9 */
0xeb 0xa5 0x55 0x69 0x5a 0x56 0x80 /* Row 10 */ 0xeb, 0xa5, 0x55, 0x69, 0x5a, 0x56, 0x80, /* Row 10 */
0xad 0xa5 0x55 0x55 0x5a 0x56 0x80 /* Row 11 */ 0xad, 0xa5, 0x55, 0x55, 0x5a, 0x56, 0x80, /* Row 11 */
0xa5 0xa5 0x55 0x55 0x5a 0x56 0x80 /* Row 12 */ 0xa5, 0xa5, 0x55, 0x55, 0x5a, 0x56, 0x80, /* Row 12 */
0xa5 0xa5 0x55 0x55 0x55 0x56 0x80 /* Row 13 */ 0xa5, 0xa5, 0x55, 0x55, 0x55, 0x56, 0x80, /* Row 13 */
0xa5 0xa5 0x55 0x55 0x55 0x56 0x80 /* Row 14 */ 0xa5, 0xa5, 0x55, 0x55, 0x55, 0x56, 0x80, /* Row 14 */
0xad 0xb5 0x55 0x55 0x55 0x56 0x80 /* Row 15 */ 0xad, 0xb5, 0x55, 0x55, 0x55, 0x56, 0x80, /* Row 15 */
0xad 0x55 0x55 0x55 0x55 0x56 0x80 /* Row 16 */ 0xad, 0x55, 0x55, 0x55, 0x55, 0x56, 0x80, /* Row 16 */
0xed 0x55 0x55 0x55 0x55 0x5e 0x80 /* Row 17 */ 0xed, 0x55, 0x55, 0x55, 0x55, 0x5e, 0x80, /* Row 17 */
0xed 0x55 0x55 0x55 0x55 0x5e 0x80 /* Row 18 */ 0xed, 0x55, 0x55, 0x55, 0x55, 0x5e, 0x80, /* Row 18 */
0xe9 0x55 0x55 0x55 0x55 0x5a 0xc0 /* Row 19 */ 0xe9, 0x55, 0x55, 0x55, 0x55, 0x5a, 0xc0, /* Row 19 */
0x29 0x55 0x55 0x55 0x55 0x5a 0x00 /* Row 20 */ 0x29, 0x55, 0x55, 0x55, 0x55, 0x5a, 0x00, /* Row 20 */
0x2b 0x55 0x55 0x55 0x55 0x5a 0x00 /* Row 21 */ 0x2b, 0x55, 0x55, 0x55, 0x55, 0x5a, 0x00, /* Row 21 */
0x3a 0x55 0x55 0x55 0x55 0x7a 0x00 /* Row 22 */ 0x3a, 0x55, 0x55, 0x55, 0x55, 0x7a, 0x00, /* Row 22 */
0x0a 0x55 0x55 0x55 0x55 0x6b 0x00 /* Row 23 */ 0x0a, 0x55, 0x55, 0x55, 0x55, 0x6b, 0x00, /* Row 23 */
0x0e 0xd5 0x55 0x55 0x55 0x68 0x00 /* Row 24 */ 0x0e, 0xd5, 0x55, 0x55, 0x55, 0x68, 0x00, /* Row 24 */
0x02 0x95 0x55 0x55 0x55 0x68 0x00 /* Row 25 */ 0x02, 0x95, 0x55, 0x55, 0x55, 0x68, 0x00, /* Row 25 */
0x00 0xa5 0x55 0x55 0x55 0x6c 0x00 /* Row 26 */ 0x00, 0xa5, 0x55, 0x55, 0x55, 0x6c, 0x00, /* Row 26 */
0x00 0xaf 0xff 0xff 0xff 0xe0 0x00 /* Row 27 */ 0x00, 0xaf, 0xff, 0xff, 0xff, 0xe0, 0x00, /* Row 27 */
0x00 0xaa 0xaa 0xaa 0xaa 0xa0 0x00 /* Row 28 */ 0x00, 0xaa, 0xaa, 0xaa, 0xaa, 0xa0, 0x00, /* Row 28 */
0x00 0x2a 0xaa 0xaa 0xaa 0xb0 0x00 /* Row 29 */ 0x00, 0x2a, 0xaa, 0xaa, 0xaa, 0xb0, 0x00, /* Row 29 */
} };
const struct nx_cursorimage_s g_grabCursor = const struct nx_cursorimage_s g_grabCursor =
{ {
.size = .size =
{ {
.w = 25 .w = 25,
.h = 30 .h = 30
}, },
.color1 = .color1 =

View File

@ -6,60 +6,60 @@
#include <nuttx/nx/nxcursor.h> #include <nuttx/nx/nxcursor.h>
#if CONFIG_NXWIDGETS_BPP == 8 #if CONFIG_NXWIDGETS_BPP == 8
# define FGCOLOR1 RGB8WHITE # define FGCOLOR1 RGB8_WHITE
# define FGCOLOR2 RGB8BLACK # define FGCOLOR2 RGB8_BLACK
# define FGCOLOR3 RGB8GRAY # define FGCOLOR3 RGB8_GRAY
#elif CONFIG_NXWIDGETS_BPP == 16 #elif CONFIG_NXWIDGETS_BPP == 16
# define FGCOLOR1 RGB16WHITE # define FGCOLOR1 RGB16_WHITE
# define FGCOLOR2 RGB18BLACK # define FGCOLOR2 RGB16_BLACK
# define FGCOLOR3 RGB16GRAY # define FGCOLOR3 RGB16_GRAY
#elif CONFIG_NXWIDGETS_BPP == 24 || CONFIG_NXWIDGETS_BPP == 32 #elif CONFIG_NXWIDGETS_BPP == 24 || CONFIG_NXWIDGETS_BPP == 32
# define FGCOLOR1 RGB24WHITE # define FGCOLOR1 RGB24_WHITE
# define FGCOLOR2 RGB24BLACK # define FGCOLOR2 RGB24_BLACK
# define FGCOLOR3 RGB24GRAY # define FGCOLOR3 RGB24_GRAY
#else #else
# error "Pixel depth not supported (CONFIG_NXWIDGETS_BPP)" # error "Pixel depth not supported (CONFIG_NXWIDGETS_BPP)"
#endif #endif
static const uint8_t g_waitImage[] = static const uint8_t g_waitImage[] =
{ {
0xaa 0xaa 0xaa 0xaa 0xaa 0xa8 /* Row 0 */ 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xa8, /* Row 0 */
0xea 0xaa 0xaa 0xaa 0xaa 0xac /* Row 1 */ 0xea, 0xaa, 0xaa, 0xaa, 0xaa, 0xac, /* Row 1 */
0x02 0x95 0x55 0x55 0x5a 0x00 /* Row 2 */ 0x02, 0x95, 0x55, 0x55, 0x5a, 0x00, /* Row 2 */
0x02 0x95 0x55 0x55 0x5a 0x00 /* Row 3 */ 0x02, 0x95, 0x55, 0x55, 0x5a, 0x00, /* Row 3 */
0x02 0x95 0x55 0x55 0x5a 0x00 /* Row 4 */ 0x02, 0x95, 0x55, 0x55, 0x5a, 0x00, /* Row 4 */
0x02 0x95 0x55 0x55 0x5a 0x00 /* Row 5 */ 0x02, 0x95, 0x55, 0x55, 0x5a, 0x00, /* Row 5 */
0x02 0xb5 0x55 0x55 0x7a 0x00 /* Row 6 */ 0x02, 0xb5, 0x55, 0x55, 0x7a, 0x00, /* Row 6 */
0x03 0xa5 0x55 0x55 0x6b 0x00 /* Row 7 */ 0x03, 0xa5, 0x55, 0x55, 0x6b, 0x00, /* Row 7 */
0x00 0xa5 0x55 0x55 0x68 0x00 /* Row 8 */ 0x00, 0xa5, 0x55, 0x55, 0x68, 0x00, /* Row 8 */
0x00 0xed 0x55 0x55 0xec 0x00 /* Row 9 */ 0x00, 0xed, 0x55, 0x55, 0xec, 0x00, /* Row 9 */
0x00 0x2b 0x55 0x57 0xa0 0x00 /* Row 10 */ 0x00, 0x2b, 0x55, 0x57, 0xa0, 0x00, /* Row 10 */
0x00 0x0a 0xd5 0x5e 0x80 0x00 /* Row 11 */ 0x00, 0x0a, 0xd5, 0x5e, 0x80, 0x00, /* Row 11 */
0x00 0x0e 0xa5 0x6a 0xc0 0x00 /* Row 12 */ 0x00, 0x0e, 0xa5, 0x6a, 0xc0, 0x00, /* Row 12 */
0x00 0x03 0xad 0xeb 0x00 0x00 /* Row 13 */ 0x00, 0x03, 0xad, 0xeb, 0x00, 0x00, /* Row 13 */
0x00 0x00 0xe9 0xac 0x00 0x00 /* Row 14 */ 0x00, 0x00, 0xe9, 0xac, 0x00, 0x00, /* Row 14 */
0x00 0x00 0xe9 0xac 0x00 0x00 /* Row 15 */ 0x00, 0x00, 0xe9, 0xac, 0x00, 0x00, /* Row 15 */
0x00 0x03 0xad 0xeb 0x00 0x00 /* Row 16 */ 0x00, 0x03, 0xad, 0xeb, 0x00, 0x00, /* Row 16 */
0x00 0x0e 0xa5 0x6a 0xc0 0x00 /* Row 17 */ 0x00, 0x0e, 0xa5, 0x6a, 0xc0, 0x00, /* Row 17 */
0x00 0x0a 0xd5 0x5e 0x80 0x00 /* Row 18 */ 0x00, 0x0a, 0xd5, 0x5e, 0x80, 0x00, /* Row 18 */
0x00 0x2b 0x55 0x57 0xa0 0x00 /* Row 19 */ 0x00, 0x2b, 0x55, 0x57, 0xa0, 0x00, /* Row 19 */
0x00 0xed 0x55 0x55 0xec 0x00 /* Row 20 */ 0x00, 0xed, 0x55, 0x55, 0xec, 0x00, /* Row 20 */
0x00 0xa5 0x55 0x55 0x68 0x00 /* Row 21 */ 0x00, 0xa5, 0x55, 0x55, 0x68, 0x00, /* Row 21 */
0x03 0xa5 0x55 0x55 0x6b 0x00 /* Row 22 */ 0x03, 0xa5, 0x55, 0x55, 0x6b, 0x00, /* Row 22 */
0x02 0xb5 0x55 0x55 0x7a 0x00 /* Row 23 */ 0x02, 0xb5, 0x55, 0x55, 0x7a, 0x00, /* Row 23 */
0x02 0x95 0x55 0x55 0x5a 0x00 /* Row 24 */ 0x02, 0x95, 0x55, 0x55, 0x5a, 0x00, /* Row 24 */
0x02 0x95 0x55 0x55 0x5a 0x00 /* Row 25 */ 0x02, 0x95, 0x55, 0x55, 0x5a, 0x00, /* Row 25 */
0x02 0x95 0x55 0x55 0x5a 0x00 /* Row 26 */ 0x02, 0x95, 0x55, 0x55, 0x5a, 0x00, /* Row 26 */
0x02 0x95 0x55 0x55 0x5a 0x00 /* Row 27 */ 0x02, 0x95, 0x55, 0x55, 0x5a, 0x00, /* Row 27 */
0xea 0xaa 0xaa 0xaa 0xaa 0xac /* Row 28 */ 0xea, 0xaa, 0xaa, 0xaa, 0xaa, 0xac, /* Row 28 */
0xaa 0xaa 0xaa 0xaa 0xaa 0xa8 /* Row 29 */ 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xa8, /* Row 29 */
} };
const struct nx_cursorimage_s g_waitCursor = const struct nx_cursorimage_s g_waitCursor =
{ {
.size = .size =
{ {
.w = 23 .w = 23,
.h = 30 .h = 30
}, },
.color1 = .color1 =

View File

@ -6,60 +6,60 @@
#include <nuttx/nx/nxcursor.h> #include <nuttx/nx/nxcursor.h>
#if CONFIG_NXWIDGETS_BPP == 8 #if CONFIG_NXWIDGETS_BPP == 8
# define FGCOLOR1 RGB8WHITE # define FGCOLOR1 RGB8_WHITE
# define FGCOLOR2 RGB8BLACK # define FGCOLOR2 RGB8_BLACK
# define FGCOLOR3 RGB8GRAY # define FGCOLOR3 RGB8_GRAY
#elif CONFIG_NXWIDGETS_BPP == 16 #elif CONFIG_NXWIDGETS_BPP == 16
# define FGCOLOR1 RGB16WHITE # define FGCOLOR1 RGB16_WHITE
# define FGCOLOR2 RGB18BLACK # define FGCOLOR2 RGB16_BLACK
# define FGCOLOR3 RGB16GRAY # define FGCOLOR3 RGB16_GRAY
#elif CONFIG_NXWIDGETS_BPP == 24 || CONFIG_NXWIDGETS_BPP == 32 #elif CONFIG_NXWIDGETS_BPP == 24 || CONFIG_NXWIDGETS_BPP == 32
# define FGCOLOR1 RGB24WHITE # define FGCOLOR1 RGB24_WHITE
# define FGCOLOR2 RGB24BLACK # define FGCOLOR2 RGB24_BLACK
# define FGCOLOR3 RGB24GRAY # define FGCOLOR3 RGB24_GRAY
#else #else
# error "Pixel depth not supported (CONFIG_NXWIDGETS_BPP)" # error "Pixel depth not supported (CONFIG_NXWIDGETS_BPP)"
#endif #endif
static const uint8_t g_zoomInImage[] = static const uint8_t g_zoomInImage[] =
{ {
0x00 0x03 0xaa 0xa8 0x00 0x00 0x00 0x00 /* Row 0 */ 0x00, 0x03, 0xaa, 0xa8, 0x00, 0x00, 0x00, 0x00, /* Row 0 */
0x00 0x3a 0xaa 0xaa 0xc0 0x00 0x00 0x00 /* Row 1 */ 0x00, 0x3a, 0xaa, 0xaa, 0xc0, 0x00, 0x00, 0x00, /* Row 1 */
0x00 0xaa 0x55 0x5e 0xa0 0x00 0x00 0x00 /* Row 2 */ 0x00, 0xaa, 0x55, 0x5e, 0xa0, 0x00, 0x00, 0x00, /* Row 2 */
0x02 0xad 0x55 0x55 0xa8 0x00 0x00 0x00 /* Row 3 */ 0x02, 0xad, 0x55, 0x55, 0xa8, 0x00, 0x00, 0x00, /* Row 3 */
0x0a 0x95 0x55 0x55 0x6a 0x00 0x00 0x00 /* Row 4 */ 0x0a, 0x95, 0x55, 0x55, 0x6a, 0x00, 0x00, 0x00, /* Row 4 */
0x3a 0x55 0x55 0x55 0x5a 0x80 0x00 0x00 /* Row 5 */ 0x3a, 0x55, 0x55, 0x55, 0x5a, 0x80, 0x00, 0x00, /* Row 5 */
0x2b 0x55 0x5e 0x55 0x56 0x80 0x00 0x00 /* Row 6 */ 0x2b, 0x55, 0x5e, 0x55, 0x56, 0x80, 0x00, 0x00, /* Row 6 */
0xe9 0x55 0x5a 0x55 0x56 0xa0 0x00 0x00 /* Row 7 */ 0xe9, 0x55, 0x5a, 0x55, 0x56, 0xa0, 0x00, 0x00, /* Row 7 */
0xa5 0x55 0x5a 0x55 0x55 0xa0 0x00 0x00 /* Row 8 */ 0xa5, 0x55, 0x5a, 0x55, 0x55, 0xa0, 0x00, 0x00, /* Row 8 */
0xa5 0x55 0x5a 0x55 0x55 0xa0 0x00 0x00 /* Row 9 */ 0xa5, 0x55, 0x5a, 0x55, 0x55, 0xa0, 0x00, 0x00, /* Row 9 */
0xa5 0x5e 0xaa 0xaa 0x55 0xac 0x00 0x00 /* Row 10 */ 0xa5, 0x5e, 0xaa, 0xaa, 0x55, 0xac, 0x00, 0x00, /* Row 10 */
0xa5 0x5a 0xaa 0xaa 0x55 0xac 0x00 0x00 /* Row 11 */ 0xa5, 0x5a, 0xaa, 0xaa, 0x55, 0xac, 0x00, 0x00, /* Row 11 */
0xa5 0x55 0x5a 0x55 0x55 0xa0 0x00 0x00 /* Row 12 */ 0xa5, 0x55, 0x5a, 0x55, 0x55, 0xa0, 0x00, 0x00, /* Row 12 */
0xa5 0x55 0x5a 0x55 0x55 0xa0 0x00 0x00 /* Row 13 */ 0xa5, 0x55, 0x5a, 0x55, 0x55, 0xa0, 0x00, 0x00, /* Row 13 */
0xad 0x55 0x5a 0x55 0x55 0xa0 0x00 0x00 /* Row 14 */ 0xad, 0x55, 0x5a, 0x55, 0x55, 0xa0, 0x00, 0x00, /* Row 14 */
0x29 0x55 0x5a 0x55 0x56 0x80 0x00 0x00 /* Row 15 */ 0x29, 0x55, 0x5a, 0x55, 0x56, 0x80, 0x00, 0x00, /* Row 15 */
0x3a 0x55 0x55 0x55 0x5a 0x80 0x00 0x00 /* Row 16 */ 0x3a, 0x55, 0x55, 0x55, 0x5a, 0x80, 0x00, 0x00, /* Row 16 */
0x0a 0x95 0x55 0x55 0x7a 0xa0 0x00 0x00 /* Row 17 */ 0x0a, 0x95, 0x55, 0x55, 0x7a, 0xa0, 0x00, 0x00, /* Row 17 */
0x02 0xa5 0x55 0x55 0xab 0xa8 0x00 0x00 /* Row 18 */ 0x02, 0xa5, 0x55, 0x55, 0xab, 0xa8, 0x00, 0x00, /* Row 18 */
0x00 0xab 0x55 0x56 0xad 0x6b 0x00 0x00 /* Row 19 */ 0x00, 0xab, 0x55, 0x56, 0xad, 0x6b, 0x00, 0x00, /* Row 19 */
0x00 0x2a 0xaa 0xaa 0xa9 0x5a 0xc0 0x00 /* Row 20 */ 0x00, 0x2a, 0xaa, 0xaa, 0xa9, 0x5a, 0xc0, 0x00, /* Row 20 */
0x00 0x02 0xaa 0xab 0x2a 0x56 0xb0 0x00 /* Row 21 */ 0x00, 0x02, 0xaa, 0xab, 0x2a, 0x56, 0xb0, 0x00, /* Row 21 */
0x00 0x00 0x0f 0xc0 0x0a 0x95 0xac 0x00 /* Row 22 */ 0x00, 0x00, 0x0f, 0xc0, 0x0a, 0x95, 0xac, 0x00, /* Row 22 */
0x00 0x00 0x00 0x00 0x03 0xa5 0x6a 0x00 /* Row 23 */ 0x00, 0x00, 0x00, 0x00, 0x03, 0xa5, 0x6a, 0x00, /* Row 23 */
0x00 0x00 0x00 0x00 0x00 0xe9 0x5a 0x80 /* Row 24 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0xe9, 0x5a, 0x80, /* Row 24 */
0x00 0x00 0x00 0x00 0x00 0x3a 0x56 0xa0 /* Row 25 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x3a, 0x56, 0xa0, /* Row 25 */
0x00 0x00 0x00 0x00 0x00 0x0e 0x95 0xa0 /* Row 26 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x95, 0xa0, /* Row 26 */
0x00 0x00 0x00 0x00 0x00 0x02 0xa5 0xa0 /* Row 27 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xa5, 0xa0, /* Row 27 */
0x00 0x00 0x00 0x00 0x00 0x00 0xaa 0xa0 /* Row 28 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xa0, /* Row 28 */
0x00 0x00 0x00 0x00 0x00 0x00 0x2a 0x80 /* Row 29 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2a, 0x80, /* Row 29 */
} };
const struct nx_cursorimage_s g_zoomInCursor = const struct nx_cursorimage_s g_zoomInCursor =
{ {
.size = .size =
{ {
.w = 30 .w = 30,
.h = 30 .h = 30
}, },
.color1 = .color1 =

View File

@ -6,60 +6,60 @@
#include <nuttx/nx/nxcursor.h> #include <nuttx/nx/nxcursor.h>
#if CONFIG_NXWIDGETS_BPP == 8 #if CONFIG_NXWIDGETS_BPP == 8
# define FGCOLOR1 RGB8WHITE # define FGCOLOR1 RGB8_WHITE
# define FGCOLOR2 RGB8BLACK # define FGCOLOR2 RGB8_BLACK
# define FGCOLOR3 RGB8GRAY # define FGCOLOR3 RGB8_GRAY
#elif CONFIG_NXWIDGETS_BPP == 16 #elif CONFIG_NXWIDGETS_BPP == 16
# define FGCOLOR1 RGB16WHITE # define FGCOLOR1 RGB16_WHITE
# define FGCOLOR2 RGB18BLACK # define FGCOLOR2 RGB16_BLACK
# define FGCOLOR3 RGB16GRAY # define FGCOLOR3 RGB16_GRAY
#elif CONFIG_NXWIDGETS_BPP == 24 || CONFIG_NXWIDGETS_BPP == 32 #elif CONFIG_NXWIDGETS_BPP == 24 || CONFIG_NXWIDGETS_BPP == 32
# define FGCOLOR1 RGB24WHITE # define FGCOLOR1 RGB24_WHITE
# define FGCOLOR2 RGB24BLACK # define FGCOLOR2 RGB24_BLACK
# define FGCOLOR3 RGB24GRAY # define FGCOLOR3 RGB24_GRAY
#else #else
# error "Pixel depth not supported (CONFIG_NXWIDGETS_BPP)" # error "Pixel depth not supported (CONFIG_NXWIDGETS_BPP)"
#endif #endif
static const uint8_t g_zoomOutImage[] = static const uint8_t g_zoomOutImage[] =
{ {
0x00 0x03 0xaa 0xab 0x00 0x00 0x00 0x00 /* Row 0 */ 0x00, 0x03, 0xaa, 0xab, 0x00, 0x00, 0x00, 0x00, /* Row 0 */
0x00 0x3a 0xaa 0xaa 0xb0 0x00 0x00 0x00 /* Row 1 */ 0x00, 0x3a, 0xaa, 0xaa, 0xb0, 0x00, 0x00, 0x00, /* Row 1 */
0x00 0xaa 0xd5 0x5e 0xac 0x00 0x00 0x00 /* Row 2 */ 0x00, 0xaa, 0xd5, 0x5e, 0xac, 0x00, 0x00, 0x00, /* Row 2 */
0x02 0xad 0x55 0x55 0xea 0x00 0x00 0x00 /* Row 3 */ 0x02, 0xad, 0x55, 0x55, 0xea, 0x00, 0x00, 0x00, /* Row 3 */
0x0a 0x95 0x55 0x55 0x7a 0x00 0x00 0x00 /* Row 4 */ 0x0a, 0x95, 0x55, 0x55, 0x7a, 0x00, 0x00, 0x00, /* Row 4 */
0x3a 0x55 0x55 0x55 0x5e 0x80 0x00 0x00 /* Row 5 */ 0x3a, 0x55, 0x55, 0x55, 0x5e, 0x80, 0x00, 0x00, /* Row 5 */
0x2b 0x55 0x55 0x55 0x56 0x80 0x00 0x00 /* Row 6 */ 0x2b, 0x55, 0x55, 0x55, 0x56, 0x80, 0x00, 0x00, /* Row 6 */
0xe9 0x55 0x55 0x55 0x55 0xa0 0x00 0x00 /* Row 7 */ 0xe9, 0x55, 0x55, 0x55, 0x55, 0xa0, 0x00, 0x00, /* Row 7 */
0xa5 0x55 0x55 0x55 0x55 0xa0 0x00 0x00 /* Row 8 */ 0xa5, 0x55, 0x55, 0x55, 0x55, 0xa0, 0x00, 0x00, /* Row 8 */
0xa5 0x55 0x55 0x55 0x55 0xa0 0x00 0x00 /* Row 9 */ 0xa5, 0x55, 0x55, 0x55, 0x55, 0xa0, 0x00, 0x00, /* Row 9 */
0xa5 0x5e 0xaa 0xaa 0x55 0xac 0x00 0x00 /* Row 10 */ 0xa5, 0x5e, 0xaa, 0xaa, 0x55, 0xac, 0x00, 0x00, /* Row 10 */
0xa5 0x5a 0xaa 0xaa 0xd5 0xac 0x00 0x00 /* Row 11 */ 0xa5, 0x5a, 0xaa, 0xaa, 0xd5, 0xac, 0x00, 0x00, /* Row 11 */
0xa5 0x55 0x55 0x55 0x55 0xa0 0x00 0x00 /* Row 12 */ 0xa5, 0x55, 0x55, 0x55, 0x55, 0xa0, 0x00, 0x00, /* Row 12 */
0xa5 0x55 0x55 0x55 0x55 0xa0 0x00 0x00 /* Row 13 */ 0xa5, 0x55, 0x55, 0x55, 0x55, 0xa0, 0x00, 0x00, /* Row 13 */
0xad 0x55 0x55 0x55 0x55 0xa0 0x00 0x00 /* Row 14 */ 0xad, 0x55, 0x55, 0x55, 0x55, 0xa0, 0x00, 0x00, /* Row 14 */
0x29 0x55 0x55 0x55 0x57 0x80 0x00 0x00 /* Row 15 */ 0x29, 0x55, 0x55, 0x55, 0x57, 0x80, 0x00, 0x00, /* Row 15 */
0x3a 0x55 0x55 0x55 0x56 0x80 0x00 0x00 /* Row 16 */ 0x3a, 0x55, 0x55, 0x55, 0x56, 0x80, 0x00, 0x00, /* Row 16 */
0x0a 0x95 0x55 0x55 0x5a 0xa0 0x00 0x00 /* Row 17 */ 0x0a, 0x95, 0x55, 0x55, 0x5a, 0xa0, 0x00, 0x00, /* Row 17 */
0x02 0xa5 0x55 0x55 0x6a 0xa8 0x00 0x00 /* Row 18 */ 0x02, 0xa5, 0x55, 0x55, 0x6a, 0xa8, 0x00, 0x00, /* Row 18 */
0x00 0xab 0x55 0x56 0xa9 0x6a 0x00 0x00 /* Row 19 */ 0x00, 0xab, 0x55, 0x56, 0xa9, 0x6a, 0x00, 0x00, /* Row 19 */
0x00 0x2a 0xaa 0xaa 0xab 0x5a 0x80 0x00 /* Row 20 */ 0x00, 0x2a, 0xaa, 0xaa, 0xab, 0x5a, 0x80, 0x00, /* Row 20 */
0x00 0x02 0xaa 0xab 0x3a 0x56 0xa0 0x00 /* Row 21 */ 0x00, 0x02, 0xaa, 0xab, 0x3a, 0x56, 0xa0, 0x00, /* Row 21 */
0x00 0x00 0x0f 0xc0 0x0e 0x95 0xa8 0x00 /* Row 22 */ 0x00, 0x00, 0x0f, 0xc0, 0x0e, 0x95, 0xa8, 0x00, /* Row 22 */
0x00 0x00 0x00 0x00 0x00 0xad 0x7a 0xc0 /* Row 23 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0xad, 0x7a, 0xc0, /* Row 23 */
0x00 0x00 0x00 0x00 0x00 0xeb 0x5e 0xb0 /* Row 24 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0xeb, 0x5e, 0xb0, /* Row 24 */
0x00 0x00 0x00 0x00 0x00 0x3a 0xd7 0xa0 /* Row 25 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x3a, 0xd7, 0xa0, /* Row 25 */
0x00 0x00 0x00 0x00 0x00 0x0e 0xb5 0xe0 /* Row 26 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0xb5, 0xe0, /* Row 26 */
0x00 0x00 0x00 0x00 0x00 0x03 0xad 0xa0 /* Row 27 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xad, 0xa0, /* Row 27 */
0x00 0x00 0x00 0x00 0x00 0x00 0xea 0xa0 /* Row 28 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xea, 0xa0, /* Row 28 */
0x00 0x00 0x00 0x00 0x00 0x00 0x3a 0x80 /* Row 29 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3a, 0x80, /* Row 29 */
} };
const struct nx_cursorimage_s g_zoomOutCursor = const struct nx_cursorimage_s g_zoomOutCursor =
{ {
.size = .size =
{ {
.w = 30 .w = 30,
.h = 30 .h = 30
}, },
.color1 = .color1 =

View File

@ -108,17 +108,17 @@ int main(int argc, char **argv, char **envp)
printf("#include <nuttx/nx/nxcursor.h>\n\n"); printf("#include <nuttx/nx/nxcursor.h>\n\n");
printf("#if CONFIG_NXWIDGETS_BPP == 8\n"); printf("#if CONFIG_NXWIDGETS_BPP == 8\n");
printf("# define FGCOLOR1 RGB8WHITE\n"); printf("# define FGCOLOR1 RGB8_WHITE\n");
printf("# define FGCOLOR2 RGB8BLACK\n"); printf("# define FGCOLOR2 RGB8_BLACK\n");
printf("# define FGCOLOR3 RGB8GRAY\n"); printf("# define FGCOLOR3 RGB8_GRAY\n");
printf("#elif CONFIG_NXWIDGETS_BPP == 16\n"); printf("#elif CONFIG_NXWIDGETS_BPP == 16\n");
printf("# define FGCOLOR1 RGB16WHITE\n"); printf("# define FGCOLOR1 RGB16_WHITE\n");
printf("# define FGCOLOR2 RGB18BLACK\n"); printf("# define FGCOLOR2 RGB16_BLACK\n");
printf("# define FGCOLOR3 RGB16GRAY\n"); printf("# define FGCOLOR3 RGB16_GRAY\n");
printf("#elif CONFIG_NXWIDGETS_BPP == 24 || CONFIG_NXWIDGETS_BPP == 32\n"); printf("#elif CONFIG_NXWIDGETS_BPP == 24 || CONFIG_NXWIDGETS_BPP == 32\n");
printf("# define FGCOLOR1 RGB24WHITE\n"); printf("# define FGCOLOR1 RGB24_WHITE\n");
printf("# define FGCOLOR2 RGB24BLACK\n"); printf("# define FGCOLOR2 RGB24_BLACK\n");
printf("# define FGCOLOR3 RGB24GRAY\n"); printf("# define FGCOLOR3 RGB24_GRAY\n");
printf("#else\n"); printf("#else\n");
printf("# error \"Pixel depth not supported (CONFIG_NXWIDGETS_BPP)\"\n"); printf("# error \"Pixel depth not supported (CONFIG_NXWIDGETS_BPP)\"\n");
printf("#endif\n\n"); printf("#endif\n\n");
@ -171,18 +171,18 @@ int main(int argc, char **argv, char **envp)
code |= (uint32_t)rgb2gray2(r, g, b); code |= (uint32_t)rgb2gray2(r, g, b);
} }
printf(" 0x%02x", code); printf(" 0x%02x,", code);
} }
printf(" /* Row %d */\n", i); printf(" /* Row %d */\n", i);
} }
printf("}\n\n"); printf("};\n\n");
printf("const struct nx_cursorimage_s g_cursor =\n"); printf("const struct nx_cursorimage_s g_cursor =\n");
printf("{\n"); printf("{\n");
printf(" .size =\n"); printf(" .size =\n");
printf(" {\n"); printf(" {\n");
printf(" .w = %u\n", gimp_image.width); printf(" .w = %u,\n", gimp_image.width);
printf(" .h = %u\n", gimp_image.height); printf(" .h = %u\n", gimp_image.height);
printf(" },\n"); printf(" },\n");
printf(" .color1 =\n"); printf(" .color1 =\n");