From 249a1b345f1064957a6fd187fcdfbbcd3c1fecad Mon Sep 17 00:00:00 2001 From: Joel Bodenmann Date: Fri, 11 Jan 2013 15:04:33 +0100 Subject: [PATCH] added tdisp demo --- .../{ => gdisp}/gdisp_basics/gfxconf.h | 0 demos/modules/{ => gdisp}/gdisp_basics/main.c | 0 .../{ => gdisp}/gdisp_circles/gfxconf.h | 0 .../modules/{ => gdisp}/gdisp_circles/main.c | 0 .../modules/{ => gdisp}/gdisp_text/gfxconf.h | 0 demos/modules/{ => gdisp}/gdisp_text/main.c | 0 demos/modules/tdisp/gfxconf.h | 55 +++++++++++++++++++ demos/modules/tdisp/main.c | 49 +++++++++++++++++ src/tdisp/tdisp.c | 2 +- 9 files changed, 105 insertions(+), 1 deletion(-) rename demos/modules/{ => gdisp}/gdisp_basics/gfxconf.h (100%) rename demos/modules/{ => gdisp}/gdisp_basics/main.c (100%) rename demos/modules/{ => gdisp}/gdisp_circles/gfxconf.h (100%) rename demos/modules/{ => gdisp}/gdisp_circles/main.c (100%) rename demos/modules/{ => gdisp}/gdisp_text/gfxconf.h (100%) rename demos/modules/{ => gdisp}/gdisp_text/main.c (100%) create mode 100644 demos/modules/tdisp/gfxconf.h create mode 100644 demos/modules/tdisp/main.c diff --git a/demos/modules/gdisp_basics/gfxconf.h b/demos/modules/gdisp/gdisp_basics/gfxconf.h similarity index 100% rename from demos/modules/gdisp_basics/gfxconf.h rename to demos/modules/gdisp/gdisp_basics/gfxconf.h diff --git a/demos/modules/gdisp_basics/main.c b/demos/modules/gdisp/gdisp_basics/main.c similarity index 100% rename from demos/modules/gdisp_basics/main.c rename to demos/modules/gdisp/gdisp_basics/main.c diff --git a/demos/modules/gdisp_circles/gfxconf.h b/demos/modules/gdisp/gdisp_circles/gfxconf.h similarity index 100% rename from demos/modules/gdisp_circles/gfxconf.h rename to demos/modules/gdisp/gdisp_circles/gfxconf.h diff --git a/demos/modules/gdisp_circles/main.c b/demos/modules/gdisp/gdisp_circles/main.c similarity index 100% rename from demos/modules/gdisp_circles/main.c rename to demos/modules/gdisp/gdisp_circles/main.c diff --git a/demos/modules/gdisp_text/gfxconf.h b/demos/modules/gdisp/gdisp_text/gfxconf.h similarity index 100% rename from demos/modules/gdisp_text/gfxconf.h rename to demos/modules/gdisp/gdisp_text/gfxconf.h diff --git a/demos/modules/gdisp_text/main.c b/demos/modules/gdisp/gdisp_text/main.c similarity index 100% rename from demos/modules/gdisp_text/main.c rename to demos/modules/gdisp/gdisp_text/main.c diff --git a/demos/modules/tdisp/gfxconf.h b/demos/modules/tdisp/gfxconf.h new file mode 100644 index 00000000..5077e010 --- /dev/null +++ b/demos/modules/tdisp/gfxconf.h @@ -0,0 +1,55 @@ +/** + * 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_TDISP TRUE +#define GFX_USE_GDISP FALSE +#define GFX_USE_GWIN FALSE +#define GFX_USE_GEVENT FALSE +#define GFX_USE_GTIMER FALSE +#define GFX_USE_GINPUT FALSE + +/* Features for the GDISP subsystem */ +#define GDISP_NEED_VALIDATION FALSE +#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 + +/* Features for the TDISP subsystem */ +#define TDISP_NEED_4BIT_MODE TRUE +#define TDISP_NEED_8BIT_MODE 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 FALSE +#define GDISP_INCLUDE_FONT_LARGENUMBERS FALSE + +/* GWIN */ +#define GWIN_NEED_CONSOLE FALSE +#define GWIN_NEED_GRAPH FALSE +#define GWIN_NEED_BUTTON FALSE +#define GWIN_NEED_DIAL FALSE + +/* GINPUT */ +#define GINPUT_NEED_MOUSE FALSE + +#endif /* _GFXCONF_H */ + diff --git a/demos/modules/tdisp/main.c b/demos/modules/tdisp/main.c new file mode 100644 index 00000000..b67b3b8c --- /dev/null +++ b/demos/modules/tdisp/main.c @@ -0,0 +1,49 @@ +/* + ChibiOS/GFX - Copyright (C) 2012 + Joel Bodenmann aka Tectu + + 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 . +*/ + +#include "ch.h" +#include "hal.h" +#include "gfx.h" + +int main(void) { + halInit(); + chSysInit(); + + tdispInit(); + + tdispHome(); + tdispClear(); + + tdispGotoXY(4, 0); + tdispDrawChar('H'); + tdispDrawChar('D'); + tdispDrawChar('4'); + tdispDrawChar('4'); + tdispDrawChar('7'); + tdispDrawChar('8'); + tdispDrawChar('0'); + + tdispDrawStringLocation(0, 1, "chibios-gfx.com"); + + while(TRUE) { + chThdSleepMilliseconds(250); + } +} + diff --git a/src/tdisp/tdisp.c b/src/tdisp/tdisp.c index 121ebcf5..d57bae56 100644 --- a/src/tdisp/tdisp.c +++ b/src/tdisp/tdisp.c @@ -36,7 +36,7 @@ static uint8_t _displaycontrol; bool_t tdispInit(void) { bool_t ret; - ret = TDIP_LLD(init)(); + ret = TDISP_LLD(init)(); return ret; }