Skip to content

Commit 2952f0b

Browse files
thisiskeithbthinkyhead
thisiskeithb
authored and
thinkyhead
committed
Updates from #24560 
1 parent 752f3d4 commit 2952f0b

23 files changed

Lines changed: 164 additions & 149 deletions

File tree

‎.github/contributing.md‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,11 @@ This project and everyone participating in it is governed by the [Marlin Code of
3434
3535
We have a Message Board and a Facebook group where our knowledgable user community can provide helpful advice if you have questions.
3636

37-
* [Marlin RepRap forum](https://reprap.org/forum/list.php?415)
38-
* [MarlinFirmware on Facebook](https://www.facebook.com/groups/1049718498464482/)
37+
- [Marlin Documentation](https://marlinfw.org) - Official Marlin documentation
38+
- Facebook Group ["Marlin Firmware"](https://www.facebook.com/groups/1049718498464482/)
39+
- RepRap.org [Marlin Forum](https://forums.reprap.org/list.php?415)
40+
- Facebook Group ["Marlin Firmware for 3D Printers"](https://www.facebook.com/groups/3Dtechtalk/)
41+
- [Marlin Configuration](https://www.youtube.com/results?search_query=marlin+configuration) on YouTube
3942

4043
If chat is more your speed, you can join the MarlinFirmware Discord server:
4144

‎Marlin/Configuration_adv.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2426,7 +2426,7 @@
24262426

24272427
/**
24282428
* Extra G-code to run while executing tool-change commands. Can be used to use an additional
2429-
* stepper motor (I axis, see option LINEAR_AXES in Configuration.h) to drive the tool-changer.
2429+
* stepper motor (e.g., I axis in Configuration.h) to drive the tool-changer.
24302430
*/
24312431
//#define EVENT_GCODE_TOOLCHANGE_T0 "G28 A\nG1 A0" // Extra G-code to run while executing tool-change command T0
24322432
//#define EVENT_GCODE_TOOLCHANGE_T1 "G1 A10" // Extra G-code to run while executing tool-change command T1

‎Marlin/src/gcode/control/M17_M18_M84.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ void do_enable(const stepper_flags_t to_enable) {
9191

9292
if ((also_enabled &= ~(shall_enable | was_enabled))) {
9393
SERIAL_CHAR('(');
94-
LOOP_LINEAR_AXES(a) if (TEST(also_enabled, a)) SERIAL_CHAR(axis_codes[a], ' ');
94+
LOOP_LINEAR_AXES(a) if (TEST(also_enabled, a)) SERIAL_CHAR(AXIS_CHAR(a), ' ');
9595
#if HAS_EXTRUDERS
9696
#define _EN_ALSO(N) if (TEST(also_enabled, INDEX_OF_AXIS(E_AXIS, N))) SERIAL_CHAR('E', '0' + N, ' ');
9797
REPEAT(EXTRUDERS, _EN_ALSO)

‎Marlin/src/gcode/feature/trinamic/M569.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,6 @@ void GcodeSuite::M569_report(const bool forReplay/*=true*/) {
186186

187187
if (TERN0(Z3_HAS_STEALTHCHOP, stepperZ3.get_stored_stealthChop())) { say_M569(forReplay, F("I2 Z"), true); }
188188
if (TERN0(Z4_HAS_STEALTHCHOP, stepperZ4.get_stored_stealthChop())) { say_M569(forReplay, F("I3 Z"), true); }
189-
190189
#if HAS_I_AXIS
191190
if (TERN0(I_HAS_STEALTHCHOP, stepperI.get_stored_stealthChop())) { say_M569(forReplay, FPSTR(SP_I_STR), true); }
192191
#endif

‎Marlin/src/gcode/geometry/M206_M428.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,8 @@
3939
*/
4040
void GcodeSuite::M206() {
4141
if (!parser.seen_any()) return M206_report();
42-
4342
LOOP_LINEAR_AXES(a)
4443
if (parser.seenval(AXIS_CHAR(a))) set_home_offset((AxisEnum)a, parser.value_axis_units((AxisEnum)a));
45-
4644
#if ENABLED(MORGAN_SCARA)
4745
if (parser.seenval('T')) set_home_offset(A_AXIS, parser.value_float()); // Theta
4846
if (parser.seenval('P')) set_home_offset(B_AXIS, parser.value_float()); // Psi

‎Marlin/src/inc/Conditionals_LCD.h‎

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -824,7 +824,7 @@
824824
* Number of Primary Linear Axes (e.g., XYZ)
825825
* X, XY, or XYZ axes. Excluding duplicate axes (X2, Y2. Z2. Z3, Z4)
826826
*/
827-
#if HAS_I_AXIS
827+
#if LINEAR_AXES >= 3
828828
#define PRIMARY_LINEAR_AXES 3
829829
#else
830830
#define PRIMARY_LINEAR_AXES LINEAR_AXES
@@ -961,7 +961,7 @@
961961
#endif
962962

963963
/**
964-
* Set a flag for any type of bed probe, including the paper-test
964+
* Set flags for any form of bed probe
965965
*/
966966
#if ANY(HAS_Z_SERVO_PROBE, FIX_MOUNTED_PROBE, NOZZLE_AS_PROBE, TOUCH_MI_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, SOLENOID_PROBE, SENSORLESS_PROBING, RACK_AND_PINION_PROBE, MAGLEV4)
967967
#define HAS_BED_PROBE 1
@@ -1284,29 +1284,6 @@
12841284
#define HAS_ETHERNET 1
12851285
#endif
12861286

1287-
// Fallback axis inverting
1288-
#ifndef INVERT_X_DIR
1289-
#define INVERT_X_DIR false
1290-
#endif
1291-
#if HAS_Y_AXIS && !defined(INVERT_Y_DIR)
1292-
#define INVERT_Y_DIR false
1293-
#endif
1294-
#if HAS_Z_AXIS && !defined(INVERT_Z_DIR)
1295-
#define INVERT_Z_DIR false
1296-
#endif
1297-
#if HAS_I_AXIS && !defined(INVERT_I_DIR)
1298-
#define INVERT_I_DIR false
1299-
#endif
1300-
#if HAS_J_AXIS && !defined(INVERT_J_DIR)
1301-
#define INVERT_J_DIR false
1302-
#endif
1303-
#if HAS_K_AXIS && !defined(INVERT_K_DIR)
1304-
#define INVERT_K_DIR false
1305-
#endif
1306-
#if HAS_EXTRUDERS && !defined(INVERT_E_DIR)
1307-
#define INVERT_E_DIR false
1308-
#endif
1309-
13101287
/**
13111288
* This setting is also used by M109 when trying to calculate
13121289
* a ballpark safe margin to prevent wait-forever situation.

‎Marlin/src/lcd/HD44780/marlinui_HD44780.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,11 @@ static void createChar_P(const char c, const byte * const ptr) {
120120
#endif
121121

122122
#if ENABLED(LCD_USE_I2C_BUZZER)
123+
123124
void MarlinUI::buzz(const long duration, const uint16_t freq) {
124-
if (!sound_on) return;
125-
lcd.buzz(duration, freq);
125+
if (sound_on) lcd.buzz(duration, freq);
126126
}
127+
127128
#endif
128129

129130
void MarlinUI::set_custom_characters(const HD44780CharSet screen_charset/*=CHARSET_INFO*/) {

‎Marlin/src/module/motion.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ extern xyze_pos_t current_position, // High-level current tool position
4444

4545
// G60/G61 Position Save and Return
4646
#if SAVED_POSITIONS
47-
extern uint8_t saved_slots[(SAVED_POSITIONS + 7) >> 3]; // TODO: Add support for LINEAR_AXES >= 4
47+
extern uint8_t saved_slots[(SAVED_POSITIONS + 7) >> 3]; // TODO: Add support for HAS_I_AXIS
4848
extern xyze_pos_t stored_position[SAVED_POSITIONS];
4949
#endif
5050

‎Marlin/src/pins/pins.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -877,14 +877,14 @@
877877
#undef BOARD_STM32F103R
878878
#undef BOARD_ESP32
879879
#undef BOARD_STEVAL
880-
#undef BOARD_BIGTREE_SKR_MINI_E3
881880
#undef BOARD_BIGTREE_SKR_V1_1
882881
#undef BOARD_BIGTREE_SKR_V1_3
883882
#undef BOARD_BIGTREE_SKR_V1_4
884883
#undef BOARD_BIGTREE_SKR_V1_4_TURBO
885884
#undef BOARD_BIGTREE_BTT002_V1_0
886885
#undef BOARD_BIGTREE_SKR_PRO_V1_1
887886
#undef BOARD_BIGTREE_SKR_MINI_V1_1
887+
#undef BOARD_BIGTREE_SKR_MINI_E3
888888
#undef BOARD_BIGTREE_SKR_E3_DIP
889889
#undef BOARD_RUMBA32
890890
#undef BOARD_RUMBA32_AUS3D

‎Marlin/src/pins/ramps/pins_RAMPS.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,9 @@
272272
#if HAS_CUTTER && !defined(SPINDLE_LASER_ENA_PIN)
273273
#if NUM_SERVOS < 2 // Use servo connector if possible
274274
#define SPINDLE_LASER_ENA_PIN 4 // Pullup or pulldown!
275-
#define SPINDLE_LASER_PWM_PIN 6 // Hardware PWM
275+
#ifndef SPINDLE_LASER_PWM_PIN
276+
#define SPINDLE_LASER_PWM_PIN 6 // Hardware PWM
277+
#endif
276278
#define SPINDLE_DIR_PIN 5
277279
#elif HAS_FREE_AUX2_PINS
278280
#define SPINDLE_LASER_ENA_PIN 40 // Pullup or pulldown!

0 commit comments

Comments
 (0)