andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DAC driver improvement. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7975 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
Giovanni Di Sirio 2015-05-13 09:25:53 +00:00
parent e294750f06
commit e4b3c5cdde
3 changed files with 7 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
os/hal/include/dac.h
View File

@ -239,10 +239,7 @@ extern "C" {
void dacObjectInit(DACDriver *dacp); void dacObjectInit(DACDriver *dacp);
void dacStart(DACDriver *dacp, const DACConfig *config); void dacStart(DACDriver *dacp, const DACConfig *config);
void dacStop(DACDriver *dacp); void dacStop(DACDriver *dacp);
void dacPutChannel(DACDriver *dacp, void dacPutChannelX(DACDriver *dacp,
dacchannel_t channel,
dacsample_t sample);
void dacPutChannelI(DACDriver *dacp,
dacchannel_t channel, dacchannel_t channel,
dacsample_t sample); dacsample_t sample);
void dacStartConversion(DACDriver *dacp, const DACConversionGroup *grpp, void dacStartConversion(DACDriver *dacp, const DACConversionGroup *grpp,

8
os/hal/ports/STM32/LLD/DACv1/dac_lld.c
View File

@ -437,14 +437,14 @@ void dac_lld_start_conversion(DACDriver *dacp) {
#endif #endif
default: default:
chDbgAssert(false, "unexpected DAC mode"); chDbgAssert(false, "unexpected DAC mode");
break; return;
} }
dmaStreamSetMemory0(dacp->params->dma, dacp->samples); dmaStreamSetMemory0(dacp->params->dma, dacp->samples);
dmaStreamSetTransactionSize(dacp->params->dma, n); dmaStreamSetTransactionSize(dacp->params->dma, n);
dmaStreamSetMode(dacp->params->dma, dmamode | dmaStreamSetMode(dacp->params->dma, dmamode |
STM32_DMA_CR_DMEIE | STM32_DMA_CR_TEIE | STM32_DMA_CR_DMEIE | STM32_DMA_CR_TEIE |
STM32_DMA_CR_HTIE | STM32_DMA_CR_TCIE); STM32_DMA_CR_HTIE | STM32_DMA_CR_TCIE);
dmaStreamEnable(dacp->params->dma); dmaStreamEnable(dacp->params->dma);
/* DAC configuration.*/ /* DAC configuration.*/

20
os/hal/src/dac.c
View File

@ -137,25 +137,9 @@ void dacStop(DACDriver *dacp) {
* @param[in] channel DAC channel number * @param[in] channel DAC channel number
* @param[in] sample value to be output * @param[in] sample value to be output
* *
* @api * @xclass
*/ */
void dacPutChannel(DACDriver *dacp, dacchannel_t channel, dacsample_t sample) { void dacPutChannelX(DACDriver *dacp, dacchannel_t channel, dacsample_t sample) {
osalSysLock();
dacPutChannelI(dacp, channel, sample);
osalSysUnlock();
}
/**
* @brief Outputs a value directly on a DAC channel.
*
* @param[in] dacp pointer to the @p DACDriver object
* @param[in] channel DAC channel number
* @param[in] sample value to be output
*
* @iclass
*/
void dacPutChannelI(DACDriver *dacp, dacchannel_t channel, dacsample_t sample) {
osalDbgCheckClassI(); osalDbgCheckClassI();
osalDbgCheck(channel < DAC_MAX_CHANNELS); osalDbgCheck(channel < DAC_MAX_CHANNELS);