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

Jump to bottom

fix compile STM32F103RC_creality with SERIAL_DMA #26531

Merged
merged 3 commits into from
Feb 2, 2024
Merged

fix compile STM32F103RC_creality with SERIAL_DMA #26531

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c268329
fix compile STM32F103RC_creality with SERIAL_DMA
rmbq Dec 15, 2023
b0e25b7
fix USING_HW_SERIAL6
rmbq Dec 15, 2023
3aeca36
Merge branch 'bugfix-2.1.x' into pr/26531
thinkyhead Feb 2, 2024
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
6 changes: 3 additions & 3 deletions Marlin/src/HAL/STM32/HardwareSerial.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
void serialEvent2() __attribute__((weak));
#endif
#ifdef USING_HW_SERIAL3
HAL_HardwareSerial Serial3(USART3);
HAL_HardwareSerial HSerial3(USART3);
void serialEvent3() __attribute__((weak));
#endif
#ifdef USING_HW_SERIAL4
Expand All @@ -147,9 +147,9 @@
#endif
#ifdef USING_HW_SERIAL6
#ifdef USART6
HAL_HardwareSerial HSerial5(USART6);
HAL_HardwareSerial HSerial6(USART6);
#else
HAL_HardwareSerial HSerial5(UART6);
HAL_HardwareSerial HSerial6(UART6);
#endif
void serialEvent5() __attribute__((weak));
#endif
Expand Down
Loading