Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

analogout: STM32: modified analogout_free api #14864

Merged
merged 1 commit into from Jul 6, 2021
Merged

analogout: STM32: modified analogout_free api #14864

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
36 changes: 32 additions & 4 deletions targets/TARGET_STM/TARGET_STM32F0/analogout_device.c
View file
Open in desktop
Expand Up @@ -23,6 +23,11 @@
#include "mbed_error.h"
#include "PeripheralPins.h"

static int channel1_used = 0;
#if defined(DAC_CHANNEL_2)
static int channel2_used = 0;
#endif

void analogout_init(dac_t *obj, PinName pin)
{
DAC_ChannelConfTypeDef sConfig = {0};
Expand Down Expand Up @@ -72,17 +77,40 @@ void analogout_init(dac_t *obj, PinName pin)
if (HAL_DAC_ConfigChannel(&obj->handle, &sConfig, obj->channel) != HAL_OK) {
error("HAL_DAC_ConfigChannel failed");
}

if (obj->channel == DAC_CHANNEL_1) {
channel1_used = 1;
}
#if defined(DAC_CHANNEL_2)
if (obj->channel == DAC_CHANNEL_2) {
channel2_used = 1;
}
#endif

analogout_write_u16(obj, 0);
HAL_DAC_Start(&obj->handle, obj->channel);
}

void analogout_free(dac_t *obj)
{
// Reset DAC and disable clock
__HAL_RCC_DAC1_FORCE_RESET();
__HAL_RCC_DAC1_RELEASE_RESET();
__HAL_RCC_DAC1_CLK_DISABLE();
if (obj->channel == DAC_CHANNEL_1) {
channel1_used = 0;
}
#if defined(DAC_CHANNEL_2)
if (obj->channel == DAC_CHANNEL_2) {
channel2_used = 0;
}
#endif
if ((channel1_used == 0)
#if defined(DAC_CHANNEL_2)
&& (channel2_used == 0)
#endif
) {
// Reset DAC and disable clock
__HAL_RCC_DAC1_FORCE_RESET();
__HAL_RCC_DAC1_RELEASE_RESET();
__HAL_RCC_DAC1_CLK_DISABLE();
}

// Configure GPIO back to reset value
pin_function(obj->pin, STM_PIN_DATA(STM_MODE_ANALOG, GPIO_NOPULL, 0));
Expand Down
35 changes: 31 additions & 4 deletions targets/TARGET_STM/TARGET_STM32F1/analogout_device.c
View file
Open in desktop
Expand Up @@ -35,6 +35,11 @@
#include "mbed_error.h"
#include "PeripheralPins.h"

static int channel1_used = 0;
#if defined(DAC_CHANNEL_2)
static int channel2_used = 0;
#endif

void analogout_init(dac_t *obj, PinName pin)
{
DAC_ChannelConfTypeDef sConfig = {0};
Expand Down Expand Up @@ -85,16 +90,38 @@ void analogout_init(dac_t *obj, PinName pin)
error("HAL_DAC_ConfigChannel failed");
}

if (obj->channel == DAC_CHANNEL_1) {
channel1_used = 1;
}
#if defined(DAC_CHANNEL_2)
if (obj->channel == DAC_CHANNEL_2) {
channel2_used = 1;
}
#endif
analogout_write_u16(obj, 0);
HAL_DAC_Start(&obj->handle, obj->channel);
}

