Skip to content

Commit

Permalink
Merge pull request #4094 from thinkyhead/rc_cartesio_config
Browse files Browse the repository at this point in the history 
Cartesio UI display option in all configs
  • Loading branch information
@thinkyhead
thinkyhead authored Jun 20, 2016
2 parents 43ec241 + f8c278c commit 15a5eeb
Show file tree
Hide file tree
Showing 19 changed files with 76 additions and 0 deletions.
4 changes: 4 additions & 0 deletions Marlin/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -958,6 +958,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

//
// PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
// http://reprap.org/wiki/PanelOne
Expand Down
4 changes: 4 additions & 0 deletions Marlin/example_configurations/Felix/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -941,6 +941,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

//
// PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
// http://reprap.org/wiki/PanelOne
Expand Down
4 changes: 4 additions & 0 deletions Marlin/example_configurations/Felix/DUAL/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -939,6 +939,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

//
// PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
// http://reprap.org/wiki/PanelOne
Expand Down
4 changes: 4 additions & 0 deletions Marlin/example_configurations/Hephestos/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -950,6 +950,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
//
//#define ULTIPANEL

// Cartesio UI
// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
//#define CARTESIO_UI

//
// PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
// http://reprap.org/wiki/PanelOne
Expand Down
4 changes: 4 additions & 0 deletions Marlin/example_configurations/Hephestos_2/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -957,6 +957,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

//
// PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
// http://reprap.org/wiki/PanelOne
Expand Down
4 changes: 4 additions & 0 deletions Marlin/example_configurations/K8200/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -975,6 +975,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

//
// PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
// http://reprap.org/wiki/PanelOne
Expand Down
4 changes: 4 additions & 0 deletions Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -958,6 +958,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

//
// PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
// http://reprap.org/wiki/PanelOne
Expand Down
4 changes: 4 additions & 0 deletions Marlin/example_configurations/RigidBot/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -953,6 +953,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

//
// PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
// http://reprap.org/wiki/PanelOne
Expand Down
4 changes: 4 additions & 0 deletions Marlin/example_configurations/SCARA/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -966,6 +966,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

//
// PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
// http://reprap.org/wiki/PanelOne
Expand Down
4 changes: 4 additions & 0 deletions Marlin/example_configurations/TAZ4/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -979,6 +979,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

//
// PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
// http://reprap.org/wiki/PanelOne
Expand Down
4 changes: 4 additions & 0 deletions Marlin/example_configurations/WITBOX/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -950,6 +950,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
//
//#define ULTIPANEL

// Cartesio UI
// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
//#define CARTESIO_UI

//
// PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
// http://reprap.org/wiki/PanelOne
Expand Down
4 changes: 4 additions & 0 deletions Marlin/example_configurations/adafruit/ST7565/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -958,6 +958,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

//
// PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
// http://reprap.org/wiki/PanelOne
Expand Down
4 changes: 4 additions & 0 deletions Marlin/example_configurations/delta/biv2.5/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1047,6 +1047,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
//
//#define ULTIPANEL

// Cartesio UI
// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
//#define CARTESIO_UI

//
// PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
// http://reprap.org/wiki/PanelOne
Expand Down
4 changes: 4 additions & 0 deletions Marlin/example_configurations/delta/generic/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1041,6 +1041,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
//
//#define ULTIPANEL

// Cartesio UI
// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
//#define CARTESIO_UI

//
// PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
// http://reprap.org/wiki/PanelOne
Expand Down
4 changes: 4 additions & 0 deletions Marlin/example_configurations/delta/kossel_mini/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1044,6 +1044,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

//
// PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
// http://reprap.org/wiki/PanelOne
Expand Down
4 changes: 4 additions & 0 deletions Marlin/example_configurations/delta/kossel_pro/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1049,6 +1049,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

//
// PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
// http://reprap.org/wiki/PanelOne
Expand Down
4 changes: 4 additions & 0 deletions Marlin/example_configurations/delta/kossel_xl/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1046,6 +1046,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

//
// PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
// http://reprap.org/wiki/PanelOne
Expand Down
4 changes: 4 additions & 0 deletions Marlin/example_configurations/makibox/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -961,6 +961,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

//
// PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
// http://reprap.org/wiki/PanelOne
Expand Down
4 changes: 4 additions & 0 deletions Marlin/example_configurations/tvrrug/Round2/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -952,6 +952,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
//
//#define ULTIPANEL

// Cartesio UI
// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
//#define CARTESIO_UI

//
// PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
// http://reprap.org/wiki/PanelOne
Expand Down

0 comments on commit 15a5eeb

Please sign in to comment.