Merge pull request #4241 from AnHardt/adTXbuffer3
Add TX-buffer for MarlinSerial
This commit is contained in:
commit
c23dd7eefc
20 changed files with 280 additions and 48 deletions
|
@ -520,6 +520,12 @@ const unsigned int dropsegments = 5; //everything with less than this number of
|
||||||
#define MAX_CMD_SIZE 96
|
#define MAX_CMD_SIZE 96
|
||||||
#define BUFSIZE 4
|
#define BUFSIZE 4
|
||||||
|
|
||||||
|
// Set Transfer-Buffer-Size by uncommenting the next define. Default size is 32byte.
|
||||||
|
// :[0,2,4,8,16,32,64,128,256]. To save 386byte of PROGMEM and (3 + TX_BUFFER_SIZE) bytes of RAM set TX_BUFFER_SIZE to 0
|
||||||
|
// To buffer a simple "ok" you need 4 byte, for ADVANCED_OK/M105 you need 32 and for debug-echo: 128 byte to get the optimal speed.
|
||||||
|
// Any other output does not need to be that speedy.
|
||||||
|
#define TX_BUFFER_SIZE 0
|
||||||
|
|
||||||
// Enable an emergency-command parser to intercept certain commands as they
|
// Enable an emergency-command parser to intercept certain commands as they
|
||||||
// enter the serial receive buffer, so they cannot be blocked.
|
// enter the serial receive buffer, so they cannot be blocked.
|
||||||
// Currently handles M108, M112, M410
|
// Currently handles M108, M112, M410
|
||||||
|
|
|
@ -21,11 +21,12 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
HardwareSerial.cpp - Hardware serial library for Wiring
|
MarlinSerial.cpp - Hardware serial library for Wiring
|
||||||
Copyright (c) 2006 Nicholas Zambetti. All right reserved.
|
Copyright (c) 2006 Nicholas Zambetti. All right reserved.
|
||||||
|
|
||||||
Modified 23 November 2006 by David A. Mellis
|
Modified 23 November 2006 by David A. Mellis
|
||||||
Modified 28 September 2010 by Mark Sproul
|
Modified 28 September 2010 by Mark Sproul
|
||||||
|
Modified 14 February 2016 by Andreas Hardtung (added tx buffer)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "Marlin.h"
|
#include "Marlin.h"
|
||||||
|
@ -38,8 +39,13 @@
|
||||||
#if defined(UBRRH) || defined(UBRR0H) || defined(UBRR1H) || defined(UBRR2H) || defined(UBRR3H)
|
#if defined(UBRRH) || defined(UBRR0H) || defined(UBRR1H) || defined(UBRR2H) || defined(UBRR3H)
|
||||||
|
|
||||||
#if UART_PRESENT(SERIAL_PORT)
|
#if UART_PRESENT(SERIAL_PORT)
|
||||||
ring_buffer rx_buffer = { { 0 }, 0, 0 };
|
ring_buffer_r rx_buffer = { { 0 }, 0, 0 };
|
||||||
|
#if TX_BUFFER_SIZE > 0
|
||||||
|
ring_buffer_t tx_buffer = { { 0 }, 0, 0 };
|
||||||
|
static bool _written;
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
FORCE_INLINE void store_char(unsigned char c) {
|
FORCE_INLINE void store_char(unsigned char c) {
|
||||||
CRITICAL_SECTION_START;
|
CRITICAL_SECTION_START;
|
||||||
|
@ -61,12 +67,38 @@ FORCE_INLINE void store_char(unsigned char c) {
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if TX_BUFFER_SIZE > 0
|
||||||
|
FORCE_INLINE void _tx_udr_empty_irq(void)
|
||||||
|
{
|
||||||
|
// If interrupts are enabled, there must be more data in the output
|
||||||
|
// buffer. Send the next byte
|
||||||
|
uint8_t t = tx_buffer.tail;
|
||||||
|
uint8_t c = tx_buffer.buffer[t];
|
||||||
|
tx_buffer.tail = (t + 1) & (TX_BUFFER_SIZE - 1);
|
||||||
|
|
||||||
|
M_UDRx = c;
|
||||||
|
|
||||||
|
// clear the TXC bit -- "can be cleared by writing a one to its bit
|
||||||
|
// location". This makes sure flush() won't return until the bytes
|
||||||
|
// actually got written
|
||||||
|
SBI(M_UCSRxA, M_TXCx);
|
||||||
|
|
||||||
|
if (tx_buffer.head == tx_buffer.tail) {
|
||||||
|
// Buffer empty, so disable interrupts
|
||||||
|
CBI(M_UCSRxB, M_UDRIEx);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#if defined(M_USARTx_UDRE_vect)
|
||||||
|
ISR(M_USARTx_UDRE_vect) {
|
||||||
|
_tx_udr_empty_irq();
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
//#elif defined(SIG_USART_RECV)
|
|
||||||
#if defined(M_USARTx_RX_vect)
|
#if defined(M_USARTx_RX_vect)
|
||||||
// fixed by Mark Sproul this is on the 644/644p
|
ISR(M_USARTx_RX_vect) {
|
||||||
//SIGNAL(SIG_USART_RECV)
|
|
||||||
SIGNAL(M_USARTx_RX_vect) {
|
|
||||||
unsigned char c = M_UDRx;
|
unsigned char c = M_UDRx;
|
||||||
store_char(c);
|
store_char(c);
|
||||||
}
|
}
|
||||||
|
@ -107,14 +139,25 @@ void MarlinSerial::begin(long baud) {
|
||||||
SBI(M_UCSRxB, M_RXENx);
|
SBI(M_UCSRxB, M_RXENx);
|
||||||
SBI(M_UCSRxB, M_TXENx);
|
SBI(M_UCSRxB, M_TXENx);
|
||||||
SBI(M_UCSRxB, M_RXCIEx);
|
SBI(M_UCSRxB, M_RXCIEx);
|
||||||
|
#if TX_BUFFER_SIZE > 0
|
||||||
|
CBI(M_UCSRxB, M_UDRIEx);
|
||||||
|
_written = false;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void MarlinSerial::end() {
|
void MarlinSerial::end() {
|
||||||
CBI(M_UCSRxB, M_RXENx);
|
CBI(M_UCSRxB, M_RXENx);
|
||||||
CBI(M_UCSRxB, M_TXENx);
|
CBI(M_UCSRxB, M_TXENx);
|
||||||
CBI(M_UCSRxB, M_RXCIEx);
|
CBI(M_UCSRxB, M_RXCIEx);
|
||||||
|
CBI(M_UCSRxB, M_UDRIEx);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void MarlinSerial::checkRx(void) {
|
||||||
|
if (TEST(M_UCSRxA, M_RXCx)) {
|
||||||
|
uint8_t c = M_UDRx;
|
||||||
|
store_char(c);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
int MarlinSerial::peek(void) {
|
int MarlinSerial::peek(void) {
|
||||||
int v;
|
int v;
|
||||||
|
@ -145,7 +188,16 @@ int MarlinSerial::read(void) {
|
||||||
return v;
|
return v;
|
||||||
}
|
}
|
||||||
|
|
||||||
void MarlinSerial::flush() {
|
uint8_t MarlinSerial::available(void) {
|
||||||
|
CRITICAL_SECTION_START;
|
||||||
|
uint8_t h = rx_buffer.head;
|
||||||
|
uint8_t t = rx_buffer.tail;
|
||||||
|
CRITICAL_SECTION_END;
|
||||||
|
return (uint8_t)(RX_BUFFER_SIZE + h - t) & (RX_BUFFER_SIZE - 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
void MarlinSerial::flush(void) {
|
||||||
|
// RX
|
||||||
// don't reverse this or there may be problems if the RX interrupt
|
// don't reverse this or there may be problems if the RX interrupt
|
||||||
// occurs after reading the value of rx_buffer_head but before writing
|
// occurs after reading the value of rx_buffer_head but before writing
|
||||||
// the value to rx_buffer_tail; the previous value of rx_buffer_head
|
// the value to rx_buffer_tail; the previous value of rx_buffer_head
|
||||||
|
@ -156,6 +208,86 @@ void MarlinSerial::flush() {
|
||||||
CRITICAL_SECTION_END;
|
CRITICAL_SECTION_END;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if TX_BUFFER_SIZE > 0
|
||||||
|
uint8_t MarlinSerial::availableForWrite(void) {
|
||||||
|
CRITICAL_SECTION_START;
|
||||||
|
uint8_t h = tx_buffer.head;
|
||||||
|
uint8_t t = tx_buffer.tail;
|
||||||
|
CRITICAL_SECTION_END;
|
||||||
|
return (uint8_t)(TX_BUFFER_SIZE + h - t) & (TX_BUFFER_SIZE - 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
void MarlinSerial::write(uint8_t c) {
|
||||||
|
_written = true;
|
||||||
|
CRITICAL_SECTION_START;
|
||||||
|
bool emty = (tx_buffer.head == tx_buffer.tail);
|
||||||
|
CRITICAL_SECTION_END;
|
||||||
|
// If the buffer and the data register is empty, just write the byte
|
||||||
|
// to the data register and be done. This shortcut helps
|
||||||
|
// significantly improve the effective datarate at high (>
|
||||||
|
// 500kbit/s) bitrates, where interrupt overhead becomes a slowdown.
|
||||||
|
if (emty && TEST(M_UCSRxA, M_UDREx)) {
|
||||||
|
CRITICAL_SECTION_START;
|
||||||
|
M_UDRx = c;
|
||||||
|
SBI(M_UCSRxA, M_TXCx);
|
||||||
|
CRITICAL_SECTION_END;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
uint8_t i = (tx_buffer.head + 1) & (TX_BUFFER_SIZE - 1);
|
||||||
|
|
||||||
|
// If the output buffer is full, there's nothing for it other than to
|
||||||
|
// wait for the interrupt handler to empty it a bit
|
||||||
|
while (i == tx_buffer.tail) {
|
||||||
|
if (!TEST(SREG, SREG_I)) {
|
||||||
|
// Interrupts are disabled, so we'll have to poll the data
|
||||||
|
// register empty flag ourselves. If it is set, pretend an
|
||||||
|
// interrupt has happened and call the handler to free up
|
||||||
|
// space for us.
|
||||||
|
if(TEST(M_UCSRxA, M_UDREx))
|
||||||
|
_tx_udr_empty_irq();
|
||||||
|
} else {
|
||||||
|
// nop, the interrupt handler will free up space for us
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
tx_buffer.buffer[tx_buffer.head] = c;
|
||||||
|
{ CRITICAL_SECTION_START;
|
||||||
|
tx_buffer.head = i;
|
||||||
|
SBI(M_UCSRxB, M_UDRIEx);
|
||||||
|
CRITICAL_SECTION_END;
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
void MarlinSerial::flushTX(void) {
|
||||||
|
// TX
|
||||||
|
// If we have never written a byte, no need to flush. This special
|
||||||
|
// case is needed since there is no way to force the TXC (transmit
|
||||||
|
// complete) bit to 1 during initialization
|
||||||
|
if (!_written)
|
||||||
|
return;
|
||||||
|
|
||||||
|
while (TEST(M_UCSRxB, M_UDRIEx) || !TEST(M_UCSRxA, M_TXCx)) {
|
||||||
|
if (!TEST(SREG, SREG_I) && TEST(M_UCSRxB, M_UDRIEx))
|
||||||
|
// Interrupts are globally disabled, but the DR empty
|
||||||
|
// interrupt should be enabled, so poll the DR empty flag to
|
||||||
|
// prevent deadlock
|
||||||
|
if (TEST(M_UCSRxA, M_UDREx))
|
||||||
|
_tx_udr_empty_irq();
|
||||||
|
}
|
||||||
|
// If we get here, nothing is queued anymore (DRIE is disabled) and
|
||||||
|
// the hardware finished tranmission (TXC is set).
|
||||||
|
}
|
||||||
|
|
||||||
|
#else
|
||||||
|
void MarlinSerial::write(uint8_t c) {
|
||||||
|
while (!TEST(M_UCSRxA, M_UDREx))
|
||||||
|
;
|
||||||
|
M_UDRx = c;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// end NEW
|
||||||
|
|
||||||
/// imports from print.h
|
/// imports from print.h
|
||||||
|
|
||||||
|
@ -321,7 +453,7 @@ MarlinSerial customizedSerial;
|
||||||
// Currently looking for: M108, M112, M410
|
// Currently looking for: M108, M112, M410
|
||||||
// If you alter the parser please don't forget to update the capabilities in Conditionals.h
|
// If you alter the parser please don't forget to update the capabilities in Conditionals.h
|
||||||
|
|
||||||
void emergency_parser(unsigned char c) {
|
FORCE_INLINE void emergency_parser(unsigned char c) {
|
||||||
|
|
||||||
enum e_parser_state {
|
enum e_parser_state {
|
||||||
state_RESET,
|
state_RESET,
|
||||||
|
|
|
@ -21,10 +21,12 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
HardwareSerial.h - Hardware serial library for Wiring
|
MarlinSerial.h - Hardware serial library for Wiring
|
||||||
Copyright (c) 2006 Nicholas Zambetti. All right reserved.
|
Copyright (c) 2006 Nicholas Zambetti. All right reserved.
|
||||||
|
|
||||||
Modified 28 September 2010 by Mark Sproul
|
Modified 28 September 2010 by Mark Sproul
|
||||||
|
Modified 14 February 2016 by Andreas Hardtung (added tx buffer)
|
||||||
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef MarlinSerial_h
|
#ifndef MarlinSerial_h
|
||||||
|
@ -61,14 +63,17 @@
|
||||||
#define M_UCSRxB SERIAL_REGNAME(UCSR,SERIAL_PORT,B)
|
#define M_UCSRxB SERIAL_REGNAME(UCSR,SERIAL_PORT,B)
|
||||||
#define M_RXENx SERIAL_REGNAME(RXEN,SERIAL_PORT,)
|
#define M_RXENx SERIAL_REGNAME(RXEN,SERIAL_PORT,)
|
||||||
#define M_TXENx SERIAL_REGNAME(TXEN,SERIAL_PORT,)
|
#define M_TXENx SERIAL_REGNAME(TXEN,SERIAL_PORT,)
|
||||||
|
#define M_TXCx SERIAL_REGNAME(TXC,SERIAL_PORT,)
|
||||||
#define M_RXCIEx SERIAL_REGNAME(RXCIE,SERIAL_PORT,)
|
#define M_RXCIEx SERIAL_REGNAME(RXCIE,SERIAL_PORT,)
|
||||||
#define M_UDREx SERIAL_REGNAME(UDRE,SERIAL_PORT,)
|
#define M_UDREx SERIAL_REGNAME(UDRE,SERIAL_PORT,)
|
||||||
|
#define M_UDRIEx SERIAL_REGNAME(UDRIE,SERIAL_PORT,)
|
||||||
#define M_UDRx SERIAL_REGNAME(UDR,SERIAL_PORT,)
|
#define M_UDRx SERIAL_REGNAME(UDR,SERIAL_PORT,)
|
||||||
#define M_UBRRxH SERIAL_REGNAME(UBRR,SERIAL_PORT,H)
|
#define M_UBRRxH SERIAL_REGNAME(UBRR,SERIAL_PORT,H)
|
||||||
#define M_UBRRxL SERIAL_REGNAME(UBRR,SERIAL_PORT,L)
|
#define M_UBRRxL SERIAL_REGNAME(UBRR,SERIAL_PORT,L)
|
||||||
#define M_RXCx SERIAL_REGNAME(RXC,SERIAL_PORT,)
|
#define M_RXCx SERIAL_REGNAME(RXC,SERIAL_PORT,)
|
||||||
#define M_USARTx_RX_vect SERIAL_REGNAME(USART,SERIAL_PORT,_RX_vect)
|
#define M_USARTx_RX_vect SERIAL_REGNAME(USART,SERIAL_PORT,_RX_vect)
|
||||||
#define M_U2Xx SERIAL_REGNAME(U2X,SERIAL_PORT,)
|
#define M_U2Xx SERIAL_REGNAME(U2X,SERIAL_PORT,)
|
||||||
|
#define M_USARTx_UDRE_vect SERIAL_REGNAME(USART,SERIAL_PORT,_UDRE_vect)
|
||||||
|
|
||||||
|
|
||||||
#define DEC 10
|
#define DEC 10
|
||||||
|
@ -87,18 +92,35 @@
|
||||||
#ifndef RX_BUFFER_SIZE
|
#ifndef RX_BUFFER_SIZE
|
||||||
#define RX_BUFFER_SIZE 128
|
#define RX_BUFFER_SIZE 128
|
||||||
#endif
|
#endif
|
||||||
|
#ifndef TX_BUFFER_SIZE
|
||||||
|
#define TX_BUFFER_SIZE 32
|
||||||
|
#endif
|
||||||
#if !((RX_BUFFER_SIZE == 256) ||(RX_BUFFER_SIZE == 128) ||(RX_BUFFER_SIZE == 64) ||(RX_BUFFER_SIZE == 32) ||(RX_BUFFER_SIZE == 16) ||(RX_BUFFER_SIZE == 8) ||(RX_BUFFER_SIZE == 4) ||(RX_BUFFER_SIZE == 2))
|
#if !((RX_BUFFER_SIZE == 256) ||(RX_BUFFER_SIZE == 128) ||(RX_BUFFER_SIZE == 64) ||(RX_BUFFER_SIZE == 32) ||(RX_BUFFER_SIZE == 16) ||(RX_BUFFER_SIZE == 8) ||(RX_BUFFER_SIZE == 4) ||(RX_BUFFER_SIZE == 2))
|
||||||
#error "RX_BUFFER_SIZE has to be a power of 2 and >= 2"
|
#error "RX_BUFFER_SIZE has to be a power of 2 and >= 2"
|
||||||
#endif
|
#endif
|
||||||
|
#if !((TX_BUFFER_SIZE == 256) ||(TX_BUFFER_SIZE == 128) ||(TX_BUFFER_SIZE == 64) ||(TX_BUFFER_SIZE == 32) ||(TX_BUFFER_SIZE == 16) ||(TX_BUFFER_SIZE == 8) ||(TX_BUFFER_SIZE == 4) ||(TX_BUFFER_SIZE == 2) ||(TX_BUFFER_SIZE == 0))
|
||||||
|
#error TX_BUFFER_SIZE has to be a power of 2 or 0
|
||||||
|
#endif
|
||||||
|
|
||||||
struct ring_buffer {
|
struct ring_buffer_r {
|
||||||
unsigned char buffer[RX_BUFFER_SIZE];
|
unsigned char buffer[RX_BUFFER_SIZE];
|
||||||
volatile uint8_t head;
|
volatile uint8_t head;
|
||||||
volatile uint8_t tail;
|
volatile uint8_t tail;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#if TX_BUFFER_SIZE > 0
|
||||||
|
struct ring_buffer_t {
|
||||||
|
unsigned char buffer[TX_BUFFER_SIZE];
|
||||||
|
volatile uint8_t head;
|
||||||
|
volatile uint8_t tail;
|
||||||
|
};
|
||||||
|
#endif
|
||||||
|
|
||||||
#if UART_PRESENT(SERIAL_PORT)
|
#if UART_PRESENT(SERIAL_PORT)
|
||||||
extern ring_buffer rx_buffer;
|
extern ring_buffer_r rx_buffer;
|
||||||
|
#if TX_BUFFER_SIZE > 0
|
||||||
|
extern ring_buffer_t tx_buffer;
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(EMERGENCY_PARSER)
|
#if ENABLED(EMERGENCY_PARSER)
|
||||||
|
@ -115,43 +137,13 @@ class MarlinSerial { //: public Stream
|
||||||
int peek(void);
|
int peek(void);
|
||||||
int read(void);
|
int read(void);
|
||||||
void flush(void);
|
void flush(void);
|
||||||
|
uint8_t available(void);
|
||||||
FORCE_INLINE uint8_t available(void) {
|
void checkRx(void);
|
||||||
CRITICAL_SECTION_START;
|
void write(uint8_t c);
|
||||||
uint8_t h = rx_buffer.head;
|
#if TX_BUFFER_SIZE > 0
|
||||||
uint8_t t = rx_buffer.tail;
|
uint8_t availableForWrite(void);
|
||||||
CRITICAL_SECTION_END;
|
void flushTX(void);
|
||||||
return (uint8_t)(RX_BUFFER_SIZE + h - t) & (RX_BUFFER_SIZE - 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
FORCE_INLINE void write(uint8_t c) {
|
|
||||||
while (!TEST(M_UCSRxA, M_UDREx))
|
|
||||||
;
|
|
||||||
M_UDRx = c;
|
|
||||||
}
|
|
||||||
|
|
||||||
FORCE_INLINE void checkRx(void) {
|
|
||||||
if (TEST(M_UCSRxA, M_RXCx)) {
|
|
||||||
unsigned char c = M_UDRx;
|
|
||||||
CRITICAL_SECTION_START;
|
|
||||||
uint8_t h = rx_buffer.head;
|
|
||||||
uint8_t i = (uint8_t)(h + 1) & (RX_BUFFER_SIZE - 1);
|
|
||||||
|
|
||||||
// if we should be storing the received character into the location
|
|
||||||
// just before the tail (meaning that the head would advance to the
|
|
||||||
// current location of the tail), we're about to overflow the buffer
|
|
||||||
// and so we don't write the character or advance the head.
|
|
||||||
if (i != rx_buffer.tail) {
|
|
||||||
rx_buffer.buffer[h] = c;
|
|
||||||
rx_buffer.head = i;
|
|
||||||
}
|
|
||||||
CRITICAL_SECTION_END;
|
|
||||||
|
|
||||||
#if ENABLED(EMERGENCY_PARSER)
|
|
||||||
emergency_parser(c);
|
|
||||||
#endif
|
#endif
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void printNumber(unsigned long, uint8_t);
|
void printNumber(unsigned long, uint8_t);
|
||||||
|
|
|
@ -520,6 +520,12 @@ const unsigned int dropsegments = 5; //everything with less than this number of
|
||||||
#define MAX_CMD_SIZE 96
|
#define MAX_CMD_SIZE 96
|
||||||
#define BUFSIZE 4
|
#define BUFSIZE 4
|
||||||
|
|
||||||
|
// Set Transfer-Buffer-Size by uncommenting the next define. Default size is 32byte.
|
||||||
|
// :[0,2,4,8,16,32,64,128,256]. To save 386byte of PROGMEM and (3 + TX_BUFFER_SIZE) bytes of RAM set TX_BUFFER_SIZE to 0
|
||||||
|
// To buffer a simple "ok" you need 4 byte, for ADVANCED_OK/M105 you need 32 and for debug-echo: 128 byte to get the optimal speed.
|
||||||
|
// Any other output does not need to be that speedy.
|
||||||
|
#define TX_BUFFER_SIZE 0
|
||||||
|
|
||||||
// Enable an emergency-command parser to intercept certain commands as they
|
// Enable an emergency-command parser to intercept certain commands as they
|
||||||
// enter the serial receive buffer, so they cannot be blocked.
|
// enter the serial receive buffer, so they cannot be blocked.
|
||||||
// Currently handles M108, M112, M410
|
// Currently handles M108, M112, M410
|
||||||
|
|
|
@ -520,6 +520,12 @@ const unsigned int dropsegments = 5; //everything with less than this number of
|
||||||
#define MAX_CMD_SIZE 96
|
#define MAX_CMD_SIZE 96
|
||||||
#define BUFSIZE 4
|
#define BUFSIZE 4
|
||||||
|
|
||||||
|
// Set Transfer-Buffer-Size by uncommenting the next define. Default size is 32byte.
|
||||||
|
// :[0,2,4,8,16,32,64,128,256]. To save 386byte of PROGMEM and (3 + TX_BUFFER_SIZE) bytes of RAM set TX_BUFFER_SIZE to 0
|
||||||
|
// To buffer a simple "ok" you need 4 byte, for ADVANCED_OK/M105 you need 32 and for debug-echo: 128 byte to get the optimal speed.
|
||||||
|
// Any other output does not need to be that speedy.
|
||||||
|
#define TX_BUFFER_SIZE 0
|
||||||
|
|
||||||
// Enable an emergency-command parser to intercept certain commands as they
|
// Enable an emergency-command parser to intercept certain commands as they
|
||||||
// enter the serial receive buffer, so they cannot be blocked.
|
// enter the serial receive buffer, so they cannot be blocked.
|
||||||
// Currently handles M108, M112, M410
|
// Currently handles M108, M112, M410
|
||||||
|
|
|
@ -520,6 +520,12 @@ const unsigned int dropsegments = 5; //everything with less than this number of
|
||||||
#define MAX_CMD_SIZE 96
|
#define MAX_CMD_SIZE 96
|
||||||
#define BUFSIZE 4
|
#define BUFSIZE 4
|
||||||
|
|
||||||
|
// Set Transfer-Buffer-Size by uncommenting the next define. Default size is 32byte.
|
||||||
|
// :[0,2,4,8,16,32,64,128,256]. To save 386byte of PROGMEM and (3 + TX_BUFFER_SIZE) bytes of RAM set TX_BUFFER_SIZE to 0
|
||||||
|
// To buffer a simple "ok" you need 4 byte, for ADVANCED_OK/M105 you need 32 and for debug-echo: 128 byte to get the optimal speed.
|
||||||
|
// Any other output does not need to be that speedy.
|
||||||
|
#define TX_BUFFER_SIZE 0
|
||||||
|
|
||||||
// Enable an emergency-command parser to intercept certain commands as they
|
// Enable an emergency-command parser to intercept certain commands as they
|
||||||
// enter the serial receive buffer, so they cannot be blocked.
|
// enter the serial receive buffer, so they cannot be blocked.
|
||||||
// Currently handles M108, M112, M410
|
// Currently handles M108, M112, M410
|
||||||
|
|
|
@ -520,6 +520,12 @@ const unsigned int dropsegments = 5; //everything with less than this number of
|
||||||
#define MAX_CMD_SIZE 96
|
#define MAX_CMD_SIZE 96
|
||||||
#define BUFSIZE 4
|
#define BUFSIZE 4
|
||||||
|
|
||||||
|
// Set Transfer-Buffer-Size by uncommenting the next define. Default size is 32byte.
|
||||||
|
// :[0,2,4,8,16,32,64,128,256]. To save 386byte of PROGMEM and (3 + TX_BUFFER_SIZE) bytes of RAM set TX_BUFFER_SIZE to 0
|
||||||
|
// To buffer a simple "ok" you need 4 byte, for ADVANCED_OK/M105 you need 32 and for debug-echo: 128 byte to get the optimal speed.
|
||||||
|
// Any other output does not need to be that speedy.
|
||||||
|
#define TX_BUFFER_SIZE 0
|
||||||
|
|
||||||
// Enable an emergency-command parser to intercept certain commands as they
|
// Enable an emergency-command parser to intercept certain commands as they
|
||||||
// enter the serial receive buffer, so they cannot be blocked.
|
// enter the serial receive buffer, so they cannot be blocked.
|
||||||
// Currently handles M108, M112, M410
|
// Currently handles M108, M112, M410
|
||||||
|
|
|
@ -526,6 +526,12 @@ const unsigned int dropsegments = 2; //everything with less than this number of
|
||||||
#define MAX_CMD_SIZE 96
|
#define MAX_CMD_SIZE 96
|
||||||
#define BUFSIZE 4
|
#define BUFSIZE 4
|
||||||
|
|
||||||
|
// Set Transfer-Buffer-Size by uncommenting the next define. Default size is 32byte.
|
||||||
|
// :[0,2,4,8,16,32,64,128,256]. To save 386byte of PROGMEM and (3 + TX_BUFFER_SIZE) bytes of RAM set TX_BUFFER_SIZE to 0
|
||||||
|
// To buffer a simple "ok" you need 4 byte, for ADVANCED_OK/M105 you need 32 and for debug-echo: 128 byte to get the optimal speed.
|
||||||
|
// Any other output does not need to be that speedy.
|
||||||
|
#define TX_BUFFER_SIZE 0
|
||||||
|
|
||||||
// Enable an emergency-command parser to intercept certain commands as they
|
// Enable an emergency-command parser to intercept certain commands as they
|
||||||
// enter the serial receive buffer, so they cannot be blocked.
|
// enter the serial receive buffer, so they cannot be blocked.
|
||||||
// Currently handles M108, M112, M410
|
// Currently handles M108, M112, M410
|
||||||
|
|
|
@ -520,6 +520,12 @@ const unsigned int dropsegments = 5; //everything with less than this number of
|
||||||
#define MAX_CMD_SIZE 96
|
#define MAX_CMD_SIZE 96
|
||||||
#define BUFSIZE 26
|
#define BUFSIZE 26
|
||||||
|
|
||||||
|
// Set Transfer-Buffer-Size by uncommenting the next define. Default size is 32byte.
|
||||||
|
// :[0,2,4,8,16,32,64,128,256]. To save 386byte of PROGMEM and (3 + TX_BUFFER_SIZE) bytes of RAM set TX_BUFFER_SIZE to 0
|
||||||
|
// To buffer a simple "ok" you need 4 byte, for ADVANCED_OK/M105 you need 32 and for debug-echo: 128 byte to get the optimal speed.
|
||||||
|
// Any other output does not need to be that speedy.
|
||||||
|
#define TX_BUFFER_SIZE 0
|
||||||
|
|
||||||
// Enable an emergency-command parser to intercept certain commands as they
|
// Enable an emergency-command parser to intercept certain commands as they
|
||||||
// enter the serial receive buffer, so they cannot be blocked.
|
// enter the serial receive buffer, so they cannot be blocked.
|
||||||
// Currently handles M108, M112, M410
|
// Currently handles M108, M112, M410
|
||||||
|
|
|
@ -520,6 +520,12 @@ const unsigned int dropsegments = 5; //everything with less than this number of
|
||||||
#define MAX_CMD_SIZE 96
|
#define MAX_CMD_SIZE 96
|
||||||
#define BUFSIZE 8
|
#define BUFSIZE 8
|
||||||
|
|
||||||
|
// Set Transfer-Buffer-Size by uncommenting the next define. Default size is 32byte.
|
||||||
|
// :[0,2,4,8,16,32,64,128,256]. To save 386byte of PROGMEM and (3 + TX_BUFFER_SIZE) bytes of RAM set TX_BUFFER_SIZE to 0
|
||||||
|
// To buffer a simple "ok" you need 4 byte, for ADVANCED_OK/M105 you need 32 and for debug-echo: 128 byte to get the optimal speed.
|
||||||
|
// Any other output does not need to be that speedy.
|
||||||
|
#define TX_BUFFER_SIZE 0
|
||||||
|
|
||||||
// Enable an emergency-command parser to intercept certain commands as they
|
// Enable an emergency-command parser to intercept certain commands as they
|
||||||
// enter the serial receive buffer, so they cannot be blocked.
|
// enter the serial receive buffer, so they cannot be blocked.
|
||||||
// Currently handles M108, M112, M410
|
// Currently handles M108, M112, M410
|
||||||
|
|
|
@ -520,6 +520,12 @@ const unsigned int dropsegments = 5; //everything with less than this number of
|
||||||
#define MAX_CMD_SIZE 96
|
#define MAX_CMD_SIZE 96
|
||||||
#define BUFSIZE 4
|
#define BUFSIZE 4
|
||||||
|
|
||||||
|
// Set Transfer-Buffer-Size by uncommenting the next define. Default size is 32byte.
|
||||||
|
// :[0,2,4,8,16,32,64,128,256]. To save 386byte of PROGMEM and (3 + TX_BUFFER_SIZE) bytes of RAM set TX_BUFFER_SIZE to 0
|
||||||
|
// To buffer a simple "ok" you need 4 byte, for ADVANCED_OK/M105 you need 32 and for debug-echo: 128 byte to get the optimal speed.
|
||||||
|
// Any other output does not need to be that speedy.
|
||||||
|
#define TX_BUFFER_SIZE 0
|
||||||
|
|
||||||
// Enable an emergency-command parser to intercept certain commands as they
|
// Enable an emergency-command parser to intercept certain commands as they
|
||||||
// enter the serial receive buffer, so they cannot be blocked.
|
// enter the serial receive buffer, so they cannot be blocked.
|
||||||
// Currently handles M108, M112, M410
|
// Currently handles M108, M112, M410
|
||||||
|
|
|
@ -528,6 +528,12 @@ const unsigned int dropsegments = 5; //everything with less than this number of
|
||||||
#define MAX_CMD_SIZE 96
|
#define MAX_CMD_SIZE 96
|
||||||
#define BUFSIZE 4
|
#define BUFSIZE 4
|
||||||
|
|
||||||
|
// Set Transfer-Buffer-Size by uncommenting the next define. Default size is 32byte.
|
||||||
|
// :[0,2,4,8,16,32,64,128,256]. To save 386byte of PROGMEM and (3 + TX_BUFFER_SIZE) bytes of RAM set TX_BUFFER_SIZE to 0
|
||||||
|
// To buffer a simple "ok" you need 4 byte, for ADVANCED_OK/M105 you need 32 and for debug-echo: 128 byte to get the optimal speed.
|
||||||
|
// Any other output does not need to be that speedy.
|
||||||
|
#define TX_BUFFER_SIZE 0
|
||||||
|
|
||||||
// Enable an emergency-command parser to intercept certain commands as they
|
// Enable an emergency-command parser to intercept certain commands as they
|
||||||
// enter the serial receive buffer, so they cannot be blocked.
|
// enter the serial receive buffer, so they cannot be blocked.
|
||||||
// Currently handles M108, M112, M410
|
// Currently handles M108, M112, M410
|
||||||
|
|
|
@ -520,6 +520,12 @@ const unsigned int dropsegments = 5; //everything with less than this number of
|
||||||
#define MAX_CMD_SIZE 96
|
#define MAX_CMD_SIZE 96
|
||||||
#define BUFSIZE 4
|
#define BUFSIZE 4
|
||||||
|
|
||||||
|
// Set Transfer-Buffer-Size by uncommenting the next define. Default size is 32byte.
|
||||||
|
// :[0,2,4,8,16,32,64,128,256]. To save 386byte of PROGMEM and (3 + TX_BUFFER_SIZE) bytes of RAM set TX_BUFFER_SIZE to 0
|
||||||
|
// To buffer a simple "ok" you need 4 byte, for ADVANCED_OK/M105 you need 32 and for debug-echo: 128 byte to get the optimal speed.
|
||||||
|
// Any other output does not need to be that speedy.
|
||||||
|
#define TX_BUFFER_SIZE 0
|
||||||
|
|
||||||
// Enable an emergency-command parser to intercept certain commands as they
|
// Enable an emergency-command parser to intercept certain commands as they
|
||||||
// enter the serial receive buffer, so they cannot be blocked.
|
// enter the serial receive buffer, so they cannot be blocked.
|
||||||
// Currently handles M108, M112, M410
|
// Currently handles M108, M112, M410
|
||||||
|
|
|
@ -522,6 +522,12 @@ const unsigned int dropsegments = 5; //everything with less than this number of
|
||||||
#define MAX_CMD_SIZE 96
|
#define MAX_CMD_SIZE 96
|
||||||
#define BUFSIZE 4
|
#define BUFSIZE 4
|
||||||
|
|
||||||
|
// Set Transfer-Buffer-Size by uncommenting the next define. Default size is 32byte.
|
||||||
|
// :[0,2,4,8,16,32,64,128,256]. To save 386byte of PROGMEM and (3 + TX_BUFFER_SIZE) bytes of RAM set TX_BUFFER_SIZE to 0
|
||||||
|
// To buffer a simple "ok" you need 4 byte, for ADVANCED_OK/M105 you need 32 and for debug-echo: 128 byte to get the optimal speed.
|
||||||
|
// Any other output does not need to be that speedy.
|
||||||
|
#define TX_BUFFER_SIZE 0
|
||||||
|
|
||||||
// Enable an emergency-command parser to intercept certain commands as they
|
// Enable an emergency-command parser to intercept certain commands as they
|
||||||
// enter the serial receive buffer, so they cannot be blocked.
|
// enter the serial receive buffer, so they cannot be blocked.
|
||||||
// Currently handles M108, M112, M410
|
// Currently handles M108, M112, M410
|
||||||
|
|
|
@ -522,6 +522,12 @@ const unsigned int dropsegments = 5; //everything with less than this number of
|
||||||
#define MAX_CMD_SIZE 96
|
#define MAX_CMD_SIZE 96
|
||||||
#define BUFSIZE 4
|
#define BUFSIZE 4
|
||||||
|
|
||||||
|
// Set Transfer-Buffer-Size by uncommenting the next define. Default size is 32byte.
|
||||||
|
// :[0,2,4,8,16,32,64,128,256]. To save 386byte of PROGMEM and (3 + TX_BUFFER_SIZE) bytes of RAM set TX_BUFFER_SIZE to 0
|
||||||
|
// To buffer a simple "ok" you need 4 byte, for ADVANCED_OK/M105 you need 32 and for debug-echo: 128 byte to get the optimal speed.
|
||||||
|
// Any other output does not need to be that speedy.
|
||||||
|
#define TX_BUFFER_SIZE 0
|
||||||
|
|
||||||
// Enable an emergency-command parser to intercept certain commands as they
|
// Enable an emergency-command parser to intercept certain commands as they
|
||||||
// enter the serial receive buffer, so they cannot be blocked.
|
// enter the serial receive buffer, so they cannot be blocked.
|
||||||
// Currently handles M108, M112, M410
|
// Currently handles M108, M112, M410
|
||||||
|
|
|
@ -521,6 +521,12 @@ const unsigned int dropsegments = 5; //everything with less than this number of
|
||||||
#define MAX_CMD_SIZE 96
|
#define MAX_CMD_SIZE 96
|
||||||
#define BUFSIZE 4
|
#define BUFSIZE 4
|
||||||
|
|
||||||
|
// Set Transfer-Buffer-Size by uncommenting the next define. Default size is 32byte.
|
||||||
|
// :[0,2,4,8,16,32,64,128,256]. To save 386byte of PROGMEM and (3 + TX_BUFFER_SIZE) bytes of RAM set TX_BUFFER_SIZE to 0
|
||||||
|
// To buffer a simple "ok" you need 4 byte, for ADVANCED_OK/M105 you need 32 and for debug-echo: 128 byte to get the optimal speed.
|
||||||
|
// Any other output does not need to be that speedy.
|
||||||
|
#define TX_BUFFER_SIZE 0
|
||||||
|
|
||||||
// Enable an emergency-command parser to intercept certain commands as they
|
// Enable an emergency-command parser to intercept certain commands as they
|
||||||
// enter the serial receive buffer, so they cannot be blocked.
|
// enter the serial receive buffer, so they cannot be blocked.
|
||||||
// Currently handles M108, M112, M410
|
// Currently handles M108, M112, M410
|
||||||
|
|
|
@ -526,6 +526,12 @@ const unsigned int dropsegments = 5; //everything with less than this number of
|
||||||
#define MAX_CMD_SIZE 96
|
#define MAX_CMD_SIZE 96
|
||||||
#define BUFSIZE 4
|
#define BUFSIZE 4
|
||||||
|
|
||||||
|
// Set Transfer-Buffer-Size by uncommenting the next define. Default size is 32byte.
|
||||||
|
// :[0,2,4,8,16,32,64,128,256]. To save 386byte of PROGMEM and (3 + TX_BUFFER_SIZE) bytes of RAM set TX_BUFFER_SIZE to 0
|
||||||
|
// To buffer a simple "ok" you need 4 byte, for ADVANCED_OK/M105 you need 32 and for debug-echo: 128 byte to get the optimal speed.
|
||||||
|
// Any other output does not need to be that speedy.
|
||||||
|
#define TX_BUFFER_SIZE 0
|
||||||
|
|
||||||
// Enable an emergency-command parser to intercept certain commands as they
|
// Enable an emergency-command parser to intercept certain commands as they
|
||||||
// enter the serial receive buffer, so they cannot be blocked.
|
// enter the serial receive buffer, so they cannot be blocked.
|
||||||
// Currently handles M108, M112, M410
|
// Currently handles M108, M112, M410
|
||||||
|
|
|
@ -522,6 +522,12 @@ const unsigned int dropsegments = 5; //everything with less than this number of
|
||||||
#define MAX_CMD_SIZE 96
|
#define MAX_CMD_SIZE 96
|
||||||
#define BUFSIZE 4
|
#define BUFSIZE 4
|
||||||
|
|
||||||
|
// Set Transfer-Buffer-Size by uncommenting the next define. Default size is 32byte.
|
||||||
|
// :[0,2,4,8,16,32,64,128,256]. To save 386byte of PROGMEM and (3 + TX_BUFFER_SIZE) bytes of RAM set TX_BUFFER_SIZE to 0
|
||||||
|
// To buffer a simple "ok" you need 4 byte, for ADVANCED_OK/M105 you need 32 and for debug-echo: 128 byte to get the optimal speed.
|
||||||
|
// Any other output does not need to be that speedy.
|
||||||
|
#define TX_BUFFER_SIZE 0
|
||||||
|
|
||||||
// Enable an emergency-command parser to intercept certain commands as they
|
// Enable an emergency-command parser to intercept certain commands as they
|
||||||
// enter the serial receive buffer, so they cannot be blocked.
|
// enter the serial receive buffer, so they cannot be blocked.
|
||||||
// Currently handles M108, M112, M410
|
// Currently handles M108, M112, M410
|
||||||
|
|
|
@ -520,6 +520,12 @@ const unsigned int dropsegments = 5; //everything with less than this number of
|
||||||
#define MAX_CMD_SIZE 96
|
#define MAX_CMD_SIZE 96
|
||||||
#define BUFSIZE 4
|
#define BUFSIZE 4
|
||||||
|
|
||||||
|
// Set Transfer-Buffer-Size by uncommenting the next define. Default size is 32byte.
|
||||||
|
// :[0,2,4,8,16,32,64,128,256]. To save 386byte of PROGMEM and (3 + TX_BUFFER_SIZE) bytes of RAM set TX_BUFFER_SIZE to 0
|
||||||
|
// To buffer a simple "ok" you need 4 byte, for ADVANCED_OK/M105 you need 32 and for debug-echo: 128 byte to get the optimal speed.
|
||||||
|
// Any other output does not need to be that speedy.
|
||||||
|
#define TX_BUFFER_SIZE 0
|
||||||
|
|
||||||
// Enable an emergency-command parser to intercept certain commands as they
|
// Enable an emergency-command parser to intercept certain commands as they
|
||||||
// enter the serial receive buffer, so they cannot be blocked.
|
// enter the serial receive buffer, so they cannot be blocked.
|
||||||
// Currently handles M108, M112, M410
|
// Currently handles M108, M112, M410
|
||||||
|
|
|
@ -520,6 +520,12 @@ const unsigned int dropsegments = 5; //everything with less than this number of
|
||||||
#define MAX_CMD_SIZE 96
|
#define MAX_CMD_SIZE 96
|
||||||
#define BUFSIZE 4
|
#define BUFSIZE 4
|
||||||
|
|
||||||
|
// Set Transfer-Buffer-Size by uncommenting the next define. Default size is 32byte.
|
||||||
|
// :[0,2,4,8,16,32,64,128,256]. To save 386byte of PROGMEM and (3 + TX_BUFFER_SIZE) bytes of RAM set TX_BUFFER_SIZE to 0
|
||||||
|
// To buffer a simple "ok" you need 4 byte, for ADVANCED_OK/M105 you need 32 and for debug-echo: 128 byte to get the optimal speed.
|
||||||
|
// Any other output does not need to be that speedy.
|
||||||
|
#define TX_BUFFER_SIZE 0
|
||||||
|
|
||||||
// Enable an emergency-command parser to intercept certain commands as they
|
// Enable an emergency-command parser to intercept certain commands as they
|
||||||
// enter the serial receive buffer, so they cannot be blocked.
|
// enter the serial receive buffer, so they cannot be blocked.
|
||||||
// Currently handles M108, M112, M410
|
// Currently handles M108, M112, M410
|
||||||
|
|
Reference in a new issue