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

Level bed corners Z-hop height option (#12858)

Browse Source
This commit is contained in:
Ondřej Nový
2019-01-11 02:15:17 +01:00
committed by Scott Lahteine
parent 8ae6f1e556
commit a0ef6198ff
86 changed files with 93 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/lcd/menu/menu.h
View File

@ -154,8 +154,8 @@ template<typename NAME>
class TMenuItem : MenuItemBase {
private:
typedef typename NAME::type_t type_t;
inline static float unscale(const float value) { return value * (1.0f / NAME::scale); }
inline static float scale(const float value) { return value * NAME::scale; }
static inline float unscale(const float value) { return value * (1.0f / NAME::scale); }
static inline float scale(const float value) { return value * NAME::scale; }
static void load(void *ptr, const int32_t value) { *((type_t*)ptr) = unscale(value); }
static char* to_string(const int32_t value) { return NAME::strfunc(unscale(value)); }
public:

8
Marlin/src/lcd/menu/menu_bed_corners.cpp
View File

@ -32,12 +32,18 @@
#include "../../module/motion.h"
#include "../../module/planner.h"
#ifndef LEVEL_CORNERS_Z_HOP
#define LEVEL_CORNERS_Z_HOP 4.0
#endif
static_assert(LEVEL_CORNERS_Z_HOP >= 0, "LEVEL_CORNERS_Z_HOP must be >= 0. Please update your configuration.");
/**
* Level corners, starting in the front-left corner.
*/
static int8_t bed_corner;
void _lcd_goto_next_corner() {
line_to_z(4.0);
line_to_z(LEVEL_CORNERS_Z_HOP);
switch (bed_corner) {
case 0:
current_position[X_AXIS] = X_MIN_BED + LEVEL_CORNERS_INSET;