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

Merge branch 'smallopt' into Marlin_v1

Browse Source 
Conflicts:
	Marlin/temperature.h
This commit is contained in:
Bernhard
2011-11-28 21:36:01 +01:00
parent 85da81e673 2d9a715655
commit 311627141b
11 changed files with 246 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/stepper.cpp
View File

@ -212,7 +212,7 @@ void st_wake_up() {
ENABLE_STEPPER_DRIVER_INTERRUPT();
}
inline unsigned short calc_timer(unsigned short step_rate) {
FORCE_INLINE unsigned short calc_timer(unsigned short step_rate) {
unsigned short timer;
if(step_rate > MAX_STEP_FREQUENCY) step_rate = MAX_STEP_FREQUENCY;
@ -249,7 +249,7 @@ inline unsigned short calc_timer(unsigned short step_rate) {
// Initializes the trapezoid generator from the current block. Called whenever a new
// block begins.
inline void trapezoid_generator_reset() {
FORCE_INLINE void trapezoid_generator_reset() {
#ifdef ADVANCE
advance = current_block->initial_advance;
final_advance = current_block->final_advance;