Browse Source

Merge pull request #4537 from thinkyhead/rc_fix_some_flaws

Patch up some flaws here and there
Scott Lahteine 8 years ago
parent
commit
5ef4a5577c
5 changed files with 14 additions and 5 deletions
  1. 1
    5
      Marlin/Conditionals_post.h
  2. 1
    0
      Marlin/Marlin.h
  3. 1
    0
      Marlin/Marlin_main.cpp
  4. 9
    0
      Marlin/SanityCheck.h
  5. 2
    0
      Marlin/ultralcd.cpp

+ 1
- 5
Marlin/Conditionals_post.h View File

@@ -633,17 +633,13 @@
633 633
     #ifndef LCD_FEEDBACK_FREQUENCY_DURATION_MS
634 634
       #define LCD_FEEDBACK_FREQUENCY_DURATION_MS 100
635 635
     #endif
636
-  #elif PIN_EXISTS(BEEPER)
636
+  #else
637 637
     #ifndef LCD_FEEDBACK_FREQUENCY_HZ
638 638
       #define LCD_FEEDBACK_FREQUENCY_HZ 5000
639 639
     #endif
640 640
     #ifndef LCD_FEEDBACK_FREQUENCY_DURATION_MS
641 641
       #define LCD_FEEDBACK_FREQUENCY_DURATION_MS 2
642 642
     #endif
643
-  #else
644
-    #ifndef LCD_FEEDBACK_FREQUENCY_DURATION_MS
645
-      #define LCD_FEEDBACK_FREQUENCY_DURATION_MS 2
646
-    #endif
647 643
   #endif
648 644
 
649 645
   /**

+ 1
- 0
Marlin/Marlin.h View File

@@ -89,6 +89,7 @@ extern const char echomagic[] PROGMEM;
89 89
 
90 90
 #define SERIAL_ECHOPAIR(name,value) (serial_echopair_P(PSTR(name),(value)))
91 91
 
92
+void serial_echopair_P(const char* s_P, const char *v);
92 93
 void serial_echopair_P(const char* s_P, char v);
93 94
 void serial_echopair_P(const char* s_P, int v);
94 95
 void serial_echopair_P(const char* s_P, long v);

+ 1
- 0
Marlin/Marlin_main.cpp View File

@@ -572,6 +572,7 @@ void set_current_from_steppers_for_axis(AxisEnum axis);
572 572
   void plan_cubic_move(const float offset[4]);
573 573
 #endif
574 574
 
575
+void serial_echopair_P(const char* s_P, const char *v)   { serialprintPGM(s_P); SERIAL_ECHO(v); }
575 576
 void serial_echopair_P(const char* s_P, char v)          { serialprintPGM(s_P); SERIAL_CHAR(v); }
576 577
 void serial_echopair_P(const char* s_P, int v)           { serialprintPGM(s_P); SERIAL_ECHO(v); }
577 578
 void serial_echopair_P(const char* s_P, long v)          { serialprintPGM(s_P); SERIAL_ECHO(v); }

+ 9
- 0
Marlin/SanityCheck.h View File

@@ -185,6 +185,15 @@
185 185
 #endif
186 186
 
187 187
 /**
188
+ * Delta requirements
189
+ */
190
+#if ENABLED(DELTA)
191
+  #if DISABLED(USE_XMAX_PLUG) && DISABLED(USE_YMAX_PLUG) && DISABLED(USE_ZMAX_PLUG)
192
+    #error "You probably want to use Max Endstops for DELTA!"
193
+  #endif
194
+#endif
195
+
196
+/**
188 197
  * Babystepping
189 198
  */
190 199
 #if ENABLED(BABYSTEPPING)

+ 2
- 0
Marlin/ultralcd.cpp View File

@@ -2327,6 +2327,8 @@ void kill_screen(const char* lcd_msg) {
2327 2327
       lcd.buzz(duration, freq);
2328 2328
     #elif PIN_EXISTS(BEEPER)
2329 2329
       buzzer.tone(duration, freq);
2330
+    #else
2331
+      UNUSED(duration); UNUSED(freq);
2330 2332
     #endif
2331 2333
   }
2332 2334
 

Loading…
Cancel
Save