diff options
| author | inmarket <andrewh@inmarket.com.au> | 2014-03-24 16:49:17 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2014-03-24 16:49:17 +1000 |
| commit | 343ddd7158a5f102767d93598c8cba21121d6bcb (patch) | |
| tree | b95aa984fefbf0ed6a2e43a3ee316bcb3dbfcb27 /demos | |
| parent | 9919aeac899e0044549c75be849aaf6b1e2456ab (diff) | |
| download | uGFX-343ddd7158a5f102767d93598c8cba21121d6bcb.tar.gz uGFX-343ddd7158a5f102767d93598c8cba21121d6bcb.tar.bz2 uGFX-343ddd7158a5f102767d93598c8cba21121d6bcb.zip | |
Final updates to GADC recording after fixing bugs in the ChibiOS AT91SAM7X ADC driver
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/modules/gadc/gwinosc.h | 2 | ||||
| -rw-r--r-- | demos/modules/gadc/main.c | 4 | ||||
| -rw-r--r-- | demos/modules/gaudio/oscilloscope/main.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/demos/modules/gadc/gwinosc.h b/demos/modules/gadc/gwinosc.h index 8f5c1be3..0c687a4f 100644 --- a/demos/modules/gadc/gwinosc.h +++ b/demos/modules/gadc/gwinosc.h @@ -43,7 +43,7 @@ /* The extent of scaling for our audio data - fixed scale at the moment */ #ifndef SCOPE_Y_BITS - #define SCOPE_Y_BITS 7 // 7 bits = 0..128 + #define SCOPE_Y_BITS 7 // 7 bits = 0..128 #endif /* Trigger methods */ diff --git a/demos/modules/gadc/main.c b/demos/modules/gadc/main.c index 67eed456..7db14c82 100644 --- a/demos/modules/gadc/main.c +++ b/demos/modules/gadc/main.c @@ -171,7 +171,7 @@ int main(void) { * Allocate buffers for the high speed GADC device - eg. 4 x 128 byte buffers. * You may need to increase this for slower cpu's. * You may be able to decrease this for low latency operating systems. - * 10 x 128 seems to work on the really slow Olimex SAM7EX256 board (display speed limitation) + * 4 x 128 seems to work on the really slow Olimex SAM7EX256 board (display speed limitation) * If your oscilloscope display stops but the low speed reading keep going then it is likely that * your high speed timer has stalled due to running out of free buffers. Increase the number * of buffers.. @@ -179,7 +179,7 @@ int main(void) { * the low speed items to occur in which case your memory will fill up with low speed requests until * you run out of memory. */ - gfxBufferAlloc(10, 128); + gfxBufferAlloc(4, 128); /* Set up the scope window in the top right on the screen */ { diff --git a/demos/modules/gaudio/oscilloscope/main.c b/demos/modules/gaudio/oscilloscope/main.c index 9b53de8e..3636e8f9 100644 --- a/demos/modules/gaudio/oscilloscope/main.c +++ b/demos/modules/gaudio/oscilloscope/main.c @@ -59,11 +59,11 @@ int main(void) { * Allocate audio buffers - eg. 4 x 128 byte buffers. * You may need to increase this for slower cpu's. * You may be able to decrease this for low latency operating systems. - * 16 x 256 seems to work on the really slow Olimex SAM7EX256 board (display speed limitation) @8kHz + * 8 x 256 seems to work on the really slow Olimex SAM7EX256 board (display speed limitation) @8kHz * If your oscilloscope display stops then it is likely that your driver has stalled due to running * out of free buffers. Increase the number of buffers.. */ - gfxBufferAlloc(16, 256); + gfxBufferAlloc(8, 256); /* Get the screen dimensions */ swidth = gdispGetWidth(); |