You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2022/06/25 06:35:22 UTC
[incubator-nuttx] branch master updated (667afb3b91 -> 78535d0123)
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
from 667afb3b91 sama5: add config SAMA5_SYSTEMRESET in arch/arm/src/Kconfig SAMA5D2 and SAMA5D4 does not support external reset. Some SAMA5 board's Kconfig contain item SAMA5_SYSTEMRESET, but it is better in arch/arm/src/Kconfig.
new 20cd657a65 arch/stm32_capture: fix offset address of slave mode control register
new 78535d0123 arch/stm32_capture: completion other slave mode selection
The 2 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/stm32/stm32_capture.c | 29 ++++++++++++++++++++++++++---
arch/arm/src/stm32/stm32_capture.h | 8 ++++++--
2 files changed, 32 insertions(+), 5 deletions(-)
[incubator-nuttx] 02/02: arch/stm32_capture: completion other slave mode selection
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 78535d012360f47f309e229540ad23f6f024f7d0
Author: zouboan <ff...@feedforward.com.cn>
AuthorDate: Sat Jun 25 10:17:33 2022 +0800
arch/stm32_capture: completion other slave mode selection
---
arch/arm/src/stm32/stm32_capture.c | 29 ++++++++++++++++++++++++++---
arch/arm/src/stm32/stm32_capture.h | 8 ++++++--
2 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/arch/arm/src/stm32/stm32_capture.c b/arch/arm/src/stm32/stm32_capture.c
index 4e114a6f5e..57050a83ed 100644
--- a/arch/arm/src/stm32/stm32_capture.c
+++ b/arch/arm/src/stm32/stm32_capture.c
@@ -651,17 +651,40 @@ static int stm32_cap_setclock(struct stm32_cap_dev_s *dev,
regval = GTIM_SMCR_DISAB;
break;
+ case STM32_CAP_CLK_ENC1:
+ regval = GTIM_SMCR_ENCMD1;
+ break;
+
+ case STM32_CAP_CLK_ENC2:
+ regval = GTIM_SMCR_ENCMD2;
+ break;
+
+ case STM32_CAP_CLK_ENC3:
+ regval = GTIM_SMCR_ENCMD3;
+ break;
+
+ case STM32_CAP_CLK_RST:
+ regval = GTIM_SMCR_RESET;
+ break;
+
+ case STM32_CAP_CLK_GAT:
+ regval = GTIM_SMCR_GATED;
+ break;
+
+ case STM32_CAP_CLK_TRG:
+ regval = GTIM_SMCR_TRIGGER;
+ break;
+
case STM32_CAP_CLK_EXT:
regval = GTIM_SMCR_EXTCLK1;
break;
- /* TODO: Add other case */
-
default:
return ERROR;
}
- stm32_modifyreg16(priv, STM32_GTIM_SMCR_OFFSET, GTIM_SMCR_SMS_MASK, regval);
+ stm32_modifyreg16(priv, STM32_GTIM_SMCR_OFFSET,
+ GTIM_SMCR_SMS_MASK, regval);
/* Set Maximum */
diff --git a/arch/arm/src/stm32/stm32_capture.h b/arch/arm/src/stm32/stm32_capture.h
index ad8de8b078..347545fc31 100644
--- a/arch/arm/src/stm32/stm32_capture.h
+++ b/arch/arm/src/stm32/stm32_capture.h
@@ -127,9 +127,13 @@ typedef enum
typedef enum
{
STM32_CAP_CLK_INT = 0,
+ STM32_CAP_CLK_ENC1,
+ STM32_CAP_CLK_ENC2,
+ STM32_CAP_CLK_ENC3,
+ STM32_CAP_CLK_RST,
+ STM32_CAP_CLK_GAT,
+ STM32_CAP_CLK_TRG,
STM32_CAP_CLK_EXT,
-
- /* TODO: Add other clock */
} stm32_cap_clk_t;
/* Capture flags */
[incubator-nuttx] 01/02: arch/stm32_capture: fix offset address of slave mode control register
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 20cd657a651359903a95a60ddd96596e3b1325d1
Author: zouboan <ff...@feedforward.com.cn>
AuthorDate: Sat Jun 25 10:09:11 2022 +0800
arch/stm32_capture: fix offset address of slave mode control register
---
arch/arm/src/stm32/stm32_capture.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/src/stm32/stm32_capture.c b/arch/arm/src/stm32/stm32_capture.c
index 7d96912529..4e114a6f5e 100644
--- a/arch/arm/src/stm32/stm32_capture.c
+++ b/arch/arm/src/stm32/stm32_capture.c
@@ -661,7 +661,7 @@ static int stm32_cap_setclock(struct stm32_cap_dev_s *dev,
return ERROR;
}
- stm32_modifyreg16(priv, STM32_BTIM_EGR_OFFSET, GTIM_SMCR_SMS_MASK, regval);
+ stm32_modifyreg16(priv, STM32_GTIM_SMCR_OFFSET, GTIM_SMCR_SMS_MASK, regval);
/* Set Maximum */