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
f0967cf2
Commit
f0967cf2
authored
Apr 02, 2016
by
Stefy Lanza (nextime / spora )
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix build time errors
parent
86fcfaad
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
10 deletions
+9
-10
Configuration_Core.h
MK/Configuration_Core.h
+2
-2
MK.ino
MK/MK.ino
+1
-2
laser.cpp
MK/module/laser/laser.cpp
+5
-5
laser.h
MK/module/laser/laser.h
+1
-1
No files found.
MK/Configuration_Core.h
View file @
f0967cf2
...
...
@@ -238,7 +238,7 @@
/*****************************************************************************************
************************************** MBL or ABL ***************************************
/
*****************************************************************************************
*****************************************************************************************
* *
* Manual Bed Leveling (MBL) or Auto Bed Leveling (ABL) settings *
* Set the rectangle in which to probe in MBL or ABL. *
...
...
@@ -445,4 +445,4 @@
//#define HOTEND_OFFSET_Z {0.0, 0.0, 0.0, 0.0} // (in mm) for each hotend, offset of the hotend on the Z axis
/*****************************************************************************************/
#endif
\ No newline at end of file
#endif
MK/MK.ino
View file @
f0967cf2
...
...
@@ -193,9 +193,8 @@
* T0-T3 - Select a tool by index (usually an extruder) [ F<mm/min> ]
*
*/
#include "base.h"
#include "base.h"
#if ENABLED(DIGIPOT_I2C) || ENABLED(BLINKM)
#include <Wire.h>
#endif
...
...
MK/module/laser/laser.cpp
View file @
f0967cf2
...
...
@@ -17,13 +17,11 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "laser.h"
#include "Configuration.h"
#include "ConfigurationStore.h"
#include "pins.h"
#include "../../base.h"
#include <avr/interrupt.h>
#include <Arduino.h>
#include "Marlin.h"
#if ENABLED(LASER)
laser_t
laser
;
...
...
@@ -192,3 +190,5 @@ void laser_wait_for_peripherals() {
}
}
#endif // LASER_PERIPHERALS
#endif // LASER
MK/module/laser/laser.h
View file @
f0967cf2
...
...
@@ -21,7 +21,7 @@
#define LASER_H
#include <inttypes.h>
#include "
Configuration
.h"
#include "
../../base
.h"
// split into planned and status
typedef
struct
{
...
...
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