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

Apply HAS_SPI_LCD as needed

Browse Source
This commit is contained in:
Scott Lahteine
2019-07-29 18:45:01 -05:00
parent 8837cd3b53
commit eae543adf3
6 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -334,7 +334,7 @@ class Planner {
static uint32_t axis_segment_time_us[2][3];
#endif
#if ENABLED(ULTRA_LCD)
#if HAS_SPI_LCD
volatile static uint32_t block_buffer_runtime_us; //Theoretical block buffer runtime in µs
#endif
@ -773,7 +773,7 @@ class Planner {
// No trapezoid calculated? Don't execute yet.
if (TEST(block->flag, BLOCK_BIT_RECALCULATE)) return nullptr;
#if ENABLED(ULTRA_LCD)
#if HAS_SPI_LCD
block_buffer_runtime_us -= block->segment_time_us; // We can't be sure how long an active block will take, so don't count it.
#endif
@ -789,7 +789,7 @@ class Planner {
}
// The queue became empty
#if ENABLED(ULTRA_LCD)
#if HAS_SPI_LCD
clear_block_buffer_runtime(); // paranoia. Buffer is empty now - so reset accumulated time to zero.
#endif
@ -806,7 +806,7 @@ class Planner {
block_buffer_tail = next_block_index(block_buffer_tail);
}
#if ENABLED(ULTRA_LCD)
#if HAS_SPI_LCD
static uint16_t block_buffer_runtime() {
#ifdef __AVR__