You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by gn...@apache.org on 2020/04/24 18:38:54 UTC
[incubator-nuttx] branch master updated (3fcb441 -> a0d4e61)
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git.
from 3fcb441 STM32L4 PWR/RCC: nxstyle
new ff85335 fix use of undefined CONFIG_STM32L4_LPTIM1_CH1POL
new 436979b STM32L4 PWM: nxstyle
new a0d4e61 STM32L4 PWM: nxstyle
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:
arch/arm/src/stm32l4/stm32l4_pwm.c | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
[incubator-nuttx] 02/03: STM32L4 PWM: nxstyle
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 436979baed4106f777cbe8f05226698067fd4ffc
Author: Matias Nitsche <mn...@dc.uba.ar>
AuthorDate: Fri Apr 24 14:36:15 2020 -0300
STM32L4 PWM: nxstyle
---
arch/arm/src/stm32l4/stm32l4_pwm.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/arch/arm/src/stm32l4/stm32l4_pwm.c b/arch/arm/src/stm32l4/stm32l4_pwm.c
index c1ea8da..bbcbc28 100644
--- a/arch/arm/src/stm32l4/stm32l4_pwm.c
+++ b/arch/arm/src/stm32l4/stm32l4_pwm.c
@@ -176,8 +176,8 @@ struct stm32l4_pwm_out_s
struct stm32l4_pwmchan_s
{
- uint8_t channel:4; /* Timer output channel: {1,..4} */
- uint8_t mode:4; /* PWM channel mode (see stm32l4_pwm_chanmode_e) */
+ uint8_t channel:4; /* Timer output channel: {1,..4} */
+ uint8_t mode:4; /* PWM channel mode (see stm32l4_pwm_chanmode_e) */
struct stm32l4_pwm_out_s out1; /* PWM output configuration */
#ifdef HAVE_BREAK
struct stm32l4_pwm_break_s brk; /* PWM break configuration */
@@ -196,6 +196,7 @@ struct stm32l4_pwmtimer_s
FAR const struct stm32l4_pwm_ops_s *llops; /* Low-level PWM ops */
#endif
FAR struct stm32l4_pwmchan_s *channels; /* Channels configuration */
+
uint8_t timid:5; /* Timer ID {1,...,17} */
uint8_t chan_num:3; /* Number of configured channels */
uint8_t timtype:3; /* See the TIMTYPE_* definitions */
@@ -1610,7 +1611,6 @@ static void pwm_dumpregs(FAR struct pwm_lowerhalf_s *dev,
static int pwm_ccr_update(FAR struct pwm_lowerhalf_s *dev, uint8_t index,
uint32_t ccr)
-
{
FAR struct stm32l4_pwmtimer_s *priv = (FAR struct stm32l4_pwmtimer_s *)dev;
uint32_t offset = 0;
@@ -1979,7 +1979,8 @@ static int pwm_frequency_update(FAR struct pwm_lowerhalf_s *dev,
reload--;
}
- pwminfo("TIM%u PCLK: %u frequency: %u TIMCLK: %u prescaler: %u reload: %u\n",
+ pwminfo("TIM%u PCLK: %u frequency: %u TIMCLK: %u "
+ "prescaler: %u reload: %u\n",
priv->timid, priv->pclk, frequency, timclk, prescaler, reload);
/* Set the reload and prescaler values */
@@ -2047,7 +2048,8 @@ static int pwm_lp_frequency_update(FAR struct pwm_lowerhalf_s *dev,
* and not simply return the feasible frequency without complaining.
*/
- pwminfo("LPTIM%u PCLK: %u frequency: %u TIMCLK: %u prescaler: %u reload: %u\n",
+ pwminfo("LPTIM%u PCLK: %u frequency: %u TIMCLK: %u "
+ "prescaler: %u reload: %u\n",
priv->timid, priv->pclk, frequency, timclk, prescaler, reload);
/* Set the reload register value */
@@ -2555,7 +2557,8 @@ static int pwm_outputs_enable(FAR struct pwm_lowerhalf_s *dev,
regval |= ((outputs & STM32L4_PWM_OUT3N) ? ATIM_CCER_CC3NE : 0);
regval |= ((outputs & STM32L4_PWM_OUT4) ? ATIM_CCER_CC4E : 0);
- /* NOTE: CC4N does not exist, but some docs show configuration bits for it */
+ /* NOTE: CC4N does not exist, but some docs show configuration bits for it
+ */
regval |= ((outputs & STM32L4_PWM_OUT5) ? ATIM_CCER_CC5E : 0);
regval |= ((outputs & STM32L4_PWM_OUT6) ? ATIM_CCER_CC6E : 0);
[incubator-nuttx] 01/03: fix use of undefined
CONFIG_STM32L4_LPTIM1_CH1POL
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit ff85335b71bcbd28a656ac61c12e8c96075a073e
Author: Matias Nitsche <mn...@dc.uba.ar>
AuthorDate: Wed Apr 15 18:47:15 2020 -0300
fix use of undefined CONFIG_STM32L4_LPTIM1_CH1POL
---
arch/arm/src/stm32l4/stm32l4_pwm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/src/stm32l4/stm32l4_pwm.c b/arch/arm/src/stm32l4/stm32l4_pwm.c
index 73dbe9a..c1ea8da 100644
--- a/arch/arm/src/stm32l4/stm32l4_pwm.c
+++ b/arch/arm/src/stm32l4/stm32l4_pwm.c
@@ -1318,7 +1318,7 @@ static struct stm32l4_pwmchan_s g_pwmlp1channels[] =
.out1 =
{
.in_use = 1,
- .pol = CONFIG_STM32L4_LPTIM1_CH1POL,
+ .pol = 0, /* REVISIT: Configure using CONFIG_STM32L4_LPTIM1_CH1POL, */
.idle = 0, /* No idle */
.pincfg = PWM_LPTIM1_CH1CFG,
}
[incubator-nuttx] 03/03: STM32L4 PWM: nxstyle
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit a0d4e61d5494b6fa26d3bd5e3178e51ce9497915
Author: Matias Nitsche <mn...@dc.uba.ar>
AuthorDate: Fri Apr 24 14:54:42 2020 -0300
STM32L4 PWM: nxstyle
---
arch/arm/src/stm32l4/stm32l4_pwm.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/arm/src/stm32l4/stm32l4_pwm.c b/arch/arm/src/stm32l4/stm32l4_pwm.c
index bbcbc28..2c39b7d 100644
--- a/arch/arm/src/stm32l4/stm32l4_pwm.c
+++ b/arch/arm/src/stm32l4/stm32l4_pwm.c
@@ -2682,7 +2682,8 @@ static int pwm_soft_break(FAR struct pwm_lowerhalf_s *dev, bool state)
*
****************************************************************************/
-static uint16_t pwm_outputs_from_channels(FAR struct stm32l4_pwmtimer_s *priv)
+static uint16_t
+ pwm_outputs_from_channels(FAR struct stm32l4_pwmtimer_s *priv)
{
uint16_t outputs = 0;
uint8_t channel = 0;