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
ef51ece4
Commit
ef51ece4
authored
Nov 26, 2014
by
MagoKimbra
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Laserbeam command on G0 or G1
parent
546a5da8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
70 deletions
+10
-70
.gitignore
.gitignore
+5
-70
Marlin_main.cpp
MarlinKimbra/Marlin_main.cpp
+5
-0
No files found.
.gitignore
View file @
ef51ece4
# Compiled Object files
*.slo
*.lo
*.o
*.o
*.obj
applet/
*~
# Compiled Dynamic libraries
*.orig
*.so
*.rej
*.dylib
*.bak
*.dll
\ No newline at end of file
# Fortran module files
*.mod
# Compiled Static libraries
*.lai
*.la
*.a
*.lib
# Executables
*.exe
*.out
*.app
# =========================
# Operating System Files
# =========================
# OSX
# =========================
.DS_Store
.AppleDouble
.LSOverride
# Icon must end with two \r
Icon
# Thumbnails
._*
# Files that might appear on external disk
.Spotlight-V100
.Trashes
# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk
# Windows
# =========================
# Windows image file caches
Thumbs.db
ehthumbs.db
# Folder config file
Desktop.ini
# Recycle Bin used on file shares
$RECYCLE.BIN/
# Windows Installer files
*.cab
*.msi
*.msm
*.msp
MarlinKimbra/Marlin_main.cpp
View file @
ef51ece4
...
@@ -5259,6 +5259,11 @@ void get_coordinates()
...
@@ -5259,6 +5259,11 @@ void get_coordinates()
next_feedrate
=
code_value
();
next_feedrate
=
code_value
();
if
(
next_feedrate
>
0.0
)
feedrate
=
next_feedrate
;
if
(
next_feedrate
>
0.0
)
feedrate
=
next_feedrate
;
}
}
#ifdef LASERBEAM
if
(
code_seen
(
'L'
)){
laser_ttl_modulation
=
constrain
(
code_value
(),
0
,
255
);
}
#endif // LASERBEAM
}
}
void
get_arc_coordinates
()
void
get_arc_coordinates
()
...
...
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