0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix STM32F1 SPI device init, MKS_LCD12864 (#19271)

Browse source
This commit is contained in:
Victor Oliveira 2020-09-06 19:29:43 -03:00 committed by GitHub
parent b6ab163814
commit 486731162f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 28 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Marlin/src/HAL/STM32F1/SPI.cpp
View file

@ -40,6 +40,9 @@
#include <boards.h> #include <boards.h>
#include <wirish.h> #include <wirish.h>
#include "../../inc/MarlinConfig.h"
#include "spi_pins.h"
/** Time in ms for DMA receive timeout */ /** Time in ms for DMA receive timeout */
#define DMA_TIMEOUT 100 #define DMA_TIMEOUT 100
@ -710,6 +713,6 @@ static spi_baud_rate determine_baud_rate(spi_dev *dev, uint32_t freq) {
return baud_rates[i]; return baud_rates[i];
} }
SPIClass SPI(1); SPIClass SPI(SPI_DEVICE);
#endif // __STM32F1__ #endif // __STM32F1__

1
Marlin/src/lcd/dogm/u8g_dev_uc1701_mini12864_HAL.cpp
View file

@ -112,6 +112,7 @@ static const uint8_t u8g_dev_uc1701_mini12864_HAL_init_seq[] PROGMEM = {
U8G_ESC_CS(1), // enable chip U8G_ESC_CS(1), // enable chip
UC1701_ALL_PIX(0), // normal display UC1701_ALL_PIX(0), // normal display
U8G_ESC_CS(0), // disable chip U8G_ESC_CS(0), // disable chip
U8G_ESC_DLY(150), // delay 150 ms before sending any data
U8G_ESC_END // end of sequence U8G_ESC_END // end of sequence
}; };

50
Marlin/src/lcd/dogm/ultralcd_DOGM.cpp
View file

@ -240,39 +240,35 @@ bool MarlinUI::detected() { return true; }
// Initialize or re-initialize the LCD // Initialize or re-initialize the LCD
void MarlinUI::init_lcd() { void MarlinUI::init_lcd() {
#if DISABLED(MKS_LCD12864) #if PIN_EXISTS(LCD_BACKLIGHT)
OUT_WRITE(LCD_BACKLIGHT_PIN, DISABLED(DELAYED_BACKLIGHT_INIT)); // Illuminate after reset or right away
#endif
#if PIN_EXISTS(LCD_BACKLIGHT) #if ANY(MKS_12864OLED, MKS_12864OLED_SSD1306, FYSETC_242_OLED_12864, ZONESTAR_12864OLED)
OUT_WRITE(LCD_BACKLIGHT_PIN, DISABLED(DELAYED_BACKLIGHT_INIT)); // Illuminate after reset or right away SET_OUTPUT(LCD_PINS_DC);
#ifndef LCD_RESET_PIN
#define LCD_RESET_PIN LCD_PINS_RS
#endif #endif
#endif
#if ANY(MKS_12864OLED, MKS_12864OLED_SSD1306, FYSETC_242_OLED_12864, ZONESTAR_12864OLED) #if PIN_EXISTS(LCD_RESET)
SET_OUTPUT(LCD_PINS_DC); // Perform a clean hardware reset with needed delays
#ifndef LCD_RESET_PIN OUT_WRITE(LCD_RESET_PIN, LOW);
#define LCD_RESET_PIN LCD_PINS_RS _delay_ms(5);
#endif WRITE(LCD_RESET_PIN, HIGH);
#endif _delay_ms(5);
u8g.begin();
#endif
#if PIN_EXISTS(LCD_RESET) #if PIN_EXISTS(LCD_BACKLIGHT) && ENABLED(DELAYED_BACKLIGHT_INIT)
// Perform a clean hardware reset with needed delays WRITE(LCD_BACKLIGHT_PIN, HIGH);
OUT_WRITE(LCD_RESET_PIN, LOW); #endif
_delay_ms(5);
WRITE(LCD_RESET_PIN, HIGH);
_delay_ms(5);
u8g.begin();
#endif
#if PIN_EXISTS(LCD_BACKLIGHT) && ENABLED(DELAYED_BACKLIGHT_INIT) TERN_(HAS_LCD_CONTRAST, refresh_contrast());
WRITE(LCD_BACKLIGHT_PIN, HIGH);
#endif
TERN_(HAS_LCD_CONTRAST, refresh_contrast()); TERN_(LCD_SCREEN_ROT_90, u8g.setRot90());
TERN_(LCD_SCREEN_ROT_180, u8g.setRot180());
TERN_(LCD_SCREEN_ROT_90, u8g.setRot90()); TERN_(LCD_SCREEN_ROT_270, u8g.setRot270());
TERN_(LCD_SCREEN_ROT_180, u8g.setRot180());
TERN_(LCD_SCREEN_ROT_270, u8g.setRot270());
#endif // !MKS_LCD12864
uxg_SetUtf8Fonts(g_fontinfo, COUNT(g_fontinfo)); uxg_SetUtf8Fonts(g_fontinfo, COUNT(g_fontinfo));
} }

3
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
View file

@ -33,7 +33,6 @@
//#define DISABLE_DEBUG //#define DISABLE_DEBUG
#define DISABLE_JTAG #define DISABLE_JTAG
#define ENABLE_SPI2
// //
// EEPROM // EEPROM
@ -152,8 +151,6 @@
#define DOGLCD_SCK PB13 #define DOGLCD_SCK PB13
#define DOGLCD_MOSI PB15 #define DOGLCD_MOSI PB15
#undef SHOW_BOOTSCREEN
#else #else
#define LCD_PINS_D4 PA6 #define LCD_PINS_D4 PA6

2
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE3.h
View file

@ -115,8 +115,6 @@
#define DOGLCD_SCK PB13 #define DOGLCD_SCK PB13
#define DOGLCD_MOSI PB15 #define DOGLCD_MOSI PB15
#undef SHOW_BOOTSCREEN
#else // !MKS_MINI_12864 #else // !MKS_MINI_12864
#define LCD_PINS_D4 PA6 #define LCD_PINS_D4 PA6

4
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
View file

@ -351,10 +351,6 @@
#define DOGLCD_SCK PA5 #define DOGLCD_SCK PA5
#define DOGLCD_MOSI PA7 #define DOGLCD_MOSI PA7
// Required for MKS_MINI_12864 with this board
#define MKS_LCD12864B
#undef SHOW_BOOTSCREEN
#else // !MKS_MINI_12864 #else // !MKS_MINI_12864
#define LCD_PINS_D4 PE14 #define LCD_PINS_D4 PE14