aboutsummaryrefslogtreecommitdiffstats
path: root/demos/modules/gdisp
diff options
context:
space:
mode:
authorAndrew Hannam <andrewh@inmarket.com.au>2013-04-04 21:02:05 +1000
committerAndrew Hannam <andrewh@inmarket.com.au>2013-04-04 21:02:05 +1000
commit8b15aab802024434bd8565aebb33368e66532a97 (patch)
treeef9865401787d886683950d83568992cfd8f2326 /demos/modules/gdisp
parent553b3682faea820f95608a0143153d2676ea2046 (diff)
downloaduGFX-8b15aab802024434bd8565aebb33368e66532a97.tar.gz
uGFX-8b15aab802024434bd8565aebb33368e66532a97.tar.bz2
uGFX-8b15aab802024434bd8565aebb33368e66532a97.zip
Update demo to use Memory Reader for images
Diffstat (limited to 'demos/modules/gdisp')
-rw-r--r--demos/modules/gdisp/gdisp_images/main.c16
1 files changed, 15 insertions, 1 deletions
diff --git a/demos/modules/gdisp/gdisp_images/main.c b/demos/modules/gdisp/gdisp_images/main.c
index 6ca5f640..8f14750e 100644
--- a/demos/modules/gdisp/gdisp_images/main.c
+++ b/demos/modules/gdisp/gdisp_images/main.c
@@ -22,12 +22,22 @@
#include "hal.h"
#include "gfx.h"
+#ifdef WIN32
+ #define USE_MEMORY_FILE FALSE // Can be true or false for Win32
+#else
+ #define USE_MEMORY_FILE TRUE // Non-Win32 - use the compiled in image
+#endif
+
+#if USE_MEMORY_FILE
+ #include "test-pal8.h"
+#endif
+
static gdispImage myImage;
int main(void) {
coord_t swidth, sheight;
- halInit(); // Initialise the Hardware
+ halInit(); // Initialize the Hardware
chSysInit(); // Initialize the OS
gdispInit(); // Initialize the display
@@ -38,7 +48,11 @@ int main(void) {
sheight = gdispGetHeight();
// Set up IO for our image
+#if USE_MEMORY_FILE
+ gdispImageSetMemoryReader(&myImage, test_pal8);
+#else
gdispImageSetSimulFileReader(&myImage, "test-pal8.bmp");
+#endif
gdispImageOpen(&myImage);
gdispImageDraw(&myImage, 0, 0, swidth, sheight, 0, 0);