3DPrinting/MarlinFirmware
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-12-18 08:17:18 +00:00
Code Issues Releases Wiki Activity

Remove conditional wrap from ubl.h

Browse Source
This commit is contained in:
Scott Lahteine 2018-02-25 20:37:40 -06:00
parent 8f6a5d538f
commit 1617798287
1 changed files with 303 additions and 306 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
Marlin/ubl.h
View File

@ -25,53 +25,51 @@
#include "MarlinConfig.h" #include "MarlinConfig.h"
#if ENABLED(AUTO_BED_LEVELING_UBL) //#define UBL_DEVEL_DEBUGGING
//#define UBL_DEVEL_DEBUGGING #include "Marlin.h"
#include "planner.h"
#include "math.h"
#include "vector_3.h"
#include "configuration_store.h"
#include "Marlin.h" #define UBL_VERSION "1.01"
#include "planner.h" #define UBL_OK false
#include "math.h" #define UBL_ERR true
#include "vector_3.h"
#include "configuration_store.h"
#define UBL_VERSION "1.01" #define USE_NOZZLE_AS_REFERENCE 0
#define UBL_OK false #define USE_PROBE_AS_REFERENCE 1
#define UBL_ERR true
#define USE_NOZZLE_AS_REFERENCE 0 // ubl_motion.cpp
#define USE_PROBE_AS_REFERENCE 1
// ubl_motion.cpp #if ENABLED(UBL_DEVEL_DEBUGGING)
#if ENABLED(UBL_DEVEL_DEBUGGING)
void debug_current_and_destination(const char * const title); void debug_current_and_destination(const char * const title);
#else #else
FORCE_INLINE void debug_current_and_destination(const char * const title) { UNUSED(title); } FORCE_INLINE void debug_current_and_destination(const char * const title) { UNUSED(title); }
#endif #endif
// ubl_G29.cpp // ubl_G29.cpp
enum MeshPointType { INVALID, REAL, SET_IN_BITMAP }; enum MeshPointType { INVALID, REAL, SET_IN_BITMAP };
// External references // External references
char *ftostr43sign(const float&, char); char *ftostr43sign(const float&, char);
void home_all_axes(); void home_all_axes();
extern uint8_t ubl_cnt; extern uint8_t ubl_cnt;
/////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////
#if ENABLED(ULTRA_LCD) #if ENABLED(ULTRA_LCD)
extern char lcd_status_message[]; extern char lcd_status_message[];
void lcd_quick_feedback(const bool clear_buttons); void lcd_quick_feedback(const bool clear_buttons);
#endif #endif
#define MESH_X_DIST (float(MESH_MAX_X - (MESH_MIN_X)) / float(GRID_MAX_POINTS_X - 1)) #define MESH_X_DIST (float(MESH_MAX_X - (MESH_MIN_X)) / float(GRID_MAX_POINTS_X - 1))
#define MESH_Y_DIST (float(MESH_MAX_Y - (MESH_MIN_Y)) / float(GRID_MAX_POINTS_Y - 1)) #define MESH_Y_DIST (float(MESH_MAX_Y - (MESH_MIN_Y)) / float(GRID_MAX_POINTS_Y - 1))
class unified_bed_leveling { class unified_bed_leveling {
private: private:
static int g29_verbose_level, static int g29_verbose_level,
@ -367,11 +365,10 @@
|| isnan(z_values[0][0]) || isnan(z_values[0][0])
); );
} }
}; // class unified_bed_leveling }; // class unified_bed_leveling
extern unified_bed_leveling ubl; extern unified_bed_leveling ubl;
FORCE_INLINE void gcode_G29() { ubl.G29(); } FORCE_INLINE void gcode_G29() { ubl.G29(); }
#endif // AUTO_BED_LEVELING_UBL
#endif // UNIFIED_BED_LEVELING_H #endif // UNIFIED_BED_LEVELING_H