Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
M
marlin-anet-a8
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD 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
Jonas Leder
marlin-anet-a8
Commits
900d4cf8
Unverified
Commit
900d4cf8
authored
4 years ago
by
Chris Barr
Committed by
GitHub
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Allow STM32 HAL_TIMER_RATE override (#18374)
parent
e424dfc8
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Marlin/src/HAL/STM32/timers.cpp
+7
-4
7 additions, 4 deletions
Marlin/src/HAL/STM32/timers.cpp
Marlin/src/pins/stm32f4/pins_RUMBA32_common.h
+1
-0
1 addition, 0 deletions
Marlin/src/pins/stm32f4/pins_RUMBA32_common.h
with
8 additions
and
4 deletions
Marlin/src/HAL/STM32/timers.cpp
+
7
−
4
View file @
900d4cf8
...
...
@@ -44,23 +44,26 @@
#endif
#ifdef STM32F0xx
#define
HAL
_TIMER_RATE (F_CPU) // Frequency of timer peripherals
#define
MCU
_TIMER_RATE (F_CPU) // Frequency of timer peripherals
#define MCU_STEP_TIMER 16
#define MCU_TEMP_TIMER 17
#elif defined(STM32F1xx)
#define
HAL
_TIMER_RATE (F_CPU)
#define
MCU
_TIMER_RATE (F_CPU)
#define MCU_STEP_TIMER 4
#define MCU_TEMP_TIMER 2
#elif defined(STM32F401xC) || defined(STM32F401xE)
#define
HAL
_TIMER_RATE (F_CPU / 2)
#define
MCU
_TIMER_RATE (F_CPU / 2)
#define MCU_STEP_TIMER 9
#define MCU_TEMP_TIMER 10
#elif defined(STM32F4xx) || defined(STM32F7xx)
#define
HAL
_TIMER_RATE (F_CPU / 2)
#define
MCU
_TIMER_RATE (F_CPU / 2)
#define MCU_STEP_TIMER 6 // STM32F401 has no TIM6, TIM7, or TIM8
#define MCU_TEMP_TIMER 14 // TIM7 is consumed by Software Serial if used.
#endif
#ifndef HAL_TIMER_RATE
#define HAL_TIMER_RATE MCU_TIMER_RATE
#endif
#ifndef STEP_TIMER
#define STEP_TIMER MCU_STEP_TIMER
#endif
...
...
This diff is collapsed.
Click to expand it.
Marlin/src/pins/stm32f4/pins_RUMBA32_common.h
+
1
−
0
View file @
900d4cf8
...
...
@@ -47,6 +47,7 @@
#define STEP_TIMER 10
#define TEMP_TIMER 14
#define TIMER_SERIAL TIM9
#define HAL_TIMER_RATE F_CPU
//
// Limit Switches
...
...
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