SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #4473 from esenapaj/Follow-up-the-PR-#4408-etc

Browse source 
Follow-up the PR #4408 (Add support for reprapworld LCD), etc
This commit is contained in:
Scott Lahteine 2016-07-30 04:45:27 -07:00 committed by GitHub
commit f575e92f2e
21 changed files with 126 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Marlin/example_configurations/Cartesio/Configuration.h
View file

@ -103,7 +103,6 @@
// example configuration folder.
//
#define SHOW_CUSTOM_BOOTSCREEN
// @section machine
// SERIAL_PORT selects which serial port should be used for communication with the host.
@ -1100,6 +1099,12 @@
//
//#define MAKRPANEL
//
// ReprapWorld Graphical LCD
// https://reprapworld.com/?products_details&products_id/1218
//
//#define REPRAPWORLD_GRAPHICAL_LCD
//
// Activate one of these if you have a Panucatt Devices
// Viki 2.0 or mini Viki with Graphic LCD

7
Marlin/example_configurations/Felix/Configuration.h
View file

@ -103,7 +103,6 @@
// example configuration folder.
//
//#define SHOW_CUSTOM_BOOTSCREEN
// @section machine
// SERIAL_PORT selects which serial port should be used for communication with the host.
@ -1083,6 +1082,12 @@
//
//#define MAKRPANEL
//
// ReprapWorld Graphical LCD
// https://reprapworld.com/?products_details&products_id/1218
//
//#define REPRAPWORLD_GRAPHICAL_LCD
//
// Activate one of these if you have a Panucatt Devices
// Viki 2.0 or mini Viki with Graphic LCD

7
Marlin/example_configurations/Felix/DUAL/Configuration.h
View file

@ -103,7 +103,6 @@
// example configuration folder.
//
//#define SHOW_CUSTOM_BOOTSCREEN
// @section machine
// SERIAL_PORT selects which serial port should be used for communication with the host.
@ -1081,6 +1080,12 @@
//
//#define MAKRPANEL
//
// ReprapWorld Graphical LCD
// https://reprapworld.com/?products_details&products_id/1218
//
//#define REPRAPWORLD_GRAPHICAL_LCD
//
// Activate one of these if you have a Panucatt Devices
// Viki 2.0 or mini Viki with Graphic LCD

7
Marlin/example_configurations/Hephestos/Configuration.h
View file

@ -103,7 +103,6 @@
// example configuration folder.
//
//#define SHOW_CUSTOM_BOOTSCREEN
// @section machine
// SERIAL_PORT selects which serial port should be used for communication with the host.
@ -1092,6 +1091,12 @@
//
//#define MAKRPANEL
//
// ReprapWorld Graphical LCD
// https://reprapworld.com/?products_details&products_id/1218
//
//#define REPRAPWORLD_GRAPHICAL_LCD
//
// Activate one of these if you have a Panucatt Devices
// Viki 2.0 or mini Viki with Graphic LCD

6
Marlin/example_configurations/Hephestos_2/Configuration.h
View file

@ -1093,6 +1093,12 @@
//
//#define MAKRPANEL
//
// ReprapWorld Graphical LCD
// https://reprapworld.com/?products_details&products_id/1218
//
//#define REPRAPWORLD_GRAPHICAL_LCD
//
// Activate one of these if you have a Panucatt Devices
// Viki 2.0 or mini Viki with Graphic LCD

7
Marlin/example_configurations/K8200/Configuration.h
View file

@ -110,7 +110,6 @@
// example configuration folder.
//
//#define SHOW_CUSTOM_BOOTSCREEN
// @section machine
// SERIAL_PORT selects which serial port should be used for communication with the host.
@ -1117,6 +1116,12 @@
//
//#define MAKRPANEL
//
// ReprapWorld Graphical LCD
// https://reprapworld.com/?products_details&products_id/1218
//
//#define REPRAPWORLD_GRAPHICAL_LCD
//
// Activate one of these if you have a Panucatt Devices
// Viki 2.0 or mini Viki with Graphic LCD

7
Marlin/example_configurations/K8400/Configuration.h
View file

@ -103,7 +103,6 @@
// example configuration folder.
//
//#define SHOW_CUSTOM_BOOTSCREEN
// @section machine
// SERIAL_PORT selects which serial port should be used for communication with the host.
@ -1100,6 +1099,12 @@
//
//#define MAKRPANEL
//
// ReprapWorld Graphical LCD
// https://reprapworld.com/?products_details&products_id/1218
//
//#define REPRAPWORLD_GRAPHICAL_LCD
//
// Activate one of these if you have a Panucatt Devices
// Viki 2.0 or mini Viki with Graphic LCD

