Merge branch 'tdisp'

8 files changed, 104 insertions, 0 deletions

diff --git a/demos/modules/gdisp_basics/gfxconf.h b/demos/modules/gdisp/gdisp_basics/gfxconf.h
index 498046b4..498046b4 100644
--- a/demos/modules/gdisp_basics/gfxconf.h
+++ b/demos/modules/gdisp/gdisp_basics/gfxconf.h
diff --git a/demos/modules/gdisp_basics/main.c b/demos/modules/gdisp/gdisp_basics/main.c
index fa0bef45..fa0bef45 100644
--- a/demos/modules/gdisp_basics/main.c
+++ b/demos/modules/gdisp/gdisp_basics/main.c
diff --git a/demos/modules/gdisp_circles/gfxconf.h b/demos/modules/gdisp/gdisp_circles/gfxconf.h
index 00d88e48..00d88e48 100644
--- a/demos/modules/gdisp_circles/gfxconf.h
+++ b/demos/modules/gdisp/gdisp_circles/gfxconf.h
diff --git a/demos/modules/gdisp_circles/main.c b/demos/modules/gdisp/gdisp_circles/main.c
index 45764d4f..45764d4f 100644
--- a/demos/modules/gdisp_circles/main.c
+++ b/demos/modules/gdisp/gdisp_circles/main.c
diff --git a/demos/modules/gdisp_text/gfxconf.h b/demos/modules/gdisp/gdisp_text/gfxconf.h
index a928806b..a928806b 100644
--- a/demos/modules/gdisp_text/gfxconf.h
+++ b/demos/modules/gdisp/gdisp_text/gfxconf.h
diff --git a/demos/modules/gdisp_text/main.c b/demos/modules/gdisp/gdisp_text/main.c
index 4dc45f71..4dc45f71 100644
--- a/demos/modules/gdisp_text/main.c
+++ b/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 <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"

+

+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);	

+	}

+}

+