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

Merge branch 'Development' into manual-bed-leveling+mesh-bed-level

Browse Source 
Fixed conflicts:
	Marlin/planner.h
This commit is contained in:
Edward Patel
2015-03-17 22:48:08 +01:00
parent e983a5ab92 f5f99c4883
commit 8067a985ce
20 changed files with 1958 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/planner.h
View File

@ -84,9 +84,11 @@ void plan_init();
#if defined(ENABLE_AUTO_BED_LEVELING) || defined(MESH_BED_LEVELING)
void plan_buffer_line(float x, float y, float z, const float &e, float feed_rate, const uint8_t &extruder);
// Get the position applying the bed level matrix if enabled
#if defined(ENABLE_AUTO_BED_LEVELING)
vector_3 plan_get_position();
#ifndef DELTA
// Get the position applying the bed level matrix if enabled
vector_3 plan_get_position();
#endif
#endif // ENABLE_AUTO_BED_LEVELING
#else
void plan_buffer_line(const float &x, const float &y, const float &z, const float &e, float feed_rate, const uint8_t &extruder);