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
d8e71113
Commit
d8e71113
authored
Jan 19, 2015
by
MagoKimbra
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix DIO3
parent
36a2f2a1
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
8 deletions
+8
-8
Marlin_main.cpp
MarlinKimbra/Marlin_main.cpp
+6
-6
ultralcd.cpp
MarlinKimbra/ultralcd.cpp
+2
-2
No files found.
MarlinKimbra/Marlin_main.cpp
View file @
d8e71113
...
@@ -701,9 +701,9 @@ void setup()
...
@@ -701,9 +701,9 @@ void setup()
setup_photpin
();
setup_photpin
();
#ifdef LASERBEAM // Initialize Laser beam
#ifdef LASERBEAM // Initialize Laser beam
SET_OUTPUT
(
LASER_PWR_PIN
);
SET_OUTPUT
(
LASER_PWR_PIN
);
digitalWrite
(
LASER_PWR_PIN
,
LOW
);
WRITE
(
LASER_PWR_PIN
,
LOW
);
SET_OUTPUT
(
LASER_TTL_PIN
);
SET_OUTPUT
(
LASER_TTL_PIN
);
digitalWrite
(
LASER_TTL_PIN
,
LOW
);
WRITE
(
LASER_TTL_PIN
,
LOW
);
#endif
#endif
servo_init
();
servo_init
();
...
@@ -719,8 +719,8 @@ void setup()
...
@@ -719,8 +719,8 @@ void setup()
digipot_i2c_init
();
digipot_i2c_init
();
#endif
#endif
#ifdef Z_PROBE_SLED
#ifdef Z_PROBE_SLED
pinMode
(
SERVO0_PIN
,
OUTPUT
);
SET_OUTPUT
(
SERVO0_PIN
);
digitalWrite
(
SERVO0_PIN
,
LOW
);
// turn it off
WRITE
(
SERVO0_PIN
,
LOW
);
// turn it off
#endif // Z_PROBE_SLED
#endif // Z_PROBE_SLED
setup_homepin
();
setup_homepin
();
#ifdef FIRMWARE_TEST
#ifdef FIRMWARE_TEST
...
@@ -3134,11 +3134,11 @@ void process_commands()
...
@@ -3134,11 +3134,11 @@ void process_commands()
}
}
break
;
break
;
case
4
:
// M04 - Turn on laser beam
case
4
:
// M04 - Turn on laser beam
digitalWrite
(
LASER_PWR_PIN
,
HIGH
);
WRITE
(
LASER_PWR_PIN
,
HIGH
);
laser_ttl_modulation
=
0
;
laser_ttl_modulation
=
0
;
break
;
break
;
case
5
:
// M05 - Turn off laser beam
case
5
:
// M05 - Turn off laser beam
digitalWrite
(
LASER_PWR_PIN
,
LOW
);
WRITE
(
LASER_PWR_PIN
,
LOW
);
laser_ttl_modulation
=
0
;
laser_ttl_modulation
=
0
;
break
;
break
;
#endif // LASERBEAM
#endif // LASERBEAM
...
...
MarlinKimbra/ultralcd.cpp
View file @
d8e71113
...
@@ -782,9 +782,9 @@ static void lcd_prepare_menu()
...
@@ -782,9 +782,9 @@ static void lcd_prepare_menu()
#ifdef LASERBEAM
#ifdef LASERBEAM
MENU_ITEM_EDIT
(
int3
,
MSG_LASER
,
&
laser_ttl_modulation
,
0
,
255
);
MENU_ITEM_EDIT
(
int3
,
MSG_LASER
,
&
laser_ttl_modulation
,
0
,
255
);
if
(
laser_ttl_modulation
==
0
)
{
if
(
laser_ttl_modulation
==
0
)
{
digitalWrite
(
LASER_PWR_PIN
,
LOW
);
WRITE
(
LASER_PWR_PIN
,
LOW
);
}
else
{
}
else
{
digitalWrite
(
LASER_PWR_PIN
,
HIGH
);
WRITE
(
LASER_PWR_PIN
,
HIGH
);
}
}
#endif
#endif
#if TEMP_SENSOR_0 != 0
#if TEMP_SENSOR_0 != 0
...
...
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