aboutsummaryrefslogtreecommitdiffstats
path: root/demos/modules/gdisp
diff options
context:
space:
mode:
authorinmarket <andrewh@inmarket.com.au>2013-10-28 10:46:25 +1000
committerinmarket <andrewh@inmarket.com.au>2013-10-28 10:46:25 +1000
commitdb09e33dff7110861ce2fa586b04c05626e3f7e8 (patch)
tree620f0d1a16b644bf3abd561a6529f1220db58c19 /demos/modules/gdisp
parent602cba0e62d9ed38a80a47fe5a698ce21d01517a (diff)
downloaduGFX-db09e33dff7110861ce2fa586b04c05626e3f7e8.tar.gz
uGFX-db09e33dff7110861ce2fa586b04c05626e3f7e8.tar.bz2
uGFX-db09e33dff7110861ce2fa586b04c05626e3f7e8.zip
Fix spelling error and migrate demo gfxconf.h changes to all demos including the new streaming and multiple display demos
Diffstat (limited to 'demos/modules/gdisp')
-rw-r--r--demos/modules/gdisp/basics/gfxconf.h6
-rw-r--r--demos/modules/gdisp/circles/gfxconf.h6
-rw-r--r--demos/modules/gdisp/fonts/gfxconf.h22
-rw-r--r--demos/modules/gdisp/fonts_cyrillic/gfxconf.h10
-rw-r--r--demos/modules/gdisp/images/gfxconf.h6
-rw-r--r--demos/modules/gdisp/images_animated/gfxconf.h6
-rw-r--r--demos/modules/gdisp/multiple_displays/gfxconf.h (renamed from demos/modules/gdisp/gdisp_multiple_displays/gfxconf.h)16
-rw-r--r--demos/modules/gdisp/multiple_displays/main.c (renamed from demos/modules/gdisp/gdisp_multiple_displays/main.c)0
-rw-r--r--demos/modules/gdisp/streaming/gfxconf.h (renamed from demos/modules/gdisp/gdisp_streaming/gfxconf.h)22
-rw-r--r--demos/modules/gdisp/streaming/main.c (renamed from demos/modules/gdisp/gdisp_streaming/main.c)0
10 files changed, 32 insertions, 62 deletions
diff --git a/demos/modules/gdisp/basics/gfxconf.h b/demos/modules/gdisp/basics/gfxconf.h
index 60b8888e..a37ef1e7 100644
--- a/demos/modules/gdisp/basics/gfxconf.h
+++ b/demos/modules/gdisp/basics/gfxconf.h
@@ -30,11 +30,11 @@
#ifndef _GFXCONF_H
#define _GFXCONF_H
-/* The operating system to use. One of these must be defined - perferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS FALSE
+/* The operating system to use. One of these must be defined - preferably in your Makefile */
+//#define GFX_USE_OS_CHIBIOS FALSE
//#define GFX_USE_OS_WIN32 FALSE
//#define GFX_USE_OS_LINUX FALSE
-//#define GFX_USE_OS_OSX FALSE
+//#define GFX_USE_OS_OSX FALSE
/* GFX sub-systems to turn on */
#define GFX_USE_GDISP TRUE
diff --git a/demos/modules/gdisp/circles/gfxconf.h b/demos/modules/gdisp/circles/gfxconf.h
index 28311ccb..4bb605ac 100644
--- a/demos/modules/gdisp/circles/gfxconf.h
+++ b/demos/modules/gdisp/circles/gfxconf.h
@@ -30,11 +30,11 @@
#ifndef _GFXCONF_H
#define _GFXCONF_H
-/* The operating system to use. One of these must be defined - perferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS FALSE
+/* The operating system to use. One of these must be defined - preferably in your Makefile */
+//#define GFX_USE_OS_CHIBIOS FALSE
//#define GFX_USE_OS_WIN32 FALSE
//#define GFX_USE_OS_LINUX FALSE
-//#define GFX_USE_OS_OSX FALSE
+//#define GFX_USE_OS_OSX FALSE
/* GFX sub-systems to turn on */
#define GFX_USE_GDISP TRUE
diff --git a/demos/modules/gdisp/fonts/gfxconf.h b/demos/modules/gdisp/fonts/gfxconf.h
index 9f569e37..64481774 100644
--- a/demos/modules/gdisp/fonts/gfxconf.h
+++ b/demos/modules/gdisp/fonts/gfxconf.h
@@ -30,11 +30,11 @@
#ifndef _GFXCONF_H
#define _GFXCONF_H
-/* The operating system to use. One of these must be defined - perferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS FALSE
+/* The operating system to use. One of these must be defined - preferably in your Makefile */
+//#define GFX_USE_OS_CHIBIOS FALSE
//#define GFX_USE_OS_WIN32 FALSE
//#define GFX_USE_OS_LINUX FALSE
-//#define GFX_USE_OS_OSX FALSE
+//#define GFX_USE_OS_OSX FALSE
/* GFX sub-systems to turn on */
#define GFX_USE_GDISP TRUE
@@ -43,18 +43,13 @@
#define GDISP_NEED_VALIDATION TRUE
#define GDISP_NEED_CLIP TRUE
#define GDISP_NEED_TEXT TRUE
-#define GDISP_NEED_CIRCLE FALSE
-#define GDISP_NEED_ELLIPSE FALSE
-#define GDISP_NEED_ARC FALSE
-#define GDISP_NEED_SCROLL FALSE
-#define GDISP_NEED_PIXELREAD FALSE
-#define GDISP_NEED_CONTROL FALSE
-#define GDISP_NEED_MULTITHREAD FALSE
-#define GDISP_NEED_ASYNC FALSE
-#define GDISP_NEED_MSGAPI FALSE
#define GDISP_NEED_ANTIALIAS TRUE
/* GDISP - fonts to include */
+#define GDISP_INCLUDE_USER_FONTS TRUE
+#define GDISP_INCLUDE_FONT_UI1 FALSE
+#define GDISP_INCLUDE_FONT_UI2 TRUE
+#define GDISP_INCLUDE_FONT_LARGENUMBERS FALSE
#define GDISP_INCLUDE_FONT_DEJAVUSANS10 TRUE
#define GDISP_INCLUDE_FONT_DEJAVUSANS12 FALSE
#define GDISP_INCLUDE_FONT_DEJAVUSANS16 FALSE
@@ -70,9 +65,6 @@
#define GDISP_INCLUDE_FONT_DEJAVUSANS32_AA FALSE
#define GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12_AA FALSE
-#define GDISP_INCLUDE_FONT_UI1 FALSE
-#define GDISP_INCLUDE_FONT_UI2 TRUE
-#define GDISP_INCLUDE_FONT_LARGENUMBERS FALSE
#endif /* _GFXCONF_H */
diff --git a/demos/modules/gdisp/fonts_cyrillic/gfxconf.h b/demos/modules/gdisp/fonts_cyrillic/gfxconf.h
index 1bf1baeb..dab77ba1 100644
--- a/demos/modules/gdisp/fonts_cyrillic/gfxconf.h
+++ b/demos/modules/gdisp/fonts_cyrillic/gfxconf.h
@@ -30,11 +30,11 @@
#ifndef _GFXCONF_H
#define _GFXCONF_H
-/* The operating system to use. One of these must be defined - perferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS FALSE
-//#define GFX_USE_OS_WIN32 FALSE
-//#define GFX_USE_OS_LINUX FALSE
-//#define GFX_USE_OS_OSX FALSE
+/* The operating system to use. One of these must be defined - preferably in your Makefile */
+//#define GFX_USE_OS_CHIBIOS FALSE
+//#define GFX_USE_OS_WIN32 FALSE
+//#define GFX_USE_OS_LINUX FALSE
+//#define GFX_USE_OS_OSX FALSE
/* GFX subsystems to turn on */
#define GFX_USE_GDISP TRUE
diff --git a/demos/modules/gdisp/images/gfxconf.h b/demos/modules/gdisp/images/gfxconf.h
index 0bf9f1fc..6cd78b37 100644
--- a/demos/modules/gdisp/images/gfxconf.h
+++ b/demos/modules/gdisp/images/gfxconf.h
@@ -30,11 +30,11 @@
#ifndef _GFXCONF_H
#define _GFXCONF_H
-/* The operating system to use. One of these must be defined - perferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS FALSE
+/* The operating system to use. One of these must be defined - preferably in your Makefile */
+//#define GFX_USE_OS_CHIBIOS FALSE
//#define GFX_USE_OS_WIN32 FALSE
//#define GFX_USE_OS_LINUX FALSE
-//#define GFX_USE_OS_OSX FALSE
+//#define GFX_USE_OS_OSX FALSE
/* GFX sub-systems to turn on */
#define GFX_USE_GDISP TRUE
diff --git a/demos/modules/gdisp/images_animated/gfxconf.h b/demos/modules/gdisp/images_animated/gfxconf.h
index 8cf34e87..cc38ed36 100644
--- a/demos/modules/gdisp/images_animated/gfxconf.h
+++ b/demos/modules/gdisp/images_animated/gfxconf.h
@@ -30,11 +30,11 @@
#ifndef _GFXCONF_H
#define _GFXCONF_H
-/* The operating system to use. One of these must be defined - perferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS FALSE
+/* The operating system to use. One of these must be defined - preferably in your Makefile */
+//#define GFX_USE_OS_CHIBIOS FALSE
//#define GFX_USE_OS_WIN32 FALSE
//#define GFX_USE_OS_LINUX FALSE
-//#define GFX_USE_OS_OSX FALSE
+//#define GFX_USE_OS_OSX FALSE
/* GFX sub-systems to turn on */
#define GFX_USE_GDISP TRUE
diff --git a/demos/modules/gdisp/gdisp_multiple_displays/gfxconf.h b/demos/modules/gdisp/multiple_displays/gfxconf.h
index 71c16864..60467f93 100644
--- a/demos/modules/gdisp/gdisp_multiple_displays/gfxconf.h
+++ b/demos/modules/gdisp/multiple_displays/gfxconf.h
@@ -30,10 +30,11 @@
#ifndef _GFXCONF_H
#define _GFXCONF_H
-/* The operating system to use - one of these must be defined */
-//#define GFX_USE_OS_CHIBIOS TRUE
+//* The operating system to use. One of these must be defined - preferably in your Makefile */
+//#define GFX_USE_OS_CHIBIOS FALSE
//#define GFX_USE_OS_WIN32 FALSE
-//#define GFX_USE_OS_POSIX FALSE
+//#define GFX_USE_OS_LINUX FALSE
+//#define GFX_USE_OS_OSX FALSE
/* GFX sub-systems to turn on */
#define GFX_USE_GDISP TRUE
@@ -42,15 +43,6 @@
#define GDISP_NEED_VALIDATION TRUE
#define GDISP_NEED_CLIP TRUE
#define GDISP_NEED_TEXT TRUE
-#define GDISP_NEED_CIRCLE FALSE
-#define GDISP_NEED_ELLIPSE FALSE
-#define GDISP_NEED_ARC FALSE
-#define GDISP_NEED_SCROLL FALSE
-#define GDISP_NEED_PIXELREAD FALSE
-#define GDISP_NEED_CONTROL FALSE
-#define GDISP_NEED_MULTITHREAD FALSE
-#define GDISP_NEED_ASYNC FALSE
-#define GDISP_NEED_MSGAPI FALSE
#define GDISP_INCLUDE_FONT_UI2 TRUE
diff --git a/demos/modules/gdisp/gdisp_multiple_displays/main.c b/demos/modules/gdisp/multiple_displays/main.c
index 443bee27..443bee27 100644
--- a/demos/modules/gdisp/gdisp_multiple_displays/main.c
+++ b/demos/modules/gdisp/multiple_displays/main.c
diff --git a/demos/modules/gdisp/gdisp_streaming/gfxconf.h b/demos/modules/gdisp/streaming/gfxconf.h
index b38be854..4038a3fd 100644
--- a/demos/modules/gdisp/gdisp_streaming/gfxconf.h
+++ b/demos/modules/gdisp/streaming/gfxconf.h
@@ -9,35 +9,21 @@
#ifndef _GFXCONF_H
#define _GFXCONF_H
-/* The operating system to use - one of these must be defined */
-//#define GFX_USE_OS_CHIBIOS TRUE
+/* The operating system to use. One of these must be defined - preferably in your Makefile */
+//#define GFX_USE_OS_CHIBIOS FALSE
//#define GFX_USE_OS_WIN32 FALSE
-//#define GFX_USE_OS_POSIX FALSE
+//#define GFX_USE_OS_LINUX FALSE
+//#define GFX_USE_OS_OSX FALSE
/* GFX sub-systems to turn on */
#define GFX_USE_GDISP TRUE
#define GFX_USE_GMISC TRUE
/* Features for the GDISP sub-system. */
-#define GDISP_NEED_AUTOFLUSH FALSE
#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_CLIP FALSE
-#define GDISP_NEED_TEXT FALSE
-#define GDISP_NEED_CIRCLE FALSE
-#define GDISP_NEED_ELLIPSE FALSE
-#define GDISP_NEED_ARC FALSE
-#define GDISP_NEED_SCROLL FALSE
-#define GDISP_NEED_PIXELREAD FALSE
-#define GDISP_NEED_CONTROL FALSE
-#define GDISP_NEED_MULTITHREAD FALSE
#define GDISP_NEED_STREAMING TRUE
-/* Builtin Fonts */
-#define GDISP_INCLUDE_FONT_UI2 FALSE
-
#define GFX_USE_GMISC TRUE
-#define GMISC_NEED_FIXEDTRIG FALSE
-#define GMISC_NEED_FASTTRIG FALSE
#define GMISC_NEED_INVSQRT TRUE
//#define GDISP_INVSQRT_MIXED_ENDIAN TRUE
//#define GDISP_INVSQRT_REAL_SLOW TRUE
diff --git a/demos/modules/gdisp/gdisp_streaming/main.c b/demos/modules/gdisp/streaming/main.c
index 5b857eeb..5b857eeb 100644
--- a/demos/modules/gdisp/gdisp_streaming/main.c
+++ b/demos/modules/gdisp/streaming/main.c
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-14 13:13:43 +0000