From 04b6bd9f1c7802710536555c638ce8a48c00721d Mon Sep 17 00:00:00 2001 From: Tanguy Pruvot Date: Sun, 22 Aug 2021 05:04:29 +0200 Subject: [PATCH 1/3] Longer3D: Set STEP_TIMER TEMP_TIMER & TIMER_SERIAL in variant SoftwareSerial default is TIM5 if not set, let TIM2 & TIM4 free for PWM pins TIM1 remains free for now... --- .../variants/MARLIN_F103VE_LONGER/PeripheralPins.c | 1 + .../variants/MARLIN_F103VE_LONGER/variant.h | 12 +++++++++++- ini/stm32f1.ini | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/PeripheralPins.c b/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/PeripheralPins.c index 99226a739d80..23c1344fe9bd 100644 --- 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 index b0f2ddf0c22c..1c23ff9fc2f1 100644 --- a/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/variant.h +++ b/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/variant.h @@ -117,13 +117,23 @@ extern "C" { #define PIN_WIRE_SCL PB10 // Timer Definitions -// Use TIM6/TIM7 when possible as servo and tone don't need GPIO output pin +// Let TIMER 2 for optional Fan PWM +#ifndef TEMP_TIMER + #define TEMP_TIMER 3 +#endif +// Let TIMER 4 for TFT backlight PWM or Servo freq... +#ifndef STEP_TIMER + #define STEP_TIMER 5 +#endif #ifndef TIMER_TONE #define TIMER_TONE TIM6 #endif #ifndef TIMER_SERVO #define TIMER_SERVO TIM7 #endif +#ifndef TIMER_SERIAL + #define TIMER_SERIAL TIM8 +#endif // UART Definitions // Define here Serial instance number to map on Serial generic name diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini index dc9607ef844b..f1cb078fd81c 100644 --- 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 From 26da5d633b7b1fa94d8cb11d31dd476e1fd2452d Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 25 Aug 2021 18:11:40 -0500 Subject: [PATCH 2/3] Update variant.h --- .../share/PlatformIO/variants/MARLIN_F103VE_LONGER/variant.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/variant.h index 1c23ff9fc2f1..5156faff05d8 100644 --- a/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/variant.h +++ b/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/variant.h @@ -117,11 +117,11 @@ extern "C" { #define PIN_WIRE_SCL PB10 // Timer Definitions -// Let TIMER 2 for optional Fan PWM +// Leave TIMER 2 for optional Fan PWM #ifndef TEMP_TIMER #define TEMP_TIMER 3 #endif -// Let TIMER 4 for TFT backlight PWM or Servo freq... +// Leave TIMER 4 for TFT backlight PWM or Servo freq... #ifndef STEP_TIMER #define STEP_TIMER 5 #endif From 382e9185b62a6a27de21087fb7d92c5bd760d7cd Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 25 Aug 2021 18:15:09 -0500 Subject: [PATCH 3/3] Warn on override --- .../variants/MARLIN_F103VE_LONGER/variant.h | 20 +++++-------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/variant.h index 5156faff05d8..56ae719077ce 100644 --- a/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/variant.h +++ b/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/variant.h @@ -118,22 +118,12 @@ extern "C" { // Timer Definitions // Leave TIMER 2 for optional Fan PWM -#ifndef TEMP_TIMER - #define TEMP_TIMER 3 -#endif +#define TEMP_TIMER 3 // Leave TIMER 4 for TFT backlight PWM or Servo freq... -#ifndef STEP_TIMER - #define STEP_TIMER 5 -#endif -#ifndef TIMER_TONE - #define TIMER_TONE TIM6 -#endif -#ifndef TIMER_SERVO - #define TIMER_SERVO TIM7 -#endif -#ifndef TIMER_SERIAL - #define TIMER_SERIAL TIM8 -#endif +#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