SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix LA_active_extruder (static)

Browse source
This commit is contained in:
Scott Lahteine 2018-03-07 05:49:10 -06:00
parent e5ec793f7e
commit 9515e5aefb
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Marlin/src/feature/bedlevel/ubl/ubl.h
View file

@ -136,7 +136,7 @@ class unified_bed_leveling {
// 15 is the maximum nubmer of grid points supported + 1 safety margin for now, // 15 is the maximum nubmer of grid points supported + 1 safety margin for now,
// until determinism prevails // until determinism prevails
constexpr static float _mesh_index_to_xpos[16] PROGMEM = { static constexpr float _mesh_index_to_xpos[16] PROGMEM = {
MESH_MIN_X + 0 * (MESH_X_DIST), MESH_MIN_X + 1 * (MESH_X_DIST), MESH_MIN_X + 0 * (MESH_X_DIST), MESH_MIN_X + 1 * (MESH_X_DIST),
MESH_MIN_X + 2 * (MESH_X_DIST), MESH_MIN_X + 3 * (MESH_X_DIST), MESH_MIN_X + 2 * (MESH_X_DIST), MESH_MIN_X + 3 * (MESH_X_DIST),
MESH_MIN_X + 4 * (MESH_X_DIST), MESH_MIN_X + 5 * (MESH_X_DIST), MESH_MIN_X + 4 * (MESH_X_DIST), MESH_MIN_X + 5 * (MESH_X_DIST),
@ -147,7 +147,7 @@ class unified_bed_leveling {
MESH_MIN_X + 14 * (MESH_X_DIST), MESH_MIN_X + 15 * (MESH_X_DIST) MESH_MIN_X + 14 * (MESH_X_DIST), MESH_MIN_X + 15 * (MESH_X_DIST)
}; };
constexpr static float _mesh_index_to_ypos[16] PROGMEM = { static constexpr float _mesh_index_to_ypos[16] PROGMEM = {
MESH_MIN_Y + 0 * (MESH_Y_DIST), MESH_MIN_Y + 1 * (MESH_Y_DIST), MESH_MIN_Y + 0 * (MESH_Y_DIST), MESH_MIN_Y + 1 * (MESH_Y_DIST),
MESH_MIN_Y + 2 * (MESH_Y_DIST), MESH_MIN_Y + 3 * (MESH_Y_DIST), MESH_MIN_Y + 2 * (MESH_Y_DIST), MESH_MIN_Y + 3 * (MESH_Y_DIST),
MESH_MIN_Y + 4 * (MESH_Y_DIST), MESH_MIN_Y + 5 * (MESH_Y_DIST), MESH_MIN_Y + 4 * (MESH_Y_DIST), MESH_MIN_Y + 5 * (MESH_Y_DIST),

2
Marlin/src/module/stepper.h
View file

@ -108,7 +108,7 @@ class Stepper {
#if E_STEPPERS > 1 #if E_STEPPERS > 1
static int8_t LA_active_extruder; // Copy from current executed block. Needed because current_block is set to NULL "too early". static int8_t LA_active_extruder; // Copy from current executed block. Needed because current_block is set to NULL "too early".
#else #else
constexpr int8_t LA_active_extruder = 0; static constexpr int8_t LA_active_extruder = 0;
#endif #endif
#else // !LIN_ADVANCE #else // !LIN_ADVANCE