You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ac...@apache.org on 2020/10/17 13:41:01 UTC
[incubator-nuttx] branch master updated (4c7d7d5 -> 7284956)
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git.
from 4c7d7d5 Minor improvement in STM32 Kconfig menus.
new 00eccfd Added support to STM32L432KC DAC.
new 45cefc5 Fix nxstyle.
new 7284956 Fix nxstyle errors and warnings
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
boards/arm/stm32l4/nucleo-l432kc/include/board.h | 46 ++++++++++++----------
boards/arm/stm32l4/nucleo-l432kc/src/Makefile | 4 ++
.../arm/stm32l4/nucleo-l432kc/src/nucleo-l432kc.h | 18 +++++++--
.../arm/stm32l4/nucleo-l432kc/src/stm32_appinit.c | 6 +++
.../src/stm32_dac.c | 23 +++++------
5 files changed, 63 insertions(+), 34 deletions(-)
copy boards/arm/stm32l4/{nucleo-l452re => nucleo-l432kc}/src/stm32_dac.c (93%)
[incubator-nuttx] 03/03: Fix nxstyle errors and warnings
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 728495673092b0deae257e5268436b3be974f5ac
Author: Daniel P. Carvalho <da...@gmail.com>
AuthorDate: Fri Oct 16 17:12:06 2020 -0300
Fix nxstyle errors and warnings
---
boards/arm/stm32l4/nucleo-l432kc/include/board.h | 14 +++++++-------
boards/arm/stm32l4/nucleo-l432kc/src/nucleo-l432kc.h | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/boards/arm/stm32l4/nucleo-l432kc/include/board.h b/boards/arm/stm32l4/nucleo-l432kc/include/board.h
index c3d7f16..ed50664 100644
--- a/boards/arm/stm32l4/nucleo-l432kc/include/board.h
+++ b/boards/arm/stm32l4/nucleo-l432kc/include/board.h
@@ -37,7 +37,7 @@
#define __BOARDS_ARM_STM32L4_NUCLEO_L432KC_INCLUDE_BOARD_H
/*****************************************************************************
- * Included File
+ * Included Files
*****************************************************************************/
#include <nuttx/config.h>
@@ -45,18 +45,18 @@
# include <stdint.h>
#endif
-/* Do not include STM32L4 header files here */
-
-/*****************************************************************************
- * Pre-processor Definitions
- *****************************************************************************/
-
/* Clocking ******************************************************************/
#if defined(CONFIG_ARCH_CHIP_STM32L432KC)
# include <arch/board/nucleo-l432kc.h>
#endif
+/* Do not include STM32L4 header files here */
+
+/*****************************************************************************
+ * Pre-processor Definitions
+ *****************************************************************************/
+
/* DMA Channel/Stream Selections *********************************************/
/* Stream selections are arbitrary for now but might become important in the
diff --git a/boards/arm/stm32l4/nucleo-l432kc/src/nucleo-l432kc.h b/boards/arm/stm32l4/nucleo-l432kc/src/nucleo-l432kc.h
index ca8c36f..3f3251b 100644
--- a/boards/arm/stm32l4/nucleo-l432kc/src/nucleo-l432kc.h
+++ b/boards/arm/stm32l4/nucleo-l432kc/src/nucleo-l432kc.h
@@ -131,7 +131,7 @@ extern struct spi_dev_s *g_spi2;
#endif
/****************************************************************************
- * Public Functions
+ * Public functions
****************************************************************************/
/****************************************************************************
[incubator-nuttx] 01/03: Added support to STM32L432KC DAC.
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 00eccfd4fa457f9b46b7520e9e283bee6e0f61fe
Author: Daniel P. Carvalho <da...@gmail.com>
AuthorDate: Fri Oct 16 14:34:21 2020 -0300
Added support to STM32L432KC DAC.
---
boards/arm/stm32l4/nucleo-l432kc/include/board.h | 6 ++
boards/arm/stm32l4/nucleo-l432kc/src/Makefile | 4 +
.../arm/stm32l4/nucleo-l432kc/src/nucleo-l432kc.h | 12 +++
.../arm/stm32l4/nucleo-l432kc/src/stm32_appinit.c | 6 ++
boards/arm/stm32l4/nucleo-l432kc/src/stm32_dac.c | 96 ++++++++++++++++++++++
5 files changed, 124 insertions(+)
diff --git a/boards/arm/stm32l4/nucleo-l432kc/include/board.h b/boards/arm/stm32l4/nucleo-l432kc/include/board.h
index d410e55..f625c2e 100644
--- a/boards/arm/stm32l4/nucleo-l432kc/include/board.h
+++ b/boards/arm/stm32l4/nucleo-l432kc/include/board.h
@@ -221,6 +221,12 @@
#define LED_ASSERTION 2
#define LED_PANIC 1
+/* DAC
+ * Default is PA4 (same as ADC, do not use both at the same time)
+ */
+
+#define GPIO_DAC1_OUT GPIO_DAC1_OUT_1
+
/* Quadrature encoder
* Default is to use timer 5 (32-bit) and encoder on PA0/PA1
*/
diff --git a/boards/arm/stm32l4/nucleo-l432kc/src/Makefile b/boards/arm/stm32l4/nucleo-l432kc/src/Makefile
index a6bda03..17c0d05 100644
--- a/boards/arm/stm32l4/nucleo-l432kc/src/Makefile
+++ b/boards/arm/stm32l4/nucleo-l432kc/src/Makefile
@@ -55,6 +55,10 @@ ifeq ($(CONFIG_STM32L4_ADC),y)
CSRCS += stm32_adc.c
endif
+ifeq ($(CONFIG_DAC),y)
+CSRCS += stm32_dac.c
+endif
+
ifeq ($(CONFIG_DAC7571),y)
CSRCS += stm32_dac7571.c
endif
diff --git a/boards/arm/stm32l4/nucleo-l432kc/src/nucleo-l432kc.h b/boards/arm/stm32l4/nucleo-l432kc/src/nucleo-l432kc.h
index 22aea90..f5dc109 100644
--- a/boards/arm/stm32l4/nucleo-l432kc/src/nucleo-l432kc.h
+++ b/boards/arm/stm32l4/nucleo-l432kc/src/nucleo-l432kc.h
@@ -191,6 +191,18 @@ int stm32l4_adc_setup(void);
#endif
/****************************************************************************
+ * Name: stm32l4_dac_setup
+ *
+ * Description:
+ * Initialize DAC and register the DAC driver.
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_DAC
+int stm32l4_dac_setup(void);
+#endif
+
+/****************************************************************************
* Name: stm32_dac7571initialize
*
* Description:
diff --git a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_appinit.c b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_appinit.c
index bbe7591..842dd36 100644
--- a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_appinit.c
+++ b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_appinit.c
@@ -242,6 +242,12 @@ int board_app_initialize(uintptr_t arg)
}
#endif
+#ifdef CONFIG_DAC
+ ainfo("Initializing DAC\n");
+
+ stm32l4_dac_setup();
+#endif /* CONFIG_DAC */
+
#ifdef CONFIG_DAC7571
/* Initialize and register DAC7571 */
diff --git a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_dac.c b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_dac.c
new file mode 100644
index 0000000..86b23f7
--- /dev/null
+++ b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_dac.c
@@ -0,0 +1,96 @@
+/*****************************************************************************
+ * boards/arm/stm32l4/nucleo-l432kc/src/stm32_dac.c
+ *
+ * Copyright (C) 2017 Haltian Ltd. All rights reserved.
+ * Authors: Juha Niskanen <ju...@haltian.com>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ * used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+#include <errno.h>
+#include <debug.h>
+
+#include <nuttx/board.h>
+#include <nuttx/analog/dac.h>
+
+#include "stm32l4_gpio.h"
+#include "stm32l4_dac.h"
+#include "nucleo-l432kc.h"
+
+#include <arch/board/board.h>
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static struct dac_dev_s *g_dac;
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: stm32l4_dac_setup
+ ****************************************************************************/
+
+int stm32l4_dac_setup(void)
+{
+ static bool initialized = false;
+
+ if (!initialized)
+ {
+#ifdef CONFIG_STM32L4_DAC1
+ int ret;
+
+ g_dac = stm32l4_dacinitialize(0);
+ if (g_dac == NULL)
+ {
+ aerr("ERROR: Failed to get DAC interface\n");
+ return -ENODEV;
+ }
+
+ /* Register the DAC driver at "/dev/dac0" */
+
+ ret = dac_register("/dev/dac0", g_dac);
+ if (ret < 0)
+ {
+ aerr("ERROR: dac_register failed: %d\n", ret);
+ return ret;
+ }
+#endif
+ initialized = true;
+ }
+
+ return OK;
+}
[incubator-nuttx] 02/03: Fix nxstyle.
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 45cefc5a1bcee293c5b2dd7727e9767973c07d84
Author: Daniel P. Carvalho <da...@gmail.com>
AuthorDate: Fri Oct 16 15:08:30 2020 -0300
Fix nxstyle.
---
boards/arm/stm32l4/nucleo-l432kc/include/board.h | 30 +++++++++++-----------
.../arm/stm32l4/nucleo-l432kc/src/nucleo-l432kc.h | 4 +--
boards/arm/stm32l4/nucleo-l432kc/src/stm32_dac.c | 19 +++++++-------
3 files changed, 27 insertions(+), 26 deletions(-)
diff --git a/boards/arm/stm32l4/nucleo-l432kc/include/board.h b/boards/arm/stm32l4/nucleo-l432kc/include/board.h
index f625c2e..c3d7f16 100644
--- a/boards/arm/stm32l4/nucleo-l432kc/include/board.h
+++ b/boards/arm/stm32l4/nucleo-l432kc/include/board.h
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*****************************************************************************
* boards/arm/stm32l4/nucleo-l432kc/include/board.h
*
* Copyright (C) 2016, 2018-2019 Gregory Nutt. All rights reserved.
@@ -31,14 +31,14 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
- ******************************************************************************/
+ *****************************************************************************/
#ifndef __BOARDS_ARM_STM32L4_NUCLEO_L432KC_INCLUDE_BOARD_H
#define __BOARDS_ARM_STM32L4_NUCLEO_L432KC_INCLUDE_BOARD_H
-/*******************************************************************************
+/*****************************************************************************
* Included File
- ******************************************************************************/
+ *****************************************************************************/
#include <nuttx/config.h>
#ifndef __ASSEMBLY__
@@ -47,17 +47,17 @@
/* Do not include STM32L4 header files here */
-/*******************************************************************************
+/*****************************************************************************
* Pre-processor Definitions
- ******************************************************************************/
+ *****************************************************************************/
-/* Clocking *******************************************************************/
+/* Clocking ******************************************************************/
#if defined(CONFIG_ARCH_CHIP_STM32L432KC)
# include <arch/board/nucleo-l432kc.h>
#endif
-/* DMA Channel/Stream Selections **********************************************/
+/* DMA Channel/Stream Selections *********************************************/
/* Stream selections are arbitrary for now but might become important in the
* future is we set aside more DMA channels/streams.
@@ -76,7 +76,7 @@
#define ADC1_DMA_CHAN DMACHAN_ADC1_1
-/* Alternate function pin selections ******************************************/
+/* Alternate function pin selections *****************************************/
/* USART1:
* RXD: PA10 CN9 pin 3, CN10 pin 33
@@ -268,9 +268,9 @@
# define GPIO_LPTIM2_CH1OUT GPIO_LPTIM2_OUT_2
#endif
-/*******************************************************************************
+/*****************************************************************************
* Public Data
- ******************************************************************************/
+ *****************************************************************************/
#ifndef __ASSEMBLY__
@@ -283,11 +283,11 @@ extern "C"
#define EXTERN extern
#endif
-/*******************************************************************************
+/*****************************************************************************
* Public Function Prototypes
- ******************************************************************************/
+ *****************************************************************************/
-/*******************************************************************************
+/*****************************************************************************
* Name: stm32l4_board_initialize
*
* Description:
@@ -295,7 +295,7 @@ extern "C"
* entry point is called early in the initialization -- after all memory has
* been configured and mapped but before any devices have been initialized.
*
- ******************************************************************************/
+ *****************************************************************************/
void stm32l4_board_initialize(void);
diff --git a/boards/arm/stm32l4/nucleo-l432kc/src/nucleo-l432kc.h b/boards/arm/stm32l4/nucleo-l432kc/src/nucleo-l432kc.h
index f5dc109..ca8c36f 100644
--- a/boards/arm/stm32l4/nucleo-l432kc/src/nucleo-l432kc.h
+++ b/boards/arm/stm32l4/nucleo-l432kc/src/nucleo-l432kc.h
@@ -80,8 +80,8 @@
# undef HAVE_AT45DB
#endif
-/* LED. User LD3: the green LED is a user LED connected to Arduino signal D13
- * corresponding to MCU I/O PB3 (pin 26)
+/* LED. User LD3: the green LED is a user LED connected to Arduino signal
+ * D13 corresponding to MCU I/O PB3 (pin 26)
* target.
*
* - When the I/O is HIGH value, the LED is on.
diff --git a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_dac.c b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_dac.c
index 86b23f7..074420a 100644
--- a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_dac.c
+++ b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_dac.c
@@ -31,11 +31,11 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
- ****************************************************************************/
+ *****************************************************************************/
-/****************************************************************************
+/*****************************************************************************
* Included Files
- ****************************************************************************/
+ *****************************************************************************/
#include <nuttx/config.h>
#include <errno.h>
@@ -50,19 +50,19 @@
#include <arch/board/board.h>
-/****************************************************************************
+/*****************************************************************************
* Private Data
- ****************************************************************************/
+ *****************************************************************************/
static struct dac_dev_s *g_dac;
-/****************************************************************************
+/*****************************************************************************
* Public Functions
- ****************************************************************************/
+ *****************************************************************************/
-/****************************************************************************
+/*****************************************************************************
* Name: stm32l4_dac_setup
- ****************************************************************************/
+ *****************************************************************************/
int stm32l4_dac_setup(void)
{
@@ -88,6 +88,7 @@ int stm32l4_dac_setup(void)
aerr("ERROR: dac_register failed: %d\n", ret);
return ret;
}
+
#endif
initialized = true;
}