aboutsummaryrefslogtreecommitdiffstats
path: root/demos/modules
diff options
context:
space:
mode:
authorinmarket <andrewh@inmarket.com.au>2014-03-06 19:58:13 +1000
committerinmarket <andrewh@inmarket.com.au>2014-03-06 19:58:13 +1000
commit2fb6697f2a64653ae73abffb18b45fccea904aa8 (patch)
treecb21945ab421a729f95a26e58e6e6058ac42bf40 /demos/modules
parent5d758df8dab698c68dfacb7fe0ccf309a52459e7 (diff)
downloaduGFX-2fb6697f2a64653ae73abffb18b45fccea904aa8.tar.gz
uGFX-2fb6697f2a64653ae73abffb18b45fccea904aa8.tar.bz2
uGFX-2fb6697f2a64653ae73abffb18b45fccea904aa8.zip
Move gaudin oscilloscope demo to a new directory
Diffstat (limited to 'demos/modules')
-rw-r--r--demos/modules/audio/oscilloscope/demo.mk (renamed from demos/modules/gaudin/demo.mk)2
-rw-r--r--demos/modules/audio/oscilloscope/gfxconf.h (renamed from demos/modules/gaudin/gfxconf.h)1
-rw-r--r--demos/modules/audio/oscilloscope/gwinosc.c (renamed from demos/modules/gaudin/gwinosc.c)0
-rw-r--r--demos/modules/audio/oscilloscope/gwinosc.h (renamed from demos/modules/gaudin/gwinosc.h)0
-rw-r--r--demos/modules/audio/oscilloscope/main.c (renamed from demos/modules/gaudin/main.c)0
-rw-r--r--demos/modules/audio/oscilloscope/results_264x264.jpg (renamed from demos/modules/gaudin/results_264x264.jpg)bin19615 -> 19615 bytes
6 files changed, 2 insertions, 1 deletions
diff --git a/demos/modules/gaudin/demo.mk b/demos/modules/audio/oscilloscope/demo.mk
index 1b57f289..ffdf6980 100644
--- a/demos/modules/gaudin/demo.mk
+++ b/demos/modules/audio/oscilloscope/demo.mk
@@ -1,3 +1,3 @@
-DEMODIR = $(GFXLIB)/demos/modules/gaudin
+DEMODIR = $(GFXLIB)/demos/modules/audio/oscilloscope
GFXINC += $(DEMODIR)
GFXSRC += $(DEMODIR)/main.c $(DEMODIR)/gwinosc.c
diff --git a/demos/modules/gaudin/gfxconf.h b/demos/modules/audio/oscilloscope/gfxconf.h
index 8733268d..8af25391 100644
--- a/demos/modules/gaudin/gfxconf.h
+++ b/demos/modules/audio/oscilloscope/gfxconf.h
@@ -47,6 +47,7 @@
#define GFX_USE_GTIMER TRUE
//#define GFX_USE_GADC TRUE
#define GFX_USE_GAUDIN TRUE
+#define GFX_USE_GAUDOUT TRUE
/* Features for the GDISP sub-system. */
#define GDISP_NEED_VALIDATION TRUE
diff --git a/demos/modules/gaudin/gwinosc.c b/demos/modules/audio/oscilloscope/gwinosc.c
index 43ef1385..43ef1385 100644
--- a/demos/modules/gaudin/gwinosc.c
+++ b/demos/modules/audio/oscilloscope/gwinosc.c
diff --git a/demos/modules/gaudin/gwinosc.h b/demos/modules/audio/oscilloscope/gwinosc.h
index 0efb403c..0efb403c 100644
--- a/demos/modules/gaudin/gwinosc.h
+++ b/demos/modules/audio/oscilloscope/gwinosc.h
diff --git a/demos/modules/gaudin/main.c b/demos/modules/audio/oscilloscope/main.c
index 32418450..32418450 100644
--- a/demos/modules/gaudin/main.c
+++ b/demos/modules/audio/oscilloscope/main.c
diff --git a/demos/modules/gaudin/results_264x264.jpg b/demos/modules/audio/oscilloscope/results_264x264.jpg
index e459f7e1..e459f7e1 100644
--- a/demos/modules/gaudin/results_264x264.jpg
+++ b/demos/modules/audio/oscilloscope/results_264x264.jpg
Binary files differ