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
6e751b45
Commit
6e751b45
authored
Apr 02, 2016
by
Franco (nextime) Lanza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix build time errors
parent
9b9bb5f7
Changes
4
Show 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 @
6e751b45
...
@@ -238,7 +238,7 @@
...
@@ -238,7 +238,7 @@
/*****************************************************************************************
/*****************************************************************************************
************************************** MBL or ABL ***************************************
************************************** MBL or ABL ***************************************
/
*****************************************************************************************
*****************************************************************************************
* *
* *
* Manual Bed Leveling (MBL) or Auto Bed Leveling (ABL) settings *
* Manual Bed Leveling (MBL) or Auto Bed Leveling (ABL) settings *
* Set the rectangle in which to probe in MBL or ABL. *
* Set the rectangle in which to probe in MBL or ABL. *
...
...
MK/MK.ino
View file @
6e751b45
...
@@ -195,7 +195,6 @@
...
@@ -195,7 +195,6 @@
*/
*/
#include "base.h"
#include "base.h"
#if ENABLED(DIGIPOT_I2C) || ENABLED(BLINKM)
#if ENABLED(DIGIPOT_I2C) || ENABLED(BLINKM)
#include <Wire.h>
#include <Wire.h>
#endif
#endif
...
...
MK/module/laser/laser.cpp
View file @
6e751b45
...
@@ -17,13 +17,11 @@
...
@@ -17,13 +17,11 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
*/
#include "laser.h"
#include "../../base.h"
#include "Configuration.h"
#include "ConfigurationStore.h"
#include "pins.h"
#include <avr/interrupt.h>
#include <avr/interrupt.h>
#include <Arduino.h>
#include <Arduino.h>
#include "Marlin.h"
#if ENABLED(LASER)
laser_t
laser
;
laser_t
laser
;
...
@@ -192,3 +190,5 @@ void laser_wait_for_peripherals() {
...
@@ -192,3 +190,5 @@ void laser_wait_for_peripherals() {
}
}
}
}
#endif // LASER_PERIPHERALS
#endif // LASER_PERIPHERALS
#endif // LASER
MK/module/laser/laser.h
View file @
6e751b45
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
#define LASER_H
#define LASER_H
#include <inttypes.h>
#include <inttypes.h>
#include "
Configuration
.h"
#include "
../../base
.h"
// split into planned and status
// split into planned and status
typedef
struct
{
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