Skip to content

Commit 22fc07d

Browse files
thinkyheadthinkyhead
committed
🧑‍💻 ExtUI::onPlayTone optional duration
1 parent dd3b5a1 commit 22fc07d

19 files changed

+20
-19
lines changed

‎Marlin/src/lcd/extui/anycubic_chiron/chiron_extui.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ namespace ExtUI {
4949
void onMediaError() { chiron.mediaEvent(AC_media_error); }
5050
void onMediaRemoved() { chiron.mediaEvent(AC_media_removed); }
5151

52-
void onPlayTone(const uint16_t frequency, const uint16_t duration) {
52+
void onPlayTone(const uint16_t frequency, const uint16_t duration/*=0*/) {
5353
#if ENABLED(SPEAKER)
5454
::tone(BEEPER_PIN, frequency, duration);
5555
#endif

‎Marlin/src/lcd/extui/anycubic_i3mega/anycubic_extui.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ namespace ExtUI {
4141
void onMediaInserted() { anycubicTFT.onSDCardStateChange(true); }
4242
void onMediaError() { anycubicTFT.onSDCardError(); }
4343
void onMediaRemoved() { anycubicTFT.onSDCardStateChange(false); }
44-
void onPlayTone(const uint16_t frequency, const uint16_t duration) {
44+
void onPlayTone(const uint16_t frequency, const uint16_t duration/*=0*/) {
4545
TERN_(SPEAKER, ::tone(BEEPER_PIN, frequency, duration));
4646
}
4747
void onPrintTimerStarted() { anycubicTFT.onPrintTimerStarted(); }

‎Marlin/src/lcd/extui/anycubic_vyper/vyper_extui.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ namespace ExtUI {
4949
void onMediaError() { dgus.mediaEvent(AC_media_error); }
5050
void onMediaRemoved() { dgus.mediaEvent(AC_media_removed); }
5151

52-
void onPlayTone(const uint16_t frequency, const uint16_t duration) {
52+
void onPlayTone(const uint16_t frequency, const uint16_t duration/*=0*/) {
5353
#if ENABLED(SPEAKER)
5454
::tone(BEEPER_PIN, frequency, duration);
5555
#endif

‎Marlin/src/lcd/extui/dgus/dgus_extui.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ namespace ExtUI {
5252
void onMediaError() { TERN_(HAS_MEDIA, screen.sdCardError()); }
5353
void onMediaRemoved() { TERN_(HAS_MEDIA, screen.sdCardRemoved()); }
5454

55-
void onPlayTone(const uint16_t frequency, const uint16_t duration) {}
55+
void onPlayTone(const uint16_t frequency, const uint16_t duration/*=0*/) {}
5656
void onPrintTimerStarted() {}
5757
void onPrintTimerPaused() {}
5858
void onPrintTimerStopped() {}

‎Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#include "../../../../module/planner.h"
3434

3535
#include "../../ui_api.h"
36-
#include "../../../marlinui.h"
36+
#include "../../../marlinui.h" // For material presets
3737

3838
#if HAS_STEALTHCHOP
3939
#include "../../../../module/stepper/trinamic.h"

‎Marlin/src/lcd/extui/dgus_e3s1pro/DGUSDisplay.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ class DGUSDisplay {
7171
write(addr, static_cast<const void*>(&data), sizeof(T));
7272
}
7373

74-
// Until now I did not need to actively read from the display. That's why there is no ReadVariable
74+
// Until now I did not need to actively read from the display. That's why there is no readVariable
7575
// (I extensively use the auto upload of the display)
7676

7777
// Read GUI and OS version from screen

‎Marlin/src/lcd/extui/dgus_e3s1pro/DGUSScreenHandler.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ void DGUSScreenHandler::configurationStoreRead(bool success) {
281281
}
282282
}
283283

284-
void DGUSScreenHandler::playTone(const uint16_t frequency, const uint16_t duration) {
284+
void DGUSScreenHandler::playTone(const uint16_t frequency, const uint16_t duration/*=0*/) {
285285
if (WITHIN(frequency, 1, 255)) {
286286
if (WITHIN(duration, 1, 255))
287287
dgus.playSound((uint8_t)frequency, (uint8_t)duration);

‎Marlin/src/lcd/extui/dgus_e3s1pro/DGUSScreenHandler.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ class DGUSScreenHandler {
9999
static void configurationStoreWritten(bool success);
100100
static void configurationStoreRead(bool success);
101101

102-
static void playTone(const uint16_t frequency, const uint16_t duration);
102+
static void playTone(const uint16_t frequency, const uint16_t duration=0);
103103
static void angryBeeps(const uint8_t beepCount);
104104

105105
static void levelingStart();

‎Marlin/src/lcd/extui/dgus_e3s1pro/dgus_e3s1pro_extui.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ namespace ExtUI {
5959
void onMediaError() { TERN_(HAS_MEDIA, screen.sdCardError()); }
6060
void onMediaRemoved() { TERN_(HAS_MEDIA, screen.sdCardRemoved()); }
6161

62-
void onPlayTone(const uint16_t frequency, const uint16_t duration) {
62+
void onPlayTone(const uint16_t frequency, const uint16_t duration/*=0*/) {
6363
screen.playTone(frequency, duration);
6464
}
6565

‎Marlin/src/lcd/extui/dgus_reloaded/DGUSDisplay.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ class DGUSDisplay {
7474
write(addr, static_cast<const void*>(&data), sizeof(T));
7575
}
7676

77-
// Until now I did not need to actively read from the display. That's why there is no ReadVariable
77+
// Until now I did not need to actively read from the display. That's why there is no readVariable
7878
// (I extensively use the auto upload of the display)
7979

8080
// Read GUI and OS version from screen

‎Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ void DGUSScreenHandler::configurationStoreRead(bool success) {
224224
}
225225
}
226226

227-
void DGUSScreenHandler::playTone(const uint16_t frequency, const uint16_t duration) {
227+
void DGUSScreenHandler::playTone(const uint16_t frequency, const uint16_t duration/*=0*/) {
228228
if (WITHIN(frequency, 1, 255)) {
229229
if (WITHIN(duration, 1, 255))
230230
dgus.playSound((uint8_t)frequency, (uint8_t)duration);

‎Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class DGUSScreenHandler {
4545
static void configurationStoreWritten(bool success);
4646
static void configurationStoreRead(bool success);
4747

48-
static void playTone(const uint16_t frequency, const uint16_t duration);
48+
static void playTone(const uint16_t frequency, const uint16_t duration=0);
4949
static void meshUpdate(const int8_t xpos, const int8_t ypos);
5050
static void printTimerStarted();
5151
static void printTimerPaused();

‎Marlin/src/lcd/extui/dgus_reloaded/dgus_reloaded_extui.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ namespace ExtUI {
5454
void onMediaError() { TERN_(HAS_MEDIA, screen.sdCardError()); }
5555
void onMediaRemoved() { TERN_(HAS_MEDIA, screen.sdCardRemoved()); }
5656

57-
void onPlayTone(const uint16_t frequency, const uint16_t duration) {
57+
void onPlayTone(const uint16_t frequency, const uint16_t duration/*=0*/) {
5858
screen.playTone(frequency, duration);
5959
}
6060

‎Marlin/src/lcd/extui/example/example.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ namespace ExtUI {
5050
void onMediaInserted() {}
5151
void onMediaError() {}
5252
void onMediaRemoved() {}
53-
void onPlayTone(const uint16_t frequency, const uint16_t duration) {}
53+
void onPlayTone(const uint16_t frequency, const uint16_t duration/*=0*/) {}
5454
void onPrintTimerStarted() {}
5555
void onPrintTimerPaused() {}
5656
void onPrintTimerStopped() {}

‎Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ namespace ExtUI {
108108
}
109109
void onSettingsLoaded(const bool) {}
110110

111-
void onPlayTone(const uint16_t frequency, const uint16_t duration) { sound.play_tone(frequency, duration); }
111+
void onPlayTone(const uint16_t frequency, const uint16_t duration/*=0*/) { sound.play_tone(frequency, duration); }
112112

113113
void onUserConfirmRequired(const char * const msg) {
114114
if (msg)

‎Marlin/src/lcd/extui/ia_creality/ia_creality_extui.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ void onMediaRemoved() {
9898
}
9999
}
100100

101-
void onPlayTone(const uint16_t frequency, const uint16_t duration) {
101+
void onPlayTone(const uint16_t, const uint16_t/*=0*/) {
102102
rts.sendData(StartSoundSet, SoundAddr);
103103
}
104104

‎Marlin/src/lcd/extui/malyan/malyan_extui.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ namespace ExtUI {
137137
void onMediaInserted() {}
138138
void onMediaError() {}
139139
void onMediaRemoved() {}
140-
void onPlayTone(const uint16_t, const uint16_t) {}
140+
void onPlayTone(const uint16_t, const uint16_t/*=0*/) {}
141141
void onFilamentRunout(const extruder_t extruder) {}
142142
void onUserConfirmRequired(const char * const) {}
143143
void onHomingStart() {}

‎Marlin/src/lcd/extui/nextion/nextion_extui.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ namespace ExtUI {
4141
void onMediaInserted() {}
4242
void onMediaError() {}
4343
void onMediaRemoved() {}
44-
void onPlayTone(const uint16_t frequency, const uint16_t duration) {}
44+
void onPlayTone(const uint16_t frequency, const uint16_t duration/*=0*/) {}
4545
void onPrintTimerStarted() {}
4646
void onPrintTimerPaused() {}
4747
void onPrintTimerStopped() {}

‎Marlin/src/lcd/extui/ui_api.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
****************************************************************************/
4444

4545
#include "../../inc/MarlinConfig.h"
46+
4647
#include "../marlinui.h"
4748
#include "../../gcode/gcode.h"
4849

@@ -460,7 +461,7 @@ namespace ExtUI {
460461
void onMediaInserted();
461462
void onMediaError();
462463
void onMediaRemoved();
463-
void onPlayTone(const uint16_t frequency, const uint16_t duration);
464+
void onPlayTone(const uint16_t frequency, const uint16_t duration=0);
464465
void onPrinterKilled(FSTR_P const error, FSTR_P const component);
465466
void onSurviveInKilled();
466467
void onPrintTimerStarted();

0 commit comments

Comments
 (0)