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

Merge remote-tracking branch 'MarlinFirmware/Development' into Development

Browse Source 
Conflicts:
	Marlin/Configuration.h
This commit is contained in:
Chris Roadfeldt
2015-03-30 23:59:01 -05:00
parent e08f8eed05 2e7a4bd7db
commit 3be00cce6f
4 changed files with 156 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Marlin/Configuration.h
View File

@ -302,14 +302,19 @@ your extruder heater takes 2 minutes to hit the target on heating.
// Enable this option for Toshiba steppers
// #define CONFIG_STEPPERS_TOSHIBA
// The pullups are needed if you directly connect a mechanical endstop between the signal and ground pins.
#define ENDSTOPPULLUP_XMAX
#define ENDSTOPPULLUP_YMAX
#define ENDSTOPPULLUP_ZMAX
#define ENDSTOPPULLUP_XMIN
#define ENDSTOPPULLUP_YMIN
#define ENDSTOPPULLUP_ZMIN
#define ENDSTOPPULLUP_ZPROBE
// coarse Endstop Settings
#define ENDSTOPPULLUPS // Comment this out (using // at the start of the line) to disable the endstop pullup resistors
#ifndef ENDSTOPPULLUPS
// fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined
// #define ENDSTOPPULLUP_XMAX
// #define ENDSTOPPULLUP_YMAX
// #define ENDSTOPPULLUP_ZMAX
// #define ENDSTOPPULLUP_XMIN
// #define ENDSTOPPULLUP_YMIN
// #define ENDSTOPPULLUP_ZMIN
#endif
>>>>>>> MarlinFirmware/Development
// Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup).
const bool X_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic of the endstop.