Skip to content

Commit bc459a7

Browse files
🐛 TM3D fixes and improvements
Co-Authored-By: InsanityAutomation <[email protected]>
1 parent dd8ac68 commit bc459a7

File tree

6 files changed

+22
-13
lines changed

6 files changed

+22
-13
lines changed

Marlin/src/core/serial.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ extern uint8_t marlin_debug_flags;
6767
// Serial redirection
6868
//
6969
// Step 1: Find out what the first serial leaf is
70-
#if BOTH(HAS_MULTI_SERIAL, SERIAL_CATCHALL)
70+
#if HAS_MULTI_SERIAL && defined(SERIAL_CATCHALL)
7171
#define _SERIAL_LEAF_1 MYSERIAL
7272
#else
7373
#define _SERIAL_LEAF_1 MYSERIAL1

Marlin/src/lcd/dwin/e3v2/dwin.cpp

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2417,13 +2417,15 @@ void Draw_HomeOff_Menu() {
24172417
#include "../../../libs/buzzer.h"
24182418

24192419
void HMI_AudioFeedback(const bool success=true) {
2420-
if (success) {
2421-
buzzer.tone(100, 659);
2422-
buzzer.tone(10, 0);
2423-
buzzer.tone(100, 698);
2424-
}
2425-
else
2426-
buzzer.tone(40, 440);
2420+
#if HAS_BUZZER
2421+
if (success) {
2422+
buzzer.tone(100, 659);
2423+
buzzer.tone(10, 0);
2424+
buzzer.tone(100, 698);
2425+
}
2426+
else
2427+
buzzer.tone(40, 440);
2428+
#endif
24272429
}
24282430

24292431
/* Prepare */

Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/leveling_menu.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
#include "../config.h"
2424
#include "../screens.h"
2525

26-
#ifdef COCOA_LEVELING_MENU
26+
#if ENABLED(COCOA_LEVELING_MENU)
2727

28-
#if BOTH(HAS_BED_PROBE,BLTOUCH)
28+
#if BOTH(HAS_BED_PROBE, BLTOUCH)
2929
#include "../../../../feature/bltouch.h"
3030
#endif
3131

Marlin/src/lcd/extui/ui_api.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1057,7 +1057,7 @@ namespace ExtUI {
10571057
return isPrinting() && (isPrintingFromMediaPaused() || print_job_timer.isPaused());
10581058
}
10591059

1060-
bool isMediaInserted() { return TERN0(SDSUPPORT, IS_SD_INSERTED() && card.isMounted()); }
1060+
bool isMediaInserted() { return TERN0(SDSUPPORT, IS_SD_INSERTED()); }
10611061

10621062
void pausePrint() { ui.pause_print(); }
10631063
void resumePrint() { ui.resume_print(); }

Marlin/src/pins/ramps/pins_RAMPS.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -655,7 +655,9 @@
655655

656656
#define BEEPER_PIN EXP1_10_PIN
657657
#define BTN_ENC EXP1_09_PIN
658-
#define SD_DETECT_PIN EXP2_04_PIN
658+
#ifndef SD_DETECT_PIN
659+
#define SD_DETECT_PIN EXP2_04_PIN
660+
#endif
659661

660662
#ifndef KILL_PIN
661663
#define KILL_PIN EXP2_03_PIN

Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,13 @@
172172
//
173173
// Misc. Functions
174174
//
175-
#define LED_CONTROL_PIN PA13
175+
#define CASE_LIGHT_PIN PA13
176176

177177
#ifndef NEOPIXEL_PIN
178178
#define NEOPIXEL_PIN PA8
179179
#endif
180+
181+
#define SUICIDE_PIN PC13
182+
#ifndef SUICIDE_PIN_INVERTING
183+
#define SUICIDE_PIN_INVERTING false
184+
#endif

0 commit comments

Comments
 (0)