ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Added: second analog out.

pull/257/head
dinau 2014-04-09 20:36:34 +09:00
parent 8303f307e4
commit 4e32f9440d
1 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/analogout_api.c
View File

@ -37,6 +37,7 @@
static const PinMap PinMap_DAC[] = { static const PinMap PinMap_DAC[] = {
{PA_4, DAC_1, STM_PIN_DATA(GPIO_Mode_AN, GPIO_OType_PP, GPIO_PuPd_NOPULL, 0xFF)}, // DAC_OUT1 {PA_4, DAC_1, STM_PIN_DATA(GPIO_Mode_AN, GPIO_OType_PP, GPIO_PuPd_NOPULL, 0xFF)}, // DAC_OUT1
{PA_5, DAC_1, STM_PIN_DATA(GPIO_Mode_AN, GPIO_OType_PP, GPIO_PuPd_NOPULL, 0xFF)}, // DAC_OUT2
{NC, NC, 0} {NC, NC, 0}
}; };
@ -64,8 +65,15 @@ void analogout_init(dac_t *obj, PinName pin) {
// Configure and enable DAC channel // Configure and enable DAC channel
DAC_StructInit(&DAC_InitStructure); DAC_StructInit(&DAC_InitStructure);
DAC_Init(dac, DAC_Channel_1, &DAC_InitStructure);
DAC_Cmd(dac, DAC_Channel_1, ENABLE); if (obj->channel == PA_4) {
DAC_Init(dac,DAC_Channel_1, &DAC_InitStructure);
DAC_Cmd(dac,DAC_Channel_1, ENABLE);
}
if (obj->channel == PA_5) {
DAC_Init(dac,DAC_Channel_2, &DAC_InitStructure);
DAC_Cmd(dac,DAC_Channel_2, ENABLE);
}
analogout_write_u16(obj, 0); analogout_write_u16(obj, 0);
} }
@ -74,13 +82,24 @@ void analogout_free(dac_t *obj) {
} }
static inline void dac_write(dac_t *obj, uint16_t value) { static inline void dac_write(dac_t *obj, uint16_t value) {
DAC_TypeDef *dac = (DAC_TypeDef *)(obj->dac); DAC_TypeDef *dac = (DAC_TypeDef *)(obj->dac);
DAC_SetChannel1Data(dac, DAC_Align_12b_R, value); if (obj->channel == PA_4) {
DAC_SetChannel1Data(dac,DAC_Align_12b_R, value);
}
if (obj->channel == PA_5) {
DAC_SetChannel2Data(dac,DAC_Align_12b_R, value);
}
} }
static inline int dac_read(dac_t *obj) { static inline int dac_read(dac_t *obj) {
DAC_TypeDef *dac = (DAC_TypeDef *)(obj->dac); DAC_TypeDef *dac = (DAC_TypeDef *)(obj->dac);
return (int)DAC_GetDataOutputValue(dac, DAC_Channel_1); if (obj->channel == PA_4) {
return (int)DAC_GetDataOutputValue(dac,DAC_Channel_1);
}
if (obj->channel == PA_5) {
return (int)DAC_GetDataOutputValue(dac,DAC_Channel_2);
}
return 0;
} }
void analogout_write(dac_t *obj, float value) { void analogout_write(dac_t *obj, float value) {
@ -96,7 +115,8 @@ void analogout_write(dac_t *obj, float value) {
void analogout_write_u16(dac_t *obj, uint16_t value) { void analogout_write_u16(dac_t *obj, uint16_t value) {
if (value > (uint16_t)RANGE_12BIT) { if (value > (uint16_t)RANGE_12BIT) {
dac_write(obj, (uint16_t)RANGE_12BIT); // Max value dac_write(obj, (uint16_t)RANGE_12BIT); // Max value
} else { }
else {
dac_write(obj, value); dac_write(obj, value);
} }
} }