Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Longer3D: Set STEP_TIMER TEMP_TIMER & TIMER_SERIAL in variant #22632

Merged
merged 3 commits into from
Aug 27, 2021
Merged

Longer3D: Set STEP_TIMER TEMP_TIMER & TIMER_SERIAL in variant #22632

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
04b6bd9
Longer3D: Set STEP_TIMER TEMP_TIMER & TIMER_SERIAL in variant
tpruvot Aug 22, 2021
26da5d6
Update variant.h
thinkyhead Aug 25, 2021
382e918
Warn on override
thinkyhead Aug 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/PeripheralPins.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
12 changes: 11 additions & 1 deletion buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/variant.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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...
thinkyhead marked this conversation as resolved.
Show resolved Hide resolved
#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
Expand Down
2 changes: 1 addition & 1 deletion ini/stm32f1.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down