Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
NuttX RTOS
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
f4grx
NuttX RTOS
Commits
662622b5
Commit
662622b5
authored
11 years ago
by
Gregory Nutt
Browse files
Options
Downloads
Patches
Plain Diff
STM32 Timer: Set CCMR wehn selecting timer channel. From David Sidrane
parent
416187d7
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
arch/arm/src/stm32/stm32_tim.c
+10
-4
10 additions, 4 deletions
arch/arm/src/stm32/stm32_tim.c
with
10 additions
and
4 deletions
arch/arm/src/stm32/stm32_tim.c
+
10
−
4
View file @
662622b5
...
...
@@ -485,8 +485,10 @@ static int stm32_tim_setmode(FAR struct stm32_tim_dev_s *dev, stm32_tim_mode_t m
static
int
stm32_tim_setchannel
(
FAR
struct
stm32_tim_dev_s
*
dev
,
uint8_t
channel
,
stm32_tim_channel_t
mode
)
{
uint16_t
ccmr_val
=
0
;
uint16_t
ccer_val
=
stm32_getreg16
(
dev
,
STM32_GTIM_CCER_OFFSET
);
uint16_t
ccmr_orig
=
0
;
uint16_t
ccmr_val
=
0
;
uint16_t
ccmr_mask
=
0xff
;
uint16_t
ccer_val
=
stm32_getreg16
(
dev
,
STM32_GTIM_CCER_OFFSET
);
uint8_t
ccmr_offset
=
STM32_GTIM_CCMR1_OFFSET
;
ASSERT
(
dev
);
...
...
@@ -543,7 +545,8 @@ static int stm32_tim_setchannel(FAR struct stm32_tim_dev_s *dev, uint8_t channel
if
(
channel
&
1
)
{
ccmr_val
<<=
8
;
ccmr_val
<<=
8
;
ccmr_mask
<<=
8
;
}
if
(
channel
>
1
)
...
...
@@ -551,7 +554,10 @@ static int stm32_tim_setchannel(FAR struct stm32_tim_dev_s *dev, uint8_t channel
ccmr_offset
=
STM32_GTIM_CCMR2_OFFSET
;
}
stm32_putreg16
(
dev
,
ccmr_offset
,
ccmr_val
);
ccmr_orig
=
stm32_getreg16
(
dev
,
ccmr_offset
);
ccmr_orig
&=
~
ccmr_mask
;
ccmr_orig
|=
ccmr_val
;
stm32_putreg16
(
dev
,
ccmr_offset
,
ccmr_orig
);
stm32_putreg16
(
dev
,
STM32_GTIM_CCER_OFFSET
,
ccer_val
);
/* set GPIO */
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment