bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

G60/G61 Position Save/Restore (#16557)

Browse Source
This commit is contained in:
Hans007a
2020-01-07 20:52:19 +01:00
committed by Scott Lahteine
parent a0a93e35ae
commit e2eef1256a
10 changed files with 183 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Marlin/src/HAL/HAL_STM32/timers.h
View File

@ -61,8 +61,6 @@
#define HAL_TIMER_RATE (F_CPU / 2) // frequency of timer peripherals
// STM32F401 only has timers 1-5 & 9-11 with timers 4 & 5 usually assigned to TIMER_SERVO and TIMER_TONE
#ifndef STEP_TIMER
#define STEP_TIMER 9
#endif
@ -76,19 +74,19 @@
#define HAL_TIMER_RATE (F_CPU / 2) // frequency of timer peripherals
#ifndef STEP_TIMER
#define STEP_TIMER 6
#define STEP_TIMER 6 // STM32F401 has no TIM6, TIM7, or TIM8
#endif
#ifndef TEMP_TIMER
#define TEMP_TIMER 14
#define TEMP_TIMER 14 // TIM7 is consumed by Software Serial if used.
#endif
#elif defined(STM32F7xx)
#define HAL_TIMER_RATE (F_CPU/2) // frequency of timer peripherals
#define HAL_TIMER_RATE (F_CPU / 2) // frequency of timer peripherals
#ifndef STEP_TIMER
#define STEP_TIMER 6
#define STEP_TIMER 6 // the RIGHT timer!
#endif
#ifndef TEMP_TIMER