aboutsummaryrefslogtreecommitdiffstats
path: root/demos/applications
diff options
context:
space:
mode:
authorJoel Bodenmann <joel@unormal.org>2013-02-11 09:25:26 +0100
committerJoel Bodenmann <joel@unormal.org>2013-02-11 09:25:26 +0100
commit885b3d53b3a491c62fb0634b78cb9857723ac15d (patch)
tree4b825dc642cb6eb9a060e54bf8d69288fbee4904 /demos/applications
parent851e5fb09bdc086d734647128fd3051c3a8528e2 (diff)
downloaduGFX-885b3d53b3a491c62fb0634b78cb9857723ac15d.tar.gz
uGFX-885b3d53b3a491c62fb0634b78cb9857723ac15d.tar.bz2
uGFX-885b3d53b3a491c62fb0634b78cb9857723ac15d.zip
removed GDISP_LLD() macro
Diffstat (limited to 'demos/applications')
-rw-r--r--demos/applications/mandelbrot/gfxconf.h33
-rw-r--r--demos/applications/mandelbrot/main.c79
-rw-r--r--demos/applications/notepad/gfxconf.h43
-rw-r--r--demos/applications/notepad/main.c113
4 files changed, 0 insertions, 268 deletions
diff --git a/demos/applications/mandelbrot/gfxconf.h b/demos/applications/mandelbrot/gfxconf.h
deleted file mode 100644
index 7eaacc50..00000000
--- a/demos/applications/mandelbrot/gfxconf.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * This file has a different license to the rest of the GFX system.
- * You can copy, modify and distribute this file as you see fit.
- * You do not need to publish your source modifications to this file.
- * The only thing you are not permitted to do is to relicense it
- * under a different license.
- */
-
-#ifndef _GFXCONF_H
-#define _GFXCONF_H
-
-/* 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
-#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_ASYNC FALSE
-#define GDISP_NEED_MSGAPI FALSE
-
-#endif /* _GFXCONF_H */
diff --git a/demos/applications/mandelbrot/main.c b/demos/applications/mandelbrot/main.c
deleted file mode 100644
index 2fe1141d..00000000
--- a/demos/applications/mandelbrot/main.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- ChibiOS/GFX - Copyright (C) 2012
- Joel Bodenmann aka Tectu <joel@unormal.org>
-
- This file is part of ChibiOS/GFX.
-
- ChibiOS/GFX is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- ChibiOS/GFX is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "ch.h"
-#include "hal.h"
-#include "gfx.h"
-
-void mandelbrot(float x1, float y1, float x2, float y2) {
- unsigned int i,j, width, height;
- uint16_t iter;
- color_t color;
- float fwidth, fheight;
-
- float sy = y2 - y1;
- float sx = x2 - x1;
- const int MAX = 512;
-
- width = (unsigned int)gdispGetWidth();
- height = (unsigned int)gdispGetHeight();
- fwidth = width;
- fheight = height;
-
- for(i = 0; i < width; i++) {
- for(j = 0; j < height; j++) {
- float cy = j * sy / fheight + y1;
- float cx = i * sx / fwidth + x1;
- float x=0.0f, y=0.0f, xx=0.0f, yy=0.0f;
- for(iter=0; iter <= MAX && xx+yy<4.0f; iter++) {
- xx = x*x;
- yy = y*y;
- y = 2.0f*x*y + cy;
- x = xx - yy + cx;
- }
- //color = ((iter << 8) | (iter&0xFF));
- color = RGB2COLOR(iter<<7, iter<<4, iter);
- gdispDrawPixel(i, j, color);
- }
- }
-}
-
-int main(void) {
- float cx, cy;
- float zoom = 1.0f;
-
- halInit();
- chSysInit();
-
- gdispInit();
-
- /* where to zoom in */
- cx = -0.086f;
- cy = 0.85f;
-
- while(TRUE) {
- mandelbrot(-2.0f*zoom+cx, -1.5f*zoom+cy, 2.0f*zoom+cx, 1.5f*zoom+cy);
-
- zoom *= 0.7f;
- if(zoom <= 0.00001f)
- zoom = 1.0f;
- }
-}
-
diff --git a/demos/applications/notepad/gfxconf.h b/demos/applications/notepad/gfxconf.h
deleted file mode 100644
index 45413580..00000000
--- a/demos/applications/notepad/gfxconf.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * This file has a different license to the rest of the GFX system.
- * You can copy, modify and distribute this file as you see fit.
- * You do not need to publish your source modifications to this file.
- * The only thing you are not permitted to do is to relicense it
- * under a different license.
- */
-
-#ifndef _GFXCONF_H
-#define _GFXCONF_H
-
-/* GFX sub-systems to turn on */
-#define GFX_USE_GDISP TRUE
-#define GFX_USE_GWIN FALSE
-#define GFX_USE_GEVENT TRUE
-#define GFX_USE_GTIMER TRUE
-#define GFX_USE_GINPUT TRUE
-
-/* Features for the GDISP sub-system. */
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_CLIP TRUE
-#define GDISP_NEED_TEXT TRUE
-#define GDISP_NEED_CIRCLE TRUE
-#define GDISP_NEED_ELLIPSE FALSE
-#define GDISP_NEED_ARC FALSE
-#define GDISP_NEED_SCROLL FALSE
-#define GDISP_NEED_PIXELREAD FALSE
-#define GDISP_NEED_CONTROL TRUE
-#define GDISP_NEED_MULTITHREAD TRUE
-#define GDISP_NEED_ASYNC FALSE
-#define GDISP_NEED_MSGAPI FALSE
-
-/* Builtin Fonts */
-#define GDISP_INCLUDE_FONT_SMALL FALSE
-#define GDISP_INCLUDE_FONT_LARGER FALSE
-#define GDISP_INCLUDE_FONT_UI1 FALSE
-#define GDISP_INCLUDE_FONT_UI2 TRUE
-#define GDISP_INCLUDE_FONT_LARGENUMBERS TRUE
-
-/* Features for the GINPUT sub-system. */
-#define GINPUT_NEED_MOUSE TRUE
-
-#endif /* _GFXCONF_H */
diff --git a/demos/applications/notepad/main.c b/demos/applications/notepad/main.c
deleted file mode 100644
index 919aaafc..00000000
--- a/demos/applications/notepad/main.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- ChibiOS/GFX - Copyright (C) 2012
- Joel Bodenmann aka Tectu <joel@unormal.org>
-
- This file is part of ChibiOS/GFX.
-
- ChibiOS/GFX is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- ChibiOS/GFX is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "ch.h"
-#include "hal.h"
-#include "gfx.h"
-
-#define COLOR_SIZE 20
-#define PEN_SIZE 20
-#define OFFSET 3
-
-#define COLOR_BOX(a) (ev.x >= a && ev.x <= a + COLOR_SIZE)
-#define PEN_BOX(a) (ev.y >= a && ev.y <= a + COLOR_SIZE)
-#define GET_COLOR(a) (COLOR_BOX(a * COLOR_SIZE + OFFSET))
-#define GET_PEN(a) (PEN_BOX(a * 2 * PEN_SIZE + OFFSET))
-#define DRAW_COLOR(a) (a * COLOR_SIZE + OFFSET)
-#define DRAW_PEN(a) (a * 2 * PEN_SIZE + OFFSET)
-#define DRAW_AREA(x, y) (x >= PEN_SIZE + OFFSET + 3 && x <= gdispGetWidth() && \
- y >= COLOR_SIZE + OFFSET + 3 && y <= gdispGetHeight())
-
-void drawScreen(void) {
- char *msg = "ChibiOS/GFX";
- font_t font1, font2;
-
- font1 = gdispOpenFont("UI2 Double");
- font2 = gdispOpenFont("LargeNumbers");
-
- gdispClear(White);
- gdispDrawString(gdispGetWidth()-gdispGetStringWidth(msg, font1)-3, 3, msg, font1, Black);
-
- /* colors */
- gdispFillArea(0 * COLOR_SIZE + 3, 3, COLOR_SIZE, COLOR_SIZE, Black); /* Black */
- gdispFillArea(1 * COLOR_SIZE + 3, 3, COLOR_SIZE, COLOR_SIZE, Red); /* Red */
- gdispFillArea(2 * COLOR_SIZE + 3, 3, COLOR_SIZE, COLOR_SIZE, Yellow); /* Yellow */
- gdispFillArea(3 * COLOR_SIZE + 3, 3, COLOR_SIZE, COLOR_SIZE, Green); /* Green */
- gdispFillArea(4 * COLOR_SIZE + 3, 3, COLOR_SIZE, COLOR_SIZE, Blue); /* Blue */
- gdispDrawBox (5 * COLOR_SIZE + 3, 3, COLOR_SIZE, COLOR_SIZE, Black); /* White */
-
- /* pens */
- gdispDrawString(OFFSET * 2, DRAW_PEN(1), "1", font2, Black);
- gdispDrawString(OFFSET * 2, DRAW_PEN(2), "2", font2, Black);
- gdispDrawString(OFFSET * 2, DRAW_PEN(3), "3", font2, Black);
- gdispDrawString(OFFSET * 2, DRAW_PEN(4), "4", font2, Black);
- gdispDrawString(OFFSET * 2, DRAW_PEN(5), "5", font2, Black);
-
- gdispCloseFont(font1);
- gdispCloseFont(font2);
-}
-
-GEventMouse ev;
-
-int main(void) {
- color_t color = Black;
- uint16_t pen = 0;
-
- halInit();
- chSysInit();
-
- gdispInit();
- ginputGetMouse(0);
- gdispSetOrientation(GDISP_ROTATE_90);
-
- drawScreen();
-
- while (TRUE) {
- ginputGetMouseStatus(0, &ev);
- if (!(ev.current_buttons & GINPUT_MOUSE_BTN_LEFT))
- continue;
-
- /* inside color box ? */
- if(ev.y >= OFFSET && ev.y <= COLOR_SIZE) {
- if(GET_COLOR(0)) color = Black;
- else if(GET_COLOR(1)) color = Red;
- else if(GET_COLOR(2)) color = Yellow;
- else if(GET_COLOR(3)) color = Green;
- else if(GET_COLOR(4)) color = Blue;
- else if(GET_COLOR(5)) color = White;
-
- /* inside pen box ? */
- } else if(ev.x >= OFFSET && ev.x <= PEN_SIZE) {
- if(GET_PEN(1)) pen = 0;
- else if(GET_PEN(2)) pen = 1;
- else if(GET_PEN(3)) pen = 2;
- else if(GET_PEN(4)) pen = 3;
- else if(GET_PEN(5)) pen = 4;
-
- /* inside drawing area ? */
- } else if(DRAW_AREA(ev.x, ev.y)) {
- if(pen == 0)
- gdispDrawPixel(ev.x, ev.y, color);
- else
- gdispFillCircle(ev.x, ev.y, pen, color);
- }
- }
-}
-