Browse Source

Fix LA_active_extruder (static)

Scott Lahteine 7 years ago
parent
commit
9515e5aefb
2 changed files with 3 additions and 3 deletions
  1. 2
    2
      Marlin/src/feature/bedlevel/ubl/ubl.h
  2. 1
    1
      Marlin/src/module/stepper.h

+ 2
- 2
Marlin/src/feature/bedlevel/ubl/ubl.h View File

136
 
136
 
137
     // 15 is the maximum nubmer of grid points supported + 1 safety margin for now,
137
     // 15 is the maximum nubmer of grid points supported + 1 safety margin for now,
138
     // until determinism prevails
138
     // until determinism prevails
139
-    constexpr static float _mesh_index_to_xpos[16] PROGMEM = {
139
+    static constexpr float _mesh_index_to_xpos[16] PROGMEM = {
140
                               MESH_MIN_X +  0 * (MESH_X_DIST), MESH_MIN_X +  1 * (MESH_X_DIST),
140
                               MESH_MIN_X +  0 * (MESH_X_DIST), MESH_MIN_X +  1 * (MESH_X_DIST),
141
                               MESH_MIN_X +  2 * (MESH_X_DIST), MESH_MIN_X +  3 * (MESH_X_DIST),
141
                               MESH_MIN_X +  2 * (MESH_X_DIST), MESH_MIN_X +  3 * (MESH_X_DIST),
142
                               MESH_MIN_X +  4 * (MESH_X_DIST), MESH_MIN_X +  5 * (MESH_X_DIST),
142
                               MESH_MIN_X +  4 * (MESH_X_DIST), MESH_MIN_X +  5 * (MESH_X_DIST),
147
                               MESH_MIN_X + 14 * (MESH_X_DIST), MESH_MIN_X + 15 * (MESH_X_DIST)
147
                               MESH_MIN_X + 14 * (MESH_X_DIST), MESH_MIN_X + 15 * (MESH_X_DIST)
148
                             };
148
                             };
149
 
149
 
150
-    constexpr static float _mesh_index_to_ypos[16] PROGMEM = {
150
+    static constexpr float _mesh_index_to_ypos[16] PROGMEM = {
151
                               MESH_MIN_Y +  0 * (MESH_Y_DIST), MESH_MIN_Y +  1 * (MESH_Y_DIST),
151
                               MESH_MIN_Y +  0 * (MESH_Y_DIST), MESH_MIN_Y +  1 * (MESH_Y_DIST),
152
                               MESH_MIN_Y +  2 * (MESH_Y_DIST), MESH_MIN_Y +  3 * (MESH_Y_DIST),
152
                               MESH_MIN_Y +  2 * (MESH_Y_DIST), MESH_MIN_Y +  3 * (MESH_Y_DIST),
153
                               MESH_MIN_Y +  4 * (MESH_Y_DIST), MESH_MIN_Y +  5 * (MESH_Y_DIST),
153
                               MESH_MIN_Y +  4 * (MESH_Y_DIST), MESH_MIN_Y +  5 * (MESH_Y_DIST),

+ 1
- 1
Marlin/src/module/stepper.h View File

108
       #if E_STEPPERS > 1
108
       #if E_STEPPERS > 1
109
         static int8_t LA_active_extruder; // Copy from current executed block. Needed because current_block is set to NULL "too early".
109
         static int8_t LA_active_extruder; // Copy from current executed block. Needed because current_block is set to NULL "too early".
110
       #else
110
       #else
111
-        constexpr int8_t LA_active_extruder = 0;
111
+        static constexpr int8_t LA_active_extruder = 0;
112
       #endif
112
       #endif
113
 
113
 
114
     #else // !LIN_ADVANCE
114
     #else // !LIN_ADVANCE

Loading…
Cancel
Save