diff options
| author | inmarket <andrewh@inmarket.com.au> | 2013-05-25 01:26:52 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2013-05-25 01:26:52 +1000 |
| commit | 7fbfde42aabbcd30cffba2fba35158236c0a6c6c (patch) | |
| tree | e85c90a4f21974b706315d64209021e0b2bde764 /demos/applications | |
| parent | 42006a67b5ccfd86f30d8a91cc474681c437eaf6 (diff) | |
| download | uGFX-7fbfde42aabbcd30cffba2fba35158236c0a6c6c.tar.gz uGFX-7fbfde42aabbcd30cffba2fba35158236c0a6c6c.tar.bz2 uGFX-7fbfde42aabbcd30cffba2fba35158236c0a6c6c.zip | |
GOS module, for operating system independance
GMISC fast floating point trig
GMISC fast fixed point trig
Diffstat (limited to 'demos/applications')
| -rw-r--r-- | demos/applications/mandelbrot/gfxconf.h | 9 | ||||
| -rw-r--r-- | demos/applications/mandelbrot/main.c | 7 | ||||
| -rw-r--r-- | demos/applications/notepad/gfxconf.h | 5 | ||||
| -rw-r--r-- | demos/applications/notepad/main.c | 7 |
4 files changed, 12 insertions, 16 deletions
diff --git a/demos/applications/mandelbrot/gfxconf.h b/demos/applications/mandelbrot/gfxconf.h index 7093884f..a2b15927 100644 --- a/demos/applications/mandelbrot/gfxconf.h +++ b/demos/applications/mandelbrot/gfxconf.h @@ -28,12 +28,13 @@ #ifndef _GFXCONF_H
#define _GFXCONF_H
+/* The operating system to use - one of these must be defined */
+#define GFX_USE_OS_CHIBIOS TRUE
+#define GFX_USE_OS_WIN32 FALSE
+#define GFX_USE_OS_POSIX FALSE
+
/* GFX sub-systems to turn on */
#define GFX_USE_GDISP TRUE
-#define GFX_USE_GWIN FALSE
-#define GFX_USE_GEVENT FALSE
-#define GFX_USE_GTIMER FALSE
-#define GFX_USE_GINPUT FALSE
/* Features for the GDISP sub-system. */
#define GDISP_NEED_VALIDATION TRUE
diff --git a/demos/applications/mandelbrot/main.c b/demos/applications/mandelbrot/main.c index 969a9c92..9d753a87 100644 --- a/demos/applications/mandelbrot/main.c +++ b/demos/applications/mandelbrot/main.c @@ -25,8 +25,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "ch.h"
-#include "hal.h"
#include "gfx.h"
void mandelbrot(float x1, float y1, float x2, float y2) {
@@ -66,10 +64,7 @@ int main(void) { float cx, cy;
float zoom = 1.0f;
- halInit();
- chSysInit();
-
- gdispInit();
+ gfxInit();
/* where to zoom in */
cx = -0.086f;
diff --git a/demos/applications/notepad/gfxconf.h b/demos/applications/notepad/gfxconf.h index 7ba6483b..b9aa53f9 100644 --- a/demos/applications/notepad/gfxconf.h +++ b/demos/applications/notepad/gfxconf.h @@ -28,6 +28,11 @@ #ifndef _GFXCONF_H
#define _GFXCONF_H
+/* The operating system to use - one of these must be defined */
+#define GFX_USE_OS_CHIBIOS TRUE
+#define GFX_USE_OS_WIN32 FALSE
+#define GFX_USE_OS_POSIX FALSE
+
/* GFX sub-systems to turn on */
#define GFX_USE_GDISP TRUE
#define GFX_USE_GWIN FALSE
diff --git a/demos/applications/notepad/main.c b/demos/applications/notepad/main.c index 1dcfd154..d9a6d954 100644 --- a/demos/applications/notepad/main.c +++ b/demos/applications/notepad/main.c @@ -25,8 +25,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "ch.h"
-#include "hal.h"
#include "gfx.h"
#define COLOR_SIZE 20
@@ -77,10 +75,7 @@ int main(void) { color_t color = Black;
uint16_t pen = 0;
- halInit();
- chSysInit();
-
- gdispInit();
+ gfxInit();
ginputGetMouse(0);
gdispSetOrientation(GDISP_ROTATE_90);
|