MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Pins, comment cleanup

Browse Source
This commit is contained in:
Scott Lahteine 2020-12-28 23:10:48 -06:00
parent 624bf10ab5
commit d6a56b882f
13 changed files with 62 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Marlin/src/inc/Conditionals_LCD.h
View File

@ -833,6 +833,7 @@
#else
// Clear probe pin settings when no probe is selected
#undef Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
#undef USE_PROBE_FOR_Z_HOMING
#endif
#if Z_HOME_DIR > 0

4
Marlin/src/inc/Conditionals_adv.h
View File

@ -382,6 +382,10 @@
#define POLL_JOG
#endif
#ifndef HOMING_BUMP_MM
#define HOMING_BUMP_MM { 0, 0, 0 }
#endif
/**
* Driver Timings (in nanoseconds)
* NOTE: Driver timing order is longest-to-shortest duration.

2
Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
View File

@ -189,7 +189,7 @@
// Reduce baud rate to improve software serial reliability
#define TMC_BAUD_RATE 19200
#endif // TMC2208 || TMC2209
#endif // HAS_TMC_UART
//
// Temperature Sensors

10
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
View File

@ -40,7 +40,6 @@
//
// Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
//
#define DISABLE_DEBUG
//
@ -59,6 +58,11 @@
//
#define SPI_DEVICE 2
//
// Servos
//
#define SERVO0_PIN PA8 // Enable BLTOUCH
//
// Limit Switches
//
@ -155,7 +159,7 @@
// Reduce baud rate to improve software serial reliability
#define TMC_BAUD_RATE 19200
#endif // TMC2208 || TMC2209
#endif // HAS_TMC_UART
//
// Temperature Sensors
@ -200,8 +204,6 @@
#define FIL_RUNOUT_PIN PA4
#endif
#define SERVO0_PIN PA8 // Enable BLTOUCH
//#define LED_PIN PB2
//

7
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
View File

@ -56,6 +56,11 @@
#define SPI_DEVICE 2
//
// Servos
//
#define SERVO0_PIN PA8 // Enable BLTOUCH
//
// Limit Switches
//
@ -148,8 +153,6 @@
#define FIL_RUNOUT2_PIN PE6
#endif
#define SERVO0_PIN PA8 // Enable BLTOUCH support
//#define LED_PIN PB2
//

10
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
View File

@ -43,7 +43,6 @@
//
// Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
//
#define DISABLE_DEBUG
//
@ -62,6 +61,11 @@
//
#define SPI_DEVICE 2
//
// Servos
//
#define SERVO0_PIN PA8 // Enable BLTOUCH
//
// Limit Switches
//
@ -163,7 +167,7 @@
// Reduce baud rate to improve software serial reliability
#define TMC_BAUD_RATE 19200
#endif // TMC2208 || TMC2209
#endif // HAS_TMC_UART
//
// Temperature Sensors
@ -218,8 +222,6 @@
#define FIL_RUNOUT2_PIN PE6
#endif
#define SERVO0_PIN PA8 // Enable BLTOUCH
//#define LED_PIN PB2
//

2
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
View File

@ -48,7 +48,7 @@
//
// Servos
//
#define SERVO0_PIN PA8 // BLTOUCH
#define SERVO0_PIN PA8 // Enable BLTOUCH
//
// Limit Switches

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

@ -31,8 +31,11 @@
#define BOARD_INFO_NAME "MKS Robin Nano V3"
// USB Flash Drive support
#define HAS_OTG_USB_HOST_SUPPORT
// Avoid conflict with TIMER_TONE
#define STEP_TIMER 10
#define STEP_TIMER 10
// Use one of these or SDCard-based Emulation will be used
//#define SRAM_EEPROM_EMULATION // Use BackSRAM-based EEPROM emulation
@ -42,6 +45,12 @@
//
// Release PB4 (Z_DIR_PIN) from JTAG NRST role
//
//#define DISABLE_DEBUG
//
// Servos
//
#define SERVO0_PIN PA8 // Enable BLTOUCH
//
// Limit Switches
@ -98,8 +107,8 @@
//
// Software SPI pins for TMC2130 stepper drivers
// This board only supports SW SPI for stepper drivers
//
// This board only support SW SPI for stepper drivers
#if HAS_TMC_SPI
#define TMC_USE_SW_SPI
#endif
@ -179,6 +188,7 @@
#define POWER_LOSS_PIN PW_DET
#define PS_ON_PIN PW_OFF
//
// Enable MKSPWC support
//
@ -186,14 +196,13 @@
//#define KILL_PIN PA2
//#define KILL_PIN_INVERTING true
#define SERVO0_PIN PA8 // Enable BLTOUCH support
//#define LED_PIN PB2
// Random Info
#define USB_SERIAL -1 //Usb Serial
#define WIFI_SERIAL 3 //USART3
#define MKS_WIFI_MODULE_SERIAL 1 //USART1
#define MKS_WIFI_MODULE_SPI 2 //SPI2
#define USB_SERIAL -1 // USB Serial
#define WIFI_SERIAL 3 // USART3
#define MKS_WIFI_MODULE_SERIAL 1 // USART1
#define MKS_WIFI_MODULE_SPI 2 // SPI2
#ifndef SDCARD_CONNECTION
#define SDCARD_CONNECTION ONBOARD
@ -331,7 +340,7 @@
//#define MKS_LCD12864B
//#undef SHOW_BOOTSCREEN
#else // !MKS_MINI_12864
#else // !MKS_MINI_12864
#define LCD_PINS_D4 PE14
#if ENABLED(ULTIPANEL)
@ -346,5 +355,3 @@
#endif // !MKS_MINI_12864
#endif // HAS_SPI_LCD
#define HAS_OTG_USB_HOST_SUPPORT

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

@ -30,7 +30,7 @@
#define BOARD_INFO_NAME "MKS Robin PRO V2"
// Avoid conflict with TIMER_TONE
#define STEP_TIMER 10
#define STEP_TIMER 10
// Use one of these or SDCard-based Emulation will be used
//#define SRAM_EEPROM_EMULATION // Use BackSRAM-based EEPROM emulation
@ -40,12 +40,18 @@
//
// Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
//
//#define DISABLE_DEBUG
//
// Note: MKS Robin board is using SPI2 interface.
//
//#define SPI_MODULE 2
//
// Servos
//
#define SERVO0_PIN PA8 // Enable BLTOUCH
//
// Limit Switches
//
@ -55,8 +61,6 @@
#define E0_DIAG_PIN PC4
#define E1_DIAG_PIN PE7
//
#define X_STOP_PIN PA15
#define Y_STOP_PIN PA12
#define Z_MIN_PIN PA11
@ -159,7 +163,7 @@
// Reduce baud rate to improve software serial reliability
#define TMC_BAUD_RATE 19200
#endif // TMC2208 || TMC2209
#endif // HAS_TMC_UART
//
// Temperature Sensors
@ -186,19 +190,18 @@
//
// Misc. Functions
//
// #define POWER_LOSS_PIN PA2 // PW_DET
// #define PS_ON_PIN PA3 // PW_OFF
// #define SUICIDE_PIN PB2 // Enable MKSPWC support
// #define KILL_PIN PA2 // Enable MKSPWC support
// #define KILL_PIN_INVERTING true // Enable MKSPWC support
#define SERVO0_PIN PA8 // Enable BLTOUCH support
//#define POWER_LOSS_PIN PA2 // PW_DET
//#define PS_ON_PIN PA3 // PW_OFF
//#define SUICIDE_PIN PB2 // Enable MKSPWC support
//#define KILL_PIN PA2 // Enable MKSPWC support
//#define KILL_PIN_INVERTING true // Enable MKSPWC support
//#define LED_PIN PB2
#ifndef SDCARD_CONNECTION
#define SDCARD_CONNECTION ONBOARD
#endif
// #define USE_NEW_SPI_API 1
//#define USE_NEW_SPI_API 1
//
// Onboard SD card
@ -243,7 +246,7 @@
//
// 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)
@ -316,7 +319,7 @@
#define LCD_READ_ID 0xD3
#define LCD_USE_DMA_SPI
// #define TFT_DRIVER ST7796
//#define TFT_DRIVER ST7796
#define TFT_BUFFER_SIZE 14400
#elif HAS_SPI_LCD

5
Marlin/src/pins/stm32f7/pins_NUCLEO_F767ZI.h
View File

@ -36,7 +36,7 @@
// Decrease delays and flash wear by spreading writes across the
// 128 kB sector allocated for EEPROM emulation.
// Not yet supported on F7 hardware
// #define FLASH_EEPROM_LEVELING
//#define FLASH_EEPROM_LEVELING
#endif
/**
@ -188,9 +188,6 @@
#define LCD_PINS_RS PF12 // LCD_RS
#define LCD_PINS_ENABLE PD15 // LCD_EN
#define LCD_PINS_D4 PB13 // LCD_D4
// #define LCD_PINS_D5
// #define LCD_PINS_D6
// #define LCD_PINS_D7
#define BTN_EN1 PF13 // BTN_EN1
#define BTN_EN2 PE9 // BTN_EN2

2
buildroot/share/PlatformIO/variants/BIGTREE_GTR_V1/hal_conf_extra.h
View File

@ -44,7 +44,7 @@
#undef HAL_IRDA_MODULE_ENABLED
#undef HAL_SMARTCARD_MODULE_ENABLED
#undef HAL_WWDG_MODULE_ENABLED
#undef HAL_HCD_MODULE_ENABLED
//#undef HAL_HCD_MODULE_ENABLED
#undef HAL_FMPI2C_MODULE_ENABLED
#undef HAL_SPDIFRX_MODULE_ENABLED
#undef HAL_DFSDM_MODULE_ENABLED

2
buildroot/share/PlatformIO/variants/BIGTREE_SKR_PRO_1v1/hal_conf_extra.h
View File

@ -44,7 +44,7 @@
#undef HAL_IRDA_MODULE_ENABLED
#undef HAL_SMARTCARD_MODULE_ENABLED
#undef HAL_WWDG_MODULE_ENABLED
#undef HAL_HCD_MODULE_ENABLED
//#undef HAL_HCD_MODULE_ENABLED
#undef HAL_FMPI2C_MODULE_ENABLED
#undef HAL_SPDIFRX_MODULE_ENABLED
#undef HAL_DFSDM_MODULE_ENABLED

5
buildroot/tests/STM32F103VE_longer-tests
View File

@ -11,9 +11,8 @@ opt_enable BAUD_RATE_GCODE
exec_test $1 $2 "CLASSIC_UI U20 config" "$3"
use_example_configs Alfawise/U20
opt_enable BAUD_RATE_GCODE
opt_enable TFT_COLOR_UI
opt_disable TFT_CLASSIC_UI
opt_enable BAUD_RATE_GCODE TFT_COLOR_UI
opt_disable TFT_CLASSIC_UI CUSTOM_STATUS_SCREEN_IMAGE
exec_test $1 $2 "COLOR_UI U20 config" "$3"
use_example_configs Alfawise/U20-bltouch