Browse Source

🐛 TM3D fixes and improvements

Co-Authored-By: InsanityAutomation <38436470+InsanityAutomation@users.noreply.github.com>
Scott Lahteine 4 years ago
parent
commit
315a722b42

+ 1
- 1
Marlin/src/core/serial.h View File

@@ -67,7 +67,7 @@ extern uint8_t marlin_debug_flags;
67 67
 // Serial redirection
68 68
 //
69 69
 // 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)
71 71
   #define _SERIAL_LEAF_1 MYSERIAL
72 72
 #else
73 73
   #define _SERIAL_LEAF_1 MYSERIAL1

+ 9
- 7
Marlin/src/lcd/dwin/e3v2/dwin.cpp View File

@@ -2417,13 +2417,15 @@ void Draw_HomeOff_Menu() {
2417 2417
 #include "../../../libs/buzzer.h"
2418 2418
 
2419 2419
 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
2427 2429
 }
2428 2430
 
2429 2431
 /* Prepare */

+ 2
- 2
Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/leveling_menu.cpp View File

@@ -23,9 +23,9 @@
23 23
 #include "../config.h"
24 24
 #include "../screens.h"
25 25
 
26
-#ifdef COCOA_LEVELING_MENU
26
+#if ENABLED(COCOA_LEVELING_MENU)
27 27
 
28
-#if BOTH(HAS_BED_PROBE,BLTOUCH)
28
+#if BOTH(HAS_BED_PROBE, BLTOUCH)
29 29
   #include "../../../../feature/bltouch.h"
30 30
 #endif
31 31
 

+ 1
- 1
Marlin/src/lcd/extui/ui_api.cpp View File

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

+ 3
- 1
Marlin/src/pins/ramps/pins_RAMPS.h View File

@@ -655,7 +655,9 @@
655 655
 
656 656
       #define BEEPER_PIN             EXP1_10_PIN
657 657
       #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
659 661
 
660 662
       #ifndef KILL_PIN
661 663
         #define KILL_PIN             EXP2_03_PIN

+ 6
- 1
Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h View File

@@ -172,8 +172,13 @@
172 172
 //
173 173
 // Misc. Functions
174 174
 //
175
-#define LED_CONTROL_PIN                     PA13
175
+#define CASE_LIGHT_PIN                      PA13
176 176
 
177 177
 #ifndef NEOPIXEL_PIN
178 178
   #define NEOPIXEL_PIN                      PA8
179 179
 #endif
180
+
181
+#define SUICIDE_PIN                         PC13
182
+#ifndef SUICIDE_PIN_INVERTING
183
+  #define SUICIDE_PIN_INVERTING             false
184
+#endif

Loading…
Cancel
Save