Jelajahi Sumber

Merge pull request #3542 from wavexx/default_beep_freq_2

M300: do not set a default frequency if S is not set
Alex Voinea 1 tahun lalu
induk
melakukan
39dfa96167
1 mengubah file dengan 5 tambahan dan 11 penghapusan
  1. 5 11
      Firmware/Marlin_main.cpp

+ 5 - 11
Firmware/Marlin_main.cpp

@@ -7595,18 +7595,12 @@ Sigma_Exit:
     */
     case 300: // M300
     {
-      uint16_t beepS = code_seen('S') ? code_value() : 110;
+      uint16_t beepS = code_seen('S') ? code_value() : 0;
       uint16_t beepP = code_seen('P') ? code_value() : 1000;
-      if (beepS > 0)
-      {
-        #if BEEPER > 0
-          Sound_MakeCustom(beepP,beepS,false);
-        #endif
-      }
-      else
-      {
-        _delay(beepP);
-      }
+      #if BEEPER > 0
+      if (beepP > 0)
+        Sound_MakeCustom(beepP,beepS,false);
+      #endif
     }
     break;
     #endif // M300