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 free implementation for F4/F7/H7 boards #14844

Merged
merged 3 commits into from
Jul 8, 2021
Merged

Analogout free implementation for F4/F7/H7 boards #14844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b52b3b6
analogout: STM32: analogout_free implementation for F4
AnishKumarHCL Jun 22, 2021
c22331c
analogout: STM32: analogout_free implementation for STM32F7
AnishKumarHCL Jun 22, 2021
59ba97f
analogout: STM32: Implemented analogout_free for STM32H7 series
AnishKumarHCL Jun 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions targets/TARGET_STM/TARGET_STM32F4/analogout_device.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@
#include "stm32f4xx_hal.h"
#include "PeripheralPins.h"

// These variables are used for the "free" function
static int dac_channel1_used = 0;
#if defined(DAC_CHANNEL_2)
static int dac_channel2_used = 0;
AnishKumarHCL marked this conversation as resolved.
Show resolved Hide resolved
#endif

#if STATIC_PINMAP_READY
#define ANALOGOUT_INIT_DIRECT analogout_init_direct
void analogout_init_direct(dac_t *obj, const PinMap *pinmap)
Expand Down Expand Up @@ -62,6 +68,9 @@ static void _analogout_init_direct(dac_t *obj, const PinMap *pinmap)
pin_function(pinmap->pin, pinmap->function);
pin_mode(pinmap->pin, PullNone);

// Save the pin for future use
obj->pin = pinmap->pin;

__HAL_RCC_GPIOA_CLK_ENABLE();

__HAL_RCC_DAC_CLK_ENABLE();
Expand All @@ -80,6 +89,14 @@ static void _analogout_init_direct(dac_t *obj, const PinMap *pinmap)
error("HAL_DAC_ConfigChannel failed");
}

if (obj->channel == DAC_CHANNEL_1) {
dac_channel1_used = 1;
}
#if defined(DAC_CHANNEL_2)
if (obj->channel == DAC_CHANNEL_2) {
dac_channel2_used = 1;
}
#endif
analogout_write_u16(obj, 0);
HAL_DAC_Start(&obj->handle, obj->channel);
}
Expand All @@ -96,6 +113,28 @@ void analogout_init(dac_t *obj, PinName pin)

void analogout_free(dac_t *obj)
{
if (obj->channel == DAC_CHANNEL_1) {
dac_channel1_used = 0;
}
#if defined(DAC_CHANNEL_2)
if (obj->channel == DAC_CHANNEL_2) {
dac_channel2_used = 0;
}
#endif

if ((dac_channel1_used == 0)
#if defined(DAC_CHANNEL_2)
&& (dac_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));
}
}

const PinMap *analogout_pinmap()
Expand Down
1 change: 1 addition & 0 deletions targets/TARGET_STM/TARGET_STM32F4/objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ struct analogin_s {
#if DEVICE_ANALOGOUT
struct dac_s {
DACName dac;
PinName pin;
uint32_t channel;
DAC_HandleTypeDef handle;
};
Expand Down
38 changes: 38 additions & 0 deletions targets/TARGET_STM/TARGET_STM32F7/analogout_device.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,12 @@
#include "stm32f7xx_hal.h"
#include "PeripheralPins.h"

// These variables are used for the "free" function
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 @@ -67,6 +73,9 @@ void analogout_init(dac_t *obj, PinName pin)
// Configure GPIO
pinmap_pinout(pin, PinMap_DAC);

// Save the pin for future use
obj->pin = pin;

__GPIOA_CLK_ENABLE();

__DAC_CLK_ENABLE();
Expand All @@ -85,12 +94,41 @@ 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)
{
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));
}
}

const PinMap *analogout_pinmap()
Expand Down
47 changes: 47 additions & 0 deletions targets/TARGET_STM/TARGET_STM32H7/analogout_device.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@
#include "stm32h7xx_hal.h"
#include "PeripheralPins.h"

// These variables are used for the "free" function
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 @@ -55,6 +61,9 @@ void analogout_init(dac_t *obj, PinName pin)
// Configure GPIO
pinmap_pinout(pin, PinMap_DAC);

// Save the pin for future use
obj->pin = pin;

__GPIOA_CLK_ENABLE();

__HAL_RCC_DAC12_CLK_ENABLE();
Expand All @@ -73,12 +82,50 @@ 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)
{
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_DAC12_FORCE_RESET();
__HAL_RCC_DAC12_RELEASE_RESET();
__HAL_RCC_DAC12_CLK_DISABLE();
}

#if defined(DAC2)
if (obj->dac == DAC_2) {
__HAL_RCC_DAC2_FORCE_RESET();
__HAL_RCC_DAC2_RELEASE_RESET();
__HAL_RCC_DAC2_CLK_DISABLE();
}
#endif

// Configure GPIO back to reset value
pin_function(obj->pin, STM_PIN_DATA(STM_MODE_ANALOG, GPIO_NOPULL, 0));
}

const PinMap *analogout_pinmap()
Expand Down