uGFX/ugfx
2
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Update GAUDIN and GADC demos to new internal GWIN structures.

Browse Source 
Also add support for signed sample formats.
This commit is contained in:
inmarket 2013-12-22 21:37:41 +10:00
parent 53aa406668
commit 301f871ee7
5 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
demos/modules/gadc/gwinosc.c
View File

@ -64,9 +64,9 @@ static const gwinVMT scopeVMT = {
0, // The after-clear routine
};
GHandle gwinScopeCreate(GScopeObject *gs, GWindowInit *pInit, uint32_t physdev, uint32_t frequency) {
GHandle gwinGScopeCreate(GDisplay *g, GScopeObject *gs, GWindowInit *pInit, uint32_t physdev, uint32_t frequency) {
/* Initialise the base class GWIN */
if (!(gs = (GScopeObject *)_gwindowCreate(&gs->g, pInit, &scopeVMT, 0)))
if (!(gs = (GScopeObject *)_gwindowCreate(g, &gs->g, pInit, &scopeVMT, 0)))
return 0;
gfxSemInit(&gs->bsem, 0, 1);
gs->nextx = 0;
@ -114,10 +114,12 @@ void gwinScopeWaitForTrace(GHandle gh) {
/* Ensure we are drawing in the right area */
#if GDISP_NEED_CLIP
gdispSetClip(gh->x, gh->y, gh->width, gh->height);
gdispGSetClip(gh->display, gh->x, gh->y, gh->width, gh->height);
#endif
yoffset = gh->height/2 + (1<<SCOPE_Y_BITS)/2;
yoffset = gh->height/2;
if (!(GADC_SAMPLE_FORMAT & 1))
yoffset += (1<<SCOPE_Y_BITS)/2;
x = gs->nextx;
pc = gs->lastscopetrace+x;
pa = gs->myEvent.buffer;
@ -188,8 +190,8 @@ void gwinScopeWaitForTrace(GHandle gh) {
}
/* Clear the old scope pixel and then draw the new scope value */
gdispDrawPixel(gh->x+x, gh->y+pc[0], gh->bgcolor);
gdispDrawPixel(gh->x+x, gh->y+y, gh->color);
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;

8
demos/modules/gadc/gwinosc.h
View File

@ -34,6 +34,11 @@
* --------------------------- Our Custom GWIN Oscilloscope ---------------
*
* This GWIN superset implements a simple audio oscilloscope using the GADC high speed 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 */
@ -78,7 +83,8 @@ extern "C" {
/**
* Create a scope window.
*/
GHandle gwinScopeCreate(GScopeObject *gs, GWindowInit *pInit, uint32_t physdev, uint32_t frequency);
GHandle gwinGScopeCreate(GDisplay *g, GScopeObject *gs, GWindowInit *pInit, uint32_t physdev, uint32_t frequency);
#define gwinScopeCreate(gs,pI,pd,f) gwinGScopeCreate(GDISP,gs,pI,pd,f)
/**
* Wait for a scope trace to be ready and then draw it.

2
demos/modules/gaudin/gfxconf.h
View File

@ -45,7 +45,7 @@
#define GFX_USE_GDISP TRUE
#define GFX_USE_GWIN TRUE
#define GFX_USE_GTIMER TRUE
#define GFX_USE_GADC TRUE
//#define GFX_USE_GADC TRUE
#define GFX_USE_GAUDIN TRUE
/* Features for the GDISP sub-system. */

16
demos/modules/gaudin/gwinosc.c
View File

@ -71,9 +71,9 @@ static const gwinVMT scopeVMT = {
0, // The after-clear routine
};
GHandle gwinScopeCreate(GScopeObject *gs, GWindowInit *pInit, uint16_t channel, uint32_t frequency) {
GHandle gwinGScopeCreate(GDisplay *g, GScopeObject *gs, GWindowInit *pInit, uint16_t channel, uint32_t frequency) {
/* Initialise the base class GWIN */
if (!(gs = (GScopeObject *)_gwindowCreate(&gs->g, pInit, &scopeVMT, 0)))
if (!(gs = (GScopeObject *)_gwindowCreate(g, &gs->g, pInit, &scopeVMT, 0)))
return 0;
/* Initialise the scope object members and allocate memory for buffers */
@ -81,7 +81,7 @@ GHandle gwinScopeCreate(GScopeObject *gs, GWindowInit *pInit, uint16_t channel,
gs->nextx = 0;
if (!(gs->lastscopetrace = (coord_t *)gfxAlloc(gs->g.width * sizeof(coord_t))))
return 0;
if (!(gs->audiobuf = (adcsample_t *)gfxAlloc(AUDIOBUFSZ * sizeof(adcsample_t))))
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;
@ -123,10 +123,12 @@ void gwinScopeWaitForTrace(GHandle gh) {
/* Ensure we are drawing in the right area */
#if GDISP_NEED_CLIP
gdispSetClip(gh->x, gh->y, gh->width, gh->height);
gdispGSetClip(gh->display, gh->x, gh->y, gh->width, gh->height);
#endif
yoffset = gh->height/2 + (1<<SCOPE_Y_BITS)/2;
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;
@ -197,8 +199,8 @@ void gwinScopeWaitForTrace(GHandle gh) {
}
/* Clear the old scope pixel and then draw the new scope value */
gdispDrawPixel(gh->x+x, gh->y+pc[0], gh->bgcolor);
gdispDrawPixel(gh->x+x, gh->y+y, gh->color);
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;

8
demos/modules/gaudin/gwinosc.h
View File

@ -33,10 +33,9 @@
/**
* --------------------------- Our Custom GWIN Oscilloscope ---------------
*
* This GWIN superset implements a simple audio oscilloscope using the GADC high speed device.
* This GWIN superset implements a simple audio oscilloscope using the GAUDIN device.
*
* It makes many assumptions, the most fundamental of which is that the audio device
* produces unsigned integer samples.
* 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.
@ -84,7 +83,8 @@ extern "C" {
/**
* Create a scope window.
*/
GHandle gwinScopeCreate(GScopeObject *gs, GWindowInit *pInit, uint16_t channel, uint32_t frequency);
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.