Skip to content

Commit

Permalink
sync
Browse files Browse the repository at this point in the history
  • Loading branch information
Foxies-CSTL authored and dpreed committed Feb 5, 2021
1 parent a33e6ce commit c83849c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
3 changes: 2 additions & 1 deletion Marlin/Configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -1724,7 +1724,8 @@

#if ENABLED(NOZZLE_PARK_FEATURE)
// Specify a park position as { X, Y, Z_raise }
#define NOZZLE_PARK_POINT { (X_MIN_POS + 10), (Y_MAX_POS - 10), 20 }
//#define NOZZLE_PARK_POINT { (X_MIN_POS + 10), (Y_MAX_POS - 10), 20 }
#define NOZZLE_PARK_POINT { 0, (Y_MAX_POS - 10), 50 } //OPT
//#define NOZZLE_PARK_X_ONLY // X move only is required to park
//#define NOZZLE_PARK_Y_ONLY // Y move only is required to park
#define NOZZLE_PARK_Z_RAISE_MIN 2 // (mm) Always raise Z by at least this distance
Expand Down
9 changes: 5 additions & 4 deletions Marlin/QQS_Config.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@
/*-------Driver TFT Color--(1 CHOICE)-----*/
#define MKS_ROBIN_TFT32 // Mks_Robin_TFT_V2.0
//#define TFT_GENERIC
#endif

/*--- Choice UI TFT ----*/
//#define TFT_CLASSIC_UI //(F) UI STANDARD
#define TFT_COLOR_UI //(C) UI MARLIN (too big with mode UART+UBL=ok with nanolib)
#define TFT_COLOR_UI //(C) UI MARLIN

/*---- Modules -----*/
#define ESP_WIFI //(W) Module ESP8266/ESP12
/*For LedStrip which need an external power source on Vcc pin.*/
Expand All @@ -66,12 +66,13 @@
//============= End_Hardware ===============//

//Choice add menu: (OPT)
//#define DELTA_CALIBRATION_MENU // auto for CLASSIC and COLOR (NC LVGL)
#define LCD_INFO_MENU // Informations printer.
#define DELTA_CALIBRATION_MENU // auto for CLASSIC and COLOR (NC LVGL)
#define SOFT_ENDSTOPS_MENU_ITEM // for UI CLASSIC and UI COLOR
#define PID_EDIT_MENU //
#define PID_AUTOTUNE_MENU //
#define PAUSE_BEFORE_DEPLOY_STOW // Message Stow/remove Probe.
#define LCD_INFO_MENU // Informations printer.


// Type Calibration (CAL)
//#define AUTO_BED_LEVELING_BILINEAR //(A)
Expand Down

0 comments on commit c83849c

Please sign in to comment.