Skip to content

Commit 111bab5

Browse files
committed
Squashed commit of the following:
commit a1d4942 Author: thinkyhead <[email protected]> Date: Sun May 1 00:01:58 2022 +0000 [cron] Bump distribution date (2022-05-01) commit 3bcbd32 Author: Keith Bennett <[email protected]> Date: Fri Apr 29 22:54:42 2022 -0700 🔧 Mini LCD followup (MarlinFirmware#24111) commit 60f8287 Author: thinkyhead <[email protected]> Date: Sat Apr 30 00:02:33 2022 +0000 [cron] Bump distribution date (2022-04-30) commit b37d13a Author: Scott Lahteine <[email protected]> Date: Fri Apr 29 15:21:15 2022 -0500 🔧 Base NUM_AXES on defined DRIVER_TYPEs (MarlinFirmware#24106) commit 12eb1e0 Author: Keith Bennett <[email protected]> Date: Fri Apr 29 13:19:38 2022 -0700 📝 Update NEOPIXEL_TYPE comment (MarlinFirmware#24110) commit 5c47476 Author: thinkyhead <[email protected]> Date: Fri Apr 29 18:14:41 2022 +0000 [cron] Bump distribution date (2022-04-29) commit 60b6df4 Author: tombrazier <[email protected]> Date: Fri Apr 29 18:54:57 2022 +0100 🐛 Fix kinetic ABL mesh after refactor (MarlinFirmware#24107) Followup to MarlinFirmware#23868 commit e633ef8 Author: thinkyhead <[email protected]> Date: Tue Apr 26 06:00:51 2022 +0000 [cron] Bump distribution date (2022-04-26) commit a0a963f Author: Giuliano Zaro <[email protected]> Date: Tue Apr 26 05:03:16 2022 +0200 🩹 Fix "elapsed" text on DOGLCD (MarlinFirmware#24087)
1 parent 10b037a commit 111bab5

File tree

15 files changed

+325
-250
lines changed

15 files changed

+325
-250
lines changed

Marlin/Configuration.h

+26-21
Original file line numberDiff line numberDiff line change
@@ -150,18 +150,22 @@
150150
#define MACHINE_UUID "6f2960fd-c6d2-4252-81b5-eca9c449012d"
151151

152152
/**
153-
* Define the number of coordinated axes.
154-
* See https://github.com/DerAndere1/Marlin/wiki
155-
* Each axis gets its own stepper control and endstop:
153+
* Stepper Drivers
154+
*
155+
* These settings allow Marlin to tune stepper driver timing and enable advanced options for
156+
* stepper drivers that support them. You may also override timing options in Configuration_adv.h.
156157
*
157-
* Steppers: *_STEP_PIN, *_ENABLE_PIN, *_DIR_PIN, *_ENABLE_ON
158-
* Endstops: *_STOP_PIN, USE_*MIN_PLUG, USE_*MAX_PLUG
159-
* Axes: *_MIN_POS, *_MAX_POS, INVERT_*_DIR
160-
* Planner: DEFAULT_AXIS_STEPS_PER_UNIT, DEFAULT_MAX_FEEDRATE
161-
* DEFAULT_MAX_ACCELERATION, AXIS_RELATIVE_MODES,
162-
* MICROSTEP_MODES, MANUAL_FEEDRATE
158+
* A4988 is assumed for unspecified drivers.
159+
*
160+
* Use TMC2208/TMC2208_STANDALONE for TMC2225 drivers and TMC2209/TMC2209_STANDALONE for TMC2226 drivers.
163161
*
164-
* :[3, 4, 5, 6, 7, 8, 9]
162+
* Options: A4988, A5984, DRV8825, LV8729, L6470, L6474, POWERSTEP01,
163+
* TB6560, TB6600, TMC2100,
164+
* TMC2130, TMC2130_STANDALONE, TMC2160, TMC2160_STANDALONE,
165+
* TMC2208, TMC2208_STANDALONE, TMC2209, TMC2209_STANDALONE,
166+
* TMC26X, TMC26X_STANDALONE, TMC2660, TMC2660_STANDALONE,
167+
* TMC5130, TMC5130_STANDALONE, TMC5160, TMC5160_STANDALONE
168+
* :['A4988', 'A5984', 'DRV8825', 'LV8729', 'L6470', 'L6474', 'POWERSTEP01', 'TB6560', 'TB6600', 'TMC2100', 'TMC2130', 'TMC2130_STANDALONE', 'TMC2160', 'TMC2160_STANDALONE', 'TMC2208', 'TMC2208_STANDALONE', 'TMC2209', 'TMC2209_STANDALONE', 'TMC26X', 'TMC26X_STANDALONE', 'TMC2660', 'TMC2660_STANDALONE', 'TMC5130', 'TMC5130_STANDALONE', 'TMC5160', 'TMC5160_STANDALONE']
165169
*/
166170
//#define NUM_AXES 3
167171

@@ -182,27 +186,27 @@
182186
*
183187
* Regardless of these settings the axes are internally named I, J, K, U, V, W.
184188
*/
185-
#if NUM_AXES >= 4
189+
#ifdef I_DRIVER_TYPE
186190
#define AXIS4_NAME 'A' // :['A', 'B', 'C', 'U', 'V', 'W']
187191
#define AXIS4_ROTATES
188192
#endif
189-
#if NUM_AXES >= 5
193+
#ifdef J_DRIVER_TYPE
190194
#define AXIS5_NAME 'B' // :['B', 'C', 'U', 'V', 'W']
191195
#define AXIS5_ROTATES
192196
#endif
193-
#if NUM_AXES >= 6
197+
#ifdef K_DRIVER_TYPE
194198
#define AXIS6_NAME 'C' // :['C', 'U', 'V', 'W']
195199
#define AXIS6_ROTATES
196200
#endif
197-
#if NUM_AXES >= 7
201+
#ifdef U_DRIVER_TYPE
198202
#define AXIS7_NAME 'U' // :['U', 'V', 'W']
199203
//#define AXIS7_ROTATES
200204
#endif
201-
#if NUM_AXES >= 8
205+
#ifdef V_DRIVER_TYPE
202206
#define AXIS8_NAME 'V' // :['V', 'W']
203207
//#define AXIS8_ROTATES
204208
#endif
205-
#if NUM_AXES >= 9
209+
#ifdef W_DRIVER_TYPE
206210
#define AXIS9_NAME 'W' // :['W']
207211
//#define AXIS9_ROTATES
208212
#endif
@@ -960,9 +964,9 @@
960964
* TMC5130, TMC5130_STANDALONE, TMC5160, TMC5160_STANDALONE
961965
* :['A4988', 'A5984', 'DRV8825', 'LV8729', 'L6470', 'L6474', 'POWERSTEP01', 'TB6560', 'TB6600', 'TMC2100', 'TMC2130', 'TMC2130_STANDALONE', 'TMC2160', 'TMC2160_STANDALONE', 'TMC2208', 'TMC2208_STANDALONE', 'TMC2209', 'TMC2209_STANDALONE', 'TMC26X', 'TMC26X_STANDALONE', 'TMC2660', 'TMC2660_STANDALONE', 'TMC5130', 'TMC5130_STANDALONE', 'TMC5160', 'TMC5160_STANDALONE']
962966
*/
963-
#define X_DRIVER_TYPE TMC2130
964-
#define Y_DRIVER_TYPE TMC2130
965-
#define Z_DRIVER_TYPE TMC2130
967+
#define X_DRIVER_TYPE A4988
968+
#define Y_DRIVER_TYPE A4988
969+
#define Z_DRIVER_TYPE A4988
966970
//#define X2_DRIVER_TYPE A4988
967971
//#define Y2_DRIVER_TYPE A4988
968972
//#define Z2_DRIVER_TYPE A4988
@@ -974,7 +978,7 @@
974978
//#define U_DRIVER_TYPE A4988
975979
//#define V_DRIVER_TYPE A4988
976980
//#define W_DRIVER_TYPE A4988
977-
#define E0_DRIVER_TYPE TMC2130
981+
#define E0_DRIVER_TYPE A4988
978982
//#define E1_DRIVER_TYPE A4988
979983
//#define E2_DRIVER_TYPE A4988
980984
//#define E3_DRIVER_TYPE A4988
@@ -3055,7 +3059,8 @@
30553059
// Support for Adafruit NeoPixel LED driver
30563060
//#define NEOPIXEL_LED
30573061
#if ENABLED(NEOPIXEL_LED)
3058-
#define NEOPIXEL_TYPE NEO_GRBW // NEO_GRBW / NEO_GRB - four/three channel driver type (defined in Adafruit_NeoPixel.h)
3062+
#define NEOPIXEL_TYPE NEO_GRBW // NEO_GRBW, NEO_RGBW, NEO_GRB, NEO_RBG, etc.
3063+
// See https://github.com/adafruit/Adafruit_NeoPixel/blob/master/Adafruit_NeoPixel.h
30593064
//#define NEOPIXEL_PIN 4 // LED driving pin
30603065
//#define NEOPIXEL2_TYPE NEOPIXEL_TYPE
30613066
//#define NEOPIXEL2_PIN 5

Marlin/Version.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
* here we define this default string as the date where the latest release
4242
* version was tagged.
4343
*/
44-
//#define STRING_DISTRIBUTION_DATE "2022-04-26"
44+
//#define STRING_DISTRIBUTION_DATE "2022-05-01"
4545

4646
/**
4747
* Defines a generic printer name to be output to the LCD after booting Marlin.

Marlin/src/feature/bedlevel/abl/bbl.h

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#include "../../../inc/MarlinConfigPre.h"
2525

2626
class LevelingBilinear {
27+
private:
2728
static xy_pos_t grid_spacing, grid_start;
2829
static xy_float_t grid_factor;
2930
static bed_mesh_t z_values;

Marlin/src/gcode/bedlevel/abl/G29.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -507,6 +507,10 @@ G29_TYPE GcodeSuite::G29() {
507507
// Can't re-enable (on error) until the new grid is written
508508
abl.reenable = false;
509509
}
510+
511+
// Pre-populate local Z values from the stored mesh
512+
TERN_(IS_KINEMATIC, COPY(abl.z_values, Z_VALUES_ARR));
513+
510514
#endif // AUTO_BED_LEVELING_BILINEAR
511515

512516
} // !g29_in_progress

0 commit comments

Comments
 (0)