From 1381b5d57db13be4114affaf5797c2b45ec652a5 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 7 Mar 2018 05:50:25 -0600
Subject: [PATCH] Fix LA_active_extruder (static)
---
Marlin/stepper.h | 2 +-
Marlin/ubl.h | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Marlin/stepper.h b/Marlin/stepper.h
index 7e9e1b0522..a0bb030234 100644
--- a/Marlin/stepper.h
+++ b/Marlin/stepper.h
@@ -132,7 +132,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
diff --git a/Marlin/ubl.h b/Marlin/ubl.h
index 4b0316974f..1053862d93 100644
--- a/Marlin/ubl.h
+++ b/Marlin/ubl.h
@@ -130,7 +130,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),
@@ -141,7 +141,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),