Browse Source

Overrides to prevent STM32 timer conflicts (#20545)

Jason Smith 3 years ago
parent
commit
5e3be83dbb
No account linked to committer's email address

+ 3
- 0
Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h View File

40
 
40
 
41
 #define BOARD_NO_NATIVE_USB
41
 #define BOARD_NO_NATIVE_USB
42
 
42
 
43
+// Avoid conflict with TIMER_SERVO when using the STM32 HAL
44
+#define TEMP_TIMER 5
45
+
43
 //
46
 //
44
 // Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
47
 // Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
45
 //
48
 //

+ 3
- 0
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h View File

36
 
36
 
37
 #define BOARD_NO_NATIVE_USB
37
 #define BOARD_NO_NATIVE_USB
38
 
38
 
39
+// Avoid conflict with TIMER_SERVO when using the STM32 HAL
40
+#define TEMP_TIMER 5
41
+
39
 //
42
 //
40
 // Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
43
 // Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
41
 //
44
 //

+ 3
- 0
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h View File

37
 
37
 
38
 #define BOARD_NO_NATIVE_USB
38
 #define BOARD_NO_NATIVE_USB
39
 
39
 
40
+// Avoid conflict with TIMER_SERVO when using the STM32 HAL
41
+#define TEMP_TIMER 5
42
+
40
 //
43
 //
41
 // Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
44
 // Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
42
 //
45
 //

+ 4
- 0
Marlin/src/pins/stm32f4/pins_FLYF407ZG.h View File

31
 #define BOARD_WEBSITE_URL    "github.com/FLYmaker/FLYF407ZG"
31
 #define BOARD_WEBSITE_URL    "github.com/FLYmaker/FLYF407ZG"
32
 #define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
32
 #define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
33
 
33
 
34
+// Avoid conflict with fans and TIMER_TONE
35
+#define TEMP_TIMER 3
36
+#define STEP_TIMER 5
37
+
34
 //
38
 //
35
 // EEPROM Emulation
39
 // EEPROM Emulation
36
 //
40
 //

+ 3
- 0
Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h View File

31
 
31
 
32
 #define BOARD_INFO_NAME "MKS Robin Nano V3"
32
 #define BOARD_INFO_NAME "MKS Robin Nano V3"
33
 
33
 
34
+// Avoid conflict with TIMER_TONE
35
+#define STEP_TIMER 13
36
+
34
 // Use one of these or SDCard-based Emulation will be used
37
 // Use one of these or SDCard-based Emulation will be used
35
 //#define SRAM_EEPROM_EMULATION                   // Use BackSRAM-based EEPROM emulation
38
 //#define SRAM_EEPROM_EMULATION                   // Use BackSRAM-based EEPROM emulation
36
 //#define FLASH_EEPROM_EMULATION                  // Use Flash-based EEPROM emulation
39
 //#define FLASH_EEPROM_EMULATION                  // Use Flash-based EEPROM emulation

+ 3
- 0
Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h View File

29
 
29
 
30
 #define BOARD_INFO_NAME "MKS Robin PRO V2"
30
 #define BOARD_INFO_NAME "MKS Robin PRO V2"
31
 
31
 
32
+// Avoid conflict with TIMER_TONE
33
+#define STEP_TIMER 13
34
+
32
 // Use one of these or SDCard-based Emulation will be used
35
 // Use one of these or SDCard-based Emulation will be used
33
 //#define SRAM_EEPROM_EMULATION                   // Use BackSRAM-based EEPROM emulation
36
 //#define SRAM_EEPROM_EMULATION                   // Use BackSRAM-based EEPROM emulation
34
 //#define FLASH_EEPROM_EMULATION                  // Use Flash-based EEPROM emulation
37
 //#define FLASH_EEPROM_EMULATION                  // Use Flash-based EEPROM emulation

+ 1
- 1
platformio.ini View File

980
 board_build.offset   = 0x7000
980
 board_build.offset   = 0x7000
981
 board_build.firmware = Robin.bin
981
 board_build.firmware = Robin.bin
982
 build_flags          = ${common_stm32.build_flags}
982
 build_flags          = ${common_stm32.build_flags}
983
-  -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8
983
+  -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8 -DTIMER_SERIAL=TIM5
984
 build_unflags        = ${common_stm32.build_unflags}
984
 build_unflags        = ${common_stm32.build_unflags}
985
  -DUSBCON -DUSBD_USE_CDC
985
  -DUSBCON -DUSBD_USE_CDC
986
 extra_scripts        = ${common.extra_scripts}
986
 extra_scripts        = ${common.extra_scripts}

Loading…
Cancel
Save