Anet ET4 / ET4P and Anet TFT28 / TFT35 (MarlinFirmware#20280)

zillarob · Feb 25, 2021 · 1853614 · 1853614
1 parent 0210e12
commit 1853614
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/Marlin/src/HAL/STM32/tft/tft_fsmc.h b/Marlin/src/HAL/STM32/tft/tft_fsmc.h
@@ -45,6 +45,9 @@
 #define TFT_DATASIZE TERN(TFT_INTERFACE_FSMC_8BIT, DATASIZE_8BIT, DATASIZE_16BIT)
 typedef TERN(TFT_INTERFACE_FSMC_8BIT, uint8_t, uint16_t) tft_data_t;
 
+#define TFT_DATASIZE TERN(TFT_INTERFACE_FSMC_8BIT, DATASIZE_8BIT, DATASIZE_16BIT)
+typedef TERN(TFT_INTERFACE_FSMC_8BIT, uint8_t, uint16_t) tft_data_t;
+
 typedef struct {
   __IO tft_data_t REG;
   __IO tft_data_t RAM;

diff --git a/Marlin/src/HAL/STM32/tft/xpt2046.h b/Marlin/src/HAL/STM32/tft/xpt2046.h
@@ -23,8 +23,10 @@
 
 #ifdef STM32F1xx
   #include <stm32f1xx_hal.h>
+  #define __IS_DMA_ENABLED(__HANDLE__)  ((__HANDLE__)->Instance->CCR & DMA_CCR_EN)
 #elif defined(STM32F4xx)
   #include <stm32f4xx_hal.h>
+  #define __IS_DMA_ENABLED(__HANDLE__)  ((__HANDLE__)->Instance->CR & DMA_SxCR_EN)
 #endif
 
 #include "../../../inc/MarlinConfig.h"