Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
MarlinKimbra
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
machinery
MarlinKimbra
Commits
f4169b74
Commit
f4169b74
authored
Jun 05, 2016
by
MagoKimbra
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'refs/remotes/origin/master' into dev
parents
bdd8a0e4
252a4446
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
10 deletions
+12
-10
Configuration_Laser.h
MK/Configuration_Laser.h
+1
-0
pins.h
MK/module/pins.h
+11
-10
No files found.
MK/Configuration_Laser.h
View file @
f4169b74
...
@@ -14,6 +14,7 @@
...
@@ -14,6 +14,7 @@
// The following define to use the new HakanBasted laser_pulse method to fire laser. It should be more efficient, but it's less tested.
// The following define to use the new HakanBasted laser_pulse method to fire laser. It should be more efficient, but it's less tested.
// Thanks for it to HakanBastedt that has implemented it for Marlin at https://github.com/HakanBastedt/Marlin
// Thanks for it to HakanBastedt that has implemented it for Marlin at https://github.com/HakanBastedt/Marlin
// Uncomment to enable it *USE AT YOUR OWN RISK*, it should work but it's *NOT WELL TESTED YET*
// Uncomment to enable it *USE AT YOUR OWN RISK*, it should work but it's *NOT WELL TESTED YET*
// Only for MEGA. On DUE processor is automatic.
//#define LASER_PULSE_METHOD
//#define LASER_PULSE_METHOD
// If your machine has laser focuser, set this to true and it will use Z axis for focus or disable it.
// If your machine has laser focuser, set this to true and it will use Z axis for focus or disable it.
...
...
MK/module/pins.h
View file @
f4169b74
...
@@ -230,14 +230,15 @@
...
@@ -230,14 +230,15 @@
#include "../Configuration_Pins.h"
#include "../Configuration_Pins.h"
/****************************************************************************************/
/****************************************************************************************/
#if DISABLED(DUAL_X_CARRIAGE)
#if X_HOME_DIR > 0 // Home X to MAX
#if X_HOME_DIR > 0 // Home X to MAX
#undef X_MIN_PIN
#undef X_MIN_PIN
#define X_MIN_PIN -1
#define X_MIN_PIN -1
#elif X_HOME_DIR < 0 // Home X to MIN
#elif X_HOME_DIR < 0 // Home X to MIN
#undef X_MAX_PIN
#undef X_MAX_PIN
#define X_MAX_PIN -1
#define X_MAX_PIN -1
#endif //X_HOME_DIR > 0
#endif // X_HOME_DIR > 0
#endif // DISABLED(DUAL_X_CARRIAGE)
#if Y_HOME_DIR > 0 // Home Y to MAX
#if Y_HOME_DIR > 0 // Home Y to MAX
#undef Y_MIN_PIN
#undef Y_MIN_PIN
...
@@ -245,7 +246,7 @@
...
@@ -245,7 +246,7 @@
#elif Y_HOME_DIR < 0 // Home Y to MIN
#elif Y_HOME_DIR < 0 // Home Y to MIN
#undef Y_MAX_PIN
#undef Y_MAX_PIN
#define Y_MAX_PIN -1
#define Y_MAX_PIN -1
#endif //Y_HOME_DIR > 0
#endif //
Y_HOME_DIR > 0
#if Z_HOME_DIR > 0 // Home Z to MAX
#if Z_HOME_DIR > 0 // Home Z to MAX
#undef Z_MIN_PIN
#undef Z_MIN_PIN
...
@@ -253,7 +254,7 @@
...
@@ -253,7 +254,7 @@
#elif Z_HOME_DIR < 0 // Home Z to MIN
#elif Z_HOME_DIR < 0 // Home Z to MIN
#undef Z_MAX_PIN
#undef Z_MAX_PIN
#define Z_MAX_PIN -1
#define Z_MAX_PIN -1
#endif //Z_HOME_DIR > 0
#endif //
Z_HOME_DIR > 0
#if DISABLED(Z_PROBE_ENDSTOP) // Allow code to compile regardless of Z_PROBE_ENDSTOP setting.
#if DISABLED(Z_PROBE_ENDSTOP) // Allow code to compile regardless of Z_PROBE_ENDSTOP setting.
#define Z_PROBE_PIN -1
#define Z_PROBE_PIN -1
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment