Merge branch 'bugfix-2.1.x' of github.com:MarlinFirmware/Marlin into …

…leo_1S_S6_btt_mini
JaxTheWolf · Feb 3, 2024 · cd3a878 · cd3a878
2 parents 99fd4f6 + 9e21330
commit cd3a878
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Marlin/Version.h b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2024-02-01"
+//#define STRING_DISTRIBUTION_DATE "2024-02-03"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.

diff --git a/Marlin/src/HAL/STM32/HardwareSerial.cpp b/Marlin/src/HAL/STM32/HardwareSerial.cpp
@@ -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
@@ -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

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2024-02-01"
+  #define STRING_DISTRIBUTION_DATE "2024-02-03"
 #endif
 
 /**