zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

🧑‍💻 Move PB0 init for MKS_ROBIN_NANO

Browse source
This commit is contained in:
Scott Lahteine 2022-01-12 09:41:51 -06:00
parent eb8d819325
commit 0470fbe0a1
3 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp
View file

@ -127,10 +127,6 @@ void tft_lvgl_init() {
watchdog_refresh(); // LVGL init takes time watchdog_refresh(); // LVGL init takes time
#if MB(MKS_ROBIN_NANO)
OUT_WRITE(PB0, LOW); // HE1
#endif
// Init TFT first! // Init TFT first!
SPI_TFT.spi_init(SPI_FULL_SPEED); SPI_TFT.spi_init(SPI_FULL_SPEED);
SPI_TFT.LCD_init(); SPI_TFT.LCD_init();

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

@ -45,3 +45,7 @@
//#define LED_PIN PB2 //#define LED_PIN PB2
#include "pins_MKS_ROBIN_NANO_common.h" #include "pins_MKS_ROBIN_NANO_common.h"
#if HAS_TFT_LVGL_UI && FAN1_PIN != PB0 && HEATER_1_PIN != PB0
#define BOARD_INIT OUT_WRITE(PB0, LOW)
#endif

17
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_common.h
View file

@ -98,15 +98,6 @@
#ifndef HEATER_0_PIN #ifndef HEATER_0_PIN
#define HEATER_0_PIN PC3 #define HEATER_0_PIN PC3
#endif #endif
#if HOTENDS == 1 && DISABLED(HEATERS_PARALLEL)
#ifndef FAN1_PIN
#define FAN1_PIN PB0
#endif
#else
#ifndef HEATER_1_PIN
#define HEATER_1_PIN PB0
#endif
#endif
#ifndef FAN_PIN #ifndef FAN_PIN
#define FAN_PIN PB1 // FAN #define FAN_PIN PB1 // FAN
#endif #endif
@ -114,6 +105,14 @@
#define HEATER_BED_PIN PA0 #define HEATER_BED_PIN PA0
#endif #endif
#if HOTENDS == 1 && DISABLED(HEATERS_PARALLEL)
#ifndef FAN1_PIN
#define FAN1_PIN PB0
#endif
#elif !defined(HEATER_1_PIN)
#define HEATER_1_PIN PB0
#endif
// //
// Power Supply Control // Power Supply Control
// //