diff options
author | Andrew Hannam <andrewh@inmarket.com.au> | 2013-05-05 17:50:31 -0700 |
---|---|---|
committer | Andrew Hannam <andrewh@inmarket.com.au> | 2013-05-05 17:50:31 -0700 |
commit | bbfeec2dd7b312745856236214c91fce6b9ec22c (patch) | |
tree | a10fdbe9e941a35ae77cdd1490531b7061dcc6b6 /include/gadc | |
parent | a02c124940b6c5d61ffcbfb2c7e4d493775c3192 (diff) | |
parent | be61787daadcf8cc1e1f307fc48441949e5ec2c0 (diff) | |
download | uGFX-bbfeec2dd7b312745856236214c91fce6b9ec22c.tar.gz uGFX-bbfeec2dd7b312745856236214c91fce6b9ec22c.tar.bz2 uGFX-bbfeec2dd7b312745856236214c91fce6b9ec22c.zip |
Merge pull request #28 from Tectu/master
Merge Tectu Changes
Diffstat (limited to 'include/gadc')
-rw-r--r-- | include/gadc/gadc.h | 47 | ||||
-rw-r--r-- | include/gadc/lld/gadc_lld.h | 27 | ||||
-rw-r--r-- | include/gadc/options.h | 23 |
3 files changed, 11 insertions, 86 deletions
diff --git a/include/gadc/gadc.h b/include/gadc/gadc.h index 56be7cf5..17d1f028 100644 --- a/include/gadc/gadc.h +++ b/include/gadc/gadc.h @@ -1,49 +1,8 @@ /* - ChibiOS/GFX - Copyright (C) 2012, 2013 - Joel Bodenmann aka Tectu <joel@unormal.org> - - This file is part of ChibiOS/GFX. - - ChibiOS/GFX is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - ChibiOS/GFX is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ -/** - * @file include/gadc/gadc.h - * @brief GADC - Periodic ADC subsystem header file. - * - * @addtogroup GADC + * This file is subject to the terms of the GFX License, v1.0. If a copy of + * the license was not distributed with this file, you can obtain one at: * - * @details The reason why ChibiOS/GFX has it's own ADC abstraction is because - * the Chibi-OS drivers are very CPU specific and do not - * provide a way across all hardware platforms to create periodic - * ADC conversions. There are also issues with devices with different - * characteristics or periodic requirements on the same ADC - * device (but different channels). This layer attempts to solve these - * problems to provide a architecture neutral API. It also provides extra - * features such as multi-buffer chaining for high speed ADC sources. - * It provides one high speed virtual ADC device (eg a microphone) and - * numerous low speed (less than 100Hz) virtual ADC devices (eg dials, - * temperature sensors etc). The high speed device has timer based polling - * to ensure exact conversion periods and a buffer management system. - * The low speed devices are assumed to be non-critical timing devices - * and do not have any buffer management. - * Note that while only one high speed device has been provided it can - * be used to read multiple physical ADC channels on the one physical - * ADC device. - * All callback routines are thread based unlike the Chibi-OS interrupt based - * routines. - * - * @{ + * http://chibios-gfx.com/license.html */ #ifndef _GADC_H diff --git a/include/gadc/lld/gadc_lld.h b/include/gadc/lld/gadc_lld.h index dc111990..4638920e 100644 --- a/include/gadc/lld/gadc_lld.h +++ b/include/gadc/lld/gadc_lld.h @@ -1,29 +1,8 @@ /* - ChibiOS/GFX - Copyright (C) 2012, 2013 - Joel Bodenmann aka Tectu <joel@unormal.org> - - This file is part of ChibiOS/GFX. - - ChibiOS/GFX is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - ChibiOS/GFX is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ -/** - * @file include/gadc/lld/gadc_lld.h - * @brief GADC - Periodic ADC driver header file. + * This file is subject to the terms of the GFX License, v1.0. If a copy of + * the license was not distributed with this file, you can obtain one at: * - * @defgroup Driver Driver - * @ingroup GADC - * @{ + * http://chibios-gfx.com/license.html */ #ifndef _GADC_LLD_H diff --git a/include/gadc/options.h b/include/gadc/options.h index 87708efe..c83a71bf 100644 --- a/include/gadc/options.h +++ b/include/gadc/options.h @@ -1,22 +1,9 @@ /* - ChibiOS/GFX - Copyright (C) 2012, 2013 - Joel Bodenmann aka Tectu <joel@unormal.org> - - This file is part of ChibiOS/GFX. - - ChibiOS/GFX is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - ChibiOS/GFX is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ + * This file is subject to the terms of the GFX License, v1.0. If a copy of + * the license was not distributed with this file, you can obtain one at: + * + * http://chibios-gfx.com/license.html + */ /** * @file include/gadc/options.h |