[2.0.x] Report SERIAL_XON_XOFF in M115
-Report SERIAL_XON_XOFF in Extended Capabilites M115 report for hosts -Remove outdated 256 size limitation from comments on RX_BUFFER_SIZE defines -Update error message conditions
This commit is contained in:
parent
aa7efb96bf
commit
4c5ffd2349
|
@ -64,7 +64,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if TX_BUFFER_SIZE && (TX_BUFFER_SIZE < 2 || TX_BUFFER_SIZE > 256 || !IS_POWER_OF_2(TX_BUFFER_SIZE))
|
#if TX_BUFFER_SIZE && (TX_BUFFER_SIZE < 2 || TX_BUFFER_SIZE > 256 || !IS_POWER_OF_2(TX_BUFFER_SIZE))
|
||||||
#error "TX_BUFFER_SIZE must be 0 or a power of 2 greater than 1."
|
#error "TX_BUFFER_SIZE must be 0, a power of 2 greater than 1, and no greater than 256."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if RX_BUFFER_SIZE > 256
|
#if RX_BUFFER_SIZE > 256
|
||||||
|
|
|
@ -31,6 +31,13 @@ void GcodeSuite::M115() {
|
||||||
|
|
||||||
#if ENABLED(EXTENDED_CAPABILITIES_REPORT)
|
#if ENABLED(EXTENDED_CAPABILITIES_REPORT)
|
||||||
|
|
||||||
|
// SERIAL_XON_XOFF
|
||||||
|
#if ENABLED(SERIAL_XON_XOFF)
|
||||||
|
SERIAL_PROTOCOLLNPGM("Cap:SERIAL_XON_XOFF:1");
|
||||||
|
#else
|
||||||
|
SERIAL_PROTOCOLLNPGM("Cap:SERIAL_XON_XOFF:0");
|
||||||
|
#endif
|
||||||
|
|
||||||
// EEPROM (M500, M501)
|
// EEPROM (M500, M501)
|
||||||
#if ENABLED(EEPROM_SETTINGS)
|
#if ENABLED(EEPROM_SETTINGS)
|
||||||
SERIAL_PROTOCOLLNPGM("Cap:EEPROM:1");
|
SERIAL_PROTOCOLLNPGM("Cap:EEPROM:1");
|
||||||
|
|
|
@ -30,10 +30,12 @@
|
||||||
|
|
||||||
#ifndef USBCON
|
#ifndef USBCON
|
||||||
// Define constants and variables for buffering incoming serial data.
|
// Define constants and variables for buffering incoming serial data.
|
||||||
// 256 is the max limit due to uint8_t head and tail. Use only powers of 2. (...,16,32,64,128,256)
|
// Use only powers of 2.
|
||||||
|
// : [0, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, ...]
|
||||||
#ifndef RX_BUFFER_SIZE
|
#ifndef RX_BUFFER_SIZE
|
||||||
#define RX_BUFFER_SIZE 128
|
#define RX_BUFFER_SIZE 128
|
||||||
#endif
|
#endif
|
||||||
|
// 256 is the max TX buffer climit due to uint8_t head and tail.
|
||||||
#ifndef TX_BUFFER_SIZE
|
#ifndef TX_BUFFER_SIZE
|
||||||
#define TX_BUFFER_SIZE 32
|
#define TX_BUFFER_SIZE 32
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -262,7 +262,7 @@
|
||||||
|
|
||||||
// 256 is the max limit due to uint8_t head and tail. Use only powers of 2. (...,16,32,64,128,256)
|
// 256 is the max limit due to uint8_t head and tail. Use only powers of 2. (...,16,32,64,128,256)
|
||||||
#if TX_BUFFER_SIZE && (TX_BUFFER_SIZE < 2 || TX_BUFFER_SIZE > 256 || !IS_POWER_OF_2(TX_BUFFER_SIZE))
|
#if TX_BUFFER_SIZE && (TX_BUFFER_SIZE < 2 || TX_BUFFER_SIZE > 256 || !IS_POWER_OF_2(TX_BUFFER_SIZE))
|
||||||
#error "TX_BUFFER_SIZE must be 0 or a power of 2 greater than 1."
|
#error "TX_BUFFER_SIZE must be 0, a power of 2 greater than 1, and no greater than 256."
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue