Skip to content

Commit e55db2c

Browse files
committed
Squashed commit of the following:
commit 8298a47 Author: thinkyhead <[email protected]> Date: Tue Nov 15 00:24:38 2022 +0000 [cron] Bump distribution date (2022-11-15) commit 00156a3 Author: ellensp <[email protected]> Date: Mon Nov 14 21:35:24 2022 +1300 🩹 Fix 2 thermocouples (MarlinFirmware#24982) Followup to MarlinFirmware#24898 commit d62fbfb Author: Scott Lahteine <[email protected]> Date: Mon Nov 14 02:26:31 2022 -0600 🐛 Fix M808 starting count Reported by adcurtin on Discord commit 14966c0 Author: thinkyhead <[email protected]> Date: Mon Nov 14 06:23:44 2022 +0000 [cron] Bump distribution date (2022-11-14) commit e283f15 Author: Justin Hartmann <[email protected]> Date: Mon Nov 14 00:50:02 2022 -0500 🩹 Fix Overlord compile (MarlinFirmware#24947) commit 16faa29 Author: Pascal de Bruijn <[email protected]> Date: Mon Nov 14 05:59:25 2022 +0100 🚸 M306: Indicate MPC Autotune (MarlinFirmware#24949) commit abc9316 Author: ellensp <[email protected]> Date: Mon Nov 14 17:45:28 2022 +1300 🩹 Allow max endstops MKS Monster 8 V2 (MarlinFirmware#24944) commit dbd5dc4 Author: thinkyhead <[email protected]> Date: Sun Nov 13 00:23:31 2022 +0000 [cron] Bump distribution date (2022-11-13) commit 7395569 Author: Scott Lahteine <[email protected]> Date: Fri Nov 11 20:35:07 2022 -0600 🐛 Fix Anycubic / Trigorilla pins, etc. (MarlinFirmware#24971) commit e1423a8 Author: thinkyhead <[email protected]> Date: Sat Nov 12 00:40:15 2022 +0000 [cron] Bump distribution date (2022-11-12) commit d123ea7 Author: Scott Lahteine <[email protected]> Date: Fri Nov 11 16:09:26 2022 -0600 🎨 Prefer axis element over index commit 4d913fb Author: thinkyhead <[email protected]> Date: Thu Nov 10 06:06:37 2022 +0000 [cron] Bump distribution date (2022-11-10) commit 3985d26 Author: Scott Lahteine <[email protected]> Date: Wed Nov 9 20:54:17 2022 -0600 🐛 Fix recalculate_max_e_jerk
1 parent c47971d commit e55db2c

File tree

10 files changed

+41
-20
lines changed

10 files changed

+41
-20
lines changed

Diff for: 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-11-13"
44+
//#define STRING_DISTRIBUTION_DATE "2022-11-15"
4545

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

Diff for: Marlin/src/feature/leds/leds.cpp

-12
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,6 @@
3030

3131
#include "leds.h"
3232

33-
#if ENABLED(BLINKM)
34-
#include "blinkm.h"
35-
#endif
36-
37-
#if ENABLED(PCA9632)
38-
#include "pca9632.h"
39-
#endif
40-
41-
#if ENABLED(PCA9533)
42-
#include "pca9533.h"
43-
#endif
44-
4533
#if EITHER(CASE_LIGHT_USE_RGB_LED, CASE_LIGHT_USE_NEOPIXEL)
4634
#include "../../feature/caselight.h"
4735
#endif

Diff for: Marlin/src/feature/leds/leds.h

+12
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,18 @@
4040
#undef _NEOPIXEL_INCLUDE_
4141
#endif
4242

43+
#if ENABLED(BLINKM)
44+
#include "blinkm.h"
45+
#endif
46+
47+
#if ENABLED(PCA9533)
48+
#include "pca9533.h"
49+
#endif
50+
51+
#if ENABLED(PCA9632)
52+
#include "pca9632.h"
53+
#endif
54+
4355
/**
4456
* LEDcolor type for use with leds.set_color
4557
*/

Diff for: Marlin/src/feature/repeat.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ void Repeat::add_marker(const uint32_t sdpos, const uint16_t count) {
4242
SERIAL_ECHO_MSG("!Too many markers.");
4343
else {
4444
marker[index].sdpos = sdpos;
45-
marker[index].counter = count ?: -1;
45+
marker[index].counter = count ? count - 1 : -1;
4646
index++;
4747
DEBUG_ECHOLNPGM("Add Marker ", index, " at ", sdpos, " (", count, ")");
4848
}

Diff for: Marlin/src/gcode/temp/M306.cpp

+7-1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#if ENABLED(MPCTEMP)
2626

2727
#include "../gcode.h"
28+
#include "../../lcd/marlinui.h"
2829
#include "../../module/temperature.h"
2930

3031
/**
@@ -42,7 +43,12 @@
4243
*/
4344

4445
void GcodeSuite::M306() {
45-
if (parser.seen_test('T')) { thermalManager.MPC_autotune(); return; }
46+
if (parser.seen_test('T')) {
47+
LCD_MESSAGE(MSG_MPC_AUTOTUNE);
48+
thermalManager.MPC_autotune();
49+
ui.reset_status();
50+
return;
51+
}
4652

4753
if (parser.seen("ACFPRH")) {
4854
const heater_id_t hid = (heater_id_t)parser.intval('E', 0);

Diff for: Marlin/src/inc/Version.h

+4
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,11 @@
4242
* version was tagged.
4343
*/
4444
#ifndef STRING_DISTRIBUTION_DATE
45+
<<<<<<< HEAD
4546
#define STRING_DISTRIBUTION_DATE "2022-11-13"
47+
=======
48+
#define STRING_DISTRIBUTION_DATE "2022-11-15"
49+
>>>>>>> 8298a477e1f1fa6188788448eec3f349c1ba93de
4650
#endif
4751

4852
/**

Diff for: Marlin/src/module/temperature.cpp

+7-2
Original file line numberDiff line numberDiff line change
@@ -3076,8 +3076,13 @@ void Temperature::disable_all_heaters() {
30763076
// Needed to return the correct temp when this is called between readings
30773077
static raw_adc_t max_tc_temp_previous[MAX_TC_COUNT] = { 0 };
30783078
#define THERMO_TEMP(I) max_tc_temp_previous[I]
3079-
#define THERMO_SEL(A,B,C) (hindex > 1 ? (C) : hindex == 1 ? (B) : (A))
3080-
#define MAXTC_CS_WRITE(V) do{ switch (hindex) { case 1: WRITE(TEMP_1_CS_PIN, V); break; case 2: WRITE(TEMP_2_CS_PIN, V); break; default: WRITE(TEMP_0_CS_PIN, V); } }while(0)
3079+
#if MAX_TC_COUNT > 2
3080+
#define THERMO_SEL(A,B,C) (hindex > 1 ? (C) : hindex == 1 ? (B) : (A))
3081+
#define MAXTC_CS_WRITE(V) do{ switch (hindex) { case 1: WRITE(TEMP_1_CS_PIN, V); break; case 2: WRITE(TEMP_2_CS_PIN, V); break; default: WRITE(TEMP_0_CS_PIN, V); } }while(0)
3082+
#elif MAX_TC_COUNT > 1
3083+
#define THERMO_SEL(A,B,C) ( hindex == 1 ? (B) : (A))
3084+
#define MAXTC_CS_WRITE(V) do{ switch (hindex) { case 1: WRITE(TEMP_1_CS_PIN, V); break; default: WRITE(TEMP_0_CS_PIN, V); } }while(0)
3085+
#endif
30813086
#else
30823087
// When we have only 1 max tc, THERMO_SEL will pick the appropriate sensor
30833088
// variable, and MAXTC_*() macros will be hardcoded to the correct CS pin.

Diff for: Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_V1.h

+2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@
2626
//
2727
// Limit Switches
2828
//
29+
#define X_MIN_PIN PA14
2930
#define X_MAX_PIN PA13
31+
#define Y_MIN_PIN PA15
3032
#define Y_MAX_PIN PC5
3133

3234
//

Diff for: Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_V2.h

+7-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@
2323

2424
#define BOARD_INFO_NAME "MKS Monster8 V2"
2525

26+
//
27+
// Limit Switches
28+
//
29+
#define X_STOP_PIN PA14
30+
#define Y_STOP_PIN PA15
31+
2632
//
2733
// Steppers
2834
//
@@ -52,6 +58,6 @@
5258
#define WIFI_RESET_PIN PD14 // MKS ESP WIFI RESET PIN
5359
#endif
5460

55-
#define NEOPIXEL_PIN PC5
61+
#define NEOPIXEL_PIN PC5
5662

5763
#include "pins_MKS_MONSTER8_common.h"

Diff for: Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_common.h

-2
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,6 @@
6464
#define E4_DIAG_PIN -1 // Driver7 diag signal is not connected
6565

6666
// Limit Switches for endstops
67-
#define X_MIN_PIN PA14
68-
#define Y_MIN_PIN PA15
6967
#define Z_MIN_PIN PB13
7068
#define Z_MAX_PIN PB12
7169

0 commit comments

Comments
 (0)