Merge commit 'c35e271dba2f608cb72f48357a1d36a8bfa66a12' into ender3v2…

…_bugfix * commit 'c35e271dba2f608cb72f48357a1d36a8bfa66a12': (34 commits) Clean up, update some variants tick() => isr() to spotlight interrupt-time [cron] Bump distribution date (2021-04-11) EXP2_01_PIN for BTT BTT002 1.0 Followup to "no status for serial::write" (MarlinFirmware#21577) Fix M114 E / R broken by `LIN_ADVANCE` (MarlinFirmware#21579) [cron] Bump distribution date (2021-04-10) Fix manual move with MKS H43 (MarlinFirmware#21511) Drop return value from Serial::write() (MarlinFirmware#21567) Macros to eliminate 'f + 0.0' (MarlinFirmware#21568) Check for old Marlin files mixed in (MarlinFirmware#21574) Delay U8glib init using U8glib-HAL 0.4.4 (MarlinFirmware#21496) [cron] Bump distribution date (2021-04-09) [cron] Bump distribution date (2021-04-08) Fix axis char printing Sanity Check newer Configs too (MarlinFirmware#21550) Park Magnetic Switching Toolhead at the very end (MarlinFirmware#21552) [cron] Bump distribution date (2021-04-07) BTT SKR-SE-BX (STM32H743IIT6 ARM Cortex M7) and BIQU_BX_TFT70 (MarlinFirmware#21536) getHighESpeed => autotemp_task ...
TyMi · Apr 11, 2021 · d792df5 · d792df5
2 parents efabe18 + c35e271
commit d792df5
Show file tree

Hide file tree

Showing 144 changed files with 6,546 additions and 1,706 deletions.
diff --git a/.github/workflows/test-builds.yml b/.github/workflows/test-builds.yml
@@ -89,6 +89,7 @@ jobs:
         - mks_robin_nano35_stm32
         - NUCLEO_F767ZI
         - REMRAM_V1
+        - BTT_SKR_SE_BX
 
         # Put lengthy tests last
 

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
@@ -2507,6 +2507,11 @@
 //
 //#define ANET_ET5_TFT35
 
+//
+// 1024x600, 7", RGB Stock Display from BIQU-BX
+//
+//#define BIQU_BX_TFT70
+
 //
 // Generic TFT with detailed options
 //

diff --git a/Marlin/src/HAL/AVR/MarlinSerial.cpp b/Marlin/src/HAL/AVR/MarlinSerial.cpp
@@ -454,7 +454,7 @@ void MarlinSerial<Cfg>::flush() {
 }
 
 template<typename Cfg>
-size_t MarlinSerial<Cfg>::write(const uint8_t c) {
+void MarlinSerial<Cfg>::write(const uint8_t c) {
   if (Cfg::TX_SIZE == 0) {
 
     _written = true;
@@ -480,7 +480,7 @@ size_t MarlinSerial<Cfg>::write(const uint8_t c) {
       // location". This makes sure flush() won't return until the bytes
       // actually got written
       B_TXC = 1;
-      return 1;
+      return;
     }
 
     const uint8_t i = (tx_buffer.head + 1) & (Cfg::TX_SIZE - 1);
@@ -510,7 +510,6 @@ size_t MarlinSerial<Cfg>::write(const uint8_t c) {
     // Enable TX ISR - Non atomic, but it will eventually enable TX ISR
     B_UDRIE = 1;
   }
-  return 1;
 }
 
 template<typename Cfg>

diff --git a/Marlin/src/HAL/AVR/MarlinSerial.h b/Marlin/src/HAL/AVR/MarlinSerial.h
@@ -210,7 +210,7 @@
     static int read();
     static void flush();
     static ring_buffer_pos_t available();
-    static size_t write(const uint8_t c);
+    static void write(const uint8_t c);
     static void flushTX();
     #if HAS_DGUS_LCD
       static ring_buffer_pos_t get_tx_buffer_free();

diff --git a/Marlin/src/HAL/DUE/eeprom_flash.cpp b/Marlin/src/HAL/DUE/eeprom_flash.cpp
@@ -135,7 +135,7 @@ static uint8_t buffer[256] = {0},   // The RAM buffer to accumulate writes
 #define DEBUG_OUT ENABLED(EE_EMU_DEBUG)
 #include "../../core/debug_out.h"
 
-static void ee_Dump(const int page, const void* data) {
+static void ee_Dump(const int page, const void *data) {
 
   #ifdef EE_EMU_DEBUG
 
@@ -181,7 +181,7 @@ static void ee_Dump(const int page, const void* data) {
  * @param data    (pointer to the data buffer)
  */
 __attribute__ ((long_call, section (".ramfunc")))
-static bool ee_PageWrite(uint16_t page, const void* data) {
+static bool ee_PageWrite(uint16_t page, const void *data) {
 
   uint16_t i;
   uint32_t addrflash = uint32_t(getFlashStorage(page));

diff --git a/Marlin/src/HAL/ESP32/i2s.cpp b/Marlin/src/HAL/ESP32/i2s.cpp
@@ -139,7 +139,7 @@ static void IRAM_ATTR i2s_intr_handler_default(void *arg) {
   I2S0.int_clr.val = I2S0.int_st.val; //clear pending interrupt
 }
 
-void stepperTask(void* parameter) {
+void stepperTask(void *parameter) {
   uint32_t remaining = 0;
 
   while (1) {

diff --git a/Marlin/src/HAL/STM32/MarlinSPI.cpp b/Marlin/src/HAL/STM32/MarlinSPI.cpp
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC)
+#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC) && !defined(STM32H7xx)
 
 #include "MarlinSPI.h"
 

diff --git a/Marlin/src/HAL/STM32/MarlinSerial.h b/Marlin/src/HAL/STM32/MarlinSerial.h
@@ -29,7 +29,7 @@
 typedef void (*usart_rx_callback_t)(serial_t * obj);
 
 struct MarlinSerial : public HardwareSerial {
-  MarlinSerial(void* peripheral, usart_rx_callback_t rx_callback) :
+  MarlinSerial(void *peripheral, usart_rx_callback_t rx_callback) :
       HardwareSerial(peripheral), _rx_callback(rx_callback)
   { }
 

diff --git a/Marlin/src/HAL/STM32/inc/SanityCheck.h b/Marlin/src/HAL/STM32/inc/SanityCheck.h
@@ -52,6 +52,6 @@
   #error "SERIAL_STATS_DROPPED_RX is not supported on STM32."
 #endif
 
-#if ANY(TFT_COLOR_UI, TFT_LVGL_UI, TFT_CLASSIC_UI) && NOT_TARGET(STM32F4xx, STM32F1xx)
-  #error "TFT_COLOR_UI, TFT_LVGL_UI and TFT_CLASSIC_UI are currently only supported on STM32F4 and STM32F1 hardware."
+#if ANY(TFT_COLOR_UI, TFT_LVGL_UI, TFT_CLASSIC_UI) && NOT_TARGET(STM32H7xx, STM32F4xx, STM32F1xx)
+  #error "TFT_COLOR_UI, TFT_LVGL_UI and TFT_CLASSIC_UI are currently only supported on STM32H7, STM32F4 and STM32F1 hardware."
 #endif