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

Merge pull request #332 from bcostm/master 

[NUCLEO_L053R8] Fix issue with upper case file name
pull/334/head
Bogdan Marinescu 2014-05-27 12:53:24 +01:00
parent 1cdfe81b13 d4b8cb8a1c
commit 22f1f3a38a
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/mbed/targets/cmsis/TARGET_STM/TARGET_NUCLEO_L053R8/stm32l0xx_hal_rcc.h
View File

@ -1110,7 +1110,7 @@ typedef struct
*/ */
/* Include RCC HAL Extension module */ /* Include RCC HAL Extension module */
#include "stm32L0xx_hal_rcc_ex.h" #include "stm32l0xx_hal_rcc_ex.h"
/* Exported functions --------------------------------------------------------*/ /* Exported functions --------------------------------------------------------*/
/* Initialization and de-initialization methods ******************************/ /* Initialization and de-initialization methods ******************************/

10
libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/analogout_api.c
View File

@ -58,7 +58,7 @@ void analogout_init(dac_t *obj, PinName pin) {
pinmap_pinout(pin, PinMap_DAC); pinmap_pinout(pin, PinMap_DAC);
// Save the channel for future use // Save the channel for future use
obj->channel = pin; obj->pin = pin;
// Enable DAC clock // Enable DAC clock
__DAC_CLK_ENABLE(); __DAC_CLK_ENABLE();
@ -67,9 +67,7 @@ void analogout_init(dac_t *obj, PinName pin) {
sConfig.DAC_Trigger = DAC_TRIGGER_NONE; sConfig.DAC_Trigger = DAC_TRIGGER_NONE;
sConfig.DAC_OutputBuffer = DAC_OUTPUTBUFFER_DISABLE; sConfig.DAC_OutputBuffer = DAC_OUTPUTBUFFER_DISABLE;
//if (pin == PA_4) {
HAL_DAC_ConfigChannel(&DacHandle, &sConfig, DAC_CHANNEL_1); HAL_DAC_ConfigChannel(&DacHandle, &sConfig, DAC_CHANNEL_1);
//}
analogout_write_u16(obj, 0); analogout_write_u16(obj, 0);
} }
@ -81,20 +79,16 @@ void analogout_free(dac_t *obj) {
__DAC_CLK_DISABLE(); __DAC_CLK_DISABLE();
// Configure GPIO // Configure GPIO
pin_function(obj->channel, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)); pin_function(obj->pin, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0));
} }
static inline void dac_write(dac_t *obj, uint16_t value) { static inline void dac_write(dac_t *obj, uint16_t value) {
//if (obj->channel == PA_4) {
HAL_DAC_SetValue(&DacHandle, DAC_CHANNEL_1, DAC_ALIGN_12B_R, value); HAL_DAC_SetValue(&DacHandle, DAC_CHANNEL_1, DAC_ALIGN_12B_R, value);
HAL_DAC_Start(&DacHandle, DAC_CHANNEL_1); HAL_DAC_Start(&DacHandle, DAC_CHANNEL_1);
//}
} }
static inline int dac_read(dac_t *obj) { static inline int dac_read(dac_t *obj) {
//if (obj->channel == PA_4) {
return (int)HAL_DAC_GetValue(&DacHandle, DAC_CHANNEL_1); return (int)HAL_DAC_GetValue(&DacHandle, DAC_CHANNEL_1);
//}
} }
void analogout_write(dac_t *obj, float value) { void analogout_write(dac_t *obj, float value) {

2
libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/objects.h
View File

@ -61,7 +61,7 @@ struct analogin_s {
struct dac_s { struct dac_s {
DACName dac; DACName dac;
PinName channel; PinName pin;
}; };
struct serial_s { struct serial_s {