Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix 2.0.x #4

Merged
merged 5 commits into from
May 14, 2020
Merged

Bugfix 2.0.x #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6d92f56
FTDI/EVE, pins cleanup for SKR E3/DIP (#17990)
sl1pkn07 May 13, 2020
21bfb94
Fix FTDI EVE Touch UI typo (#17985)
thisiskeithb May 13, 2020
5a92462
Less ambiguous option comment (#17983)
thisiskeithb May 13, 2020
6ec8903
Fix BIGTREE_SKR_PRO tests
thinkyhead May 13, 2020
1d654b5
[cron] Bump distribution date (2020-05-14)
thinkyhead May 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions Marlin/Configuration_adv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1381,8 +1381,6 @@
//#define AO_EXP2_PINMAP // AlephObjects CLCD UI EXP2 mapping
//#define CR10_TFT_PINMAP // Rudolph Riedel's CR10 pin mapping
//#define S6_TFT_PINMAP // FYSETC S6 pin mapping
//#define E3_EXP1_PINMAP // E3 type boards (SKR E3/DIP, and Stock boards) EXP1 pin mapping
//#define GENERIC_EXP2_PINMAP // GENERIC EXP2 pin mapping

//#define OTHER_PIN_LAYOUT // Define pins manually below
#if ENABLED(OTHER_PIN_LAYOUT)
Expand Down Expand Up @@ -1980,7 +1978,7 @@
#define PAUSE_PARK_NO_STEPPER_TIMEOUT // Enable for XYZ steppers to stay powered on during filament change.

//#define PARK_HEAD_ON_PAUSE // Park the nozzle during pause and filament change.
//#define HOME_BEFORE_FILAMENT_CHANGE // Ensure homing has been completed prior to parking for filament change
//#define HOME_BEFORE_FILAMENT_CHANGE // If needed, home before parking for filament change

//#define FILAMENT_LOAD_UNLOAD_GCODES // Add M701/M702 Load/Unload G-codes, plus Load/Unload in the LCD Prepare menu.
//#define FILAMENT_UNLOAD_ALL_EXTRUDERS // Allow M702 to unload all extruders above a minimum target temp (as set by M302)
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/gcode/feature/pause/M600.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ void GcodeSuite::M600() {
#endif

#if ENABLED(HOME_BEFORE_FILAMENT_CHANGE)
// Don't allow filament change without homing first
// If needed, home before parking for filament change
if (!all_axes_known()) home_all_axes();
#endif

Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/inc/Version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
* version was tagged.
*/
#ifndef STRING_DISTRIBUTION_DATE
#define STRING_DISTRIBUTION_DATE "2020-05-13"
#define STRING_DISTRIBUTION_DATE "2020-05-14"
#endif

/**
Expand Down
9 changes: 0 additions & 9 deletions Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/pin_mappings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,12 +154,3 @@
#define CLCD_SPI_EXTRA_CS SDSS
#endif
#endif

#if EITHER(E3_EXP1_PINMAP, GENERIC_EXP2_PINMAP)
#ifndef __MARLIN_FIRMWARE__
#error "This pin mapping requires Marlin."
#endif

#define CLCD_MOD_RESET BTN_EN1
#define CLCD_SPI_CS LCD_PINS_RS
#endif
2 changes: 1 addition & 1 deletion Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/tune_menu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ void TuneMenu::onRedraw(draw_mode_t what) {
#define PAUSE_POS BTN_POS(1,3), BTN_SIZE(1,1)
#define STOP_POS BTN_POS(2,3), BTN_SIZE(1,1)
#define FILAMENT_POS BTN_POS(1,4), BTN_SIZE(1,1)
#defome BACK_POS BTN_POS(2,4), BTN_SIZE(1,1)
#define BACK_POS BTN_POS(2,4), BTN_SIZE(1,1)
#endif

if (what & FOREGROUND) {
Expand Down
7 changes: 2 additions & 5 deletions Marlin/src/pins/ramps/pins_RAMPS.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -759,11 +759,8 @@

#define BEEPER_PIN 37

#define BTN_EN1 31
#define LCD_PINS_RS 33

#define SD_DETECT_PIN 49

#define KILL_PIN -1

#define CLCD_MOD_RESET 31
#define CLCD_SPI_CS 33
#endif // TOUCH_UI_FTDI_EVE && LCD_FYSETC_TFT81050
60 changes: 26 additions & 34 deletions Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,39 +172,31 @@
* EXP1
*/

#define EXPA1_03_PIN PB7
#define EXPA1_04_PIN PB8
#define EXPA1_05_PIN PB9
#define EXPA1_06_PIN PA10
#define EXPA1_07_PIN -1
#define EXPA1_08_PIN PA9
#define EXPA1_09_PIN PB6
#define EXPA1_10_PIN PA15

#if HAS_SPI_LCD

#if ENABLED(CR10_STOCKDISPLAY)

#define BEEPER_PIN EXPA1_10_PIN
#define BEEPER_PIN PA15

#define BTN_ENC EXPA1_09_PIN
#define BTN_EN1 EXPA1_08_PIN
#define BTN_EN2 EXPA1_06_PIN
#define BTN_ENC PB6
#define BTN_EN1 PA9
#define BTN_EN2 PA10

#define LCD_PINS_RS EXPA1_04_PIN
#define LCD_PINS_ENABLE EXPA1_03_PIN
#define LCD_PINS_D4 EXPA1_05_PIN
#define LCD_PINS_RS PB8
#define LCD_PINS_ENABLE PB7
#define LCD_PINS_D4 PB9

#elif ENABLED(ZONESTAR_LCD) // ANET A8 LCD Controller - Must convert to 3.3V - CONNECTING TO 5V WILL DAMAGE THE BOARD!

#error "CAUTION! ZONESTAR_LCD requires wiring modifications. See 'pins_BTT_SKR_MINI_E3.h' for details. Comment out this line to continue."

#define LCD_PINS_RS EXPA1_05_PIN
#define LCD_PINS_ENABLE EXPA1_09_PIN
#define LCD_PINS_D4 EXPA1_04_PIN
#define LCD_PINS_D5 EXPA1_06_PIN
#define LCD_PINS_D6 EXPA1_08_PIN
#define LCD_PINS_D7 EXPA1_10_PIN
#define LCD_PINS_RS PB9
#define LCD_PINS_ENABLE PB6
#define LCD_PINS_D4 PB8
#define LCD_PINS_D5 PA10
#define LCD_PINS_D6 PA9
#define LCD_PINS_D7 PA15
#define ADC_KEYPAD_PIN PA1 // Repurpose servo pin for ADC - CONNECTING TO 5V WILL DAMAGE THE BOARD!

#elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
Expand All @@ -220,14 +212,14 @@
* EXP1
*/

#define BTN_ENC EXPA1_09_PIN
#define BTN_EN1 EXPA1_08_PIN
#define BTN_EN2 EXPA1_06_PIN
#define BTN_ENC PB6
#define BTN_EN1 PA9
#define BTN_EN2 PA10

#define DOGLCD_CS EXPA1_04_PIN
#define DOGLCD_A0 EXPA1_05_PIN
#define DOGLCD_SCK EXPA1_10_PIN
#define DOGLCD_MOSI EXPA1_03_PIN
#define DOGLCD_CS PB8
#define DOGLCD_A0 PB9
#define DOGLCD_SCK PA15
#define DOGLCD_MOSI PB7
#define FORCE_SOFT_SPI
#define LCD_BACKLIGHT_PIN -1

Expand Down Expand Up @@ -272,10 +264,10 @@

#define CLCD_SPI_BUS 1 // SPI1 connector

#define BEEPER_PIN EXPA1_09_PIN
#define BEEPER_PIN PB6

#define BTN_EN1 EXPA1_08_PIN
#define LCD_PINS_RS EXPA1_04_PIN
#define CLCD_MOD_RESET PA9
#define CLCD_SPI_CS PA8

#endif // TOUCH_UI_FTDI_EVE && LCD_FYSETC_TFT81050

Expand All @@ -284,16 +276,16 @@
//

#ifndef SDCARD_CONNECTION
#define SDCARD_CONNECTION ONBOARD
#define SDCARD_CONNECTION ONBOARD
#endif

#if SD_CONNECTION_IS(ONBOARD)
#define SD_DETECT_PIN PC4
#endif

#if BOTH(TOUCH_UI_FTDI_EVE, LCD_FYSETC_TFT81050) && SD_CONNECTION_IS(LCD)
#define SD_DETECT_PIN EXPA1_10_PIN
#define SS_PIN EXPA1_06_PIN
#define SD_DETECT_PIN PA15
#define SS_PIN PA10
#elif SD_CONNECTION_IS(CUSTOM_CABLE)
#error "SD CUSTOM_CABLE is not compatible with SKR E3 DIP."
#endif
Expand Down
61 changes: 25 additions & 36 deletions Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,39 +112,30 @@
* EXP1
*/

#define EXPA1_03_PIN PB7
#define EXPA1_04_PIN PB8
#define EXPA1_05_PIN PB9
#define EXPA1_06_PIN PA10
#define EXPA1_07_PIN -1
#define EXPA1_08_PIN PA9
#define EXPA1_09_PIN PB6
#define EXPA1_10_PIN PB5

#if HAS_SPI_LCD

#if ENABLED(CR10_STOCKDISPLAY)

#define BEEPER_PIN EXPA1_10_PIN
#define BEEPER_PIN PB5

#define BTN_ENC EXPA1_09_PIN
#define BTN_EN1 EXPA1_08_PIN
#define BTN_EN2 EXPA1_06_PIN
#define BTN_ENC PB6
#define BTN_EN1 PA9
#define BTN_EN2 PA10

#define LCD_PINS_RS EXPA1_04_PIN
#define LCD_PINS_ENABLE EXPA1_03_PIN
#define LCD_PINS_D4 EXPA1_05_PIN
#define LCD_PINS_RS PB8
#define LCD_PINS_ENABLE PB7
#define LCD_PINS_D4 PB9

#elif ENABLED(ZONESTAR_LCD) // ANET A8 LCD Controller - Must convert to 3.3V - CONNECTING TO 5V WILL DAMAGE THE BOARD!

#error "CAUTION! ZONESTAR_LCD requires wiring modifications. See 'pins_BTT_SKR_MINI_E3.h' for details. Comment out this line to continue."

#define LCD_PINS_RS EXPA1_05_PIN
#define LCD_PINS_ENABLE EXPA1_09_PIN
#define LCD_PINS_D4 EXPA1_04_PIN
#define LCD_PINS_D5 EXPA1_06_PIN
#define LCD_PINS_D6 EXPA1_08_PIN
#define LCD_PINS_D7 EXPA1_10_PIN
#define LCD_PINS_RS PB9
#define LCD_PINS_ENABLE PB6
#define LCD_PINS_D4 PB8
#define LCD_PINS_D5 PA10
#define LCD_PINS_D6 PA9
#define LCD_PINS_D7 PB5
#define ADC_KEYPAD_PIN PA1 // Repurpose servo pin for ADC - CONNECTING TO 5V WILL DAMAGE THE BOARD!

#elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
Expand All @@ -160,14 +151,14 @@
* EXP1
*/

#define BTN_ENC EXPA1_09_PIN
#define BTN_EN1 EXPA1_08_PIN
#define BTN_EN2 EXPA1_06_PIN
#define BTN_ENC PB6
#define BTN_EN1 PA9
#define BTN_EN2 PA10

#define DOGLCD_CS EXPA1_04_PIN
#define DOGLCD_A0 EXPA1_05_PIN
#define DOGLCD_SCK EXPA1_10_PIN
#define DOGLCD_MOSI EXPA1_03_PIN
#define DOGLCD_CS PB8
#define DOGLCD_A0 PB9
#define DOGLCD_SCK PB5
#define DOGLCD_MOSI PB7
#define FORCE_SOFT_SPI
#define LCD_BACKLIGHT_PIN -1

Expand Down Expand Up @@ -212,12 +203,10 @@

#define CLCD_SPI_BUS 1 // SPI1 connector

#define BEEPER_PIN EXPA1_09_PIN
#define BEEPER_PIN PB6

#define BTN_EN1 EXPA1_08_PIN
#define LCD_PINS_RS EXPA1_04_PIN
#define LCD_PINS_ENABLE EXPA1_03_PIN
#define LCD_PINS_D4 EXPA1_05_PIN
#define CLCD_MOD_RESET PA9
#define CLCD_SPI_CS PB8

#endif // TOUCH_UI_FTDI_EVE && LCD_FYSETC_TFT81050

Expand All @@ -234,8 +223,8 @@
#endif

#if BOTH(TOUCH_UI_FTDI_EVE, LCD_FYSETC_TFT81050) && SD_CONNECTION_IS(LCD)
#define SD_DETECT_PIN EXPA1_10_PIN
#define SS_PIN EXPA1_06_PIN
#define SD_DETECT_PIN PB5
#define SS_PIN PA10
#elif SD_CONNECTION_IS(CUSTOM_CABLE)
#error "SD CUSTOM_CABLE is not compatible with SKR Mini E3."
#endif
Expand Down
4 changes: 2 additions & 2 deletions buildroot/share/tests/BIGTREE_SKR_PRO-tests
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ opt_set TEMP_SENSOR_2 1
opt_set E0_AUTO_FAN_PIN PC10
opt_set E1_AUTO_FAN_PIN PC11
opt_set E2_AUTO_FAN_PIN PC12
opt_set BLTOUCH Z_SAFE_HOMING
opt_set X_DRIVER_TYPE TMC2209
opt_set Y_DRIVER_TYPE TMC2130
exec_test $1 $2 "BigTreeTech SKR Pro 3 Extruders, Auto-Fan, BLTOUCH, and mixed TMC drivers"
opt_enable BLTOUCH EEPROM_SETTINGS AUTO_BED_LEVELING_3POINT Z_SAFE_HOMING
exec_test $1 $2 "BigTreeTech SKR Pro 3 Extruders, Auto-Fan, BLTOUCH, mixed TMC drivers"

# clean up
restore_configs