bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Rename LCD conditionals (#19533)

Browse Source
This commit is contained in:
Scott Lahteine
2020-09-28 01:13:27 -05:00
committed by GitHub
parent 1c372df449
commit c2c6a679ea
138 changed files with 353 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/module/endstops.cpp
View File

@ -351,7 +351,7 @@ void Endstops::event_handler() {
if (hit_state == prev_hit_state) return;
prev_hit_state = hit_state;
if (hit_state) {
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
char chrX = ' ', chrY = ' ', chrZ = ' ', chrP = ' ';
#define _SET_STOP_CHAR(A,C) (chr## A = C)
#else
@ -382,7 +382,7 @@ void Endstops::event_handler() {
#endif
SERIAL_EOL();
TERN_(HAS_SPI_LCD, ui.status_printf_P(0, PSTR(S_FMT " %c %c %c %c"), GET_TEXT(MSG_LCD_ENDSTOPS), chrX, chrY, chrZ, chrP));
TERN_(HAS_WIRED_LCD, ui.status_printf_P(0, PSTR(S_FMT " %c %c %c %c"), GET_TEXT(MSG_LCD_ENDSTOPS), chrX, chrY, chrZ, chrP));
#if BOTH(SD_ABORT_ON_ENDSTOP_HIT, SDSUPPORT)
if (planner.abort_on_endstop_hit) {

16
Marlin/src/module/planner.cpp
View File

@ -234,7 +234,7 @@ float Planner::previous_nominal_speed_sqr;
xyze_pos_t Planner::position_cart;
#endif
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
volatile uint32_t Planner::block_buffer_runtime_us = 0;
#endif
@ -747,7 +747,7 @@ block_t* Planner::get_current_block() {
if (TEST(block->flag, BLOCK_BIT_RECALCULATE)) return nullptr;
// We can't be sure how long an active block will take, so don't count it.
TERN_(HAS_SPI_LCD, block_buffer_runtime_us -= block->segment_time_us);
TERN_(HAS_WIRED_LCD, block_buffer_runtime_us -= block->segment_time_us);
// As this block is busy, advance the nonbusy block pointer
block_buffer_nonbusy = next_block_index(block_buffer_tail);
@ -761,7 +761,7 @@ block_t* Planner::get_current_block() {
}
// The queue became empty
TERN_(HAS_SPI_LCD, clear_block_buffer_runtime()); // paranoia. Buffer is empty now - so reset accumulated time to zero.
TERN_(HAS_WIRED_LCD, clear_block_buffer_runtime()); // paranoia. Buffer is empty now - so reset accumulated time to zero.
return nullptr;
}
@ -1578,7 +1578,7 @@ void Planner::quick_stop() {
// forced to empty, there's no risk the ISR will touch this.
delay_before_delivering = BLOCK_DELAY_FOR_1ST_MOVE;
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
// Clear the accumulated runtime
clear_block_buffer_runtime();
#endif
@ -2081,7 +2081,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
const uint8_t moves_queued = nonbusy_movesplanned();
// Slow down when the buffer starts to empty, rather than wait at the corner for a buffer refill
#if EITHER(SLOWDOWN, HAS_SPI_LCD) || defined(XY_FREQUENCY_LIMIT)
#if EITHER(SLOWDOWN, HAS_WIRED_LCD) || defined(XY_FREQUENCY_LIMIT)
// Segment time im micro seconds
int32_t segment_time_us = LROUND(1000000.0f / inverse_secs);
#endif
@ -2096,14 +2096,14 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
// Buffer is draining so add extra time. The amount of time added increases if the buffer is still emptied more.
const int32_t nst = segment_time_us + LROUND(2 * time_diff / moves_queued);
inverse_secs = 1000000.0f / nst;
#if defined(XY_FREQUENCY_LIMIT) || HAS_SPI_LCD
#if defined(XY_FREQUENCY_LIMIT) || HAS_WIRED_LCD
segment_time_us = nst;
#endif
}
}
#endif
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
// Protect the access to the position.
const bool was_enabled = stepper.suspend();
@ -3029,7 +3029,7 @@ void Planner::set_max_jerk(const AxisEnum axis, float targetValue) {
#endif
}
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
uint16_t Planner::block_buffer_runtime() {
#ifdef __AVR__

6
Marlin/src/module/planner.h
View File

@ -218,7 +218,7 @@ typedef struct block_t {
uint8_t valve_pressure, e_to_p_pressure;
#endif
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
uint32_t segment_time_us;
#endif
@ -438,7 +438,7 @@ class Planner {
static uint8_t g_uc_extruder_last_move[EXTRUDERS];
#endif
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
volatile static uint32_t block_buffer_runtime_us; // Theoretical block buffer runtime in µs
#endif
@ -871,7 +871,7 @@ class Planner {
block_buffer_tail = next_block_index(block_buffer_tail);
}
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
static uint16_t block_buffer_runtime();
static void clear_block_buffer_runtime();
#endif