diff options
| author | inmarket <andrewh@inmarket.com.au> | 2014-02-03 18:23:53 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2014-02-03 18:23:53 +1000 |
| commit | f26581dc7e85f77393143a44c0c3eb3eef0da8b4 (patch) | |
| tree | 9a83c5eaf1abe2cc61b216012f997e6891840a19 /demos/modules/gadc/gwinosc.c | |
| parent | b6daaabf32bf2092689e0732ca4486f25e80317f (diff) | |
| parent | d869d9b3b80cb9ab2314840b2fa274e89e5342db (diff) | |
| download | uGFX-f26581dc7e85f77393143a44c0c3eb3eef0da8b4.tar.gz uGFX-f26581dc7e85f77393143a44c0c3eb3eef0da8b4.tar.bz2 uGFX-f26581dc7e85f77393143a44c0c3eb3eef0da8b4.zip | |
Merge branch 'master' into freertos
Diffstat (limited to 'demos/modules/gadc/gwinosc.c')
| -rw-r--r-- | demos/modules/gadc/gwinosc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/demos/modules/gadc/gwinosc.c b/demos/modules/gadc/gwinosc.c index b7201088..4cc1fc3a 100644 --- a/demos/modules/gadc/gwinosc.c +++ b/demos/modules/gadc/gwinosc.c @@ -70,9 +70,9 @@ GHandle gwinGScopeCreate(GDisplay *g, GScopeObject *gs, GWindowInit *pInit, uint return 0; gfxSemInit(&gs->bsem, 0, 1); gs->nextx = 0; - if (!(gs->lastscopetrace = (coord_t *)gfxAlloc(gs->g.width * sizeof(coord_t)))) + if (!(gs->lastscopetrace = gfxAlloc(gs->g.width * sizeof(coord_t)))) return 0; - if (!(gs->audiobuf = (adcsample_t *)gfxAlloc(AUDIOBUFSZ * sizeof(adcsample_t)))) + if (!(gs->audiobuf = gfxAlloc(AUDIOBUFSZ * sizeof(adcsample_t)))) return 0; #if TRIGGER_METHOD == TRIGGER_POSITIVERAMP gs->lasty = gs->g.height/2; |