Ramiro Polla
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
4 additions and
5 deletions
-
Marlin/src/HAL/AVR/MarlinSerial.cpp
-
Marlin/src/HAL/AVR/MarlinSerial.h
-
Marlin/src/core/serial_base.h
|
@ -454,7 +454,7 @@ void MarlinSerial<Cfg>::flush() { |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
template<typename Cfg> |
|
|
template<typename Cfg> |
|
|
size_t MarlinSerial<Cfg>::write(const uint8_t c) { |
|
|
void MarlinSerial<Cfg>::write(const uint8_t c) { |
|
|
if (Cfg::TX_SIZE == 0) { |
|
|
if (Cfg::TX_SIZE == 0) { |
|
|
|
|
|
|
|
|
_written = true; |
|
|
_written = true; |
|
@ -480,7 +480,7 @@ size_t MarlinSerial<Cfg>::write(const uint8_t c) { |
|
|
// location". This makes sure flush() won't return until the bytes
|
|
|
// location". This makes sure flush() won't return until the bytes
|
|
|
// actually got written
|
|
|
// actually got written
|
|
|
B_TXC = 1; |
|
|
B_TXC = 1; |
|
|
return 1; |
|
|
return; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
const uint8_t i = (tx_buffer.head + 1) & (Cfg::TX_SIZE - 1); |
|
|
const uint8_t i = (tx_buffer.head + 1) & (Cfg::TX_SIZE - 1); |
|
@ -510,7 +510,6 @@ size_t MarlinSerial<Cfg>::write(const uint8_t c) { |
|
|
// Enable TX ISR - Non atomic, but it will eventually enable TX ISR
|
|
|
// Enable TX ISR - Non atomic, but it will eventually enable TX ISR
|
|
|
B_UDRIE = 1; |
|
|
B_UDRIE = 1; |
|
|
} |
|
|
} |
|
|
return 1; |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
template<typename Cfg> |
|
|
template<typename Cfg> |
|
|
|
@ -210,7 +210,7 @@ |
|
|
static int read(); |
|
|
static int read(); |
|
|
static void flush(); |
|
|
static void flush(); |
|
|
static ring_buffer_pos_t available(); |
|
|
static ring_buffer_pos_t available(); |
|
|
static size_t write(const uint8_t c); |
|
|
static void write(const uint8_t c); |
|
|
static void flushTX(); |
|
|
static void flushTX(); |
|
|
#if HAS_DGUS_LCD |
|
|
#if HAS_DGUS_LCD |
|
|
static ring_buffer_pos_t get_tx_buffer_free(); |
|
|
static ring_buffer_pos_t get_tx_buffer_free(); |
|
|
|
@ -100,7 +100,7 @@ struct SerialBase { |
|
|
|
|
|
|
|
|
// Static dispatch methods below:
|
|
|
// Static dispatch methods below:
|
|
|
// The most important method here is where it all ends to:
|
|
|
// The most important method here is where it all ends to:
|
|
|
size_t write(uint8_t c) { return SerialChild->write(c); } |
|
|
void write(uint8_t c) { SerialChild->write(c); } |
|
|
|
|
|
|
|
|
// Called when the parser finished processing an instruction, usually build to nothing
|
|
|
// Called when the parser finished processing an instruction, usually build to nothing
|
|
|
void msgDone() const { SerialChild->msgDone(); } |
|
|
void msgDone() const { SerialChild->msgDone(); } |
|
|