sravan/Marlin-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup spacing, commentary

Browse Source
This commit is contained in:
Scott Lahteine
2018-01-11 18:52:54 -06:00
parent e2871f0dcd
commit c1d6d24b9d
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/Marlin_main.cpp
View File

@@ -10288,7 +10288,7 @@ inline void gcode_M502() {
#if HAS_TRINAMIC #if HAS_TRINAMIC
#if ENABLED(TMC_DEBUG) #if ENABLED(TMC_DEBUG)
inline void gcode_M122() { inline void gcode_M122() {
if (parser.seen('S')) if (parser.seen('S'))
tmc_set_report_status(parser.value_bool()); tmc_set_report_status(parser.value_bool());
else else
tmc_report_all(); tmc_report_all();

6
Marlin/planner.h
View File

@@ -530,8 +530,8 @@ class Planner {
static block_t* get_current_block() { static block_t* get_current_block() {
if (blocks_queued()) { if (blocks_queued()) {
block_t * const block = &block_buffer[block_buffer_tail]; block_t * const block = &block_buffer[block_buffer_tail];
// If the trapezoid of this block has to be recalculated, it's not save to execute it. // If the block has no trapezoid calculated, it's unsafe to execute.
if (movesplanned() > 1) { if (movesplanned() > 1) {
block_t* next = &block_buffer[next_block_index(block_buffer_tail)]; block_t* next = &block_buffer[next_block_index(block_buffer_tail)];
if (TEST(block->flag, BLOCK_BIT_RECALCULATE) || TEST(next->flag, BLOCK_BIT_RECALCULATE)) if (TEST(block->flag, BLOCK_BIT_RECALCULATE) || TEST(next->flag, BLOCK_BIT_RECALCULATE))
@@ -539,7 +539,7 @@ class Planner {
} }
else if (TEST(block->flag, BLOCK_BIT_RECALCULATE)) else if (TEST(block->flag, BLOCK_BIT_RECALCULATE))
return NULL; return NULL;
#if ENABLED(ULTRA_LCD) #if ENABLED(ULTRA_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. 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 #endif