3DPrinting/MarlinFirmware
0
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2025-03-02 04:47:20 +00:00
Code Issues Releases Wiki Activity

🩹 Fix MKS TinyBee + MKS MINI 12864 SD blank on write ()

Browse source
This commit is contained in:
Eduard Sukharev 2022-09-13 20:31:59 +03:00 committed by GitHub
parent e003552804
commit c3b58f1938
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 3 deletions
Marlin/src
HAL/ESP32
u8g_esp32_spi.cpp
pins/esp32
pins_MKS_TINYBEE.h
ini
features.ini

12
Marlin/src/HAL/ESP32/u8g_esp32_spi.cpp
View file

@ -32,6 +32,13 @@
#include "HAL.h" #include "HAL.h"
#include "SPI.h" #include "SPI.h"
#if ENABLED(SDSUPPORT)
#include "../../sd/cardreader.h"
#if ENABLED(ESP3D_WIFISUPPORT)
#include "sd_ESP32.h"
#endif
#endif
static SPISettings spiConfig; static SPISettings spiConfig;
@ -45,6 +52,11 @@ static SPISettings spiConfig;
uint8_t u8g_eps_hw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr) { uint8_t u8g_eps_hw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr) {
static uint8_t msgInitCount = 2; // Ignore all messages until 2nd U8G_COM_MSG_INIT static uint8_t msgInitCount = 2; // Ignore all messages until 2nd U8G_COM_MSG_INIT
#if ENABLED(PAUSE_LCD_FOR_BUSY_SD)
if (card.flag.saving || card.flag.logging || TERN0(ESP3D_WIFISUPPORT, sd_busy_lock == true)) return 0;
#endif
if (msgInitCount) { if (msgInitCount) {
if (msg == U8G_COM_MSG_INIT) msgInitCount--; if (msg == U8G_COM_MSG_INIT) msgInitCount--;
if (msgInitCount) return -1; if (msgInitCount) return -1;

7
Marlin/src/pins/esp32/pins_MKS_TINYBEE.h
View file

@ -166,12 +166,12 @@
#define LCD_BACKLIGHT_PIN -1 #define LCD_BACKLIGHT_PIN -1
#if ENABLED(MKS_MINI_12864) #if ENABLED(MKS_MINI_12864)
// MKS MINI12864 and MKS LCD12864B; If using MKS LCD12864A (Need to remove RPK2 resistor) // MKS MINI12864 and MKS LCD12864B; If using MKS LCD12864A (Need to remove RPK2 resistor)
#define DOGLCD_CS EXP1_06_PIN #define DOGLCD_CS EXP1_06_PIN
#define DOGLCD_A0 EXP1_07_PIN #define DOGLCD_A0 EXP1_07_PIN
#define LCD_RESET_PIN -1 #define LCD_RESET_PIN -1
#elif ENABLED(FYSETC_MINI_12864_2_1) #elif ENABLED(FYSETC_MINI_12864_2_1)
// MKS_MINI_12864_V3, BTT_MINI_12864_V1, FYSETC_MINI_12864_2_1 // MKS_MINI_12864_V3, BTT_MINI_12864_V1, FYSETC_MINI_12864_2_1
#define DOGLCD_CS EXP1_03_PIN #define DOGLCD_CS EXP1_03_PIN
#define DOGLCD_A0 EXP1_04_PIN #define DOGLCD_A0 EXP1_04_PIN
#define LCD_RESET_PIN EXP1_05_PIN #define LCD_RESET_PIN EXP1_05_PIN
@ -179,6 +179,9 @@
#if SD_CONNECTION_IS(ONBOARD) #if SD_CONNECTION_IS(ONBOARD)
#define FORCE_SOFT_SPI #define FORCE_SOFT_SPI
#endif #endif
#if BOTH(MKS_MINI_12864_V3, SDSUPPORT)
#define PAUSE_LCD_FOR_BUSY_SD
#endif
#else #else
#define LCD_PINS_D4 EXP1_05_PIN #define LCD_PINS_D4 EXP1_05_PIN
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)

2
ini/features.ini
View file

@ -238,7 +238,7 @@ HAS_SERVOS = src_filter=+<src/module/servo.cpp> +<sr
MORGAN_SCARA = src_filter=+<src/gcode/scara> MORGAN_SCARA = src_filter=+<src/gcode/scara>
HAS_MICROSTEPS = src_filter=+<src/gcode/control/M350_M351.cpp> HAS_MICROSTEPS = src_filter=+<src/gcode/control/M350_M351.cpp>
(ESP3D_)?WIFISUPPORT = AsyncTCP, ESP Async WebServer (ESP3D_)?WIFISUPPORT = AsyncTCP, ESP Async WebServer
ESP3DLib=https://github.com/luc-github/ESP3DLib/archive/master.zip ESP3DLib=https://github.com/eduard-sukharev/ESP3DLib/archive/patch-1.zip
arduinoWebSockets=links2004/WebSockets@2.3.4 arduinoWebSockets=links2004/WebSockets@2.3.4
luc-github/ESP32SSDP@1.1.1 luc-github/ESP32SSDP@1.1.1
lib_ignore=ESPAsyncTCP lib_ignore=ESPAsyncTCP