diff options
| author | Joel Bodenmann <joel@unormal.org> | 2014-04-30 13:41:34 +0200 |
|---|---|---|
| committer | Joel Bodenmann <joel@unormal.org> | 2014-04-30 13:41:34 +0200 |
| commit | 33c721c009465dd30d4e96e055a051480c567b57 (patch) | |
| tree | 5a6744a79b7469d80bae474d4314b47d4cd6d44d /demos/modules/gadc/gwinosc.h | |
| parent | 58cf2d2b35542166f1a4e50a83bcf28ff33574a5 (diff) | |
| parent | a394e2c35dde67241bea69409bcae9f46dcfc089 (diff) | |
| download | uGFX-33c721c009465dd30d4e96e055a051480c567b57.tar.gz uGFX-33c721c009465dd30d4e96e055a051480c567b57.tar.bz2 uGFX-33c721c009465dd30d4e96e055a051480c567b57.zip | |
Merge branch 'master' into freertos
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 |