From 1a1be5c518cc98426d85c78da9bff6b4cee15f26 Mon Sep 17 00:00:00 2001 From: DRracer Date: Tue, 27 Aug 2019 17:10:29 +0200 Subject: [PATCH 1/2] Fix sound mode [assist]: encoder clicking indefinitely when MMU wants to select filament --- Firmware/sound.h | 6 +++--- Firmware/ultralcd.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Firmware/sound.h b/Firmware/sound.h index bdd32ec83..90f3e7234 100644 --- a/Firmware/sound.h +++ b/Firmware/sound.h @@ -3,10 +3,10 @@ #define SOUND_H -#define MSG_SOUND_MODE_LOUD "Sound [loud]" -#define MSG_SOUND_MODE_ONCE "Sound [once]" +#define MSG_SOUND_MODE_LOUD "Sound [loud]" +#define MSG_SOUND_MODE_ONCE "Sound [once]" #define MSG_SOUND_MODE_SILENT "Sound [silent]" -#define MSG_SOUND_MODE_BLIND "Sound [blind]" +#define MSG_SOUND_MODE_BLIND "Sound [assist]" #define e_SOUND_MODE_NULL 0xFF diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index e601fd755..12010ff39 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5902,6 +5902,7 @@ uint8_t choose_menu_P(const char *header, const char *item, const char *last_ite cursor_pos++; } enc_dif = lcd_encoder_diff; + Sound_MakeSound(e_SOUND_TYPE_EncoderMove); } if (cursor_pos > 3) @@ -5952,7 +5953,6 @@ uint8_t choose_menu_P(const char *header, const char *item, const char *last_ite lcd_print(" "); lcd_set_cursor(0, cursor_pos); lcd_print(">"); - Sound_MakeSound(e_SOUND_TYPE_EncoderMove); _delay(100); if (lcd_clicked()) From 1d23cc52e9ff7edc17b091d3af9e827d0da33200 Mon Sep 17 00:00:00 2001 From: DRracer Date: Wed, 28 Aug 2019 09:39:28 +0200 Subject: [PATCH 2/2] endstop sound alert fixes --- Firmware/ultralcd.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 12010ff39..0df9d9a06 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5907,23 +5907,25 @@ uint8_t choose_menu_P(const char *header, const char *item, const char *last_ite if (cursor_pos > 3) { - Sound_MakeSound(e_SOUND_TYPE_BlindAlert); cursor_pos = 3; if (first < items_no - 3) { first++; lcd_clear(); + } else { // here we are at the very end of the list + Sound_MakeSound(e_SOUND_TYPE_BlindAlert); } } if (cursor_pos < 1) { - Sound_MakeSound(e_SOUND_TYPE_BlindAlert); cursor_pos = 1; if (first > 0) { first--; lcd_clear(); + } else { // here we are at the very end of the list + Sound_MakeSound(e_SOUND_TYPE_BlindAlert); } }