🔨 Set Longer3D timers in variant (#22632)

MarlinFirmware · Sep 13, 2021 · fd594ab · fd594ab
1 parent 8cadcf6
commit fd594ab
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/PeripheralPins.c b/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/PeripheralPins.c
@@ -154,6 +154,7 @@ WEAK const PinMap PinMap_PWM[] = {
   {PE_13, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM1_ENABLE, 3, 0)}, // TIM1_CH3
   {PE_14, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM1_ENABLE, 4, 0)}, // TIM1_CH4
 #endif // if 0
+  {PA_15, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM2_PARTIAL_1, 1, 0)}, // TIM2_CH1 Part Fan
   {PD_12, TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM4_ENABLE, 1, 0)}, // TIM4_CH1 TFT Backlight
   {PD_13, TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM4_ENABLE, 2, 0)}, // TIM4_CH2 Servo connector
   {NC,    NP,    0}

diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/variant.h
@@ -117,13 +117,13 @@ extern "C" {
 #define PIN_WIRE_SCL            PB10
 
 // Timer Definitions
-// Use TIM6/TIM7 when possible as servo and tone don't need GPIO output pin
-#ifndef TIMER_TONE
-  #define TIMER_TONE            TIM6
-#endif
-#ifndef TIMER_SERVO
-  #define TIMER_SERVO           TIM7
-#endif
+// Leave TIMER 2 for optional Fan PWM
+#define TEMP_TIMER              3
+// Leave TIMER 4 for TFT backlight PWM or Servo freq...
+#define STEP_TIMER              5
+#define TIMER_TONE              TIM6
+#define TIMER_SERVO             TIM7
+#define TIMER_SERIAL            TIM8
 
 // UART Definitions
 // Define here Serial instance number to map on Serial generic name

diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini
@@ -338,7 +338,7 @@ board_build.variant         = MARLIN_F103VE_LONGER
 board_build.rename          = project.bin
 board_build.offset          = 0x10000
 board_upload.offset_address = 0x08010000
-build_flags                 = ${stm32_variant.build_flags} -DMCU_STM32F103VE -DSTEP_TIMER=5 -DU20 -DTS_V12
+build_flags                 = ${stm32_variant.build_flags} -DMCU_STM32F103VE -DU20 -DTS_V12
 build_unflags               = ${stm32_variant.build_unflags} -DUSBCON -DUSBD_USE_CDC -DHAL_PCD_MODULE_ENABLED
 extra_scripts               = ${stm32_variant.extra_scripts}
 monitor_speed               = 250000