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
2f1d9332
Commit
2f1d9332
authored
Apr 01, 2015
by
MagoKimbra
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #32 from simone97/patch-3
Code clean
parents
82fec32f
96f014f0
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
Marlin_main.cpp
MarlinKimbra/Marlin_main.cpp
+3
-3
No files found.
MarlinKimbra/Marlin_main.cpp
View file @
2f1d9332
...
@@ -3748,7 +3748,7 @@ inline void gcode_M42() {
...
@@ -3748,7 +3748,7 @@ inline void gcode_M42() {
}
}
}
}
#if
defined(FAN_PIN) && FAN_PIN > -1
#if
HAS_FAN
if
(
pin_number
==
FAN_PIN
)
fanSpeed
=
pin_status
;
if
(
pin_number
==
FAN_PIN
)
fanSpeed
=
pin_status
;
#endif
#endif
...
@@ -5770,7 +5770,7 @@ void process_commands() {
...
@@ -5770,7 +5770,7 @@ void process_commands() {
case
105
:
// M105 Read current temperature
case
105
:
// M105 Read current temperature
gcode_M105
();
break
;
gcode_M105
();
break
;
#if
defined(FAN_PIN) && FAN_PIN > -1
#if
HAS_FAN
case
106
:
//M106 Fan On
case
106
:
//M106 Fan On
gcode_M106
();
break
;
gcode_M106
();
break
;
case
107
:
//M107 Fan Off
case
107
:
//M107 Fan Off
...
@@ -6258,7 +6258,7 @@ void prepare_arc_move(char isclockwise)
...
@@ -6258,7 +6258,7 @@ void prepare_arc_move(char isclockwise)
}
}
#if defined(CONTROLLERFAN_PIN) && CONTROLLERFAN_PIN > -1
#if defined(CONTROLLERFAN_PIN) && CONTROLLERFAN_PIN > -1
#if
defined(FAN_PIN)
#if
HAS_FAN
#if CONTROLLERFAN_PIN == FAN_PIN
#if CONTROLLERFAN_PIN == FAN_PIN
#error "You cannot set CONTROLLERFAN_PIN equal to FAN_PIN"
#error "You cannot set CONTROLLERFAN_PIN equal to FAN_PIN"
#endif // CONTROLLERFAN_PIN == FAN_PIN
#endif // CONTROLLERFAN_PIN == FAN_PIN
...
...
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