MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Merge pull request #9144 from thinkyhead/bf2_Creality_CR-10S

Browse Source 
[2.0.x] Creality CR-10S configurations
This commit is contained in:
Scott Lahteine 2018-01-11 01:33:52 -06:00 committed by GitHub
commit 06eb46b1d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 3372 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Marlin/Configuration.h
View File

@ -1642,11 +1642,10 @@
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
// //
// MKS OLED 1.3" 128 x 64 FULL GRAPHICS CONTROLLER // MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER
// http://reprap.org/wiki/MKS_12864OLED // http://reprap.org/wiki/MKS_12864OLED
// //
// Tiny, but very sharp OLED display // Tiny, but very sharp OLED display
// If there is a pixel shift, try the other controller.
// //
//#define MKS_12864OLED // Uses the SH1106 controller (default) //#define MKS_12864OLED // Uses the SH1106 controller (default)
//#define MKS_12864OLED_SSD1306 // Uses the SSD1306 controller //#define MKS_12864OLED_SSD1306 // Uses the SSD1306 controller

3
Marlin/src/config/default/Configuration.h
View File

@ -1642,11 +1642,10 @@
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
// //
// MKS OLED 1.3" 128 x 64 FULL GRAPHICS CONTROLLER // MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER
// http://reprap.org/wiki/MKS_12864OLED // http://reprap.org/wiki/MKS_12864OLED
// //
// Tiny, but very sharp OLED display // Tiny, but very sharp OLED display
// If there is a pixel shift, try the other controller.
// //
//#define MKS_12864OLED // Uses the SH1106 controller (default) //#define MKS_12864OLED // Uses the SH1106 controller (default)
//#define MKS_12864OLED_SSD1306 // Uses the SSD1306 controller //#define MKS_12864OLED_SSD1306 // Uses the SSD1306 controller

1772
Marlin/src/config/examples/Creality/CR-10S/Configuration.h Executable file
View File

File diff suppressed because it is too large Load Diff

1594
Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h Normal file
View File

File diff suppressed because it is too large Load Diff

5
Marlin/src/config/examples/Tronxy/X1/Configuration.h
View File

@ -94,7 +94,7 @@
// @section machine // @section machine
/** /**
* Select which serial port on the board will be used for communication with the host. * Select the serial port on the board to use for communication with the host.
* This allows the connection of wireless adapters (for instance) to non-default port pins. * This allows the connection of wireless adapters (for instance) to non-default port pins.
* Serial port 0 is always used by the Arduino bootloader regardless of this setting. * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
* *
@ -1627,11 +1627,10 @@
//#define CR10_STOCKDISPLAY //#define CR10_STOCKDISPLAY
// //
// MKS OLED 1.3" 128 x 64 FULL GRAPHICS CONTROLLER // MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER
// http://reprap.org/wiki/MKS_12864OLED // http://reprap.org/wiki/MKS_12864OLED
// //
// Tiny, but very sharp OLED display // Tiny, but very sharp OLED display
// If there is a pixel shift, try the other controller.
// //
//#define MKS_12864OLED // Uses the SH1106 controller (default) //#define MKS_12864OLED // Uses the SH1106 controller (default)
//#define MKS_12864OLED_SSD1306 // Uses the SSD1306 controller //#define MKS_12864OLED_SSD1306 // Uses the SSD1306 controller

2
Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h
View File

@ -94,7 +94,7 @@
// @section machine // @section machine
/** /**
* Select which serial port on the board will be used for communication with the host. * Select the serial port on the board to use for communication with the host.
* This allows the connection of wireless adapters (for instance) to non-default port pins. * This allows the connection of wireless adapters (for instance) to non-default port pins.
* Serial port 0 is always used by the Arduino bootloader regardless of this setting. * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
* *

2
Marlin/src/config/examples/stm32f103ret6/Configuration.h
View File

@ -94,7 +94,7 @@
// @section machine // @section machine
/** /**
* Select which serial port on the board will be used for communication with the host. * Select the serial port on the board to use for communication with the host.
* This allows the connection of wireless adapters (for instance) to non-default port pins. * This allows the connection of wireless adapters (for instance) to non-default port pins.
* Serial port 0 is always used by the Arduino bootloader regardless of this setting. * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
* *