Commit f797d3b4 authored by MagoKimbra's avatar MagoKimbra

Merge remote-tracking branch 'refs/remotes/origin/master' into dev

parents 951e0e16 5aa9a277
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
* M110 - Set the current line number * M110 - Set the current line number
* M111 - Set debug flags with S<mask>. See flag bits defined in Marlin.h. * M111 - Set debug flags with S<mask>. See flag bits defined in Marlin.h.
* M112 - Emergency stop * M112 - Emergency stop
* M114 - Output current position to serial port, (V)erbose for user * M114 - Output current position to serial port
* M115 - Capabilities string * M115 - Capabilities string
* M117 - Display a message on the controller screen * M117 - Display a message on the controller screen
* M119 - Output Endstop status to serial port * M119 - Output Endstop status to serial port
......
This diff is collapsed.
...@@ -5725,7 +5725,7 @@ inline void gcode_M226() { ...@@ -5725,7 +5725,7 @@ inline void gcode_M226() {
uint16_t beepS = code_seen('S') ? code_value_short() : 100; uint16_t beepS = code_seen('S') ? code_value_short() : 100;
uint32_t beepP = code_seen('P') ? code_value_long() : 1000; uint32_t beepP = code_seen('P') ? code_value_long() : 1000;
if (beepP > 5000) beepP = 5000; // limit to 5 seconds if (beepP > 5000) beepP = 5000; // limit to 5 seconds
buzz(beepS, beepP); buzz(beepP, beepS);
} }
#endif // HAS(BUZZER) #endif // HAS(BUZZER)
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#if HAS(BUZZER) #if HAS(BUZZER)
#include "buzzer.h" #include "buzzer.h"
void buzz(uint16_t freq, long duration) { void buzz(long duration, uint16_t freq) {
if (freq > 0) { if (freq > 0) {
#if ENABLED(LCD_USE_I2C_BUZZER) #if ENABLED(LCD_USE_I2C_BUZZER)
lcd_buzz(duration, freq); lcd_buzz(duration, freq);
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#define BUZZER_H #define BUZZER_H
#if HAS(BUZZER) #if HAS(BUZZER)
void buzz(uint16_t freq, long duration); void buzz(long duration, uint16_t freq);
#endif #endif
#endif // BUZZER_H #endif // BUZZER_H
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment