From 9515e5aefba9826308607ebb3f497ecfc538ca52 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 7 Mar 2018 05:49:10 -0600 Subject: [PATCH] Fix LA_active_extruder (static) --- Marlin/src/feature/bedlevel/ubl/ubl.h | 4 ++-- Marlin/src/module/stepper.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Marlin/src/feature/bedlevel/ubl/ubl.h b/Marlin/src/feature/bedlevel/ubl/ubl.h index 144a2a707..9de087c3b 100644 --- a/Marlin/src/feature/bedlevel/ubl/ubl.h +++ b/Marlin/src/feature/bedlevel/ubl/ubl.h @@ -136,7 +136,7 @@ class unified_bed_leveling { // 15 is the maximum nubmer of grid points supported + 1 safety margin for now, // 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 + 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), @@ -147,7 +147,7 @@ class unified_bed_leveling { 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 + 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), diff --git a/Marlin/src/module/stepper.h b/Marlin/src/module/stepper.h index 28bf1ee89..568a7e792 100644 --- a/Marlin/src/module/stepper.h +++ b/Marlin/src/module/stepper.h @@ -108,7 +108,7 @@ class Stepper { #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". #else - constexpr int8_t LA_active_extruder = 0; + static constexpr int8_t LA_active_extruder = 0; #endif #else // !LIN_ADVANCE