diff options
| author | Tectu <joel@unormal.org> | 2013-02-28 15:09:13 -0800 |
|---|---|---|
| committer | Tectu <joel@unormal.org> | 2013-02-28 15:09:13 -0800 |
| commit | 1802c5d6aca67b2c20c00a18aa3e568fe02f9d0f (patch) | |
| tree | 2ea08726aae7357443420ce45100c8118923dfdd /include/gfx_rules.h | |
| parent | 778cfcd928211246b45ce67c373280fe6adceb11 (diff) | |
| parent | 6ee8b005ae3ee2bc48ea6ac972b0d3b2a2949608 (diff) | |
| download | uGFX-1802c5d6aca67b2c20c00a18aa3e568fe02f9d0f.tar.gz uGFX-1802c5d6aca67b2c20c00a18aa3e568fe02f9d0f.tar.bz2 uGFX-1802c5d6aca67b2c20c00a18aa3e568fe02f9d0f.zip | |
Merge pull request #34 from inmarket/master
GAUDIN module implemented with a GADC driver
Diffstat (limited to 'include/gfx_rules.h')
| -rw-r--r-- | include/gfx_rules.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/include/gfx_rules.h b/include/gfx_rules.h index ce6bea50..27316204 100644 --- a/include/gfx_rules.h +++ b/include/gfx_rules.h @@ -99,6 +99,14 @@ #if GFX_USE_TDISP #endif +#if GFX_USE_GAUDIN + #if GFX_USE_GEVENT && !GFX_USE_GTIMER + #warning "GAUDIN: GFX_USE_GTIMER is required if GFX_USE_GAUDIN and GFX_USE_GEVENT are TRUE. It has been turned on for you." + #undef GFX_USE_GTIMER + #define GFX_USE_GTIMER TRUE + #endif +#endif + #if GFX_USE_GADC #if !CH_USE_MUTEXES || !CH_USE_SEMAPHORES #error "GADC: CH_USE_MUTEXES and CH_USE_SEMAPHORES must be defined in chconf.h" @@ -123,9 +131,6 @@ #endif #endif -#if GFX_USE_GAUDIN -#endif - #if GFX_USE_GAUDOUT #endif |