Move gaudin oscilloscope demo to a new directory

6 files changed, 0 insertions, 453 deletions

diff --git a/demos/modules/gaudin/demo.mk b/demos/modules/gaudin/demo.mk
deleted file mode 100644
index 1b57f289..00000000
--- a/demos/modules/gaudin/demo.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-DEMODIR = $(GFXLIB)/demos/modules/gaudin
-GFXINC +=   $(DEMODIR)
-GFXSRC +=	$(DEMODIR)/main.c $(DEMODIR)/gwinosc.c
diff --git a/demos/modules/gaudin/gfxconf.h b/demos/modules/gaudin/gfxconf.h
deleted file mode 100644
index 8733268d..00000000
--- a/demos/modules/gaudin/gfxconf.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>
- * Copyright (c) 2012, 2013, Andrew Hannam aka inmarket
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *    * Neither the name of the <organization> nor the
- *      names of its contributors may be used to endorse or promote products
- *      derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/**
- * Copy this file into your project directory and rename it as gfxconf.h
- * Edit your copy to turn on the GFX features you want to use.
- */
-
-#ifndef _GFXCONF_H
-#define _GFXCONF_H
-
-/* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS	FALSE
-//#define GFX_USE_OS_WIN32		FALSE
-//#define GFX_USE_OS_LINUX		FALSE
-//#define GFX_USE_OS_OSX		FALSE
-
-/* GFX sub-systems to turn on */
-#define GFX_USE_GDISP			TRUE
-#define GFX_USE_GWIN			TRUE
-#define GFX_USE_GTIMER			TRUE
-//#define GFX_USE_GADC			TRUE
-#define GFX_USE_GAUDIN			TRUE
-
-/* Features for the GDISP sub-system. */
-#define GDISP_NEED_VALIDATION	TRUE
-#define GDISP_NEED_CLIP			TRUE
-#define GDISP_NEED_MULTITHREAD	TRUE
-
-#endif /* _GFXCONF_H */
diff --git a/demos/modules/gaudin/gwinosc.c b/demos/modules/gaudin/gwinosc.c
deleted file mode 100644
index 43ef1385..00000000
--- a/demos/modules/gaudin/gwinosc.c
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
- * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>
- * Copyright (c) 2012, 2013, Andrew Hannam aka inmarket
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *    * Neither the name of the <organization> nor the
- *      names of its contributors may be used to endorse or promote products
- *      derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/**
- * --------------------------- Our Custom GWIN Oscilloscope ---------------
- *
- * This GWIN superset implements a simple audio oscilloscope using the GAUDIN module.
- *
- * It makes many assumptions, the most fundamental of which is that the audio device
- * produces unsigned integer samples.
- *
- * The GMISC module with GMISC_NEED_ARRAYOPS could be used to process the samples more
- * correctly if we were really building something generic.
- */
-
-#include "gfx.h"
-#include "gwinosc.h"
-
-/* Include internal GWIN routines so we can build our own superset class */
-#include "src/gwin/class_gwin.h"
-
-/* The size of our dynamically allocated audio buffer */
-#define AUDIOBUFSZ				64*2
-
-/* How many flat-line sample before we trigger */
-#define FLATLINE_SAMPLES		8
-
-static void _destroy(GHandle gh) {
-	gaudinStop();
-	if (((GScopeObject *)gh)->lastscopetrace) {
-		gfxFree(((GScopeObject *)gh)->lastscopetrace);
-		((GScopeObject *)gh)->lastscopetrace = 0;
-	}
-	if (((GScopeObject *)gh)->audiobuf) {
-		gfxFree(((GScopeObject *)gh)->audiobuf);
-		((GScopeObject *)gh)->audiobuf = 0;
-	}
-}
-
-static const gwinVMT scopeVMT = {
-		"Scope",				// The classname
-		sizeof(GScopeObject),	// The object size
-		_destroy,				// The destroy routine
-		0,						// The redraw routine
-		0,						// The after-clear routine
-};
-
-GHandle gwinGScopeCreate(GDisplay *g, GScopeObject *gs, GWindowInit *pInit, uint16_t channel, uint32_t frequency) {
-	/* Initialise the base class GWIN */
-	if (!(gs = (GScopeObject *)_gwindowCreate(g, &gs->g, pInit, &scopeVMT, 0)))
-		return 0;
-
-	/* Initialise the scope object members and allocate memory for buffers */
-	gfxSemInit(&gs->bsem, 0, 1);
-	gs->nextx = 0;
-	if (!(gs->lastscopetrace = (coord_t *)gfxAlloc(gs->g.width * sizeof(coord_t))))
-		return 0;
-	if (!(gs->audiobuf = (audin_sample_t *)gfxAlloc(AUDIOBUFSZ * sizeof(audin_sample_t))))
-		return 0;
-#if TRIGGER_METHOD == TRIGGER_POSITIVERAMP
-	gs->lasty = gs->g.height/2;
-#elif TRIGGER_METHOD == TRIGGER_MINVALUE
-	gs->lasty = gs->g.height/2;
-	gs->scopemin = 0;
-#endif
-
-	/* Start the GADC high speed converter */
-	gaudinInit(channel, frequency, gs->audiobuf, AUDIOBUFSZ, AUDIOBUFSZ/2);
-	gaudinSetBSem(&gs->bsem, &gs->myEvent);
-	gaudinStart();
-
-	gwinSetVisible((GHandle)gs, pInit->show);
-	return (GHandle)gs;
-}
-
-void gwinScopeWaitForTrace(GHandle gh) {
-	#define 		gs	((GScopeObject *)(gh))
-	int				i;
-	coord_t			x, y;
-	coord_t			yoffset;
-	audin_sample_t	*pa;
-	coord_t			*pc;
-#if TRIGGER_METHOD == TRIGGER_POSITIVERAMP
-	bool_t			rdytrigger;
-	int				flsamples;
-#elif TRIGGER_METHOD == TRIGGER_MINVALUE
-	bool_t			rdytrigger;
-	int				flsamples;
-	coord_t			scopemin;
-#endif
-
-	if (gh->vmt != &scopeVMT)
-		return;
-
-	/* Wait for a set of audio conversions */
-	gfxSemWait(&gs->bsem, TIME_INFINITE);
-
-	/* Ensure we are drawing in the right area */
-	#if GDISP_NEED_CLIP
-		gdispGSetClip(gh->display, gh->x, gh->y, gh->width, gh->height);
-	#endif
-
-	yoffset = gh->height/2;
-	if (!(GAUDIN_SAMPLE_FORMAT & 1))
-		yoffset += (1<<SCOPE_Y_BITS)/2;
-	x = gs->nextx;
-	pc = gs->lastscopetrace+x;
-	pa = gs->myEvent.buffer;
-#if TRIGGER_METHOD == TRIGGER_POSITIVERAMP
-	rdytrigger = FALSE;
-	flsamples = 0;
-#elif TRIGGER_METHOD == TRIGGER_MINVALUE
-	rdytrigger = FALSE;
-	flsamples = 0;
-	scopemin = 0;
-#endif
-
-	for(i = gs->myEvent.count; i; i--) {
-
-		/* Calculate the new scope value - re-scale using simple shifts for efficiency, re-center and y-invert */
-		#if GAUDIN_BITS_PER_SAMPLE > SCOPE_Y_BITS
-			y = yoffset - (*pa++ >> (GAUDIN_BITS_PER_SAMPLE - SCOPE_Y_BITS));
-		#else
-			y = yoffset - (*pa++ << (SCOPE_Y_BITS - GAUDIN_BITS_PER_SAMPLE));
-		#endif
-
-#if TRIGGER_METHOD == TRIGGER_MINVALUE
-		/* Calculate the scopemin ready for the next trace */
-		if (y > scopemin)
-			scopemin = y;
-#endif
-
-		/* Have we reached the end of a scope trace? */
-		if (x >= gh->width) {
-
-#if TRIGGER_METHOD == TRIGGER_POSITIVERAMP || TRIGGER_METHOD == TRIGGER_MINVALUE
-			/* Handle triggering - we trigger on the next sample minimum (y value maximum) or a flat-line */
-
-			#if TRIGGER_METHOD == TRIGGER_MINVALUE
-				/* Arm when we reach the sample minimum (y value maximum) of the previous trace */
-				if (!rdytrigger && y >= gs->scopemin)
-					rdytrigger = TRUE;
-			#endif
-
-			if (y == gs->lasty) {
-				/* Trigger if we get too many flat-line samples regardless of the armed state */
-				if (++flsamples < FLATLINE_SAMPLES)
-					continue;
-				flsamples = 0;
-			} else if (y > gs->lasty) {
-				gs->lasty = y;
-				flsamples = 0;
-				#if TRIGGER_METHOD == TRIGGER_POSITIVERAMP
-					/* Arm the trigger when samples fall (y increases) ie. negative slope */
-					rdytrigger = TRUE;
-				#endif
-				continue;
-			} else {
-				/* If the trigger is armed, Trigger when samples increases (y decreases) ie. positive slope */
-				gs->lasty = y;
-				flsamples = 0;
-				if (!rdytrigger)
-					continue;
-			}
-
-			/* Ready for a the next trigger cycle */
-			rdytrigger = FALSE;
-#endif
-
-			/* Prepare for a scope trace */
-			x = 0;
-			pc = gs->lastscopetrace;
-		}
-
-		/* Clear the old scope pixel and then draw the new scope value */
-		gdispGDrawPixel(gh->display, gh->x+x, gh->y+pc[0], gh->bgcolor);
-		gdispGDrawPixel(gh->display, gh->x+x, gh->y+y, gh->color);
-
-		/* Save the value */
-		*pc++ = y;
-		x++;
-		#if TRIGGER_METHOD == TRIGGER_POSITIVERAMP || TRIGGER_METHOD == TRIGGER_MINVALUE
-			gs->lasty = y;
-		#endif
-	}
-	gs->nextx = x;
-#if TRIGGER_METHOD == TRIGGER_MINVALUE
-	gs->scopemin = scopemin;
-#endif
-
-	#undef gs
-}
diff --git a/demos/modules/gaudin/gwinosc.h b/demos/modules/gaudin/gwinosc.h
deleted file mode 100644
index 0efb403c..00000000
--- a/demos/modules/gaudin/gwinosc.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>
- * Copyright (c) 2012, 2013, Andrew Hannam aka inmarket
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *    * Neither the name of the <organization> nor the
- *      names of its contributors may be used to endorse or promote products
- *      derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _GWINOSC_H
-#define _GWINOSC_H
-
-/**
- * --------------------------- Our Custom GWIN Oscilloscope ---------------
- *
- * This GWIN superset implements a simple audio oscilloscope using the GAUDIN device.
- *
- * It makes many assumptions.
- *
- * The GMISC module with GMISC_NEED_ARRAYOPS could be used to process the samples more
- * correctly if we were really building something generic.
- */
-
-/* The extent of scaling for our audio data - fixed scale at the moment */
-#ifndef SCOPE_Y_BITS
-	#define SCOPE_Y_BITS			8					// 8 bits = 0..255
-#endif
-
-/* Trigger methods */
-#define TRIGGER_NONE			0					/* No triggering */
-#define TRIGGER_POSITIVERAMP	1					/* Trigger on a positive going signal */
-#define TRIGGER_MINVALUE		2					/* Trigger on reaching the minimum value from the last scope */
-
-/**
- * Which trigger we want to use.
- * Experiments suggests that TRIGGER_MINVALUE gives the best result
- */
-#ifndef TRIGGER_METHOD
-	#define TRIGGER_METHOD			TRIGGER_MINVALUE
-#endif
-
-/* A scope window object. Treat it as a black box */
-typedef struct GScopeObject_t {
-	GWindowObject		g;						// Base Class
-
-	coord_t				*lastscopetrace;		// To store last scope trace
-	gfxSem				bsem;					// We get signalled on this
-	audin_sample_t		*audiobuf;				// To store audio samples
-	GEventAudioIn		myEvent;				// Information on received samples
-	coord_t				nextx;					// Where we are up to
-#if TRIGGER_METHOD == TRIGGER_POSITIVERAMP
-	coord_t				lasty;					// The last y value - used for trigger slope detection
-#elif TRIGGER_METHOD == TRIGGER_MINVALUE
-	coord_t				lasty;					// The last y value - used for trigger slope detection
-	coord_t				scopemin;				// The last scopes minimum value
-#endif
-	} GScopeObject;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-	/**
-	 * Create a scope window.
-	 */
-	GHandle gwinGScopeCreate(GDisplay *g, GScopeObject *gs, GWindowInit *pInit, uint16_t channel, uint32_t frequency);
-	#define gwinScopeCreate(gs,pI,ch,f)		gwinGScopeCreate(GDISP,gs,pI,ch,f)
-
-	/**
-	 * Wait for a scope trace to be ready and then draw it.
-	 */
-	void gwinScopeWaitForTrace(GHandle gh);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _GWINOSC_H */
diff --git a/demos/modules/gaudin/main.c b/demos/modules/gaudin/main.c
deleted file mode 100644
index 32418450..00000000
--- a/demos/modules/gaudin/main.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>
- * Copyright (c) 2012, 2013, Andrew Hannam aka inmarket
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *    * Neither the name of the <organization> nor the
- *      names of its contributors may be used to endorse or promote products
- *      derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/**
- * This demo demonstrates the use of the GAUDIN module to read audio channel 0.
- * The audio channel gets read to display a very simple oscilloscope.
- *
- * It also demonstrates how to write your own custom GWIN window type.
- */
-#include "gfx.h"
-
-/* Include our custom gwin audio oscilloscope */
-#include "gwinosc.h"
-
-/* Specify our timing parameters */
-#define	MY_AUDIO_FREQUENCY	4000			/* 4khz */
-#define MY_AUDIO_CHANNEL	0				/* Use channel 0 */
-
-/* Data */
-static GScopeObject			gScopeWindow;
-
-/*
- * Application entry point.
- */
-int main(void) {
-	GHandle					ghScope;
-	coord_t					swidth, sheight;
-
-	gfxInit();
-
-	/* Get the screen dimensions */
-	swidth = gdispGetWidth();
-	sheight = gdispGetHeight();
-
-	/* Set up the scope window to fill the screen */
-	{
-		GWindowInit	wi;
-
-		wi.show = TRUE;
-		wi.x = wi.y = 0;
-		wi.width = swidth; wi.height = sheight;
-		ghScope = gwinScopeCreate(&gScopeWindow, &wi, MY_AUDIO_CHANNEL, MY_AUDIO_FREQUENCY);
-	}
-	gwinSetBgColor(ghScope, White);
-	gwinSetColor(ghScope, Red);
-	gwinClear(ghScope);
-
-	/* Just keep displaying the scope traces */
-	while (TRUE) {
-		gwinScopeWaitForTrace(ghScope);
-	}
-}
diff --git a/demos/modules/gaudin/results_264x264.jpg b/demos/modules/gaudin/results_264x264.jpg
deleted file mode 100644
index e459f7e1..00000000
--- a/demos/modules/gaudin/results_264x264.jpg
+++ /dev/null