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
28b011e5
Commit
28b011e5
authored
May 31, 2016
by
MagoKimbra
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Laser & LCD
parent
4c2e2ab6
Changes
7
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
432 additions
and
270 deletions
+432
-270
GCodes.md
Documentation/GCodes.md
+1
-0
changelog.md
Documentation/changelog.md
+1
-1
MK_Main.cpp
MK/module/MK_Main.cpp
+1
-1
laser.cpp
MK/module/laser/laser.cpp
+2
-1
laser.h
MK/module/laser/laser.h
+1
-0
dogm_lcd_implementation.h
MK/module/lcd/dogm_lcd_implementation.h
+40
-14
ultralcd.cpp
MK/module/lcd/ultralcd.cpp
+386
-253
No files found.
Documentation/GCodes.md
View file @
28b011e5
...
@@ -137,6 +137,7 @@
...
@@ -137,6 +137,7 @@
*
M595 - Set hotend AD595 offset and gain
*
M595 - Set hotend AD595 offset and gain
*
M600 - Pause for filament change X
[
pos
]
Y
[
pos
]
Z
[
relative lift
]
E
[
initial retract
]
L
[
later retract distance for removal
]
*
M600 - Pause for filament change X
[
pos
]
Y
[
pos
]
Z
[
relative lift
]
E
[
initial retract
]
L
[
later retract distance for removal
]
*
M605 - Set dual x-carriage movement mode: Smode
[
X<duplication x-offset> Rduplication temp offset
]
*
M605 - Set dual x-carriage movement mode: Smode
[
X<duplication x-offset> Rduplication temp offset
]
*
M649 - Set laser options. S
<intensity>
L
<duration>
P
<ppm>
B
<set
mode
>
R
<raster
mm
per
pulse
>
F
<feedrate>
*
M666 - Set z probe offset or Endstop and delta geometry adjustment. M666 L for list command
*
M666 - Set z probe offset or Endstop and delta geometry adjustment. M666 L for list command
*
M906 - Set motor currents XYZ T0-4 E
*
M906 - Set motor currents XYZ T0-4 E
*
M907 - Set digital trimpot motor current using axis codes.
*
M907 - Set digital trimpot motor current using axis codes.
...
...
Documentation/changelog.md
View file @
28b011e5
### Version 4.2.83
### Version 4.2.83
*
Add Cooler and Hot Chamber
*
Add Cooler and Hot Chamber
*
Add Laser Beam PWM and raster base64
ONLY ARDUINO MEGA
*
Add Laser Beam PWM and raster base64
### Version 4.2.82
### Version 4.2.82
*
Add DONDOLO_DUAL_MOTOR for DONDOLO bowden and dual extruder
*
Add DONDOLO_DUAL_MOTOR for DONDOLO bowden and dual extruder
...
...
MK/module/MK_Main.cpp
View file @
28b011e5
...
@@ -7688,7 +7688,7 @@ inline void gcode_M503() {
...
@@ -7688,7 +7688,7 @@ inline void gcode_M503() {
if
(
code_seen
(
'D'
)
&&
IsRunning
())
laser
.
diagnostics
=
(
bool
)
code_value
();
if
(
code_seen
(
'D'
)
&&
IsRunning
())
laser
.
diagnostics
=
(
bool
)
code_value
();
// Wait for the rest
// Wait for the rest
//st_synchronize();
//
st_synchronize();
if
(
code_seen
(
'S'
)
&&
IsRunning
())
{
if
(
code_seen
(
'S'
)
&&
IsRunning
())
{
laser
.
intensity
=
(
float
)
code_value
();
laser
.
intensity
=
(
float
)
code_value
();
laser
.
rasterlaserpower
=
laser
.
intensity
;
laser
.
rasterlaserpower
=
laser
.
intensity
;
...
...
MK/module/laser/laser.cpp
View file @
28b011e5
...
@@ -23,6 +23,7 @@
...
@@ -23,6 +23,7 @@
/**
/**
* laser.cpp - Laser control library for Arduino using 16 bit timers- Version 1
* laser.cpp - Laser control library for Arduino using 16 bit timers- Version 1
* Copyright (c) 2013 Timothy Schmidt. All right reserved.
* Copyright (c) 2013 Timothy Schmidt. All right reserved.
* Copyright (c) 2016 Franco (nextime) Lanza
*
*
* This library is free software; you can redistribute it and/or
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* modify it under the terms of the GNU Lesser General Public
...
...
MK/module/laser/laser.h
View file @
28b011e5
...
@@ -23,6 +23,7 @@
...
@@ -23,6 +23,7 @@
/**
/**
* laser.cpp - Laser control library for Arduino using 16 bit timers- Version 1
* laser.cpp - Laser control library for Arduino using 16 bit timers- Version 1
* Copyright (c) 2013 Timothy Schmidt. All right reserved.
* Copyright (c) 2013 Timothy Schmidt. All right reserved.
* Copyright (c) 2016 Franco (nextime) Lanza
*
*
* This library is free software; you can redistribute it and/or
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* modify it under the terms of the GNU Lesser General Public
...
...
MK/module/lcd/dogm_lcd_implementation.h
View file @
28b011e5
...
@@ -67,6 +67,10 @@
...
@@ -67,6 +67,10 @@
#undef USE_BIG_EDIT_FONT
#undef USE_BIG_EDIT_FONT
#endif
#endif
#if ENABLED(LASERBEAM)
#include "../laser/laserbitmaps.h"
#endif
#if ENABLED(USE_SMALL_INFOFONT)
#if ENABLED(USE_SMALL_INFOFONT)
#include "dogm_font_data_6x9_marlin.h"
#include "dogm_font_data_6x9_marlin.h"
#define FONT_STATUSMENU_NAME u8g_font_6x9
#define FONT_STATUSMENU_NAME u8g_font_6x9
...
@@ -370,6 +374,25 @@ static void lcd_implementation_status_screen() {
...
@@ -370,6 +374,25 @@ static void lcd_implementation_status_screen() {
bool
blink
=
lcd_blink
();
bool
blink
=
lcd_blink
();
#if ENABLED(LASERBEAM)
#if ENABLED(LASER_PERIPHERALS)
if
(
laser_peripherals_ok
())
{
u8g
.
drawBitmapP
(
29
,
4
,
LASERENABLE_BYTEWIDTH
,
LASERENABLE_HEIGHT
,
laserenable_bmp
);
}
#endif
lcd_setFont
(
FONT_STATUSMENU
);
u8g
.
setColorIndex
(
1
);
u8g
.
setPrintPos
(
3
,
6
);
if
(
current_block
->
laser_status
==
LASER_ON
)
{
u8g
.
drawBitmapP
(
5
,
14
,
ICON_BYTEWIDTH
,
ICON_HEIGHT
,
laseron_bmp
);
u8g
.
print
(
itostr3
(
current_block
->
laser_intensity
));
lcd_printPGM
(
PSTR
(
"%"
));
}
else
{
u8g
.
drawBitmapP
(
5
,
14
,
ICON_BYTEWIDTH
,
ICON_HEIGHT
,
laseroff_bmp
);
lcd_printPGM
(
PSTR
(
"---%"
));
}
#else
// Symbols menu graphics, animated fan
// Symbols menu graphics, animated fan
u8g
.
drawBitmapP
(
9
,
1
,
STATUS_SCREENBYTEWIDTH
,
STATUS_SCREENHEIGHT
,
u8g
.
drawBitmapP
(
9
,
1
,
STATUS_SCREENBYTEWIDTH
,
STATUS_SCREENHEIGHT
,
#if HAS(FAN)
#if HAS(FAN)
...
@@ -378,6 +401,7 @@ static void lcd_implementation_status_screen() {
...
@@ -378,6 +401,7 @@ static void lcd_implementation_status_screen() {
status_screen0_bmp
status_screen0_bmp
#endif
#endif
);
);
#endif
// Status Menu Font for SD info, Heater status, Fan, XYZ
// Status Menu Font for SD info, Heater status, Fan, XYZ
lcd_setFont
(
FONT_STATUSMENU
);
lcd_setFont
(
FONT_STATUSMENU
);
...
@@ -434,7 +458,7 @@ static void lcd_implementation_status_screen() {
...
@@ -434,7 +458,7 @@ static void lcd_implementation_status_screen() {
u8g
.
setPrintPos
(
90
,
47
);
u8g
.
setPrintPos
(
90
,
47
);
if
(
end_time
>
1380
||
end_time
==
0
)
if
(
end_time
>
1380
||
end_time
==
0
)
u8g
.
print
(
'
E
--:--
'
);
lcd_printPGM
(
PSTR
(
"E--:--"
)
);
else
if
(
end_time
>
0
)
{
else
if
(
end_time
>
0
)
{
u8g
.
print
(
'E'
);
u8g
.
print
(
'E'
);
u8g
.
print
(
itostr2
(
end_time
/
60
));
u8g
.
print
(
itostr2
(
end_time
/
60
));
...
@@ -450,6 +474,7 @@ static void lcd_implementation_status_screen() {
...
@@ -450,6 +474,7 @@ static void lcd_implementation_status_screen() {
}
}
#endif
#endif
#if DISABLED(LASERBEAM)
// Hotends
// Hotends
for
(
int
i
=
0
;
i
<
HOTENDS
;
i
++
)
_draw_heater_status
(
6
+
i
*
25
,
i
);
for
(
int
i
=
0
;
i
<
HOTENDS
;
i
++
)
_draw_heater_status
(
6
+
i
*
25
,
i
);
...
@@ -457,6 +482,7 @@ static void lcd_implementation_status_screen() {
...
@@ -457,6 +482,7 @@ static void lcd_implementation_status_screen() {
#if HOTENDS < 4 && HAS(TEMP_BED)
#if HOTENDS < 4 && HAS(TEMP_BED)
_draw_heater_status
(
81
,
-
1
);
_draw_heater_status
(
81
,
-
1
);
#endif
#endif
#endif // !LASERBEAM
// Fan
// Fan
u8g
.
setPrintPos
(
104
,
27
);
u8g
.
setPrintPos
(
104
,
27
);
...
...
MK/module/lcd/ultralcd.cpp
View file @
28b011e5
This diff is collapsed.
Click to expand it.
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