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

Merge pull request #4108 from esenapaj/Fix-for-PR-#4093

Browse Source 
Fix for PR #4093 (Make Z Probe options independent of ABL), etc
This commit is contained in:
Scott Lahteine
2016-06-21 18:12:08 -07:00
committed by GitHub
parent c84732e605 d583ea852d
commit b0e47608e6
20 changed files with 876 additions and 818 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/example_configurations/Cartesio/Configuration.h
View File

@ -977,8 +977,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
//
//#define ULTIPANEL
//
// Cartesio UI
// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
//
#define CARTESIO_UI
//
@ -1103,7 +1105,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
//
//#define U8GLIB_SSD1306
//
// SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
//
//#define SAV_3DGLCD
#if ENABLED(SAV_3DGLCD)
//#define U8GLIB_SSD1306