7
Marlin/example_configurations/K8400/Dual-head/Configuration.h
View file

@ -103,7 +103,6 @@
// example configuration folder.
//
//#define SHOW_CUSTOM_BOOTSCREEN
// @section machine
// SERIAL_PORT selects which serial port should be used for communication with the host.
@ -1100,6 +1099,12 @@
//
//#define MAKRPANEL
//
// ReprapWorld Graphical LCD
// https://reprapworld.com/?products_details&products_id/1218
//
//#define REPRAPWORLD_GRAPHICAL_LCD
//
// Activate one of these if you have a Panucatt Devices
// Viki 2.0 or mini Viki with Graphic LCD

7
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
View file

@ -103,7 +103,6 @@
// example configuration folder.
//
//#define SHOW_CUSTOM_BOOTSCREEN
// @section machine
// SERIAL_PORT selects which serial port should be used for communication with the host.
@ -1100,6 +1099,12 @@
//
//#define MAKRPANEL
//
// ReprapWorld Graphical LCD
// https://reprapworld.com/?products_details&products_id/1218
//
//#define REPRAPWORLD_GRAPHICAL_LCD
//
// Activate one of these if you have a Panucatt Devices
// Viki 2.0 or mini Viki with Graphic LCD

7
Marlin/example_configurations/RigidBot/Configuration.h
View file

@ -103,7 +103,6 @@
// example configuration folder.
//
//#define SHOW_CUSTOM_BOOTSCREEN
// @section machine
// SERIAL_PORT selects which serial port should be used for communication with the host.
@ -1098,6 +1097,12 @@
//
//#define MAKRPANEL
//
// ReprapWorld Graphical LCD
// https://reprapworld.com/?products_details&products_id/1218
//
//#define REPRAPWORLD_GRAPHICAL_LCD
//
// Activate one of these if you have a Panucatt Devices
// Viki 2.0 or mini Viki with Graphic LCD

7
Marlin/example_configurations/SCARA/Configuration.h
View file

@ -128,7 +128,6 @@
// example configuration folder.
//
//#define SHOW_CUSTOM_BOOTSCREEN
// @section machine
// SERIAL_PORT selects which serial port should be used for communication with the host.
@ -1108,6 +1107,12 @@
//
//#define MAKRPANEL
//
// ReprapWorld Graphical LCD
// https://reprapworld.com/?products_details&products_id/1218
//
//#define REPRAPWORLD_GRAPHICAL_LCD
//
// Activate one of these if you have a Panucatt Devices
// Viki 2.0 or mini Viki with Graphic LCD

7
Marlin/example_configurations/TAZ4/Configuration.h
View file

@ -103,7 +103,6 @@
// example configuration folder.
//
//#define SHOW_CUSTOM_BOOTSCREEN
// @section machine
// SERIAL_PORT selects which serial port should be used for communication with the host.
@ -1121,6 +1120,12 @@
//
//#define MAKRPANEL
//
// ReprapWorld Graphical LCD
// https://reprapworld.com/?products_details&products_id/1218
//
//#define REPRAPWORLD_GRAPHICAL_LCD
//
// Activate one of these if you have a Panucatt Devices
// Viki 2.0 or mini Viki with Graphic LCD

6
Marlin/example_configurations/WITBOX/Configuration.h
View file

@ -1091,6 +1091,12 @@
//
//#define MAKRPANEL
//
// ReprapWorld Graphical LCD
// https://reprapworld.com/?products_details&products_id/1218
//
//#define REPRAPWORLD_GRAPHICAL_LCD
//
// Activate one of these if you have a Panucatt Devices
// Viki 2.0 or mini Viki with Graphic LCD

7
Marlin/example_configurations/adafruit/ST7565/Configuration.h
View file

@ -103,7 +103,6 @@
// example configuration folder.
//
//#define SHOW_CUSTOM_BOOTSCREEN
// @section machine
// SERIAL_PORT selects which serial port should be used for communication with the host.
@ -1100,6 +1099,12 @@
//
//#define MAKRPANEL
//
// ReprapWorld Graphical LCD
// https://reprapworld.com/?products_details&products_id/1218
//
//#define REPRAPWORLD_GRAPHICAL_LCD
//
// Activate one of these if you have a Panucatt Devices
// Viki 2.0 or mini Viki with Graphic LCD

