Skip to content

boards/esp32: changes the approach for configurations of DAC channels in board definitions #11290

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

Merged
leandrolanzieri merged 4 commits into from
May 7, 2019
Merged

boards/esp32: changes the approach for configurations of DAC channels in board definitions #11290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f872eb9
boards/esp32: disable DAC for Olimex ESP32 boards
gschorcht May 2, 2019
880e156
boards/esp32: disable DAC for WROVER-Kit boards
gschorcht May 2, 2019
0510f0c
cpu/esp32: DAC config approach changed
gschorcht May 2, 2019
7e8a1c1
boards/esp32: DAC config approach changed
gschorcht May 2, 2019
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
7 changes: 6 additions & 1 deletion boards/common/esp32/include/periph_conf_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,11 @@ static const gpio_t adc_channels[] = ADC_GPIOS;
#define DAC_GPIOS { }
#endif

/**
* @brief Static array with declared DAC channels
*/
static const gpio_t dac_channels[] = DAC_GPIOS;

/**
* @brief Number of GPIOs declared as DAC channels
*
Expand All @@ -86,7 +91,7 @@ static const gpio_t adc_channels[] = ADC_GPIOS;
*
* @note DAC_NUMOF definition must not be changed.
*/
#define DAC_NUMOF (dac_chn_num)
#define DAC_NUMOF (sizeof(dac_channels) / sizeof(dac_channels[0]))
/** @} */


Expand Down
1 change: 0 additions & 1 deletion boards/esp32-olimex-evb/Makefile.features
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ include $(RIOTBOARD)/common/esp32/Makefile.features
ifneq (,$(filter olimex_esp32_gateway,$(USEMODULE)))
FEATURES_PROVIDED += periph_adc
endif
FEATURES_PROVIDED += periph_dac
FEATURES_PROVIDED += periph_i2c
FEATURES_PROVIDED += periph_pwm
FEATURES_PROVIDED += periph_spi
Expand Down
1 change: 0 additions & 1 deletion boards/esp32-wrover-kit/Makefile.features
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ include $(RIOTBOARD)/common/esp32/Makefile.features

# additional features provided by the board
FEATURES_PROVIDED += periph_adc
FEATURES_PROVIDED += periph_dac
FEATURES_PROVIDED += periph_i2c
FEATURES_PROVIDED += periph_pwm
FEATURES_PROVIDED += periph_spi
Expand Down
3 changes: 0 additions & 3 deletions cpu/esp32/include/periph_cpu.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,9 +274,6 @@ typedef enum {
*/
#define DAC_NUMOF_MAX 2

/** Number of DAC channels determined from DAC_GPIOS */
extern const unsigned dac_chn_num;

/** @} */

/**
Expand Down
30 changes: 12 additions & 18 deletions cpu/esp32/periph/dac.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,6 @@
#define ENABLE_DEBUG (0)
#include "debug.h"

/** Map of RIOT DAC lines to GPIOs */
static const uint32_t dac_pins[] = DAC_GPIOS;

/** number of DAC channels */
const unsigned dac_chn_num = (sizeof(dac_pins) / sizeof(dac_pins[0]));

/* declaration of external functions */
extern void _adc2_ctrl_init(void);

Expand All @@ -53,7 +47,7 @@ extern const gpio_t _gpio_rtcio_map[];

int8_t dac_init (dac_t line)
{
CHECK_PARAM_RET (line < dac_chn_num, DAC_NOLINE)
CHECK_PARAM_RET (line < DAC_NUMOF, DAC_NOLINE)

if (!_dac_module_initialized) {
/* do some configuration checks */
Expand All @@ -65,7 +59,7 @@ int8_t dac_init (dac_t line)

_adc2_ctrl_init();

uint8_t rtcio = _gpio_rtcio_map[dac_pins[line]];
uint8_t rtcio = _gpio_rtcio_map[dac_channels[line]];
uint8_t idx;

/* try to initialize the pin as DAC ouput */
Expand Down Expand Up @@ -112,27 +106,27 @@ int8_t dac_init (dac_t line)

void dac_set (dac_t line, uint16_t value)
{
CHECK_PARAM (line < dac_chn_num);
RTCIO.pad_dac[_gpio_rtcio_map[dac_pins[line]] - RTCIO_DAC1].dac = value >> 8;
CHECK_PARAM (line < DAC_NUMOF);
RTCIO.pad_dac[_gpio_rtcio_map[dac_channels[line]] - RTCIO_DAC1].dac = value >> 8;
}

void dac_poweroff (dac_t line)
{
CHECK_PARAM (line < dac_chn_num);
CHECK_PARAM (line < DAC_NUMOF);
}

void dac_poweron (dac_t line)
{
CHECK_PARAM (line < dac_chn_num);
CHECK_PARAM (line < DAC_NUMOF);
}

static bool _dac_conf_check(void)
{
for (unsigned i = 0; i < dac_chn_num; i++) {
if (_gpio_rtcio_map[dac_pins[i]] != RTCIO_DAC1 &&
_gpio_rtcio_map[dac_pins[i]] != RTCIO_DAC2) {
for (unsigned i = 0; i < DAC_NUMOF; i++) {
if (_gpio_rtcio_map[dac_channels[i]] != RTCIO_DAC1 &&
_gpio_rtcio_map[dac_channels[i]] != RTCIO_DAC2) {
LOG_TAG_ERROR("dac", "GPIO%d cannot be used as DAC line\n",
dac_pins[i]);
dac_channels[i]);
return false;
}
}
Expand All @@ -144,8 +138,8 @@ void dac_print_config(void)
{
ets_printf("\tDAC\t\tpins=[ ");
#if defined(DAC_GPIOS)
for (unsigned i = 0; i < dac_chn_num; i++) {
ets_printf("%d ", dac_pins[i]);
for (unsigned i = 0; i < DAC_NUMOF; i++) {
ets_printf("%d ", dac_channels[i]);
}
#endif /* defined(DAC_GPIOS) */
ets_printf("]\n");
Expand Down