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
e2a5b4ce
Commit
e2a5b4ce
authored
May 11, 2016
by
Stefy Lanza (nextime / spora )
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Some bug fixes
parent
90e6cf17
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
2 deletions
+15
-2
Configuration_Pins.h
MK/Configuration_Pins.h
+1
-0
301.h
MK/module/boards/301.h
+1
-0
sanitycheck.h
MK/module/sanitycheck.h
+13
-2
No files found.
MK/Configuration_Pins.h
View file @
e2a5b4ce
...
@@ -109,6 +109,7 @@
...
@@ -109,6 +109,7 @@
#if ENABLED(LASER)
#if ENABLED(LASER)
#if LASER_CONTROL == 1
#if LASER_CONTROL == 1
#define LASER_FIRING_PIN 5
#define LASER_FIRING_PIN 5
#define LASER_INTENSITY_PIN -1
#endif
#endif
#if LASER_CONTROL == 2
#if LASER_CONTROL == 2
#define LASER_INTENSITY_PIN 6 // Digital pins 2, 3, 5, 6, 7, 8 are attached to timers we can use
#define LASER_INTENSITY_PIN 6 // Digital pins 2, 3, 5, 6, 7, 8 are attached to timers we can use
...
...
MK/module/boards/301.h
View file @
e2a5b4ce
...
@@ -78,6 +78,7 @@
...
@@ -78,6 +78,7 @@
#undef LASER_FIRING_PIN
#undef LASER_FIRING_PIN
#if LASER_CONTROL == 1
#if LASER_CONTROL == 1
#define LASER_FIRING_PIN 5
#define LASER_FIRING_PIN 5
#define LASER_INTENSITY_PIN -1
#endif
#endif
#if LASER_CONTROL == 2
#if LASER_CONTROL == 2
#define LASER_INTENSITY_PIN 5 // Digital pins 2, 3, 5, 6, 7, 8 are attached to timers we can use
#define LASER_INTENSITY_PIN 5 // Digital pins 2, 3, 5, 6, 7, 8 are attached to timers we can use
...
...
MK/module/sanitycheck.h
View file @
e2a5b4ce
...
@@ -1817,8 +1817,19 @@
...
@@ -1817,8 +1817,19 @@
#error DEPENDENCY ERROR: You must enable only one of LASERBEAM or LASER, not both!
#error DEPENDENCY ERROR: You must enable only one of LASERBEAM or LASER, not both!
#endif
#endif
#if ENABLED(LASER) && (!PIN_EXISTS(LASER_FIRING_PIN) || !PIN_EXISTS(LASER_INTENSITY_PIN))
#if ENABLED(LASER)
#error DEPENDENCY ERROR: You have to set LASER_FIRING_PIN and LASER_INTENSITY_PIN to a valid pin if you enable LASER
#if (!ENABLED(LASER_CONTROL) || ((LASER_CONTROL > 0) && (LASER_CONTROL < 2)))
#error DEPENDENCY ERROR: You have to set LASER_CONTROL to 1 or 2
#else
#if(LASER_CONTROL == 1)
#if( !PIN_EXISTS(LASER_FIRING_PIN))
#error DEPENDENCY ERROR: You have to set LASER_FIRING_PIN
#endif
#else
#if( !PIN_EXISTS(LASER_FIRING_PIN) || !PIN_EXISTS(LASER_INTENSITY_PIN))
#error DEPENDENCY ERROR: You have to set LASER_FIRING_PIN and LASER_INTENSITY_PIN to a valid pin if you enable LASER
#endif
#endif
#endif
#endif
#if ENABLED(FILAMENT_RUNOUT_SENSOR) && !PIN_EXISTS(FILRUNOUT)
#if ENABLED(FILAMENT_RUNOUT_SENSOR) && !PIN_EXISTS(FILRUNOUT)
...
...
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