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
df48ef6d
Commit
df48ef6d
authored
5 years ago
by
tonokip
Committed by
Scott Lahteine
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix step timer on Archim1 (#15447)
parent
acbe84c8
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
Marlin/src/HAL/HAL_DUE/timers.cpp
+1
-1
1 addition, 1 deletion
Marlin/src/HAL/HAL_DUE/timers.cpp
Marlin/src/HAL/HAL_DUE/timers.h
+4
-0
4 additions, 0 deletions
Marlin/src/HAL/HAL_DUE/timers.h
Marlin/src/pins/sam/pins_ARCHIM1.h
+6
-0
6 additions, 0 deletions
Marlin/src/pins/sam/pins_ARCHIM1.h
with
11 additions
and
1 deletion
Marlin/src/HAL/HAL_DUE/timers.cpp
+
1
−
1
View file @
df48ef6d
...
...
@@ -50,7 +50,7 @@ const tTimerConfig TimerConfig [NUM_HARDWARE_TIMERS] = {
{
TC0
,
0
,
TC0_IRQn
,
3
},
// 0 - [servo timer5]
{
TC0
,
1
,
TC1_IRQn
,
0
},
// 1
{
TC0
,
2
,
TC2_IRQn
,
2
},
// 2 - stepper
{
TC1
,
0
,
TC3_IRQn
,
0
},
// 3
{
TC1
,
0
,
TC3_IRQn
,
0
},
// 3
- stepper for BOARD_ARCHIM1
{
TC1
,
1
,
TC4_IRQn
,
15
},
// 4 - temperature
{
TC1
,
2
,
TC5_IRQn
,
3
},
// 5 - [servo timer3]
{
TC2
,
0
,
TC6_IRQn
,
14
},
// 6 - tone
...
...
This diff is collapsed.
Click to expand it.
Marlin/src/HAL/HAL_DUE/timers.h
+
4
−
0
View file @
df48ef6d
...
...
@@ -39,7 +39,9 @@ typedef uint32_t hal_timer_t;
#define HAL_TIMER_RATE ((F_CPU) / 2) // frequency of timers peripherals
#ifndef STEP_TIMER_NUM
#define STEP_TIMER_NUM 2 // index of timer to use for stepper
#endif
#define TEMP_TIMER_NUM 4 // index of timer to use for temperature
#define PULSE_TIMER_NUM STEP_TIMER_NUM
#define TONE_TIMER_NUM 6 // index of timer to use for beeper tones
...
...
@@ -61,7 +63,9 @@ typedef uint32_t hal_timer_t;
#define ENABLE_TEMPERATURE_INTERRUPT() HAL_timer_enable_interrupt(TEMP_TIMER_NUM)
#define DISABLE_TEMPERATURE_INTERRUPT() HAL_timer_disable_interrupt(TEMP_TIMER_NUM)
#ifndef HAL_STEP_TIMER_ISR()
#define HAL_STEP_TIMER_ISR() void TC2_Handler()
#endif
#define HAL_TEMP_TIMER_ISR() void TC4_Handler()
#define HAL_TONE_TIMER_ISR() void TC6_Handler()
...
...
This diff is collapsed.
Click to expand it.
Marlin/src/pins/sam/pins_ARCHIM1.h
+
6
−
0
View file @
df48ef6d
...
...
@@ -43,6 +43,12 @@
#define BOARD_INFO_NAME "Archim 1.0"
//
// Timers
//
#define STEP_TIMER_NUM 3
#define HAL_STEP_TIMER_ISR() void TC3_Handler()
//
// Items marked * have been altered from Archim v1.0
//
...
...
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