bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

🎨 Update MKSPWC, some other pins (#22557)

Browse Source
This commit is contained in:
Scott Lahteine
2021-08-13 16:32:25 -05:00
committed by Scott Lahteine
parent e62486a610
commit eb0d80cb19
41 changed files with 279 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Marlin/src/pins/stm32f4/pins_LERDGE_S.h
View File

@ -179,10 +179,10 @@
#if ENABLED(SPI_EEPROM)
// Lerdge has an SPI EEPROM Winbond W25Q128 (128Mbits) https://www.pjrc.com/teensy/W25Q128FV.pdf
#define SPI_CHAN_EEPROM1 1
#define SPI_EEPROM1_CS PB12 // datasheet: /CS pin, found with multimeter, not tested
#define EEPROM_SCK PB13 // datasheet: CLK pin, found with multimeter, not tested
#define EEPROM_MISO PB14 // datasheet: DO pin, found with multimeter, not tested
#define EEPROM_MOSI PB15 // datasheet: DI pin, found with multimeter, not tested
#define SPI_EEPROM1_CS_PIN PB12 // datasheet: /CS pin, found with multimeter, not tested
#define EEPROM_SCK_PIN PB13 // datasheet: CLK pin, found with multimeter, not tested
#define EEPROM_MISO_PIN PB14 // datasheet: DO pin, found with multimeter, not tested
#define EEPROM_MOSI_PIN PB15 // datasheet: DI pin, found with multimeter, not tested
#define EEPROM_PAGE_SIZE 0x1000U // 4KB (from datasheet)
#define MARLIN_EEPROM_SIZE 16UL * (EEPROM_PAGE_SIZE) // Limit to 64KB for now...
#else

28
Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
View File

@ -210,32 +210,24 @@
//
// Misc. Functions
//
#define MT_DET_1 PC5 // Y+
#define MT_DET_2 PB12 // Z+
#define PW_DET PC5 // Y+
#define PW_OFF PB12 // Z+
#define MT_DET_1_PIN PW_DET
#define MT_DET_2_PIN PW_OFF
#ifndef FIL_RUNOUT_PIN
#define FIL_RUNOUT_PIN MT_DET_1
#define FIL_RUNOUT_PIN MT_DET_1_PIN
#endif
#ifndef FIL_RUNOUT2_PIN
#define FIL_RUNOUT2_PIN MT_DET_2
#define FIL_RUNOUT2_PIN MT_DET_2_PIN
#endif
//
// Power Supply Control
//
#if ENABLED(PSU_CONTROL) // MKSPWC
#ifndef PS_ON_PIN
#define PS_ON_PIN MT_DET_2 // Z+
#endif
#ifndef KILL_PIN
#define KILL_PIN MT_DET_1 // Y+
#define KILL_PIN_STATE HIGH
#endif
#else
#define PW_DET MT_DET_1
#define PW_OFF MT_DET_2
#define POWER_LOSS_PIN PW_DET
#define PS_ON_PIN PW_OFF
#if ENABLED(MKS_PWC)
#define PS_ON_PIN PW_OFF
#define KILL_PIN PW_DET
#define KILL_PIN_STATE HIGH
#endif
// Random Info

58
Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
View File

@ -178,9 +178,11 @@
//
// Misc. Functions
//
#define MT_DET_1_PIN PA4
#define MT_DET_2_PIN PE6
#define MT_DET_PIN_INVERTING false // LVGL UI filament RUNOUT PIN STATE
#if HAS_TFT_LVGL_UI
#define MT_DET_1_PIN PA4 // MT_DET
#define MT_DET_2_PIN PE6
#define MT_DET_PIN_STATE LOW
#endif
#ifndef FIL_RUNOUT_PIN
#define FIL_RUNOUT_PIN MT_DET_1_PIN
@ -189,35 +191,29 @@
#define FIL_RUNOUT2_PIN MT_DET_2_PIN
#endif
//
// Enable MKSPWC support
//
#ifndef POWER_LOSS_PIN
#define POWER_LOSS_PIN PA13 // PW_DET
#endif
//#define SUICIDE_PIN PB2
//#define LED_PIN PB2
//#define KILL_PIN PA2
//#define KILL_PIN_STATE HIGH
//#define KILL_PIN_STATE LOW
//
// Power Supply Control
//
#if ENABLED(PSU_CONTROL) // MKSPWC
#if HAS_TFT_LVGL_UI
#error "PSU_CONTROL cannot be used with TFT_LVGL_UI. Disable PSU_CONTROL to continue."
#if ENABLED(MKS_PWC)
#if ENABLED(TFT_LVGL_UI)
#undef PSU_CONTROL
#undef MKS_PWC
#define SUICIDE_PIN PB2
#define SUICIDE_PIN_STATE LOW
#else
#define PS_ON_PIN PB2 // PW_OFF
#endif
#ifndef PS_ON_PIN
#define PS_ON_PIN PB2 // SUICIDE
#endif
#ifndef KILL_PIN
#define KILL_PIN PA13 // PW_DET
#define KILL_PIN_STATE HIGH
#endif
#else
#define SUICIDE_PIN PB2
#define SUICIDE_PIN_INVERTING false
#endif
#ifndef POWER_LOSS_PIN
#define POWER_LOSS_PIN PA13 // PW_DET
#define KILL_PIN PA13 // PW_DET
#define KILL_PIN_STATE HIGH
#endif
// Random Info
@ -232,9 +228,9 @@
// MKS WIFI MODULE
#if ENABLED(MKS_WIFI_MODULE)
#define WIFI_IO0_PIN PC13 // MKS ESP WIFI IO0 PIN
#define WIFI_IO1_PIN PC7 // MKS ESP WIFI IO1 PIN
#define WIFI_RESET_PIN PE9 // MKS ESP WIFI RESET PIN
#define WIFI_IO0_PIN PC13
#define WIFI_IO1_PIN PC7
#define WIFI_RESET_PIN PE9
#endif
// MKS TEST
@ -276,10 +272,10 @@
#define SPI_DEVICE 2
#define SPI_FLASH_SIZE 0x1000000
#if ENABLED(SPI_FLASH)
#define W25QXX_CS_PIN PB12
#define W25QXX_MOSI_PIN PC3
#define W25QXX_MISO_PIN PC2
#define W25QXX_SCK_PIN PB13
#define SPI_FLASH_CS_PIN PB12
#define SPI_FLASH_MOSI_PIN PC3
#define SPI_FLASH_MISO_PIN PC2
#define SPI_FLASH_SCK_PIN PB13
#endif
/**

22
Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
View File

@ -195,18 +195,18 @@
//
// Misc. Functions
//
//#define POWER_LOSS_PIN PA2 // PW_DET
//#define PS_ON_PIN PA3 // PW_OFF
//
// Power Supply Control
//
#if ENABLED(PSU_CONTROL) // MKSPWC
//#define SUICIDE_PIN PB2 // LED
//#define KILL_PIN PA2 // PW_DET
//#define KILL_PIN_STATE HIGH
#if ENABLED(MKS_PWC)
#define SUICIDE_PIN PB2
#define KILL_PIN PA2
#define KILL_PIN_STATE LOW
#else
//#define POWER_LOSS_PIN PA2 // PW_DET
//#define LED_PIN PB2
#define LED_PIN PB2
#endif
#ifndef SDCARD_CONNECTION
@ -251,14 +251,14 @@
//
// LCD / Controller
#define SPI_FLASH
#define HAS_SPI_FLASH 1
#define HAS_SPI_FLASH 1
#define SPI_DEVICE 2
#define SPI_FLASH_SIZE 0x1000000
#if ENABLED(SPI_FLASH)
#define W25QXX_CS_PIN PB12
#define W25QXX_MOSI_PIN PB15
#define W25QXX_MISO_PIN PB14
#define W25QXX_SCK_PIN PB13
#define SPI_FLASH_CS_PIN PB12
#define SPI_FLASH_MOSI_PIN PB15
#define SPI_FLASH_MISO_PIN PB14
#define SPI_FLASH_SCK_PIN PB13
#endif
/**