First tests running and working.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5002 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
parent
19f97afd4d
commit
6a0fb115c3
|
@ -474,14 +474,13 @@ void adc_lld_start_conversion(ADCDriver *adcp) {
|
|||
dmamode = adcp->dmamode;
|
||||
ccr = grpp->ccr | (adcp->adcc->CCR & (ADC_CCR_CKMODE_MASK |
|
||||
ADC_CCR_MDMA_MASK));
|
||||
cfgr = grpp->cfgr;
|
||||
cfgr = grpp->cfgr | ADC_CFGR_CONT | ADC_CFGR_DMAEN;
|
||||
if (grpp->circular) {
|
||||
dmamode |= STM32_DMA_CR_CIRC;
|
||||
#if STM32_ADC_DUAL_MODE
|
||||
ccr |= ADC_CCR_DMACFG_CIRCULAR;
|
||||
cfgr |= ADC_CFGR_CONT;
|
||||
#else
|
||||
cfgr |= ADC_CFGR_CONT | ADC_CFGR_DMACFG_CIRCULAR | ADC_CFGR_DMAEN;
|
||||
cfgr |= ADC_CFGR_DMACFG_CIRCULAR;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
|
@ -83,13 +83,6 @@
|
|||
#define ADC_CFGR1_RES_6BIT (3 << 3)
|
||||
/** @} */
|
||||
|
||||
/**
|
||||
* @name Threashold register initializer
|
||||
* @{
|
||||
*/
|
||||
#define ADC_TR(low, high) (((uint32_t)(high) << 16) | (uint32_t)(low))
|
||||
/** @} */
|
||||
|
||||
/**
|
||||
* @name CFGR register configuration helpers
|
||||
* @{
|
||||
|
@ -530,6 +523,13 @@ struct ADCDriver {
|
|||
/* Driver macros. */
|
||||
/*===========================================================================*/
|
||||
|
||||
/**
|
||||
* @name Threashold register initializer
|
||||
* @{
|
||||
*/
|
||||
#define ADC_TR(low, high) (((uint32_t)(high) << 16) | (uint32_t)(low))
|
||||
/** @} */
|
||||
|
||||
/**
|
||||
* @name Sequences building helper macros
|
||||
* @{
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
#include "ch.h"
|
||||
#include "hal.h"
|
||||
|
||||
#define ADC_GRP1_NUM_CHANNELS 1
|
||||
#define ADC_GRP1_NUM_CHANNELS 2
|
||||
#define ADC_GRP1_BUF_DEPTH 8
|
||||
|
||||
#define ADC_GRP2_NUM_CHANNELS 8
|
||||
|
@ -64,7 +64,7 @@ static const ADCConversionGroup adcgrpcfg1 = {
|
|||
NULL,
|
||||
adcerrorcallback,
|
||||
0, /* CFGR */
|
||||
0, /* TR1 */
|
||||
ADC_TR(0, 4095), /* TR1 */
|
||||
0, /* CCR */
|
||||
{ /* SMPR[2] */
|
||||
0,
|
||||
|
|
Loading…
Reference in New Issue