From a9f466d3968c1fbf12b0badcd75b395b67a3d642 Mon Sep 17 00:00:00 2001 From: Michael Colton Date: Wed, 23 Jul 2014 09:31:17 -0600 Subject: [PATCH] Added some color bitmaps and some code to draw them (way prettier graphics, here we come!), fixed a minor bug in the mode selection menu. --- Source/include/images.h | 14 +++ Source/include/main.h | 2 + Source/src/Adafruit_GFX.c | 11 +++ Source/src/images.c | 185 ++++++++++++++++++++++++++++++++++++++ Source/src/main.c | 8 +- 5 files changed, 219 insertions(+), 1 deletion(-) create mode 100644 Source/include/images.h create mode 100644 Source/src/images.c diff --git a/Source/include/images.h b/Source/include/images.h new file mode 100644 index 0000000..9cb8d21 --- /dev/null +++ b/Source/include/images.h @@ -0,0 +1,14 @@ + + +/* + * BMP image data converted from 24bpp + * to RGB565 + */ + +#define COLOR_BPP 16 +#define COLOR_STORAGE_SIZE 2 +#define BMPWIDTH 69; +#define BMPHEIGHT 33; + +extern const unsigned short psdrLogo[]; +extern const unsigned short bitmapMode[]; diff --git a/Source/include/main.h b/Source/include/main.h index 37f7348..33b4cc8 100644 --- a/Source/include/main.h +++ b/Source/include/main.h @@ -29,5 +29,7 @@ #include "misc.h" #include "stm32f4xx_hal_dac.h" +#include "images.h" + TIM_HandleTypeDef TimHandle; TIM_HandleTypeDef TimHandle4; diff --git a/Source/src/Adafruit_GFX.c b/Source/src/Adafruit_GFX.c index 66a467b..2bcb117 100644 --- a/Source/src/Adafruit_GFX.c +++ b/Source/src/Adafruit_GFX.c @@ -372,6 +372,17 @@ void Adafruit_GFX_drawBitmap(int16_t x, int16_t y, } } +void Adafruit_GFX_drawColorBitmap(int16_t x, int16_t y, uint16_t *bitmap, int16_t w, int16_t h) +{ + int16_t i, j; + + for(j=0; j= 100 size_t Adafruit_GFX_write(uint8_t c) { #else diff --git a/Source/src/images.c b/Source/src/images.c new file mode 100644 index 0000000..5c6c202 --- /dev/null +++ b/Source/src/images.c @@ -0,0 +1,185 @@ +#include "images.h" + +//This site seems to generate output that is correct +// http://www.henningkarlsen.com/electronics/_t_doimageconverter565.php + + +const const unsigned short psdrLogo[] = { + 0xCDFC, 0xCDFC, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0010 (16) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0020 (32) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0030 (48) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xCDFC, 0xCDFC, 0xCDFC, // 0x0040 (64) pixels + 0xCDFC, 0xCDFC, 0xCDFC, 0xCDFC, 0xCDFC, 0xCDFC, 0xCDFC, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0050 (80) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0060 (96) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0070 (112) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0080 (128) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xCDFC, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0090 (144) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x00A0 (160) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x00B0 (176) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x00C0 (192) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x00D0 (208) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x00E0 (224) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x00F0 (240) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0100 (256) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0110 (272) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0120 (288) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0130 (304) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0140 (320) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0150 (336) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0160 (352) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0170 (368) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0180 (384) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0190 (400) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x01A0 (416) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x01B0 (432) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x01C0 (448) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x01D0 (464) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x01E0 (480) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x01F0 (496) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0200 (512) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0210 (528) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x2146, 0x6414, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x6414, 0x29A8, // 0x0220 (544) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0230 (560) pixels + 0x0000, 0x0000, 0x0000, 0x2146, 0x5371, 0x29A8, 0x0000, 0x29A8, 0x6414, 0x7497, 0x7497, 0x7497, 0x7497, 0x6414, 0x322B, 0x2146, // 0x0240 (576) pixels + 0x6414, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x6414, 0x29A8, 0x0000, 0x0000, 0x2146, 0x5BD3, 0x6435, 0x7497, 0x7497, // 0x0250 (592) pixels + 0x7497, 0x7497, 0x7497, 0x6414, 0x29A8, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x6414, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, // 0x0260 (608) pixels + 0x7497, 0x7497, 0x7497, 0x7497, 0x6C77, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0270 (624) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x6435, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, // 0x0280 (640) pixels + 0x7497, 0x7497, 0x7497, 0x7497, 0x6435, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x6C77, 0x0000, 0x2146, // 0x0290 (656) pixels + 0x6C97, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x6C77, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x322B, // 0x02A0 (672) pixels + 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x02B0 (688) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x2146, 0x6414, 0x7497, 0x7497, 0x7497, 0x7497, // 0x02C0 (704) pixels + 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x4B30, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, // 0x02D0 (720) pixels + 0x7497, 0x7497, 0x42AE, 0x0000, 0x6414, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x0000, // 0x02E0 (736) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x29C9, 0x7497, 0x7497, 0x7497, 0x0000, // 0x02F0 (752) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xCDFC, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x6414, // 0x0300 (768) pixels + 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x5351, 0x0020, 0x6C77, 0x7497, // 0x0310 (784) pixels + 0x7497, 0x7497, 0x7497, 0x322B, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x322B, 0x7497, 0x7497, 0x7497, 0x42AE, 0x0000, 0x0000, // 0x0320 (800) pixels + 0x0000, 0x7497, 0x7497, 0x7497, 0x0000, 0x0000, 0x0000, 0x0000, 0x2146, 0x5371, 0x29A8, 0x0000, 0x0000, 0x0000, 0x0000, 0x2146, // 0x0330 (816) pixels + 0x6C56, 0x7497, 0x7497, 0x4B0F, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xCDFC, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0340 (832) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x322B, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x6435, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, // 0x0350 (848) pixels + 0x4B0F, 0x0020, 0x0000, 0x322B, 0x7497, 0x7497, 0x7497, 0x7497, 0x6C77, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x7497, // 0x0360 (864) pixels + 0x7497, 0x7497, 0x0000, 0x0000, 0x0000, 0x0000, 0x7497, 0x7497, 0x7497, 0x0000, 0x0000, 0x0000, 0x0000, 0x6435, 0x7497, 0x6C77, // 0x0370 (880) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x6435, 0x7497, 0x7497, 0x7497, 0x0020, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0380 (896) pixels + 0xCDFC, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x6435, 0x7497, 0x7497, 0x7497, 0x7497, // 0x0390 (912) pixels + 0x7497, 0x7497, 0x7497, 0x4B0F, 0x0020, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, 0x7497, 0x7497, 0x7497, 0x0000, 0x0000, // 0x03A0 (928) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x7497, 0x7497, 0x7497, 0x0000, 0x0000, 0x0000, 0x0000, 0x7497, 0x7497, 0x7497, 0x0000, 0x0000, // 0x03B0 (944) pixels + 0x0000, 0x0000, 0x7497, 0x7497, 0x7497, 0x0000, 0x0000, 0x2146, 0x6414, 0x7497, 0x7497, 0x7497, 0x42AE, 0x0000, 0x0000, 0x0000, // 0x03C0 (960) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xCDFC, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x2146, // 0x03D0 (976) pixels + 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x4B0F, 0x0020, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x03E0 (992) pixels + 0x7497, 0x7497, 0x7497, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x7497, 0x7497, 0x7497, 0x0000, 0x0000, 0x0000, 0x0000, // 0x03F0 (1008) pixels + 0x7497, 0x7497, 0x7497, 0x0000, 0x0000, 0x0000, 0x0000, 0x7497, 0x7497, 0x7497, 0x0000, 0x0000, 0x6435, 0x7497, 0x7497, 0x7497, // 0x0400 (1024) pixels + 0x4B0F, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xCDFC, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0410 (1040) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x6414, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x42AE, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0420 (1056) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x7497, 0x7497, 0x7497, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x7497, 0x7497, // 0x0430 (1072) pixels + 0x7497, 0x0000, 0x0000, 0x0000, 0x0000, 0x7497, 0x7497, 0x7497, 0x0000, 0x0000, 0x0000, 0x0000, 0x7497, 0x7497, 0x7497, 0x6414, // 0x0440 (1088) pixels + 0x7497, 0x7497, 0x7497, 0x7497, 0x4B0F, 0x0020, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xCDFC, // 0x0450 (1104) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x42CE, 0x7497, 0x7497, 0x7497, 0x4B0F, 0x0020, 0x0000, // 0x0460 (1120) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x7497, 0x7497, 0x7497, 0x29A8, 0x0000, 0x0000, // 0x0470 (1136) pixels + 0x0000, 0x0000, 0x29C9, 0x7497, 0x7497, 0x7497, 0x0000, 0x0000, 0x0000, 0x0000, 0x7497, 0x7497, 0x7497, 0x0000, 0x0000, 0x0000, // 0x0480 (1152) pixels + 0x0000, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x4B0F, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0490 (1168) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0xCDFC, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x6435, 0x7497, // 0x04A0 (1184) pixels + 0x7497, 0x7497, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x6C77, // 0x04B0 (1200) pixels + 0x7497, 0x7497, 0x6C77, 0x0000, 0x0000, 0x0000, 0x0000, 0x6435, 0x7497, 0x7497, 0x4B0F, 0x0000, 0x0000, 0x0000, 0x0000, 0x7497, // 0x04C0 (1216) pixels + 0x7497, 0x7497, 0x0000, 0x0000, 0x0000, 0x0000, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x322B, 0x0000, 0x0000, // 0x04D0 (1232) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xCDFC, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x04E0 (1248) pixels + 0x0000, 0x0000, 0x0000, 0x7497, 0x7497, 0x7497, 0x42AE, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x04F0 (1264) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x322B, 0x7497, 0x7497, 0x7497, 0x0000, 0x0000, 0x0000, 0x0000, 0x7497, 0x7497, 0x7497, 0x0020, // 0x0500 (1280) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x7497, 0x7497, 0x7497, 0x0000, 0x0000, 0x0000, 0x0000, 0x7497, 0x7497, 0x7497, 0x0020, 0x5351, // 0x0510 (1296) pixels + 0x7497, 0x7497, 0x6C77, 0x29C9, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xCDFC, 0x0000, // 0x0520 (1312) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x7497, 0x7497, 0x7497, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0530 (1328) pixels + 0x2146, 0x6414, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x0000, 0x0000, 0x0000, // 0x0540 (1344) pixels + 0x0000, 0x7497, 0x7497, 0x7497, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x7497, 0x7497, 0x7497, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0550 (1360) pixels + 0x7497, 0x7497, 0x7497, 0x0000, 0x0020, 0x6C77, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x6414, 0x29A8, 0x0000, 0x0000, 0x0000, // 0x0560 (1376) pixels + 0x0000, 0x0000, 0x0000, 0xCDFC, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x7497, 0x7497, 0x7497, // 0x0570 (1392) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x6414, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, // 0x0580 (1408) pixels + 0x7497, 0x7497, 0x0000, 0x0000, 0x0000, 0x2146, 0x7497, 0x7497, 0x7497, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x7497, 0x7497, // 0x0590 (1424) pixels + 0x7497, 0x0000, 0x0000, 0x0000, 0x0000, 0x7497, 0x7497, 0x7497, 0x0000, 0x0000, 0x322B, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, // 0x05A0 (1440) pixels + 0x7497, 0x6C77, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xCDFC, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x05B0 (1456) pixels + 0x0000, 0x0000, 0x6C77, 0x7497, 0x7497, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x322B, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, // 0x05C0 (1472) pixels + 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x42AE, 0x0000, 0x0000, 0x0000, 0x6435, 0x7497, 0x7497, 0x7497, 0x0000, 0x0000, // 0x05D0 (1488) pixels + 0x0000, 0x0000, 0x0000, 0x7497, 0x7497, 0x7497, 0x0000, 0x0000, 0x0000, 0x0000, 0x7497, 0x7497, 0x7497, 0x0000, 0x0000, 0x0000, // 0x05E0 (1504) pixels + 0x0020, 0x42CE, 0x7497, 0x7497, 0x7497, 0x7497, 0x42AE, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xCDFC, 0xCDFC, 0x0000, 0x0000, // 0x05F0 (1520) pixels + 0x0000, 0x0000, 0x0000, 0x0150, 0xADFC, 0xCDF8, 0x7140, 0x322B, 0x74DA, 0xB5FC, 0xCDFC, 0x8A60, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0600 (1536) pixels + 0x0000, 0x0000, 0x0000, 0x000B, 0x8DFC, 0xCDF8, 0x7140, 0x000B, 0x8DFC, 0xCDF8, 0x7140, 0x0000, 0x0000, 0x0000, 0x0000, 0x7497, // 0x0610 (1552) pixels + 0x7497, 0x7497, 0x42AE, 0x0000, 0x0000, 0x0000, 0x0000, 0x2146, 0x7497, 0x7497, 0x7497, 0x0000, 0x0000, 0x0000, 0x0000, 0x7497, // 0x0620 (1568) pixels + 0x7497, 0x7497, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0630 (1584) pixels + 0x0000, 0xCDFC, 0xCDFC, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0150, 0xADFC, 0xCDF8, 0x7140, 0x0000, 0x0150, 0xADFC, 0xCDFC, // 0x0640 (1600) pixels + 0x8A60, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x000B, 0x8DFC, 0xCDF8, 0x7140, 0x000B, 0x8DFC, 0xCDF8, 0x7140, // 0x0650 (1616) pixels + 0x0000, 0x0000, 0x0000, 0x2146, 0x7497, 0x7497, 0x7497, 0x0000, 0x0000, 0x0000, 0x0000, 0x29A8, 0x6C56, 0x7497, 0x7497, 0x7497, // 0x0660 (1632) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x7497, 0x7497, 0x7497, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0670 (1648) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xCDFC, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0150, 0xADFC, 0xCDF8, // 0x0680 (1664) pixels + 0x7140, 0x0000, 0x0150, 0xADFC, 0xCDFC, 0x8A60, 0x0000, 0x2B58, 0xCDFC, 0xCDFC, 0xCDFC, 0xCC4B, 0x0000, 0x000B, 0x8DFC, 0xCDF8, // 0x0690 (1680) pixels + 0x7140, 0x000B, 0x8DFC, 0xCDF8, 0x7140, 0x0000, 0x0274, 0xCDFC, 0xCDFC, 0xCDFC, 0xBD58, 0x7497, 0x29A8, 0x6414, 0x7497, 0x7497, // 0x06A0 (1696) pixels + 0x7497, 0x7497, 0x7497, 0x7497, 0x42AE, 0x0000, 0x0000, 0x0000, 0x0000, 0x7497, 0x7497, 0x7497, 0x0000, 0x0000, 0x0000, 0x0000, // 0x06B0 (1712) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x06C0 (1728) pixels + 0x0000, 0x0000, 0x0150, 0xADFC, 0xCDFC, 0xCDFC, 0xCDFC, 0xCDFC, 0xCDFC, 0xCDFC, 0x8A60, 0x0274, 0xCDFC, 0xCC4B, 0x0000, 0x545C, // 0x06D0 (1744) pixels + 0xCDFC, 0xAB46, 0x000B, 0x8DFC, 0xCDF8, 0x7140, 0x000B, 0x8DFC, 0xCDF8, 0x7140, 0x0274, 0xCDFC, 0xCDFC, 0xCDFC, 0xCDFC, 0xCDFC, // 0x06E0 (1760) pixels + 0xACF6, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x42AE, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x6C77, 0x7497, // 0x06F0 (1776) pixels + 0x7497, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0700 (1792) pixels + 0x0000, 0xCDFC, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0150, 0xADFC, 0xCDFC, 0xCDFC, 0xCDFC, 0xCDFC, 0xCDFC, 0xCDFC, 0x8A60, // 0x0710 (1808) pixels + 0x545C, 0xCDFC, 0xCDFC, 0xCDFC, 0xCDFC, 0xCDFC, 0xCD30, 0x280B, 0x8DFC, 0xCDF8, 0x7140, 0x000B, 0x8DFC, 0xCDF8, 0x7140, 0x545C, // 0x0720 (1824) pixels + 0xCDFC, 0xCC4B, 0x6C77, 0x855C, 0xCDFC, 0xCD99, 0x7497, 0x7497, 0x7497, 0x7497, 0x7497, 0x4B0F, 0x0020, 0x0000, 0x0000, 0x0000, // 0x0730 (1840) pixels + 0x0000, 0x0000, 0x0000, 0x322B, 0x7497, 0x42AE, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0740 (1856) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xCDFC, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0150, 0xADFC, 0xCDF8, 0x7140, // 0x0750 (1872) pixels + 0x0000, 0x0150, 0xADFC, 0xCDFC, 0x8A60, 0x545C, 0xCDFC, 0xCC4B, 0x0000, 0x0000, 0x0000, 0x0000, 0x000B, 0x8DFC, 0xCDF8, 0x7140, // 0x0760 (1888) pixels + 0x000B, 0x8DFC, 0xCDF8, 0x7140, 0x545C, 0xCDFC, 0xCC4B, 0x322B, 0x855C, 0xCDFC, 0xCD99, 0x7497, 0x4B0F, 0x0020, 0x0000, 0x0000, // 0x0770 (1904) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0780 (1920) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xCDFC, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0790 (1936) pixels + 0x0000, 0x0150, 0xADFC, 0xCDF8, 0x7140, 0x0000, 0x0150, 0xADFC, 0xCDFC, 0x8A60, 0x0274, 0xCDFC, 0xCDFC, 0xCDFC, 0xCDFC, 0xCDFC, // 0x07A0 (1952) pixels + 0xAB46, 0x000B, 0x8DFC, 0xCDF8, 0x7140, 0x000B, 0x8DFC, 0xCDF8, 0x7140, 0x0274, 0xCDFC, 0xCDFC, 0xCDFC, 0xCDFC, 0xCDFC, 0x8A60, // 0x07B0 (1968) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x07C0 (1984) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x07D0 (2000) pixels + 0xCDFC, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0150, 0xADFC, 0xCDF8, 0x7140, 0x0000, 0x0150, 0xADFC, 0xCDFC, 0x8A60, 0x0000, // 0x07E0 (2016) pixels + 0x2B58, 0xCDFC, 0xCDFC, 0xCDFC, 0xAB46, 0x0000, 0x000B, 0x8DFC, 0xCDF8, 0x7140, 0x000B, 0x8DFC, 0xCDF8, 0x7140, 0x0000, 0x0274, // 0x07F0 (2032) pixels + 0xCDFC, 0xCDFC, 0xCDFC, 0xAB46, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0800 (2048) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0810 (2064) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xCDFC, 0xCDFC, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0820 (2080) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0830 (2096) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0840 (2112) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0850 (2128) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xCDFC, 0xCDFC, 0xCDFC, 0x0000, 0x0000, 0x0000, // 0x0860 (2144) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0870 (2160) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0880 (2176) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0890 (2192) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xCDFC, // 0x08A0 (2208) pixels + 0xCDFC, 0xCDFC, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x08B0 (2224) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x08C0 (2240) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x08D0 (2256) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x08E0 (2272) pixels + }; + +const const unsigned short bitmapMode[] = { + 0x0000, 0x0000, 0x7BEF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, // 0x0010 (16) pixels + 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, // 0x0020 (32) pixels + 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0x7BEF, 0x0000, 0x0000, 0x0000, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, // 0x0030 (48) pixels + 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, // 0x0040 (64) pixels + 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0x0000, // 0x0050 (80) pixels + 0x7BEF, 0xFFFF, 0xFDAC, 0x0000, 0x0000, 0x000C, 0xB7FF, 0xFFF6, 0x6000, 0x0000, 0x0000, 0x65BF, 0xFFFF, 0xFFFF, 0xB320, 0x0000, // 0x0060 (96) pixels + 0x0000, 0x0000, 0x01D2, 0xDFFF, 0xFFFF, 0xFFF6, 0x6000, 0x0000, 0x0000, 0x0000, 0x0000, 0x01D2, 0xDFFF, 0xFFFF, 0xFED2, 0x3800, // 0x0070 (112) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x65BF, 0xFFFF, 0x7BEF, 0xFFFF, 0xFFFF, 0xFDAC, 0x0000, 0x0000, 0x0007, 0x96DF, 0xFED2, // 0x0080 (128) pixels + 0x3800, 0x0000, 0x0000, 0x65BF, 0xFFFB, 0x91C0, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x01D2, 0xDFFF, 0xFFF6, 0x6000, 0x0000, // 0x0090 (144) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x01D2, 0xDFFF, 0xFED2, 0x3800, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x65BF, 0xFFFF, 0xFFFF, // 0x00A0 (160) pixels + 0xFFFF, 0xFFFF, 0xFDAC, 0x0000, 0x0000, 0x0000, 0x3C9B, 0xFDAC, 0x0007, 0x39C0, 0x0000, 0x65BF, 0xFDAC, 0x0000, 0x0000, 0x65BF, // 0x00B0 (176) pixels + 0xFFFF, 0xFDAC, 0x0000, 0x0000, 0x65BF, 0xFFF6, 0x6000, 0x0000, 0x3C9B, 0xFFFF, 0xFDAC, 0x0000, 0x0007, 0x96DF, 0xFED2, 0x3800, // 0x00C0 (192) pixels + 0x0000, 0x65BF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFDAC, 0x0000, 0x01CC, 0x61C0, 0x0336, 0xB320, // 0x00D0 (208) pixels + 0x000C, 0x6320, 0x0000, 0x65BF, 0xDC87, 0x0000, 0x000C, 0xB7FF, 0xFFFF, 0xFFFB, 0x91C0, 0x0000, 0x3C9B, 0xFFF6, 0x6000, 0x0000, // 0x00E0 (224) pixels + 0x3C9B, 0xFFFF, 0xFFF6, 0x6000, 0x0000, 0x65BF, 0xFED2, 0x3800, 0x0000, 0x0000, 0x0000, 0x0000, 0x0007, 0x96DF, 0xFFFF, 0xFFFF, // 0x00F0 (240) pixels + 0xFFFF, 0xFFFF, 0xFDAC, 0x0000, 0x01D2, 0x9320, 0x0007, 0x39C0, 0x0336, 0xB320, 0x0000, 0x65BF, 0xDC87, 0x0000, 0x000C, 0xB7FF, // 0x0100 (256) pixels + 0xFFFF, 0xFFFB, 0x91C0, 0x0000, 0x3C9B, 0xFFF6, 0x6000, 0x0000, 0x3C9B, 0xFFFF, 0xFFF6, 0x6000, 0x0000, 0x65BF, 0xFED2, 0x3800, // 0x0110 (272) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0007, 0x96DF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFDAC, 0x0000, 0x01D2, 0xB487, 0x0000, 0x0000, // 0x0120 (288) pixels + 0x3C9B, 0xB320, 0x0000, 0x65BF, 0xFDAC, 0x0000, 0x0000, 0x65BF, 0xFFFF, 0xFDAC, 0x0000, 0x0000, 0x65BF, 0xFFF6, 0x6000, 0x0000, // 0x0130 (304) pixels + 0x3C9B, 0xFFFF, 0xFDAC, 0x0000, 0x0000, 0x65BF, 0xFED2, 0x3800, 0x0000, 0x65BF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, // 0x0140 (320) pixels + 0xFFFF, 0xFFFF, 0xFDAC, 0x0000, 0x01D2, 0xDED2, 0x3800, 0x0000, 0x65BF, 0xB320, 0x0000, 0x65BF, 0xFFFB, 0x91C0, 0x0000, 0x0000, // 0x0150 (336) pixels + 0x0000, 0x0000, 0x0000, 0x01D2, 0xDFFF, 0xFFF6, 0x6000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x01D2, 0xDFFF, 0xFED2, 0x3800, // 0x0160 (352) pixels + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x3C9B, 0xFFFF, 0xFFFF, 0x7BEF, 0xFFFF, 0xFDAC, 0x0000, 0x01D2, 0xDFF6, 0x6000, 0x000C, // 0x0170 (368) pixels + 0xB7FF, 0xB320, 0x0000, 0x65BF, 0xFFFF, 0xFFFF, 0xB320, 0x0000, 0x0000, 0x0000, 0x01D2, 0xDFFF, 0xFFFF, 0xFFF6, 0x6000, 0x0000, // 0x0180 (384) pixels + 0x0000, 0x0000, 0x0000, 0x01D2, 0xDFFF, 0xFFFF, 0xFED2, 0x3800, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x3C9B, 0xFFFF, 0x7BEF, // 0x0190 (400) pixels + 0x0000, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, // 0x01A0 (416) pixels + 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, // 0x01B0 (432) pixels + 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0x0000, 0x0000, 0x0000, 0x7BEF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, // 0x01C0 (448) pixels + 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, // 0x01D0 (464) pixels + 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0x7BEF, 0x0000, 0x0000, // 0x01E0 (480) pixels + }; + + diff --git a/Source/src/main.c b/Source/src/main.c index 9b47f4e..b8a1727 100644 --- a/Source/src/main.c +++ b/Source/src/main.c @@ -522,6 +522,11 @@ main(int argc, char* argv[]) Adafruit_GFX_fillScreen(ILI9340_BLACK); Adafruit_GFX_fillScreen(ILI9340_BLACK); + Adafruit_GFX_drawColorBitmap(150, 0, psdrLogo, 69,33); + Adafruit_GFX_drawColorBitmap(190, 40, psdrLogo, 69,33); + Adafruit_GFX_drawColorBitmap(240, 180, psdrLogo, 69,33); + Adafruit_GFX_drawColorBitmap(150, 210, bitmapMode, 40,12); + Encoder(); char chrisABaby[] = "Chris a baby!"; @@ -784,7 +789,8 @@ main(int argc, char* argv[]) encoderPos = getPos(); if(encoderPos != encoderLastPos) { - mode += (encoderLastPos - encoderPos) % 3; + mode = (mode + (encoderLastPos - encoderPos)) % 3; + encoderLastPos = encoderPos; Adafruit_GFX_setTextSize(1); Adafruit_GFX_setCursor(150, 190); int i;