From 1aea024589c8674045fd43ac6f1612d7ce96af7c Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Tue, 19 Dec 2017 19:03:39 -0600 Subject: [PATCH] Remove redundant serial sanity check --- Marlin/MarlinSerial.h | 11 ----------- Marlin/SanityCheck.h | 8 ++------ Marlin/planner.cpp | 2 +- 3 files changed, 3 insertions(+), 18 deletions(-) diff --git a/Marlin/MarlinSerial.h b/Marlin/MarlinSerial.h index 4679d42577..b3b5096591 100644 --- a/Marlin/MarlinSerial.h +++ b/Marlin/MarlinSerial.h @@ -87,17 +87,6 @@ #endif #ifndef USBCON - #if ENABLED(SERIAL_XON_XOFF) && RX_BUFFER_SIZE < 1024 - #error "SERIAL_XON_XOFF requires RX_BUFFER_SIZE >= 1024 for reliable transfers without drops." - #endif - - #if !IS_POWER_OF_2(RX_BUFFER_SIZE) || RX_BUFFER_SIZE < 2 - #error "RX_BUFFER_SIZE must be a power of 2 greater than 1." - #endif - - #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, a power of 2 greater than 1, and no greater than 256." - #endif #if RX_BUFFER_SIZE > 256 typedef uint16_t ring_buffer_pos_t; diff --git a/Marlin/SanityCheck.h b/Marlin/SanityCheck.h index 765277d2f7..95fd369cb2 100644 --- a/Marlin/SanityCheck.h +++ b/Marlin/SanityCheck.h @@ -260,13 +260,9 @@ #ifndef USBCON #if ENABLED(SERIAL_XON_XOFF) && RX_BUFFER_SIZE < 1024 #error "SERIAL_XON_XOFF requires RX_BUFFER_SIZE >= 1024 for reliable transfers without drops." - #endif - - #if RX_BUFFER_SIZE && (RX_BUFFER_SIZE < 2 || !IS_POWER_OF_2(RX_BUFFER_SIZE)) + #elif RX_BUFFER_SIZE && (RX_BUFFER_SIZE < 2 || !IS_POWER_OF_2(RX_BUFFER_SIZE)) #error "RX_BUFFER_SIZE must be a power of 2 greater than 1." - #endif - - #if TX_BUFFER_SIZE && (TX_BUFFER_SIZE < 2 || TX_BUFFER_SIZE > 256 || !IS_POWER_OF_2(TX_BUFFER_SIZE)) + #elif 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, a power of 2 greater than 1, and no greater than 256." #endif #elif ENABLED(SERIAL_XON_XOFF) diff --git a/Marlin/planner.cpp b/Marlin/planner.cpp index d9d7deed85..4b44bce9f7 100644 --- a/Marlin/planner.cpp +++ b/Marlin/planner.cpp @@ -1089,7 +1089,7 @@ void Planner::_buffer_steps(const int32_t (&target)[XYZE], float fr_mm_s, const float max_stepper_speed = 0, min_axis_accel_ratio = 1; // ratio < 1 means acceleration ramp needed LOOP_XYZE(i) { const float cs = FABS((current_speed[i] = delta_mm[i] * inverse_secs)); - if (cs > max_jerk[i]) + if (cs > max_jerk[i]) NOMORE(min_axis_accel_ratio, max_jerk[i] / cs); NOLESS(max_stepper_speed, cs); #if ENABLED(DISTINCT_E_FACTORS)