🎨 Rename HAL timer elements
This commit is contained in:
committed by
Scott Lahteine
parent
d75e7784e5
commit
9b1c0a75e1
@@ -46,8 +46,7 @@
|
||||
//
|
||||
// Timers
|
||||
//
|
||||
// These are already defined in DUE, so must be undefined first
|
||||
#define STEP_TIMER_NUM 3
|
||||
#define MF_TIMER_STEP 3
|
||||
#define HAL_STEP_TIMER_ISR() void TC3_Handler()
|
||||
|
||||
//
|
||||
|
@@ -45,8 +45,8 @@
|
||||
//
|
||||
// Timers
|
||||
//
|
||||
#define STEP_TIMER 6
|
||||
#define TEMP_TIMER 7
|
||||
#define STEP_TIMER 6
|
||||
#define TEMP_TIMER 7
|
||||
|
||||
//
|
||||
// Limit Switches
|
||||
|
@@ -41,7 +41,7 @@
|
||||
#define BOARD_NO_NATIVE_USB
|
||||
|
||||
// Avoid conflict with TIMER_SERVO when using the STM32 HAL
|
||||
#define TEMP_TIMER 5
|
||||
#define TEMP_TIMER 5
|
||||
|
||||
//
|
||||
// Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
|
||||
|
@@ -47,8 +47,8 @@
|
||||
// On STM32F103:
|
||||
// PB3, PB6, PB7, and PB8 can be used with pwm, which rules out TIM2 and TIM4.
|
||||
// On STM32F070, 16 and 17 are in use, but 1 and 3 are available.
|
||||
#define STEP_TIMER 1
|
||||
#define TEMP_TIMER 3
|
||||
#define STEP_TIMER 1
|
||||
#define TEMP_TIMER 3
|
||||
|
||||
//
|
||||
// Limit Switches
|
||||
|
@@ -39,7 +39,7 @@
|
||||
#define MKS_HARDWARE_TEST_ONLY_E0
|
||||
|
||||
// Avoid conflict with TIMER_SERVO when using the STM32 HAL
|
||||
#define TEMP_TIMER 5
|
||||
#define TEMP_TIMER 5
|
||||
|
||||
//
|
||||
// Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
|
||||
|
@@ -39,7 +39,7 @@
|
||||
#define USES_DIAG_PINS
|
||||
|
||||
// Avoid conflict with TIMER_SERVO when using the STM32 HAL
|
||||
#define TEMP_TIMER 5
|
||||
#define TEMP_TIMER 5
|
||||
|
||||
//
|
||||
// Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
|
||||
|
@@ -32,7 +32,7 @@
|
||||
#define BOARD_NO_NATIVE_USB
|
||||
|
||||
// Avoid conflict with TIMER_SERVO when using the STM32 HAL
|
||||
#define TEMP_TIMER 5
|
||||
#define TEMP_TIMER 5
|
||||
|
||||
//
|
||||
// EEPROM
|
||||
|
@@ -33,7 +33,7 @@
|
||||
#define I2C_SDA_PIN PB9
|
||||
|
||||
// Avoid conflict with TIMER_TONE
|
||||
#define STEP_TIMER 10
|
||||
#define STEP_TIMER 10
|
||||
|
||||
//
|
||||
// Servos
|
||||
|
@@ -50,7 +50,7 @@
|
||||
#define HAS_OTG_USB_HOST_SUPPORT // USB Flash Drive support
|
||||
|
||||
// Avoid conflict with TIMER_TONE
|
||||
#define STEP_TIMER 10
|
||||
#define STEP_TIMER 10
|
||||
|
||||
//
|
||||
// Servos
|
||||
|
@@ -33,8 +33,8 @@
|
||||
#define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
|
||||
|
||||
// Avoid conflict with fans and TIMER_TONE
|
||||
#define TEMP_TIMER 3
|
||||
#define STEP_TIMER 5
|
||||
#define TEMP_TIMER 3
|
||||
#define STEP_TIMER 5
|
||||
|
||||
//
|
||||
// EEPROM Emulation
|
||||
|
@@ -31,8 +31,8 @@
|
||||
#define BOARD_INFO_NAME "Lerdge S"
|
||||
#define DEFAULT_MACHINE_NAME "LERDGE"
|
||||
|
||||
#define STEP_TIMER 4
|
||||
#define TEMP_TIMER 2
|
||||
#define STEP_TIMER 4
|
||||
#define TEMP_TIMER 2
|
||||
|
||||
#define HAS_OTG_USB_HOST_SUPPORT // USB Flash Drive support
|
||||
|
||||
|
@@ -31,8 +31,8 @@
|
||||
#define BOARD_INFO_NAME "Lerdge X"
|
||||
#define DEFAULT_MACHINE_NAME "LERDGE"
|
||||
|
||||
#define STEP_TIMER 4
|
||||
#define TEMP_TIMER 2
|
||||
#define STEP_TIMER 4
|
||||
#define TEMP_TIMER 2
|
||||
|
||||
#define I2C_EEPROM
|
||||
#define I2C_SCL_PIN PB8
|
||||
|
@@ -38,7 +38,7 @@
|
||||
//#define DISABLE_DEBUG
|
||||
|
||||
// Avoid conflict with TIMER_TONE
|
||||
#define STEP_TIMER 10
|
||||
#define STEP_TIMER 10
|
||||
|
||||
// Use one of these or SDCard-based Emulation will be used
|
||||
//#define SRAM_EEPROM_EMULATION // Use BackSRAM-based EEPROM emulation
|
||||
|
@@ -29,7 +29,7 @@
|
||||
#define HAS_OTG_USB_HOST_SUPPORT // USB Flash Drive support
|
||||
|
||||
// Avoid conflict with TIMER_TONE
|
||||
#define STEP_TIMER 10
|
||||
#define STEP_TIMER 10
|
||||
|
||||
// Use one of these or SDCard-based Emulation will be used
|
||||
//#define SRAM_EEPROM_EMULATION // Use BackSRAM-based EEPROM emulation
|
||||
|
@@ -45,8 +45,8 @@
|
||||
// This will be difficult to solve from the Arduino IDE, without modifying the RUMBA32 variant
|
||||
// included with the STM32 framework.
|
||||
|
||||
#define STEP_TIMER 10
|
||||
#define TEMP_TIMER 14
|
||||
#define STEP_TIMER 10
|
||||
#define TEMP_TIMER 14
|
||||
|
||||
//
|
||||
// Limit Switches
|
||||
|
@@ -57,8 +57,8 @@
|
||||
* TIM14 - TEMP_TIMER (Marlin)
|
||||
*
|
||||
*/
|
||||
#define STEP_TIMER 4
|
||||
#define TEMP_TIMER 14
|
||||
#define STEP_TIMER 4
|
||||
#define TEMP_TIMER 14
|
||||
|
||||
/**
|
||||
* These pin assignments are arbitrary and intending for testing purposes.
|
||||
|
@@ -134,4 +134,4 @@
|
||||
// Timers
|
||||
//
|
||||
|
||||
#define STEP_TIMER 2
|
||||
#define STEP_TIMER 2
|
||||
|
Reference in New Issue
Block a user