aboutsummaryrefslogtreecommitdiffstats
path: root/demos
diff options
context:
space:
mode:
Diffstat (limited to 'demos')
-rw-r--r--demos/3rdparty/bubbles/demo.mk3
-rw-r--r--demos/3rdparty/bubbles/main.c8
-rw-r--r--demos/3rdparty/doom/demo.mk65
-rw-r--r--demos/3rdparty/doom/doom.mk64
-rw-r--r--demos/3rdparty/notepad-2/demo.mk5
-rw-r--r--demos/applications/mandelbrot/demo.mk3
-rw-r--r--demos/applications/notepad/demo.mk3
-rw-r--r--demos/applications/notepad/gfxconf.h1
-rw-r--r--demos/applications/notepad/main.c1
-rw-r--r--demos/benchmarks/demo.mk3
-rw-r--r--demos/modules/gadc/demo.mk3
-rw-r--r--demos/modules/gadc/gwinosc.c2
-rw-r--r--demos/modules/gaudin/demo.mk3
-rw-r--r--demos/modules/gaudin/gwinosc.c2
-rw-r--r--demos/modules/gdisp/basics/demo.mk3
-rw-r--r--demos/modules/gdisp/circles/demo.mk3
-rw-r--r--demos/modules/gdisp/fonts/demo.mk3
-rw-r--r--demos/modules/gdisp/fonts_cyrillic/demo.mk3
-rw-r--r--demos/modules/gdisp/images/demo.mk3
-rw-r--r--demos/modules/gdisp/images_animated/demo.mk3
-rw-r--r--demos/modules/gdisp/multiple_displays/demo.mk3
-rw-r--r--demos/modules/gdisp/streaming/demo.mk3
-rw-r--r--demos/modules/gtimer/demo.mk3
-rw-r--r--demos/modules/gwin/basic/demo.mk3
-rw-r--r--demos/modules/gwin/button/demo.mk3
-rw-r--r--demos/modules/gwin/button/gfxconf.h1
-rw-r--r--demos/modules/gwin/button/main.c16
-rw-r--r--demos/modules/gwin/checkbox/demo.mk3
-rw-r--r--demos/modules/gwin/checkbox/main.c2
-rw-r--r--demos/modules/gwin/console/demo.mk3
-rw-r--r--demos/modules/gwin/graph/demo.mk3
-rw-r--r--demos/modules/gwin/graph/gfxconf.h4
-rw-r--r--demos/modules/gwin/list/demo.mk3
-rw-r--r--demos/modules/gwin/list/gfxconf.h1
-rw-r--r--demos/modules/gwin/progressbar/demo.mk3
-rw-r--r--demos/modules/gwin/radio/demo.mk3
-rw-r--r--demos/modules/gwin/radio/main.c2
-rw-r--r--demos/modules/gwin/slider/demo.mk3
-rw-r--r--demos/modules/gwin/slider/main.c2
-rw-r--r--demos/modules/gwin/widgets/demo.mk3
40 files changed, 175 insertions, 76 deletions
diff --git a/demos/3rdparty/bubbles/demo.mk b/demos/3rdparty/bubbles/demo.mk
new file mode 100644
index 00000000..ca577508
--- /dev/null
+++ b/demos/3rdparty/bubbles/demo.mk
@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/3rdparty/bubbles
+GFXINC += $(DEMODIR)
+GFXSRC += $(DEMODIR)/main.c
diff --git a/demos/3rdparty/bubbles/main.c b/demos/3rdparty/bubbles/main.c
index 62ef2830..f167b536 100644
--- a/demos/3rdparty/bubbles/main.c
+++ b/demos/3rdparty/bubbles/main.c
@@ -60,7 +60,7 @@ void matrix (int16_t xyz[3][N], color_t col[N])
xyz[0][i] = x;
xyz[1][i] = y;
- d = sqrtf(x * x + y * y); /* originally a fastsqrt() call */
+ d = sqrt(x * x + y * y); /* originally a fastsqrt() call */
s = sine[(t * 30) % SCALE] + SCALE;
xyz[2][i] = sine[(d + s) % SCALE] * sine[(t * 10) % SCALE] / SCALE / 2;
@@ -151,11 +151,11 @@ int main (void)
gfxInit();
- chThdSleepMilliseconds (10);
+ gfxSleepMilliseconds (10);
gdispClear (background); /* glitches.. */
- chThdSleepMilliseconds (10);
+ gfxSleepMilliseconds (10);
gdispClear (background); /* glitches.. */
- chThdSleepMilliseconds (10);
+ gfxSleepMilliseconds (10);
gdispClear (background); /* glitches.. */
width = (uint16_t)gdispGetWidth();
diff --git a/demos/3rdparty/doom/demo.mk b/demos/3rdparty/doom/demo.mk
new file mode 100644
index 00000000..78faf4c2
--- /dev/null
+++ b/demos/3rdparty/doom/demo.mk
@@ -0,0 +1,65 @@
+DEMODIR = $(GFXLIB)/demos/3rdparty/doom
+GFXINC += $(DEMODIR)
+GFXSRC += \
+ $(DEMODIR)/d_main.c \
+ $(DEMODIR)/i_main.c \
+ $(DEMODIR)/i_system.c \
+ $(DEMODIR)/i_sound.c \
+ $(DEMODIR)/i_video.c \
+ $(DEMODIR)/i_net.c \
+ $(DEMODIR)/doomdef.c \
+ $(DEMODIR)/doomstat.c \
+ $(DEMODIR)/dstrings.c \
+ $(DEMODIR)/tables.c \
+ $(DEMODIR)/f_finale.c \
+ $(DEMODIR)/f_wipe.c \
+ $(DEMODIR)/d_net.c \
+ $(DEMODIR)/d_items.c \
+ $(DEMODIR)/g_game.c \
+ $(DEMODIR)/m_menu.c \
+ $(DEMODIR)/m_misc.c \
+ $(DEMODIR)/m_argv.c \
+ $(DEMODIR)/m_bbox.c \
+ $(DEMODIR)/m_fixed.c \
+ $(DEMODIR)/m_swap.c \
+ $(DEMODIR)/m_cheat.c \
+ $(DEMODIR)/m_random.c \
+ $(DEMODIR)/am_map.c \
+ $(DEMODIR)/p_ceilng.c \
+ $(DEMODIR)/p_doors.c \
+ $(DEMODIR)/p_enemy.c \
+ $(DEMODIR)/p_floor.c \
+ $(DEMODIR)/p_inter.c \
+ $(DEMODIR)/p_lights.c \
+ $(DEMODIR)/p_map.c \
+ $(DEMODIR)/p_maputl.c \
+ $(DEMODIR)/p_plats.c \
+ $(DEMODIR)/p_pspr.c \
+ $(DEMODIR)/p_setup.c \
+ $(DEMODIR)/p_sight.c \
+ $(DEMODIR)/p_spec.c \
+ $(DEMODIR)/p_switch.c \
+ $(DEMODIR)/p_mobj.c \
+ $(DEMODIR)/p_telept.c \
+ $(DEMODIR)/p_tick.c \
+ $(DEMODIR)/p_saveg.c \
+ $(DEMODIR)/p_user.c \
+ $(DEMODIR)/r_bsp.c \
+ $(DEMODIR)/r_data.c \
+ $(DEMODIR)/r_draw.c \
+ $(DEMODIR)/r_main.c \
+ $(DEMODIR)/r_plane.c \
+ $(DEMODIR)/r_segs.c \
+ $(DEMODIR)/r_sky.c \
+ $(DEMODIR)/r_things.c \
+ $(DEMODIR)/w_wad.c \
+ $(DEMODIR)/wi_stuff.c \
+ $(DEMODIR)/v_video.c \
+ $(DEMODIR)/st_lib.c \
+ $(DEMODIR)/st_stuff.c \
+ $(DEMODIR)/hu_stuff.c \
+ $(DEMODIR)/hu_lib.c \
+ $(DEMODIR)/s_sound.c \
+ $(DEMODIR)/z_zone.c \
+ $(DEMODIR)/info.c \
+ $(DEMODIR)/sounds.c
diff --git a/demos/3rdparty/doom/doom.mk b/demos/3rdparty/doom/doom.mk
deleted file mode 100644
index 6581f8c1..00000000
--- a/demos/3rdparty/doom/doom.mk
+++ /dev/null
@@ -1,64 +0,0 @@
-MYFILES = $(GFXLIB)/demos/3rdparty/doom
-MYCSRC = \
- $(MYFILES)/d_main.c \
- $(MYFILES)/i_main.c \
- $(MYFILES)/i_system.c \
- $(MYFILES)/i_sound.c \
- $(MYFILES)/i_video.c \
- $(MYFILES)/i_net.c \
- $(MYFILES)/doomdef.c \
- $(MYFILES)/doomstat.c \
- $(MYFILES)/dstrings.c \
- $(MYFILES)/tables.c \
- $(MYFILES)/f_finale.c \
- $(MYFILES)/f_wipe.c \
- $(MYFILES)/d_net.c \
- $(MYFILES)/d_items.c \
- $(MYFILES)/g_game.c \
- $(MYFILES)/m_menu.c \
- $(MYFILES)/m_misc.c \
- $(MYFILES)/m_argv.c \
- $(MYFILES)/m_bbox.c \
- $(MYFILES)/m_fixed.c \
- $(MYFILES)/m_swap.c \
- $(MYFILES)/m_cheat.c \
- $(MYFILES)/m_random.c \
- $(MYFILES)/am_map.c \
- $(MYFILES)/p_ceilng.c \
- $(MYFILES)/p_doors.c \
- $(MYFILES)/p_enemy.c \
- $(MYFILES)/p_floor.c \
- $(MYFILES)/p_inter.c \
- $(MYFILES)/p_lights.c \
- $(MYFILES)/p_map.c \
- $(MYFILES)/p_maputl.c \
- $(MYFILES)/p_plats.c \
- $(MYFILES)/p_pspr.c \
- $(MYFILES)/p_setup.c \
- $(MYFILES)/p_sight.c \
- $(MYFILES)/p_spec.c \
- $(MYFILES)/p_switch.c \
- $(MYFILES)/p_mobj.c \
- $(MYFILES)/p_telept.c \
- $(MYFILES)/p_tick.c \
- $(MYFILES)/p_saveg.c \
- $(MYFILES)/p_user.c \
- $(MYFILES)/r_bsp.c \
- $(MYFILES)/r_data.c \
- $(MYFILES)/r_draw.c \
- $(MYFILES)/r_main.c \
- $(MYFILES)/r_plane.c \
- $(MYFILES)/r_segs.c \
- $(MYFILES)/r_sky.c \
- $(MYFILES)/r_things.c \
- $(MYFILES)/w_wad.c \
- $(MYFILES)/wi_stuff.c \
- $(MYFILES)/v_video.c \
- $(MYFILES)/st_lib.c \
- $(MYFILES)/st_stuff.c \
- $(MYFILES)/hu_stuff.c \
- $(MYFILES)/hu_lib.c \
- $(MYFILES)/s_sound.c \
- $(MYFILES)/z_zone.c \
- $(MYFILES)/info.c \
- $(MYFILES)/sounds.c
diff --git a/demos/3rdparty/notepad-2/demo.mk b/demos/3rdparty/notepad-2/demo.mk
new file mode 100644
index 00000000..4fd08c23
--- /dev/null
+++ b/demos/3rdparty/notepad-2/demo.mk
@@ -0,0 +1,5 @@
+DEMODIR = $(GFXLIB)/demos/3rdparty/notepad-2
+GFXINC += $(DEMODIR)
+GFXSRC += $(DEMODIR)/main.c \
+ $(DEMODIR)/notepadApp.c \
+ $(DEMODIR)/notepadCore.c
diff --git a/demos/applications/mandelbrot/demo.mk b/demos/applications/mandelbrot/demo.mk
new file mode 100644
index 00000000..e2be68d3
--- /dev/null
+++ b/demos/applications/mandelbrot/demo.mk
@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/applications/mandelbrot
+GFXINC += $(DEMODIR)
+GFXSRC += $(DEMODIR)/main.c
diff --git a/demos/applications/notepad/demo.mk b/demos/applications/notepad/demo.mk
new file mode 100644
index 00000000..06c7808d
--- /dev/null
+++ b/demos/applications/notepad/demo.mk
@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/applications/notepad
+GFXINC += $(DEMODIR)
+GFXSRC += $(DEMODIR)/main.c
diff --git a/demos/applications/notepad/gfxconf.h b/demos/applications/notepad/gfxconf.h
index 7ffb22fa..b3920119 100644
--- a/demos/applications/notepad/gfxconf.h
+++ b/demos/applications/notepad/gfxconf.h
@@ -47,7 +47,6 @@
#define GDISP_NEED_CLIP TRUE
#define GDISP_NEED_TEXT TRUE
#define GDISP_NEED_CIRCLE TRUE
-#define GDISP_NEED_CONTROL TRUE
#define GDISP_NEED_MULTITHREAD TRUE
/* Builtin Fonts */
diff --git a/demos/applications/notepad/main.c b/demos/applications/notepad/main.c
index d2d53464..fb10e86b 100644
--- a/demos/applications/notepad/main.c
+++ b/demos/applications/notepad/main.c
@@ -79,7 +79,6 @@ int main(void) {
gfxInit();
ginputGetMouse(0);
- gdispSetOrientation(GDISP_ROTATE_90);
drawScreen();
diff --git a/demos/benchmarks/demo.mk b/demos/benchmarks/demo.mk
new file mode 100644
index 00000000..d6589586
--- /dev/null
+++ b/demos/benchmarks/demo.mk
@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/benchmarks
+GFXINC += $(DEMODIR)
+GFXSRC += $(DEMODIR)/main.c
diff --git a/demos/modules/gadc/demo.mk b/demos/modules/gadc/demo.mk
new file mode 100644
index 00000000..d66445af
--- /dev/null
+++ b/demos/modules/gadc/demo.mk
@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gadc
+GFXINC += $(DEMODIR)
+GFXSRC += $(DEMODIR)/main.c $(DEMODIR)/gwinosc.c
diff --git a/demos/modules/gadc/gwinosc.c b/demos/modules/gadc/gwinosc.c
index 4cc1fc3a..afa12bfc 100644
--- a/demos/modules/gadc/gwinosc.c
+++ b/demos/modules/gadc/gwinosc.c
@@ -36,7 +36,7 @@
#include "gwinosc.h"
/* Include internal GWIN routines so we can build our own superset class */
-#include "gwin/class_gwin.h"
+#include "src/gwin/class_gwin.h"
/* The size of our dynamically allocated audio buffer */
#define AUDIOBUFSZ 64*2
diff --git a/demos/modules/gaudin/demo.mk b/demos/modules/gaudin/demo.mk
new file mode 100644
index 00000000..1b57f289
--- /dev/null
+++ b/demos/modules/gaudin/demo.mk
@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gaudin
+GFXINC += $(DEMODIR)
+GFXSRC += $(DEMODIR)/main.c $(DEMODIR)/gwinosc.c
diff --git a/demos/modules/gaudin/gwinosc.c b/demos/modules/gaudin/gwinosc.c
index 28a5cf69..43ef1385 100644
--- a/demos/modules/gaudin/gwinosc.c
+++ b/demos/modules/gaudin/gwinosc.c
@@ -43,7 +43,7 @@
#include "gwinosc.h"
/* Include internal GWIN routines so we can build our own superset class */
-#include "gwin/class_gwin.h"
+#include "src/gwin/class_gwin.h"
/* The size of our dynamically allocated audio buffer */
#define AUDIOBUFSZ 64*2
diff --git a/demos/modules/gdisp/basics/demo.mk b/demos/modules/gdisp/basics/demo.mk
new file mode 100644
index 00000000..1d62403e
--- /dev/null
+++ b/demos/modules/gdisp/basics/demo.mk
@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gdisp/basics
+GFXINC += $(DEMODIR)
+GFXSRC += $(DEMODIR)/main.c
diff --git a/demos/modules/gdisp/circles/demo.mk b/demos/modules/gdisp/circles/demo.mk
new file mode 100644
index 00000000..89fb5e33
--- /dev/null
+++ b/demos/modules/gdisp/circles/demo.mk
@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gdisp/circles
+GFXINC += $(DEMODIR)
+GFXSRC += $(DEMODIR)/main.c
diff --git a/demos/modules/gdisp/fonts/demo.mk b/demos/modules/gdisp/fonts/demo.mk
new file mode 100644
index 00000000..5422c3d8
--- /dev/null
+++ b/demos/modules/gdisp/fonts/demo.mk
@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gdisp/fonts
+GFXINC += $(DEMODIR)
+GFXSRC += $(DEMODIR)/main.c
diff --git a/demos/modules/gdisp/fonts_cyrillic/demo.mk b/demos/modules/gdisp/fonts_cyrillic/demo.mk
new file mode 100644
index 00000000..84f9a1fc
--- /dev/null
+++ b/demos/modules/gdisp/fonts_cyrillic/demo.mk
@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gdisp/fonts_cyrillic
+GFXINC += $(DEMODIR)
+GFXSRC += $(DEMODIR)/main.c
diff --git a/demos/modules/gdisp/images/demo.mk b/demos/modules/gdisp/images/demo.mk
new file mode 100644
index 00000000..afa8001b
--- /dev/null
+++ b/demos/modules/gdisp/images/demo.mk
@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gdisp/images
+GFXINC += $(DEMODIR)
+GFXSRC += $(DEMODIR)/main.c
diff --git a/demos/modules/gdisp/images_animated/demo.mk b/demos/modules/gdisp/images_animated/demo.mk
new file mode 100644
index 00000000..7a478617
--- /dev/null
+++ b/demos/modules/gdisp/images_animated/demo.mk
@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gdisp/images_animated
+GFXINC += $(DEMODIR)
+GFXSRC += $(DEMODIR)/main.c
diff --git a/demos/modules/gdisp/multiple_displays/demo.mk b/demos/modules/gdisp/multiple_displays/demo.mk
new file mode 100644
index 00000000..a8ebf468
--- /dev/null
+++ b/demos/modules/gdisp/multiple_displays/demo.mk
@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gdisp/multiple_displays
+GFXINC += $(DEMODIR)
+GFXSRC += $(DEMODIR)/main.c
diff --git a/demos/modules/gdisp/streaming/demo.mk b/demos/modules/gdisp/streaming/demo.mk
new file mode 100644
index 00000000..b1c124fe
--- /dev/null
+++ b/demos/modules/gdisp/streaming/demo.mk
@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gdisp/streaming
+GFXINC += $(DEMODIR)
+GFXSRC += $(DEMODIR)/main.c
diff --git a/demos/modules/gtimer/demo.mk b/demos/modules/gtimer/demo.mk
new file mode 100644
index 00000000..6eebe93f
--- /dev/null
+++ b/demos/modules/gtimer/demo.mk
@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gtimer
+GFXINC += $(DEMODIR)
+GFXSRC += $(DEMODIR)/main.c
diff --git a/demos/modules/gwin/basic/demo.mk b/demos/modules/gwin/basic/demo.mk
new file mode 100644
index 00000000..a5b7a8f2
--- /dev/null
+++ b/demos/modules/gwin/basic/demo.mk
@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gwin/basic
+GFXINC += $(DEMODIR)
+GFXSRC += $(DEMODIR)/main.c
diff --git a/demos/modules/gwin/button/demo.mk b/demos/modules/gwin/button/demo.mk
new file mode 100644
index 00000000..5b8cd2a5
--- /dev/null
+++ b/demos/modules/gwin/button/demo.mk
@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gwin/button
+GFXINC += $(DEMODIR)
+GFXSRC += $(DEMODIR)/main.c
diff --git a/demos/modules/gwin/button/gfxconf.h b/demos/modules/gwin/button/gfxconf.h
index 5376bd52..eba3f4ef 100644
--- a/demos/modules/gwin/button/gfxconf.h
+++ b/demos/modules/gwin/button/gfxconf.h
@@ -48,6 +48,7 @@
#define GDISP_NEED_CLIP TRUE
#define GDISP_NEED_CIRCLE TRUE
#define GDISP_NEED_TEXT TRUE
+#define GDISP_NEED_CONTROL TRUE
/* GDISP fonts to include */
#define GDISP_INCLUDE_FONT_UI2 TRUE
diff --git a/demos/modules/gwin/button/main.c b/demos/modules/gwin/button/main.c
index 6ec8a287..6349ca09 100644
--- a/demos/modules/gwin/button/main.c
+++ b/demos/modules/gwin/button/main.c
@@ -54,10 +54,16 @@ static void createWidgets(void) {
int main(void) {
GEvent* pe;
+ static const orientation_t orients[] = { GDISP_ROTATE_0, GDISP_ROTATE_90, GDISP_ROTATE_180, GDISP_ROTATE_270 };
+ unsigned which;
// Initialize the display
gfxInit();
+ // We are currently at GDISP_ROTATE_0
+ which = 0;
+ gdispSetOrientation(orients[which]);
+
// Set the widget defaults
gwinSetDefaultFont(gdispOpenFont("UI2"));
gwinSetDefaultStyle(&WhiteWidgetStyle, FALSE);
@@ -81,7 +87,15 @@ int main(void) {
case GEVENT_GWIN_BUTTON:
if (((GEventGWinButton*)pe)->button == ghButton1) {
// Our button has been pressed
- printf("Button clicked\r\n");
+ if (++which >= sizeof(orients)/sizeof(orients[0]))
+ which = 0;
+
+ // Setting the orientation during run-time is a bit naughty particularly with
+ // GWIN windows. In this case however we know that the button is in the top-left
+ // corner which should translate safely into any orientation.
+ gdispSetOrientation(orients[which]);
+ gdispClear(White);
+ gwinRedrawDisplay(GDISP, FALSE);
}
break;
diff --git a/demos/modules/gwin/checkbox/demo.mk b/demos/modules/gwin/checkbox/demo.mk
new file mode 100644
index 00000000..8e6edf46
--- /dev/null
+++ b/demos/modules/gwin/checkbox/demo.mk
@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gwin/checkbox
+GFXINC += $(DEMODIR)
+GFXSRC += $(DEMODIR)/main.c
diff --git a/demos/modules/gwin/checkbox/main.c b/demos/modules/gwin/checkbox/main.c
index 51f96518..b6cef40b 100644
--- a/demos/modules/gwin/checkbox/main.c
+++ b/demos/modules/gwin/checkbox/main.c
@@ -81,7 +81,7 @@ int main(void) {
case GEVENT_GWIN_CHECKBOX:
if (((GEventGWinCheckbox*)pe)->checkbox == ghCheckbox1) {
// The state of our checkbox has changed
- printf("Checkbox state: %d\r\n", ((GEventGWinCheckbox*)pe)->isChecked);
+ //printf("Checkbox state: %d\r\n", ((GEventGWinCheckbox*)pe)->isChecked);
}
break;
diff --git a/demos/modules/gwin/console/demo.mk b/demos/modules/gwin/console/demo.mk
new file mode 100644
index 00000000..09851d35
--- /dev/null
+++ b/demos/modules/gwin/console/demo.mk
@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gwin/console
+GFXINC += $(DEMODIR)
+GFXSRC += $(DEMODIR)/main.c
diff --git a/demos/modules/gwin/graph/demo.mk b/demos/modules/gwin/graph/demo.mk
new file mode 100644
index 00000000..c602c83e
--- /dev/null
+++ b/demos/modules/gwin/graph/demo.mk
@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gwin/graph
+GFXINC += $(DEMODIR)
+GFXSRC += $(DEMODIR)/main.c
diff --git a/demos/modules/gwin/graph/gfxconf.h b/demos/modules/gwin/graph/gfxconf.h
index c09bfc6e..bc65beea 100644
--- a/demos/modules/gwin/graph/gfxconf.h
+++ b/demos/modules/gwin/graph/gfxconf.h
@@ -39,6 +39,7 @@
/* GFX sub-systems to turn on */
#define GFX_USE_GDISP TRUE
#define GFX_USE_GWIN TRUE
+#define GFX_USE_GMISC TRUE
/* Features for the GDISP sub-system. */
#define GDISP_NEED_VALIDATION TRUE
@@ -48,5 +49,8 @@
#define GWIN_NEED_WINDOWMANAGER TRUE
#define GWIN_NEED_GRAPH TRUE
+/* Features for the GMISC subsystem. */
+#define GMISC_NEED_FASTTRIG TRUE
+
#endif /* _GFXCONF_H */
diff --git a/demos/modules/gwin/list/demo.mk b/demos/modules/gwin/list/demo.mk
new file mode 100644
index 00000000..22b06b09
--- /dev/null
+++ b/demos/modules/gwin/list/demo.mk
@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gwin/list
+GFXINC += $(DEMODIR)
+GFXSRC += $(DEMODIR)/main.c
diff --git a/demos/modules/gwin/list/gfxconf.h b/demos/modules/gwin/list/gfxconf.h
index ebd35f05..505ff2cc 100644
--- a/demos/modules/gwin/list/gfxconf.h
+++ b/demos/modules/gwin/list/gfxconf.h
@@ -43,6 +43,7 @@
#define GWIN_NEED_WINDOWMANAGER TRUE
#define GWIN_NEED_WIDGET TRUE
+ #define GWIN_NEED_LABEL TRUE
#define GWIN_NEED_LIST TRUE
#define GWIN_NEED_LIST_IMAGES TRUE
diff --git a/demos/modules/gwin/progressbar/demo.mk b/demos/modules/gwin/progressbar/demo.mk
new file mode 100644
index 00000000..dffd40d7
--- /dev/null
+++ b/demos/modules/gwin/progressbar/demo.mk
@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gwin/progressbar
+GFXINC += $(DEMODIR)
+GFXSRC += $(DEMODIR)/main.c
diff --git a/demos/modules/gwin/radio/demo.mk b/demos/modules/gwin/radio/demo.mk
new file mode 100644
index 00000000..e9e61456
--- /dev/null
+++ b/demos/modules/gwin/radio/demo.mk
@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gwin/radio
+GFXINC += $(DEMODIR)
+GFXSRC += $(DEMODIR)/main.c
diff --git a/demos/modules/gwin/radio/main.c b/demos/modules/gwin/radio/main.c
index 9287dcf9..a3c493c3 100644
--- a/demos/modules/gwin/radio/main.c
+++ b/demos/modules/gwin/radio/main.c
@@ -101,7 +101,7 @@ int main(void) {
switch(pe->type) {
case GEVENT_GWIN_RADIO:
- printf("group: %u radio: %s\n", ((GEventGWinRadio *)pe)->group, gwinGetText(((GEventGWinRadio *)pe)->radio));
+ //printf("group: %u radio: %s\n", ((GEventGWinRadio *)pe)->group, gwinGetText(((GEventGWinRadio *)pe)->radio));
break;
default:
diff --git a/demos/modules/gwin/slider/demo.mk b/demos/modules/gwin/slider/demo.mk
new file mode 100644
index 00000000..3e358dfa
--- /dev/null
+++ b/demos/modules/gwin/slider/demo.mk
@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gwin/slider
+GFXINC += $(DEMODIR)
+GFXSRC += $(DEMODIR)/main.c
diff --git a/demos/modules/gwin/slider/main.c b/demos/modules/gwin/slider/main.c
index 6e72b447..0897f1f3 100644
--- a/demos/modules/gwin/slider/main.c
+++ b/demos/modules/gwin/slider/main.c
@@ -77,7 +77,7 @@ int main(void) {
switch(pe->type) {
case GEVENT_GWIN_SLIDER:
- printf("Slider %s = %d\n", gwinGetText(((GEventGWinSlider *)pe)->slider), ((GEventGWinSlider *)pe)->position);
+ //printf("Slider %s = %d\n", gwinGetText(((GEventGWinSlider *)pe)->slider), ((GEventGWinSlider *)pe)->position);
break;
default:
diff --git a/demos/modules/gwin/widgets/demo.mk b/demos/modules/gwin/widgets/demo.mk
new file mode 100644
index 00000000..2e70fa4d
--- /dev/null
+++ b/demos/modules/gwin/widgets/demo.mk
@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gwin/widgets
+GFXINC += $(DEMODIR)
+GFXSRC += $(DEMODIR)/main.c