CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up spaces and words

Browse Source
This commit is contained in:
Scott Lahteine 2021-03-10 11:35:19 -06:00
parent e1cca6d97b
commit 46246c8db6
5 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Marlin/src/MarlinCore.cpp
View File

@ -990,14 +990,14 @@ void setup() {
#endif #endif
#define SETUP_RUN(C) do{ SETUP_LOG(STRINGIFY(C)); C; }while(0) #define SETUP_RUN(C) do{ SETUP_LOG(STRINGIFY(C)); C; }while(0)
MYSERIAL0.begin(BAUDRATE); MYSERIAL1.begin(BAUDRATE);
millis_t serial_connect_timeout = millis() + 1000UL; millis_t serial_connect_timeout = millis() + 1000UL;
while (!MYSERIAL0.connected() && PENDING(millis(), serial_connect_timeout)) { /*nada*/ } while (!MYSERIAL1.connected() && PENDING(millis(), serial_connect_timeout)) { /*nada*/ }
#if HAS_MULTI_SERIAL && !HAS_ETHERNET #if HAS_MULTI_SERIAL && !HAS_ETHERNET
MYSERIAL1.begin(BAUDRATE); MYSERIAL2.begin(BAUDRATE);
serial_connect_timeout = millis() + 1000UL; serial_connect_timeout = millis() + 1000UL;
while (!MYSERIAL1.connected() && PENDING(millis(), serial_connect_timeout)) { /*nada*/ } while (!MYSERIAL2.connected() && PENDING(millis(), serial_connect_timeout)) { /*nada*/ }
#endif #endif
SERIAL_ECHOLNPGM("start"); SERIAL_ECHOLNPGM("start");
@ -1053,7 +1053,7 @@ void setup() {
#if HAS_FILAMENT_SENSOR #if HAS_FILAMENT_SENSOR
SETUP_RUN(runout.setup()); SETUP_RUN(runout.setup());
#endif #endif
#if HAS_TMC220x #if HAS_TMC220x
SETUP_RUN(tmc_serial_begin()); SETUP_RUN(tmc_serial_begin());
#endif #endif

2
Marlin/src/gcode/host/M115.cpp
View File

@ -144,7 +144,7 @@ void GcodeSuite::M115() {
// COOLER_TEMPERATURE (M143, M193) // COOLER_TEMPERATURE (M143, M193)
cap_line(PSTR("COOLER_TEMPERATURE"), ENABLED(HAS_COOLER)); cap_line(PSTR("COOLER_TEMPERATURE"), ENABLED(HAS_COOLER));
// MEATPACK Compresson // MEATPACK Compression
cap_line(PSTR("MEATPACK"), ENABLED(MEATPACK)); cap_line(PSTR("MEATPACK"), ENABLED(MEATPACK));
// Machine Geometry // Machine Geometry

18
Marlin/src/gcode/queue.cpp
View File

@ -272,7 +272,7 @@ void GCodeQueue::flush_and_request_resend(const serial_index_t serial_ind) {
SERIAL_ECHOLN(serial_state[serial_ind.index].last_N + 1); SERIAL_ECHOLN(serial_state[serial_ind.index].last_N + 1);
} }
inline bool serial_data_available(serial_index_t index) { static bool serial_data_available(serial_index_t index) {
const int a = SERIAL_IMPL.available(index); const int a = SERIAL_IMPL.available(index);
#if BOTH(RX_BUFFER_MONITOR, RX_BUFFER_SIZE) #if BOTH(RX_BUFFER_MONITOR, RX_BUFFER_SIZE)
if (a > RX_BUFFER_SIZE - 2) { if (a > RX_BUFFER_SIZE - 2) {
@ -283,13 +283,15 @@ inline bool serial_data_available(serial_index_t index) {
return a > 0; return a > 0;
} }
// Multiserial already handles dispatch to/from multiple ports #if NO_TIMEOUTS > 0
inline bool any_serial_data_available() { // Multiserial already handles dispatch to/from multiple ports
LOOP_L_N(p, NUM_SERIAL) static bool any_serial_data_available() {
if (serial_data_available(p)) LOOP_L_N(p, NUM_SERIAL)
return true; if (serial_data_available(p))
return false; return true;
} return false;
}
#endif
inline int read_serial(const serial_index_t index) { return SERIAL_IMPL.read(index); } inline int read_serial(const serial_index_t index) { return SERIAL_IMPL.read(index); }

3
Marlin/src/inc/SanityCheck.h
View File

@ -3337,12 +3337,11 @@ static_assert( _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2)
#endif #endif
#endif #endif
/** /**
* Sanity Check for MEATPACK and BINARY_FILE_TRANSFER Features * Sanity Check for MEATPACK and BINARY_FILE_TRANSFER Features
*/ */
#if BOTH(MEATPACK, BINARY_FILE_TRANSFER) #if BOTH(MEATPACK, BINARY_FILE_TRANSFER)
#error "Either enable MEATPACK or enable BINARY_FILE_TRANSFER." #error "Either enable MEATPACK or BINARY_FILE_TRANSFER, not both."
#endif #endif
/** /**

18
Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h
View File

@ -237,7 +237,7 @@
* This board does not have dedicated TMC UART pins. Custom wiring is needed. * This board does not have dedicated TMC UART pins. Custom wiring is needed.
* You may uncomment one of the options below, or add it to your Configuration.h. * You may uncomment one of the options below, or add it to your Configuration.h.
* *
* When using up to four TMC2209 drivers, hardware serial is recommented on * When using up to four TMC2209 drivers, hardware serial is recommended on
* MSerial0 or MSerial1. * MSerial0 or MSerial1.
* *
* When using TMC2208 or more than four drivers, SoftwareSerial will be needed, * When using TMC2208 or more than four drivers, SoftwareSerial will be needed,
@ -246,14 +246,14 @@
//#define TMC_HARDWARE_SERIAL //#define TMC_HARDWARE_SERIAL
#if ENABLED(TMC_HARDWARE_SERIAL) #if ENABLED(TMC_HARDWARE_SERIAL)
#define X_HARDWARE_SERIAL MSerial0 #define X_HARDWARE_SERIAL MSerial0
#define X2_HARDWARE_SERIAL MSerial0 #define X2_HARDWARE_SERIAL MSerial0
#define Y_HARDWARE_SERIAL MSerial0 #define Y_HARDWARE_SERIAL MSerial0
#define Y2_HARDWARE_SERIAL MSerial0 #define Y2_HARDWARE_SERIAL MSerial0
#define Z_HARDWARE_SERIAL MSerial0 #define Z_HARDWARE_SERIAL MSerial0
#define Z2_HARDWARE_SERIAL MSerial0 #define Z2_HARDWARE_SERIAL MSerial0
#define E0_HARDWARE_SERIAL MSerial0 #define E0_HARDWARE_SERIAL MSerial0
#define E1_HARDWARE_SERIAL MSerial0 #define E1_HARDWARE_SERIAL MSerial0
#endif #endif
//#define TMC_SOFTWARE_SERIAL //#define TMC_SOFTWARE_SERIAL