void analogout_free(dac_t *obj)
{
// Reset DAC and disable clock
__HAL_RCC_DAC_FORCE_RESET();
__HAL_RCC_DAC_RELEASE_RESET();
__HAL_RCC_DAC_CLK_DISABLE();
if (obj->channel == DAC_CHANNEL_1) {
channel1_used = 0;
}
#if defined(DAC_CHANNEL_2)
if (obj->channel == DAC_CHANNEL_2) {
channel2_used = 0;
}
#endif
if ((channel1_used == 0)
#if defined(DAC_CHANNEL_2)
&& (channel2_used == 0)
#endif
) {
// Reset DAC and disable clock
__HAL_RCC_DAC_FORCE_RESET();
__HAL_RCC_DAC_RELEASE_RESET();
__HAL_RCC_DAC_CLK_DISABLE();
}

// Configure GPIO back to reset value
pin_function(obj->pin, STM_PIN_DATA(STM_MODE_ANALOG, GPIO_NOPULL, 0));
Expand Down
36 changes: 32 additions & 4 deletions targets/TARGET_STM/TARGET_STM32F2/analogout_device.c
View file
Open in desktop
Expand Up @@ -35,6 +35,11 @@
#include "mbed_error.h"
#include "PeripheralPins.h"

static int channel1_used = 0;
#if defined(DAC_CHANNEL_2)
static int channel2_used = 0;
#endif

void analogout_init(dac_t *obj, PinName pin)
{
DAC_ChannelConfTypeDef sConfig = {0};
Expand Down Expand Up @@ -84,17 +89,40 @@ void analogout_init(dac_t *obj, PinName pin)
if (HAL_DAC_ConfigChannel(&obj->handle, &sConfig, obj->channel) != HAL_OK) {
error("HAL_DAC_ConfigChannel failed");
}

if (obj->channel == DAC_CHANNEL_1) {
channel1_used = 1;
}
#if defined(DAC_CHANNEL_2)
if (obj->channel == DAC_CHANNEL_2) {
channel2_used = 1;
}
#endif

analogout_write_u16(obj, 0);
HAL_DAC_Start(&obj->handle, obj->channel);
}

void analogout_free(dac_t *obj)
{
// Reset DAC and disable clock
__HAL_RCC_DAC_FORCE_RESET();
__HAL_RCC_DAC_RELEASE_RESET();
__HAL_RCC_DAC_CLK_DISABLE();
if (obj->channel == DAC_CHANNEL_1) {
channel1_used = 0;
}
#if defined(DAC_CHANNEL_2)
if (obj->channel == DAC_CHANNEL_2) {
channel2_used = 0;
}
#endif
if ((channel1_used == 0)
#if defined(DAC_CHANNEL_2)
&& (channel2_used == 0)
#endif
) {
// Reset DAC and disable clock
__HAL_RCC_DAC_FORCE_RESET();
__HAL_RCC_DAC_RELEASE_RESET();
__HAL_RCC_DAC_CLK_DISABLE();
}

// Configure GPIO back to reset value
pin_function(obj->pin, STM_PIN_DATA(STM_MODE_ANALOG, GPIO_NOPULL, 0));
Expand Down
37 changes: 22 additions & 15 deletions targets/TARGET_STM/TARGET_STM32F3/analogout_device.c
View file
Open in desktop
Expand Up @@ -36,8 +36,10 @@
#include "PeripheralPins.h"

// These variables are used for the "free" function
static int pa4_used = 0;
static int pa5_used = 0;
static int channel1_used = 0;
#if defined(DAC_CHANNEL_2)
static int channel2_used = 0;
#endif

#if STATIC_PINMAP_READY
#define ANALOGOUT_INIT_DIRECT analogout_init_direct
Expand Down Expand Up @@ -108,14 +110,14 @@ static void _analogout_init_direct(dac_t *obj, const PinMap *pinmap)
sConfig.DAC_OutputSwitch = DAC_OUTPUTSWITCH_ENABLE;
#endif

if (pinmap->pin == PA_4) {
pa4_used = 1;
if (obj->channel == DAC_CHANNEL_1) {
channel1_used = 1;
}

if (pinmap->pin == PA_5) {
pa5_used = 1;
#if defined(DAC_CHANNEL_2)
if (obj->channel == DAC_CHANNEL_2) {
channel2_used = 1;
}

#endif
if (HAL_DAC_ConfigChannel(&obj->handle, &sConfig, obj->channel) != HAL_OK) {
error("HAL_DAC_ConfigChannel failed");
}
Expand All @@ -137,21 +139,26 @@ void analogout_init(dac_t *obj, PinName pin)
void analogout_free(dac_t *obj)
{
// Reset DAC and disable clock
if (obj->pin == PA_4) {
pa4_used = 0;
if (obj->channel == DAC_CHANNEL_1) {
channel1_used = 0;
}
if (obj->pin == PA_5) {
pa5_used = 0;
#if defined(DAC_CHANNEL_2)
if (obj->channel == DAC_CHANNEL_2) {
channel2_used = 0;
}

if ((pa4_used == 0) && (pa5_used == 0)) {
#endif
if ((channel1_used == 0)
#if defined(DAC_CHANNEL_2)
&& (channel2_used == 0)
#endif
) {
__HAL_RCC_DAC1_FORCE_RESET();
__HAL_RCC_DAC1_RELEASE_RESET();
__HAL_RCC_DAC1_CLK_DISABLE();
}

#if defined(DAC2)
if (obj->pin == PA_6) {
if (obj->dac == DAC_2) {
__HAL_RCC_DAC2_FORCE_RESET();
__HAL_RCC_DAC2_RELEASE_RESET();
__HAL_RCC_DAC2_CLK_DISABLE();
Expand Down
35 changes: 22 additions & 13 deletions targets/TARGET_STM/TARGET_STM32G4/analogout_device.c
View file
Open in desktop
Expand Up @@ -24,8 +24,10 @@
#include "PeripheralPins.h"

// These variables are used for the "free" function
static int pa4_used = 0;
static int pa5_used = 0;
static int channel1_used = 0;
#if defined(DAC_CHANNEL_2)
static int channel2_used = 0;
#endif

#if STATIC_PINMAP_READY
#define ANALOGOUT_INIT_DIRECT analogout_init_direct
Expand Down Expand Up @@ -96,13 +98,14 @@ static void _analogout_init_direct(dac_t *obj, const PinMap *pinmap)
sConfig.DAC_OutputSwitch = DAC_OUTPUTSWITCH_ENABLE;
#endif

if (pinmap->pin == PA_4) {
pa4_used = 1;
if (obj->channel == DAC_CHANNEL_1) {
channel1_used = 1;
}

if (pinmap->pin == PA_5) {
pa5_used = 1;
#if defined(DAC_CHANNEL_2)
if (obj->channel == DAC_CHANNEL_2) {
channel2_used = 1;
}
#endif

if (HAL_DAC_ConfigChannel(&obj->handle, &sConfig, obj->channel) != HAL_OK) {
error("HAL_DAC_ConfigChannel failed");
Expand All @@ -125,21 +128,27 @@ void analogout_init(dac_t *obj, PinName pin)
void analogout_free(dac_t *obj)
{
// Reset DAC and disable clock
if (obj->pin == PA_4) {
pa4_used = 0;
if (obj->channel == DAC_CHANNEL_1) {
channel1_used = 0;
}
if (obj->pin == PA_5) {
pa5_used = 0;
#if defined(DAC_CHANNEL_2)
if (obj->channel == DAC_CHANNEL_2) {
channel2_used = 0;
}
#endif

if ((pa4_used == 0) && (pa5_used == 0)) {
if ((channel1_used == 0)
#if defined(DAC_CHANNEL_2)
&& (channel2_used == 0)
#endif
) {
__HAL_RCC_DAC1_FORCE_RESET();
__HAL_RCC_DAC1_RELEASE_RESET();
__HAL_RCC_DAC1_CLK_DISABLE();
}

#if defined(DAC2)
if (obj->pin == PA_6) {
if (obj->dac == DAC_2) {
__HAL_RCC_DAC2_FORCE_RESET();
__HAL_RCC_DAC2_RELEASE_RESET();
__HAL_RCC_DAC2_CLK_DISABLE();
Expand Down
9 changes: 8 additions & 1 deletion targets/TARGET_STM/TARGET_STM32H7/analogout_device.c
View file
Open in desktop
Expand Up @@ -57,7 +57,14 @@ void analogout_init(dac_t *obj, PinName pin)

__GPIOA_CLK_ENABLE();

__HAL_RCC_DAC12_CLK_ENABLE();
if (obj->dac == DAC_1) {
__HAL_RCC_DAC12_CLK_ENABLE();
}
#if defined(DAC2)
if (obj->dac == DAC_2) {
__HAL_RCC_DAC2_CLK_ENABLE();
}
#endif

obj->handle.Instance = DAC1;
obj->handle.State = HAL_DAC_STATE_RESET;
Expand Down
13 changes: 11 additions & 2 deletions targets/TARGET_STM/TARGET_STM32L0/analogout_device.c
View file
Open in desktop
Expand Up @@ -25,7 +25,9 @@

// These variables are used for the "free" function
static int channel1_used = 0;
#if defined(DAC_CHANNEL_2)
static int channel2_used = 0;
#endif

#if STATIC_PINMAP_READY
#define ANALOGOUT_INIT_DIRECT analogout_init_direct
Expand Down Expand Up @@ -85,9 +87,12 @@ static void _analogout_init_direct(dac_t *obj, const PinMap *pinmap)

if (obj->channel == DAC_CHANNEL_1) {
channel1_used = 1;
} else {
}
#if defined(DAC_CHANNEL_2)
if (obj->channel == DAC_CHANNEL_2) {
channel2_used = 1;
}
#endif

analogout_write_u16(obj, 0);
HAL_DAC_Start(&obj->handle, obj->channel);
Expand All @@ -114,7 +119,11 @@ void analogout_free(dac_t *obj)
channel2_used = 0;
}
#endif
if ((channel1_used == 0) && (channel2_used == 0)) {
if ((channel1_used == 0)
#if defined(DAC_CHANNEL_2)
&& (channel2_used == 0)
#endif
) {
__DAC_FORCE_RESET();
__DAC_RELEASE_RESET();
__DAC_CLK_DISABLE();
Expand Down