sravan/Marlin-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't wrap mbl.h in conditionals

Browse Source
This commit is contained in:
Scott Lahteine
2018-01-06 23:55:00 -06:00
parent fa3709451b
commit eec97a5cf1
2 changed files with 74 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/mesh_bed_leveling.cpp
View File

@@ -20,10 +20,12 @@
* *
*/ */
#include "mesh_bed_leveling.h" #include "MarlinConfig.h"
#if ENABLED(MESH_BED_LEVELING) #if ENABLED(MESH_BED_LEVELING)
#include "mesh_bed_leveling.h"
mesh_bed_leveling mbl; mesh_bed_leveling mbl;
bool mesh_bed_leveling::has_mesh; bool mesh_bed_leveling::has_mesh;

23
Marlin/mesh_bed_leveling.h
View File

@@ -20,24 +20,25 @@
* *
*/ */
#include "Marlin.h" #ifndef _MESH_BED_LEVELING_H_
#define _MESH_BED_LEVELING_H_
#if ENABLED(MESH_BED_LEVELING) #include "MarlinConfig.h"
enum MeshLevelingState { enum MeshLevelingState {
MeshReport, MeshReport,
MeshStart, MeshStart,
MeshNext, MeshNext,
MeshSet, MeshSet,
MeshSetZOffset, MeshSetZOffset,
MeshReset MeshReset
}; };
#define MESH_X_DIST ((MESH_MAX_X - (MESH_MIN_X)) / (GRID_MAX_POINTS_X - 1)) #define MESH_X_DIST ((MESH_MAX_X - (MESH_MIN_X)) / (GRID_MAX_POINTS_X - 1))
#define MESH_Y_DIST ((MESH_MAX_Y - (MESH_MIN_Y)) / (GRID_MAX_POINTS_Y - 1)) #define MESH_Y_DIST ((MESH_MAX_Y - (MESH_MIN_Y)) / (GRID_MAX_POINTS_Y - 1))
class mesh_bed_leveling { class mesh_bed_leveling {
public: public:
static bool has_mesh; static bool has_mesh;
static float z_offset, static float z_offset,
z_values[GRID_MAX_POINTS_X][GRID_MAX_POINTS_Y], z_values[GRID_MAX_POINTS_X][GRID_MAX_POINTS_Y],
@@ -104,8 +105,8 @@
#endif #endif
; ;
} }
}; };
extern mesh_bed_leveling mbl; extern mesh_bed_leveling mbl;
#endif // MESH_BED_LEVELING #endif // _MESH_BED_LEVELING_H_