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

Merge pull request #5449 from AnHardt/volatile-bbru

Browse Source 
Make block_buffer_runtime_us volatile
This commit is contained in:
Scott Lahteine 2016-12-09 05:57:45 -08:00 committed by GitHub
commit 72fe995c42
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/planner.cpp
View File

@ -146,7 +146,7 @@ float Planner::previous_speed[NUM_AXIS],
#endif #endif
#if ENABLED(ENSURE_SMOOTH_MOVES) #if ENABLED(ENSURE_SMOOTH_MOVES)
uint32_t Planner::block_buffer_runtime_us = 0; volatile uint32_t Planner::block_buffer_runtime_us = 0;
#endif #endif
/** /**
@ -1007,7 +1007,9 @@ void Planner::_buffer_line(const float &a, const float &b, const float &c, const
segment_time = (MIN_BLOCK_TIME) * 1000UL; segment_time = (MIN_BLOCK_TIME) * 1000UL;
} }
block->segment_time = segment_time; block->segment_time = segment_time;
CRITICAL_SECTION_START
block_buffer_runtime_us += segment_time; block_buffer_runtime_us += segment_time;
CRITICAL_SECTION_END
#endif #endif
block->nominal_speed = block->millimeters * inverse_mm_s; // (mm/sec) Always > 0 block->nominal_speed = block->millimeters * inverse_mm_s; // (mm/sec) Always > 0

19
Marlin/planner.h
View File

@ -215,7 +215,7 @@ class Planner {
#endif #endif
#if ENABLED(ENSURE_SMOOTH_MOVES) #if ENABLED(ENSURE_SMOOTH_MOVES)
static uint32_t block_buffer_runtime_us; //Theoretical block buffer runtime in µs volatile static uint32_t block_buffer_runtime_us; //Theoretical block buffer runtime in µs
#endif #endif
public: public:
@ -387,21 +387,26 @@ class Planner {
SBI(block->flag, BLOCK_BIT_BUSY); SBI(block->flag, BLOCK_BIT_BUSY);
return block; return block;
} }
else else {
#if ENABLED(ENSURE_SMOOTH_MOVES)
clear_block_buffer_runtime(); // paranoia. Buffer is empty now - so reset accumulated time to zero.
#endif
return NULL; return NULL;
} }
}
#if ENABLED(ENSURE_SMOOTH_MOVES) #if ENABLED(ENSURE_SMOOTH_MOVES)
static bool long_move() { static bool long_move() {
if (block_buffer_runtime_us) { CRITICAL_SECTION_START
return block_buffer_runtime_us > (LCD_UPDATE_THRESHOLD) * 1000UL + (MIN_BLOCK_TIME) * 3000UL; uint32_t bbru = block_buffer_runtime_us;
} CRITICAL_SECTION_END
else return !bbru || bbru > (LCD_UPDATE_THRESHOLD) * 1000UL + (MIN_BLOCK_TIME) * 3000UL;
return true;
} }
static void clear_block_buffer_runtime(){ static void clear_block_buffer_runtime(){
CRITICAL_SECTION_START
block_buffer_runtime_us = 0; block_buffer_runtime_us = 0;
CRITICAL_SECTION_END
} }
#endif #endif