Browse Source

Fix step timer on Archim1 (#15447)

tonokip 5 years ago
parent
commit
df48ef6df3

+ 1
- 1
Marlin/src/HAL/HAL_DUE/timers.cpp View File

50
   { TC0, 0, TC0_IRQn,  3}, // 0 - [servo timer5]
50
   { TC0, 0, TC0_IRQn,  3}, // 0 - [servo timer5]
51
   { TC0, 1, TC1_IRQn,  0}, // 1
51
   { TC0, 1, TC1_IRQn,  0}, // 1
52
   { TC0, 2, TC2_IRQn,  2}, // 2 - stepper
52
   { TC0, 2, TC2_IRQn,  2}, // 2 - stepper
53
-  { TC1, 0, TC3_IRQn,  0}, // 3
53
+  { TC1, 0, TC3_IRQn,  0}, // 3 - stepper for BOARD_ARCHIM1
54
   { TC1, 1, TC4_IRQn, 15}, // 4 - temperature
54
   { TC1, 1, TC4_IRQn, 15}, // 4 - temperature
55
   { TC1, 2, TC5_IRQn,  3}, // 5 - [servo timer3]
55
   { TC1, 2, TC5_IRQn,  3}, // 5 - [servo timer3]
56
   { TC2, 0, TC6_IRQn, 14}, // 6 - tone
56
   { TC2, 0, TC6_IRQn, 14}, // 6 - tone

+ 4
- 0
Marlin/src/HAL/HAL_DUE/timers.h View File

39
 
39
 
40
 #define HAL_TIMER_RATE         ((F_CPU) / 2)    // frequency of timers peripherals
40
 #define HAL_TIMER_RATE         ((F_CPU) / 2)    // frequency of timers peripherals
41
 
41
 
42
+#ifndef STEP_TIMER_NUM
42
 #define STEP_TIMER_NUM 2  // index of timer to use for stepper
43
 #define STEP_TIMER_NUM 2  // index of timer to use for stepper
44
+#endif
43
 #define TEMP_TIMER_NUM 4  // index of timer to use for temperature
45
 #define TEMP_TIMER_NUM 4  // index of timer to use for temperature
44
 #define PULSE_TIMER_NUM STEP_TIMER_NUM
46
 #define PULSE_TIMER_NUM STEP_TIMER_NUM
45
 #define TONE_TIMER_NUM 6  // index of timer to use for beeper tones
47
 #define TONE_TIMER_NUM 6  // index of timer to use for beeper tones
61
 #define ENABLE_TEMPERATURE_INTERRUPT()  HAL_timer_enable_interrupt(TEMP_TIMER_NUM)
63
 #define ENABLE_TEMPERATURE_INTERRUPT()  HAL_timer_enable_interrupt(TEMP_TIMER_NUM)
62
 #define DISABLE_TEMPERATURE_INTERRUPT() HAL_timer_disable_interrupt(TEMP_TIMER_NUM)
64
 #define DISABLE_TEMPERATURE_INTERRUPT() HAL_timer_disable_interrupt(TEMP_TIMER_NUM)
63
 
65
 
66
+#ifndef HAL_STEP_TIMER_ISR()
64
 #define HAL_STEP_TIMER_ISR()  void TC2_Handler()
67
 #define HAL_STEP_TIMER_ISR()  void TC2_Handler()
68
+#endif
65
 #define HAL_TEMP_TIMER_ISR()  void TC4_Handler()
69
 #define HAL_TEMP_TIMER_ISR()  void TC4_Handler()
66
 #define HAL_TONE_TIMER_ISR()  void TC6_Handler()
70
 #define HAL_TONE_TIMER_ISR()  void TC6_Handler()
67
 
71
 

+ 6
- 0
Marlin/src/pins/sam/pins_ARCHIM1.h View File

44
 #define BOARD_INFO_NAME "Archim 1.0"
44
 #define BOARD_INFO_NAME "Archim 1.0"
45
 
45
 
46
 //
46
 //
47
+// Timers
48
+//
49
+#define STEP_TIMER_NUM 3
50
+#define HAL_STEP_TIMER_ISR()  void TC3_Handler()
51
+
52
+//
47
 // Items marked * have been altered from Archim v1.0
53
 // Items marked * have been altered from Archim v1.0
48
 //
54
 //
49
 
55
 

Loading…
Cancel
Save