Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
M
marlin-anet-a8
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jonas Leder
marlin-anet-a8
Commits
e31385ec
Commit
e31385ec
authored
Oct 9, 2017
by
Scott Lahteine
Committed by
GitHub
Oct 9, 2017
Browse files
Options
Downloads
Plain Diff
Merge pull request #7904 from GMagician/Addressing-#7896
[2.0.x] Addressing #7896
parents
deeea98d
546f02c6
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
Marlin/src/HAL/HAL_AVR/MarlinSerial.cpp
+2
-3
2 additions, 3 deletions
Marlin/src/HAL/HAL_AVR/MarlinSerial.cpp
with
2 additions
and
3 deletions
Marlin/src/HAL/HAL_AVR/MarlinSerial.cpp
+
2
−
3
View file @
e31385ec
...
@@ -175,12 +175,12 @@
...
@@ -175,12 +175,12 @@
// If the character is to be stored at the index just before the tail
// If the character is to be stored at the index just before the tail
// (such that the head would advance to the current tail), the buffer is
// (such that the head would advance to the current tail), the buffer is
// critical, so don't write the character or advance the head.
// critical, so don't write the character or advance the head.
const
char
c
=
M_UDRx
;
if
(
i
!=
rx_buffer
.
tail
)
{
if
(
i
!=
rx_buffer
.
tail
)
{
rx_buffer
.
buffer
[
h
]
=
M_UDRx
;
rx_buffer
.
buffer
[
h
]
=
c
;
rx_buffer
.
head
=
i
;
rx_buffer
.
head
=
i
;
}
}
else
{
else
{
(
void
)
M_UDRx
;
#if ENABLED(SERIAL_STATS_DROPPED_RX)
#if ENABLED(SERIAL_STATS_DROPPED_RX)
if
(
!++
rx_dropped_bytes
)
++
rx_dropped_bytes
;
if
(
!++
rx_dropped_bytes
)
++
rx_dropped_bytes
;
#endif
#endif
...
@@ -194,7 +194,6 @@
...
@@ -194,7 +194,6 @@
#endif
#endif
#if ENABLED(SERIAL_XON_XOFF)
#if ENABLED(SERIAL_XON_XOFF)
// for high speed transfers, we can use XON/XOFF protocol to do
// for high speed transfers, we can use XON/XOFF protocol to do
// software handshake and avoid overruns.
// software handshake and avoid overruns.
if
((
xon_xoff_state
&
XON_XOFF_CHAR_MASK
)
==
XON_CHAR
)
{
if
((
xon_xoff_state
&
XON_XOFF_CHAR_MASK
)
==
XON_CHAR
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment