melch/Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

🐛 TM3D fixes and improvements

Browse Source 
Co-Authored-By: InsanityAutomation <38436470+InsanityAutomation@users.noreply.github.com>
This commit is contained in:
Scott Lahteine 2021-07-12 22:52:17 -05:00
parent dd8ac689c3
commit bc459a76f4
6 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/core/serial.h
View File

@ -67,7 +67,7 @@ extern uint8_t marlin_debug_flags;
// Serial redirection // Serial redirection
// //
// Step 1: Find out what the first serial leaf is // Step 1: Find out what the first serial leaf is
#if BOTH(HAS_MULTI_SERIAL, SERIAL_CATCHALL) #if HAS_MULTI_SERIAL && defined(SERIAL_CATCHALL)
#define _SERIAL_LEAF_1 MYSERIAL #define _SERIAL_LEAF_1 MYSERIAL
#else #else
#define _SERIAL_LEAF_1 MYSERIAL1 #define _SERIAL_LEAF_1 MYSERIAL1

16
Marlin/src/lcd/dwin/e3v2/dwin.cpp
View File

@ -2417,13 +2417,15 @@ void Draw_HomeOff_Menu() {
#include "../../../libs/buzzer.h" #include "../../../libs/buzzer.h"
void HMI_AudioFeedback(const bool success=true) { void HMI_AudioFeedback(const bool success=true) {
if (success) { #if HAS_BUZZER
buzzer.tone(100, 659); if (success) {
buzzer.tone(10, 0); buzzer.tone(100, 659);
buzzer.tone(100, 698); buzzer.tone(10, 0);
} buzzer.tone(100, 698);
else }
buzzer.tone(40, 440); else
buzzer.tone(40, 440);
#endif
} }
/* Prepare */ /* Prepare */

4
Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/leveling_menu.cpp
View File

@ -23,9 +23,9 @@
#include "../config.h" #include "../config.h"
#include "../screens.h" #include "../screens.h"
#ifdef COCOA_LEVELING_MENU #if ENABLED(COCOA_LEVELING_MENU)
#if BOTH(HAS_BED_PROBE,BLTOUCH) #if BOTH(HAS_BED_PROBE, BLTOUCH)
#include "../../../../feature/bltouch.h" #include "../../../../feature/bltouch.h"
#endif #endif

2
Marlin/src/lcd/extui/ui_api.cpp
View File

@ -1057,7 +1057,7 @@ namespace ExtUI {
return isPrinting() && (isPrintingFromMediaPaused() || print_job_timer.isPaused()); return isPrinting() && (isPrintingFromMediaPaused() || print_job_timer.isPaused());
} }
bool isMediaInserted() { return TERN0(SDSUPPORT, IS_SD_INSERTED() && card.isMounted()); } bool isMediaInserted() { return TERN0(SDSUPPORT, IS_SD_INSERTED()); }
void pausePrint() { ui.pause_print(); } void pausePrint() { ui.pause_print(); }
void resumePrint() { ui.resume_print(); } void resumePrint() { ui.resume_print(); }

4
Marlin/src/pins/ramps/pins_RAMPS.h
View File

@ -655,7 +655,9 @@
#define BEEPER_PIN EXP1_10_PIN #define BEEPER_PIN EXP1_10_PIN
#define BTN_ENC EXP1_09_PIN #define BTN_ENC EXP1_09_PIN
#define SD_DETECT_PIN EXP2_04_PIN #ifndef SD_DETECT_PIN
#define SD_DETECT_PIN EXP2_04_PIN
#endif
#ifndef KILL_PIN #ifndef KILL_PIN
#define KILL_PIN EXP2_03_PIN #define KILL_PIN EXP2_03_PIN

7
Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h
View File

@ -172,8 +172,13 @@
// //
// Misc. Functions // Misc. Functions
// //
#define LED_CONTROL_PIN PA13 #define CASE_LIGHT_PIN PA13
#ifndef NEOPIXEL_PIN #ifndef NEOPIXEL_PIN
#define NEOPIXEL_PIN PA8 #define NEOPIXEL_PIN PA8
#endif #endif
#define SUICIDE_PIN PC13
#ifndef SUICIDE_PIN_INVERTING
#define SUICIDE_PIN_INVERTING false
#endif