diff options
| author | Joel Bodenmann <joel@unormal.org> | 2014-04-20 10:41:53 +0200 |
|---|---|---|
| committer | Joel Bodenmann <joel@unormal.org> | 2014-04-20 10:41:53 +0200 |
| commit | c88e25b84fa8d18942df56592cec68f8371a8d41 (patch) | |
| tree | 0c13a89e07560b79ea0092a25f75b7cf630a903f /demos/modules/gadc/gwinosc.h | |
| parent | ad1d70d2957d95161c831e764c6f81c84c332458 (diff) | |
| parent | 33babb4c1a5b749faac6969681e8deff481c4344 (diff) | |
| download | uGFX-c88e25b84fa8d18942df56592cec68f8371a8d41.tar.gz uGFX-c88e25b84fa8d18942df56592cec68f8371a8d41.tar.bz2 uGFX-c88e25b84fa8d18942df56592cec68f8371a8d41.zip | |
Merge branch 'master' of https://bitbucket.org/Tectu/ugfx into gwin
Diffstat (limited to 'demos/modules/gadc/gwinosc.h')
| -rw-r--r-- | demos/modules/gadc/gwinosc.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/demos/modules/gadc/gwinosc.h b/demos/modules/gadc/gwinosc.h index 56de0f11..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 */ @@ -64,9 +64,6 @@ typedef struct GScopeObject_t { GWindowObject g; // Base Class coord_t *lastscopetrace; // To store last scope trace - gfxSem bsem; // We get signalled on this - adcsample_t *audiobuf; // To store audio samples - GEventADC 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 |