7
Marlin/example_configurations/delta/biv2.5/Configuration.h
View file

@ -103,7 +103,6 @@
// example configuration folder.
//
//#define SHOW_CUSTOM_BOOTSCREEN
// @section machine
// SERIAL_PORT selects which serial port should be used for communication with the host.
@ -1193,6 +1192,12 @@
//
//#define MAKRPANEL
//
// ReprapWorld Graphical LCD
// https://reprapworld.com/?products_details&products_id/1218
//
//#define REPRAPWORLD_GRAPHICAL_LCD
//
// Activate one of these if you have a Panucatt Devices
// Viki 2.0 or mini Viki with Graphic LCD

7
Marlin/example_configurations/delta/generic/Configuration.h
View file

@ -103,7 +103,6 @@
// example configuration folder.
//
//#define SHOW_CUSTOM_BOOTSCREEN
// @section machine
// SERIAL_PORT selects which serial port should be used for communication with the host.
@ -1187,6 +1186,12 @@
//
//#define MAKRPANEL
//
// ReprapWorld Graphical LCD
// https://reprapworld.com/?products_details&products_id/1218
//
//#define REPRAPWORLD_GRAPHICAL_LCD
//
// Activate one of these if you have a Panucatt Devices
// Viki 2.0 or mini Viki with Graphic LCD

7
Marlin/example_configurations/delta/kossel_mini/Configuration.h
View file

@ -103,7 +103,6 @@
// example configuration folder.
//
//#define SHOW_CUSTOM_BOOTSCREEN
// @section machine
// SERIAL_PORT selects which serial port should be used for communication with the host.
@ -1190,6 +1189,12 @@
//
//#define MAKRPANEL
//
// ReprapWorld Graphical LCD
// https://reprapworld.com/?products_details&products_id/1218
//
//#define REPRAPWORLD_GRAPHICAL_LCD
//
// Activate one of these if you have a Panucatt Devices
// Viki 2.0 or mini Viki with Graphic LCD

7
Marlin/example_configurations/delta/kossel_pro/Configuration.h
View file

@ -109,7 +109,6 @@
// example configuration folder.
//
//#define SHOW_CUSTOM_BOOTSCREEN
// @section machine
// SERIAL_PORT selects which serial port should be used for communication with the host.
@ -1190,6 +1189,12 @@
//
//#define MAKRPANEL
//
// ReprapWorld Graphical LCD
// https://reprapworld.com/?products_details&products_id/1218
//
//#define REPRAPWORLD_GRAPHICAL_LCD
//
// Activate one of these if you have a Panucatt Devices
// Viki 2.0 or mini Viki with Graphic LCD

7
Marlin/example_configurations/delta/kossel_xl/Configuration.h
View file

@ -96,7 +96,6 @@
// example configuration folder.
//
//#define SHOW_CUSTOM_BOOTSCREEN
// @section machine
// SERIAL_PORT selects which serial port should be used for communication with the host.
@ -1193,6 +1192,12 @@
//
//#define MAKRPANEL
//
// ReprapWorld Graphical LCD
// https://reprapworld.com/?products_details&products_id/1218
//
//#define REPRAPWORLD_GRAPHICAL_LCD
//
// Activate one of these if you have a Panucatt Devices
// Viki 2.0 or mini Viki with Graphic LCD

7
Marlin/example_configurations/makibox/Configuration.h
View file

@ -103,7 +103,6 @@
// example configuration folder.
//
//#define SHOW_CUSTOM_BOOTSCREEN
// @section machine
// SERIAL_PORT selects which serial port should be used for communication with the host.
@ -1103,6 +1102,12 @@
//
//#define MAKRPANEL
//
// ReprapWorld Graphical LCD
// https://reprapworld.com/?products_details&products_id/1218
//
//#define REPRAPWORLD_GRAPHICAL_LCD
//
// Activate one of these if you have a Panucatt Devices
// Viki 2.0 or mini Viki with Graphic LCD

6
Marlin/example_configurations/tvrrug/Round2/Configuration.h
View file

@ -1093,6 +1093,12 @@
//
//#define MAKRPANEL
//
// ReprapWorld Graphical LCD
// https://reprapworld.com/?products_details&products_id/1218
//
//#define REPRAPWORLD_GRAPHICAL_LCD
//
// Activate one of these if you have a Panucatt Devices
// Viki 2.0 or mini Viki with Graphic LCD