josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1952 from NotaRobotexe/sound 

new sound
This commit is contained in:
Marek Běl 2019-07-10 18:06:32 +02:00 committed by GitHub
parent 84ac209222 333ade9aee
commit d3dd0ad271
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 152 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
Firmware/Marlin_main.cpp
View File

@ -658,19 +658,13 @@ static void factory_reset(char level)
// Level 0: Language reset // Level 0: Language reset
case 0: case 0:
if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) Sound_MakeCustom(100,0,false);
WRITE(BEEPER, HIGH);
_delay_ms(100);
WRITE(BEEPER, LOW);
lang_reset(); lang_reset();
break; break;
//Level 1: Reset statistics //Level 1: Reset statistics
case 1: case 1:
if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) Sound_MakeCustom(100,0,false);
WRITE(BEEPER, HIGH);
_delay_ms(100);
WRITE(BEEPER, LOW);
eeprom_update_dword((uint32_t *)EEPROM_TOTALTIME, 0); eeprom_update_dword((uint32_t *)EEPROM_TOTALTIME, 0);
eeprom_update_dword((uint32_t *)EEPROM_FILAMENTUSED, 0); eeprom_update_dword((uint32_t *)EEPROM_FILAMENTUSED, 0);
@ -725,11 +719,7 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE))
fsensor_enable(); fsensor_enable();
fsensor_autoload_set(true); fsensor_autoload_set(true);
#endif //FILAMENT_SENSOR #endif //FILAMENT_SENSOR
Sound_MakeCustom(100,0,false);
if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE))
WRITE(BEEPER, HIGH);
_delay_ms(100);
WRITE(BEEPER, LOW);
//_delay_ms(2000); //_delay_ms(2000);
break; break;
@ -739,11 +729,7 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE))
lcd_puts_P(PSTR("Factory RESET")); lcd_puts_P(PSTR("Factory RESET"));
lcd_puts_at_P(1, 2, PSTR("ERASING all data")); lcd_puts_at_P(1, 2, PSTR("ERASING all data"));
if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) Sound_MakeCustom(100,0,false);
WRITE(BEEPER, HIGH);
_delay_ms(100);
WRITE(BEEPER, LOW);
er_progress = 0; er_progress = 0;
lcd_puts_at_P(3, 3, PSTR(" ")); lcd_puts_at_P(3, 3, PSTR(" "));
lcd_set_cursor(3, 3); lcd_set_cursor(3, 3);
@ -813,7 +799,7 @@ void factory_reset()
SET_OUTPUT(BEEPER); SET_OUTPUT(BEEPER);
if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) if(eSoundMode!=e_SOUND_MODE_SILENT)
WRITE(BEEPER, HIGH); WRITE(BEEPER, HIGH);
while (!READ(BTN_ENC)); while (!READ(BTN_ENC));
@ -2347,11 +2333,7 @@ void refresh_cmd_timeout(void)
#endif //FWRETRACT #endif //FWRETRACT
void trace() { void trace() {
//if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) Sound_MakeCustom(25,440,true);
_tone(BEEPER, 440);
_delay(25);
_noTone(BEEPER);
_delay(20);
} }
/* /*
void ramming() { void ramming() {
@ -3194,9 +3176,7 @@ void gcode_M701()
load_filament_final_feed(); //slow sequence load_filament_final_feed(); //slow sequence
st_synchronize(); st_synchronize();
if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) _tone(BEEPER, 500); Sound_MakeCustom(50,500,false);
delay_keep_alive(50);
_noTone(BEEPER);
if (!farm_mode && loading_flag) { if (!farm_mode && loading_flag) {
lcd_load_filament_color_check(); lcd_load_filament_color_check();
@ -3795,7 +3775,7 @@ eeprom_update_word((uint16_t*)EEPROM_NOZZLE_DIAMETER_uM,0xFFFF);
SET_OUTPUT(BEEPER); SET_OUTPUT(BEEPER);
if (counterBeep== 0){ if (counterBeep== 0){
if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) if(eSoundMode!=e_SOUND_MODE_SILENT)
WRITE(BEEPER,HIGH); WRITE(BEEPER,HIGH);
} }
@ -6463,10 +6443,7 @@ Sigma_Exit:
if (beepS > 0) if (beepS > 0)
{ {
#if BEEPER > 0 #if BEEPER > 0
if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) Sound_MakeCustom(beepP,beepS,false);
_tone(BEEPER, beepS);
_delay(beepP);
_noTone(BEEPER);
#endif #endif
} }
else else
@ -7827,10 +7804,7 @@ bool bInhibitFlag;
//-// if (degHotend0() > EXTRUDE_MINTEMP) //-// if (degHotend0() > EXTRUDE_MINTEMP)
if(0) if(0)
{ {
if ((eSoundMode == e_SOUND_MODE_LOUD) || (eSoundMode == e_SOUND_MODE_ONCE)) Sound_MakeCustom(50,1000,false);
_tone(BEEPER, 1000);
delay_keep_alive(50);
_noTone(BEEPER);
loading_flag = true; loading_flag = true;
enquecommand_front_P((PSTR("M701"))); enquecommand_front_P((PSTR("M701")));
} }
@ -9673,7 +9647,7 @@ void M600_wait_for_user(float HotendTempBckp) {
} }
SET_OUTPUT(BEEPER); SET_OUTPUT(BEEPER);
if (counterBeep == 0) { if (counterBeep == 0) {
if((eSoundMode==e_SOUND_MODE_LOUD)||((eSoundMode==e_SOUND_MODE_ONCE)&&bFirst)) if((eSoundMode==e_SOUND_MODE_BLIND)|| (eSoundMode==e_SOUND_MODE_LOUD)||((eSoundMode==e_SOUND_MODE_ONCE)&&bFirst))
{ {
bFirst=false; bFirst=false;
WRITE(BEEPER, HIGH); WRITE(BEEPER, HIGH);
@ -9776,10 +9750,7 @@ void M600_load_filament() {
#ifdef FILAMENT_SENSOR #ifdef FILAMENT_SENSOR
if (fsensor_check_autoload()) if (fsensor_check_autoload())
{ {
if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) Sound_MakeCustom(50,1000,false);
_tone(BEEPER, 1000);
delay_keep_alive(50);
_noTone(BEEPER);
break; break;
} }
#endif //FILAMENT_SENSOR #endif //FILAMENT_SENSOR
@ -9795,10 +9766,7 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE))
M600_load_filament_movements(); M600_load_filament_movements();
if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) Sound_MakeCustom(50,1000,false);
_tone(BEEPER, 500);
delay_keep_alive(50);
_noTone(BEEPER);
#ifdef FSENSOR_QUALITY #ifdef FSENSOR_QUALITY
fsensor_oq_meassure_stop(); fsensor_oq_meassure_stop();

5
Firmware/lcd.cpp
View File

@ -704,15 +704,12 @@ uint8_t lcd_clicked(void)
void lcd_beeper_quick_feedback(void) void lcd_beeper_quick_feedback(void)
{ {
SET_OUTPUT(BEEPER);
//-// //-//
Sound_MakeSound(e_SOUND_TYPE_ButtonEcho); Sound_MakeSound(e_SOUND_TYPE_ButtonEcho);
/* /*
for(int8_t i = 0; i < 10; i++) for(int8_t i = 0; i < 10; i++)
{ {
WRITE(BEEPER,HIGH); Sound_MakeCustom(100,0,false);
delayMicroseconds(100);
WRITE(BEEPER,LOW);
delayMicroseconds(100); delayMicroseconds(100);
} }
*/ */

12
Firmware/menu.cpp
View File

@ -11,8 +11,7 @@
#include "ultralcd.h" #include "ultralcd.h"
#include "language.h" #include "language.h"
#include "static_assert.h" #include "static_assert.h"
#include "sound.h"
extern int32_t lcd_encoder; extern int32_t lcd_encoder;
@ -65,7 +64,11 @@ void menu_goto(menu_func_t menu, const uint32_t encoder, const bool feedback, bo
void menu_start(void) void menu_start(void)
{ {
if (lcd_encoder > 0x8000) lcd_encoder = 0; if (lcd_encoder > 0x8000) lcd_encoder = 0;
if (lcd_encoder < 0) lcd_encoder = 0; if (lcd_encoder < 0)
{
lcd_encoder = 0;
Sound_MakeSound(e_SOUND_TYPE_BlindAlert);
}
if (lcd_encoder < menu_top) if (lcd_encoder < menu_top)
menu_top = lcd_encoder; menu_top = lcd_encoder;
menu_line = menu_top; menu_line = menu_top;
@ -75,7 +78,10 @@ void menu_start(void)
void menu_end(void) void menu_end(void)
{ {
if (lcd_encoder >= menu_item) if (lcd_encoder >= menu_item)
{
lcd_encoder = menu_item - 1; lcd_encoder = menu_item - 1;
Sound_MakeSound(e_SOUND_TYPE_BlindAlert);
}
if (((uint8_t)lcd_encoder) >= menu_top + LCD_HEIGHT) if (((uint8_t)lcd_encoder) >= menu_top + LCD_HEIGHT)
{ {
menu_top = lcd_encoder - LCD_HEIGHT + 1; menu_top = lcd_encoder - LCD_HEIGHT + 1;

2
Firmware/mmu.cpp
View File

@ -838,7 +838,7 @@ void mmu_M600_wait_and_beep() {
} }
SET_OUTPUT(BEEPER); SET_OUTPUT(BEEPER);
if (counterBeep == 0) { if (counterBeep == 0) {
if((eSoundMode==e_SOUND_MODE_LOUD)||((eSoundMode==e_SOUND_MODE_ONCE)&&bFirst)) if((eSoundMode==e_SOUND_MODE_BLIND)|| (eSoundMode==e_SOUND_MODE_LOUD)||((eSoundMode==e_SOUND_MODE_ONCE)&&bFirst))
{ {
bFirst=false; bFirst=false;
WRITE(BEEPER, HIGH); WRITE(BEEPER, HIGH);

79
Firmware/sound.cpp
View File

@ -17,7 +17,8 @@ static void Sound_SaveMode(void);
static void Sound_DoSound_Echo(void); static void Sound_DoSound_Echo(void);
static void Sound_DoSound_Prompt(void); static void Sound_DoSound_Prompt(void);
static void Sound_DoSound_Alert(bool bOnce); static void Sound_DoSound_Alert(bool bOnce);
static void Sound_DoSound_Encoder_Move(void);
static void Sound_DoSound_Blind_Alert(void);
void Sound_Init(void) void Sound_Init(void)
{ {
@ -49,9 +50,9 @@ switch(eSoundMode)
eSoundMode=e_SOUND_MODE_SILENT; eSoundMode=e_SOUND_MODE_SILENT;
break; break;
case e_SOUND_MODE_SILENT: case e_SOUND_MODE_SILENT:
eSoundMode=e_SOUND_MODE_MUTE; eSoundMode=e_SOUND_MODE_BLIND;
break; break;
case e_SOUND_MODE_MUTE: case e_SOUND_MODE_BLIND:
eSoundMode=e_SOUND_MODE_LOUD; eSoundMode=e_SOUND_MODE_LOUD;
break; break;
default: default:
@ -60,6 +61,36 @@ switch(eSoundMode)
Sound_SaveMode(); Sound_SaveMode();
} }
void Sound_MakeCustom(uint16_t ms,uint16_t tone_,bool critical){
if (!critical){
if (eSoundMode != e_SOUND_MODE_SILENT){
if(!tone_){
WRITE(BEEPER, HIGH);
delayMicroseconds(ms);
WRITE(BEEPER, LOW);
}
else{
_tone(BEEPER, tone_);
delayMicroseconds(ms);
_noTone(BEEPER);
}
}
}
else{
if(!tone_){
WRITE(BEEPER, HIGH);
delayMicroseconds(ms);
WRITE(BEEPER, LOW);
delayMicroseconds(100);
}
else{
_tone(BEEPER, tone_);
delayMicroseconds(ms);
_noTone(BEEPER);
}
}
}
void Sound_MakeSound(eSOUND_TYPE eSoundType) void Sound_MakeSound(eSOUND_TYPE eSoundType)
{ {
switch(eSoundMode) switch(eSoundMode)
@ -84,13 +115,43 @@ switch(eSoundMode)
if(eSoundType==e_SOUND_TYPE_StandardAlert) if(eSoundType==e_SOUND_TYPE_StandardAlert)
Sound_DoSound_Alert(true); Sound_DoSound_Alert(true);
break; break;
case e_SOUND_MODE_MUTE: case e_SOUND_MODE_BLIND:
break; if(eSoundType==e_SOUND_TYPE_ButtonEcho)
Sound_DoSound_Echo();
if(eSoundType==e_SOUND_TYPE_StandardPrompt)
Sound_DoSound_Prompt();
if(eSoundType==e_SOUND_TYPE_StandardAlert)
Sound_DoSound_Alert(false);
if(eSoundType==e_SOUND_TYPE_EncoderMove)
Sound_DoSound_Encoder_Move();
if(eSoundType==e_SOUND_TYPE_BlindAlert)
Sound_DoSound_Blind_Alert();
break;
default: default:
; break;
} }
} }
static void Sound_DoSound_Blind_Alert(void)
{
_tone(BEEPER,100);
delayMicroseconds(50);
_noTone(BEEPER);
delayMicroseconds(200);
}
static void Sound_DoSound_Encoder_Move(void)
{
uint8_t nI;
for(nI=0;nI<5;nI++)
{
WRITE(BEEPER,HIGH);
delayMicroseconds(75);
WRITE(BEEPER,LOW);
delayMicroseconds(75);
}
}
static void Sound_DoSound_Echo(void) static void Sound_DoSound_Echo(void)
{ {
@ -108,7 +169,7 @@ for(nI=0;nI<10;nI++)
static void Sound_DoSound_Prompt(void) static void Sound_DoSound_Prompt(void)
{ {
WRITE(BEEPER,HIGH); WRITE(BEEPER,HIGH);
delay_keep_alive(500); delayMicroseconds(500);
WRITE(BEEPER,LOW); WRITE(BEEPER,LOW);
} }
@ -120,8 +181,8 @@ nMax=bOnce?1:3;
for(nI=0;nI<nMax;nI++) for(nI=0;nI<nMax;nI++)
{ {
WRITE(BEEPER,HIGH); WRITE(BEEPER,HIGH);
delay_keep_alive(200); delayMicroseconds(200);
WRITE(BEEPER,LOW); WRITE(BEEPER,LOW);
delay_keep_alive(500); delayMicroseconds(500);
} }
} }

8
Firmware/sound.h
View File

@ -1,3 +1,4 @@
#include <stdint.h>
#ifndef SOUND_H #ifndef SOUND_H
#define SOUND_H #define SOUND_H
@ -5,16 +6,16 @@
#define MSG_SOUND_MODE_LOUD "Sound [loud]" #define MSG_SOUND_MODE_LOUD "Sound [loud]"
#define MSG_SOUND_MODE_ONCE "Sound [once]" #define MSG_SOUND_MODE_ONCE "Sound [once]"
#define MSG_SOUND_MODE_SILENT "Sound [silent]" #define MSG_SOUND_MODE_SILENT "Sound [silent]"
#define MSG_SOUND_MODE_MUTE "Sound [mute]" #define MSG_SOUND_MODE_BLIND "Sound [blind]"
#define e_SOUND_MODE_NULL 0xFF #define e_SOUND_MODE_NULL 0xFF
typedef enum typedef enum
{e_SOUND_MODE_LOUD,e_SOUND_MODE_ONCE,e_SOUND_MODE_SILENT,e_SOUND_MODE_MUTE} eSOUND_MODE; {e_SOUND_MODE_LOUD,e_SOUND_MODE_ONCE,e_SOUND_MODE_SILENT,e_SOUND_MODE_BLIND} eSOUND_MODE;
#define e_SOUND_MODE_DEFAULT e_SOUND_MODE_LOUD #define e_SOUND_MODE_DEFAULT e_SOUND_MODE_LOUD
typedef enum typedef enum
{e_SOUND_TYPE_ButtonEcho,e_SOUND_TYPE_EncoderEcho,e_SOUND_TYPE_StandardPrompt,e_SOUND_TYPE_StandardConfirm,e_SOUND_TYPE_StandardWarning,e_SOUND_TYPE_StandardAlert} eSOUND_TYPE; {e_SOUND_TYPE_ButtonEcho,e_SOUND_TYPE_EncoderEcho,e_SOUND_TYPE_StandardPrompt,e_SOUND_TYPE_StandardConfirm,e_SOUND_TYPE_StandardWarning,e_SOUND_TYPE_StandardAlert,e_SOUND_TYPE_EncoderMove,e_SOUND_TYPE_BlindAlert} eSOUND_TYPE;
typedef enum typedef enum
{e_SOUND_CLASS_Echo,e_SOUND_CLASS_Prompt,e_SOUND_CLASS_Confirm,e_SOUND_CLASS_Warning,e_SOUND_CLASS_Alert} eSOUND_CLASS; {e_SOUND_CLASS_Echo,e_SOUND_CLASS_Prompt,e_SOUND_CLASS_Confirm,e_SOUND_CLASS_Warning,e_SOUND_CLASS_Alert} eSOUND_CLASS;
@ -27,6 +28,7 @@ extern void Sound_Default(void);
extern void Sound_Save(void); extern void Sound_Save(void);
extern void Sound_CycleState(void); extern void Sound_CycleState(void);
extern void Sound_MakeSound(eSOUND_TYPE eSoundType); extern void Sound_MakeSound(eSOUND_TYPE eSoundType);
extern void Sound_MakeCustom(uint16_t ms,uint16_t tone_ ,bool critical);
//static void Sound_DoSound_Echo(void); //static void Sound_DoSound_Echo(void);
//static void Sound_DoSound_Prompt(void); //static void Sound_DoSound_Prompt(void);

16
Firmware/temperature.cpp
View File

@ -533,12 +533,7 @@ void checkFanSpeed()
static void fanSpeedErrorBeep(const char *serialMsg, const char *lcdMsg){ static void fanSpeedErrorBeep(const char *serialMsg, const char *lcdMsg){
SERIAL_ECHOLNRPGM(serialMsg); SERIAL_ECHOLNRPGM(serialMsg);
if (get_message_level() == 0) { if (get_message_level() == 0) {
if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)||(eSoundMode==e_SOUND_MODE_SILENT)){ Sound_MakeCustom(200,0,true);
WRITE(BEEPER, HIGH);
delayMicroseconds(200);
WRITE(BEEPER, LOW);
delayMicroseconds(100); // what is this wait for?
}
LCD_ALERTMESSAGERPGM(lcdMsg); LCD_ALERTMESSAGERPGM(lcdMsg);
} }
} }
@ -1395,13 +1390,9 @@ void temp_runaway_stop(bool isPreheat, bool isBed)
disable_e2(); disable_e2();
manage_heater(); manage_heater();
lcd_update(0); lcd_update(0);
if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)||(eSoundMode==e_SOUND_MODE_SILENT)) Sound_MakeCustom(200,0,true);
WRITE(BEEPER, HIGH);
delayMicroseconds(500);
WRITE(BEEPER, LOW);
delayMicroseconds(100);
if (isPreheat) if (isPreheat)
{ {
Stop(); Stop();
isBed ? LCD_ALERTMESSAGEPGM("BED PREHEAT ERROR") : LCD_ALERTMESSAGEPGM("PREHEAT ERROR"); isBed ? LCD_ALERTMESSAGEPGM("BED PREHEAT ERROR") : LCD_ALERTMESSAGEPGM("PREHEAT ERROR");
@ -1495,7 +1486,6 @@ void max_temp_error(uint8_t e) {
SET_OUTPUT(BEEPER); SET_OUTPUT(BEEPER);
WRITE(FAN_PIN, 1); WRITE(FAN_PIN, 1);
WRITE(EXTRUDER_0_AUTO_FAN_PIN, 1); WRITE(EXTRUDER_0_AUTO_FAN_PIN, 1);
if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)||(eSoundMode==e_SOUND_MODE_SILENT))
WRITE(BEEPER, 1); WRITE(BEEPER, 1);
// fanSpeed will consumed by the check_axes_activity() routine. // fanSpeed will consumed by the check_axes_activity() routine.
fanSpeed=255; fanSpeed=255;

61
Firmware/ultralcd.cpp
View File

@ -2686,10 +2686,12 @@ void lcd_alright() {
if (cursor_pos > 3) { if (cursor_pos > 3) {
cursor_pos = 3; cursor_pos = 3;
Sound_MakeSound(e_SOUND_TYPE_BlindAlert);
} }
if (cursor_pos < 1) { if (cursor_pos < 1) {
cursor_pos = 1; cursor_pos = 1;
Sound_MakeSound(e_SOUND_TYPE_BlindAlert);
} }
lcd_set_cursor(0, 1); lcd_set_cursor(0, 1);
lcd_print(" "); lcd_print(" ");
@ -2700,6 +2702,7 @@ void lcd_alright() {
lcd_set_cursor(0, cursor_pos); lcd_set_cursor(0, cursor_pos);
lcd_print(">"); lcd_print(">");
enc_dif = lcd_encoder_diff; enc_dif = lcd_encoder_diff;
Sound_MakeSound(e_SOUND_TYPE_EncoderMove);
_delay(100); _delay(100);
} }
@ -2707,7 +2710,7 @@ void lcd_alright() {
if (lcd_clicked()) { if (lcd_clicked()) {
Sound_MakeSound(e_SOUND_TYPE_ButtonEcho);
lcd_change_fil_state = cursor_pos; lcd_change_fil_state = cursor_pos;
_delay(500); _delay(500);
@ -3669,20 +3672,24 @@ int8_t lcd_show_multiscreen_message_two_choices_and_wait_P(const char *msg, bool
lcd_set_cursor(7, 3); lcd_set_cursor(7, 3);
lcd_puts_P((PSTR(">"))); lcd_puts_P((PSTR(">")));
yes = false; yes = false;
Sound_MakeSound(e_SOUND_TYPE_EncoderMove);
} }
else if (enc_dif > lcd_encoder_diff && !yes) { else if (enc_dif > lcd_encoder_diff && !yes) {
lcd_puts_P((PSTR(">"))); lcd_puts_P((PSTR(">")));
lcd_set_cursor(7, 3); lcd_set_cursor(7, 3);
lcd_puts_P((PSTR(" "))); lcd_puts_P((PSTR(" ")));
yes = true; yes = true;
Sound_MakeSound(e_SOUND_TYPE_EncoderMove);
} }
enc_dif = lcd_encoder_diff; enc_dif = lcd_encoder_diff;
} }
else { else {
Sound_MakeSound(e_SOUND_TYPE_BlindAlert);
break; //turning knob skips waiting loop break; //turning knob skips waiting loop
} }
} }
if (lcd_clicked()) { if (lcd_clicked()) {
Sound_MakeSound(e_SOUND_TYPE_ButtonEcho);
if (msg_next == NULL) { if (msg_next == NULL) {
//KEEPALIVE_STATE(IN_HANDLER); //KEEPALIVE_STATE(IN_HANDLER);
lcd_set_custom_characters(); lcd_set_custom_characters();
@ -3755,16 +3762,20 @@ int8_t lcd_show_fullscreen_message_yes_no_and_wait_P(const char *msg, bool allow
lcd_set_cursor(0, 3); lcd_set_cursor(0, 3);
lcd_puts_P((PSTR(">"))); lcd_puts_P((PSTR(">")));
yes = false; yes = false;
Sound_MakeSound(e_SOUND_TYPE_EncoderMove);
} }
else if (enc_dif > lcd_encoder_diff && !yes) { else if (enc_dif > lcd_encoder_diff && !yes) {
lcd_puts_P((PSTR(">"))); lcd_puts_P((PSTR(">")));
lcd_set_cursor(0, 3); lcd_set_cursor(0, 3);
lcd_puts_P((PSTR(" "))); lcd_puts_P((PSTR(" ")));
yes = true; yes = true;
Sound_MakeSound(e_SOUND_TYPE_EncoderMove);
} }
enc_dif = lcd_encoder_diff; enc_dif = lcd_encoder_diff;
} }
if (lcd_clicked()) { if (lcd_clicked()) {
Sound_MakeSound(e_SOUND_TYPE_ButtonEcho);
KEEPALIVE_STATE(IN_HANDLER); KEEPALIVE_STATE(IN_HANDLER);
return yes; return yes;
} }
@ -5279,8 +5290,8 @@ do\
case e_SOUND_MODE_SILENT:\ case e_SOUND_MODE_SILENT:\
MENU_ITEM_FUNCTION_P(_i(MSG_SOUND_MODE_SILENT),lcd_sound_state_set);\ MENU_ITEM_FUNCTION_P(_i(MSG_SOUND_MODE_SILENT),lcd_sound_state_set);\
break;\ break;\
case e_SOUND_MODE_MUTE:\ case e_SOUND_MODE_BLIND:\
MENU_ITEM_FUNCTION_P(_i(MSG_SOUND_MODE_MUTE),lcd_sound_state_set);\ MENU_ITEM_FUNCTION_P(_i(MSG_SOUND_MODE_BLIND),lcd_sound_state_set);\
break;\ break;\
default:\ default:\
MENU_ITEM_FUNCTION_P(_i(MSG_SOUND_MODE_LOUD),lcd_sound_state_set);\ MENU_ITEM_FUNCTION_P(_i(MSG_SOUND_MODE_LOUD),lcd_sound_state_set);\
@ -5682,10 +5693,12 @@ void bowden_menu() {
if (cursor_pos > 3) { if (cursor_pos > 3) {
cursor_pos = 3; cursor_pos = 3;
Sound_MakeSound(e_SOUND_TYPE_BlindAlert);
} }
if (cursor_pos < 0) { if (cursor_pos < 0) {
cursor_pos = 0; cursor_pos = 0;
Sound_MakeSound(e_SOUND_TYPE_BlindAlert);
} }
lcd_set_cursor(0, 0); lcd_set_cursor(0, 0);
@ -5698,13 +5711,13 @@ void bowden_menu() {
lcd_print(" "); lcd_print(" ");
lcd_set_cursor(0, cursor_pos); lcd_set_cursor(0, cursor_pos);
lcd_print(">"); lcd_print(">");
Sound_MakeSound(e_SOUND_TYPE_EncoderMove);
enc_dif = lcd_encoder_diff; enc_dif = lcd_encoder_diff;
_delay(100); _delay(100);
} }
if (lcd_clicked()) { if (lcd_clicked()) {
Sound_MakeSound(e_SOUND_TYPE_ButtonEcho);
lcd_clear(); lcd_clear();
while (1) { while (1) {
@ -5735,6 +5748,7 @@ void bowden_menu() {
} }
_delay(100); _delay(100);
if (lcd_clicked()) { if (lcd_clicked()) {
Sound_MakeSound(e_SOUND_TYPE_ButtonEcho);
EEPROM_save_B(EEPROM_BOWDEN_LENGTH + cursor_pos * 2, &bowden_length[cursor_pos]); EEPROM_save_B(EEPROM_BOWDEN_LENGTH + cursor_pos * 2, &bowden_length[cursor_pos]);
if (lcd_show_fullscreen_message_yes_no_and_wait_P(PSTR("Continue with another bowden?"))) { if (lcd_show_fullscreen_message_yes_no_and_wait_P(PSTR("Continue with another bowden?"))) {
lcd_update_enable(true); lcd_update_enable(true);
@ -5780,8 +5794,14 @@ static char snmm_stop_print_menu() { //menu for choosing which filaments will be
if ((abs(enc_dif - lcd_encoder_diff)) > 1) { if ((abs(enc_dif - lcd_encoder_diff)) > 1) {
if (enc_dif > lcd_encoder_diff) cursor_pos--; if (enc_dif > lcd_encoder_diff) cursor_pos--;
if (enc_dif < lcd_encoder_diff) cursor_pos++; if (enc_dif < lcd_encoder_diff) cursor_pos++;
if (cursor_pos > 3) cursor_pos = 3; if (cursor_pos > 3) {
if (cursor_pos < 1) cursor_pos = 1; cursor_pos = 3;
Sound_MakeSound(e_SOUND_TYPE_BlindAlert);
}
if (cursor_pos < 1){
cursor_pos = 1;
Sound_MakeSound(e_SOUND_TYPE_BlindAlert);
}
lcd_set_cursor(0, 1); lcd_set_cursor(0, 1);
lcd_print(" "); lcd_print(" ");
@ -5792,10 +5812,12 @@ static char snmm_stop_print_menu() { //menu for choosing which filaments will be
lcd_set_cursor(0, cursor_pos); lcd_set_cursor(0, cursor_pos);
lcd_print(">"); lcd_print(">");
enc_dif = lcd_encoder_diff; enc_dif = lcd_encoder_diff;
Sound_MakeSound(e_SOUND_TYPE_EncoderMove);
_delay(100); _delay(100);
} }
} }
if (lcd_clicked()) { if (lcd_clicked()) {
Sound_MakeSound(e_SOUND_TYPE_ButtonEcho);
KEEPALIVE_STATE(IN_HANDLER); KEEPALIVE_STATE(IN_HANDLER);
return(cursor_pos - 1); return(cursor_pos - 1);
} }
@ -5848,6 +5870,7 @@ uint8_t choose_menu_P(const char *header, const char *item, const char *last_ite
if (cursor_pos > 3) if (cursor_pos > 3)
{ {
Sound_MakeSound(e_SOUND_TYPE_BlindAlert);
cursor_pos = 3; cursor_pos = 3;
if (first < items_no - 3) if (first < items_no - 3)
{ {
@ -5858,6 +5881,7 @@ uint8_t choose_menu_P(const char *header, const char *item, const char *last_ite
if (cursor_pos < 1) if (cursor_pos < 1)
{ {
Sound_MakeSound(e_SOUND_TYPE_BlindAlert);
cursor_pos = 1; cursor_pos = 1;
if (first > 0) if (first > 0)
{ {
@ -5892,11 +5916,12 @@ uint8_t choose_menu_P(const char *header, const char *item, const char *last_ite
lcd_print(" "); lcd_print(" ");
lcd_set_cursor(0, cursor_pos); lcd_set_cursor(0, cursor_pos);
lcd_print(">"); lcd_print(">");
Sound_MakeSound(e_SOUND_TYPE_EncoderMove);
_delay(100); _delay(100);
if (lcd_clicked()) if (lcd_clicked())
{ {
Sound_MakeSound(e_SOUND_TYPE_ButtonEcho);
KEEPALIVE_STATE(IN_HANDLER); KEEPALIVE_STATE(IN_HANDLER);
lcd_encoder_diff = 0; lcd_encoder_diff = 0;
return(cursor_pos + first - 1); return(cursor_pos + first - 1);
@ -5951,6 +5976,7 @@ char reset_menu() {
if (cursor_pos > 3) { if (cursor_pos > 3) {
cursor_pos = 3; cursor_pos = 3;
Sound_MakeSound(e_SOUND_TYPE_BlindAlert);
if (first < items_no - 4) { if (first < items_no - 4) {
first++; first++;
lcd_clear(); lcd_clear();
@ -5959,6 +5985,7 @@ char reset_menu() {
if (cursor_pos < 0) { if (cursor_pos < 0) {
cursor_pos = 0; cursor_pos = 0;
Sound_MakeSound(e_SOUND_TYPE_BlindAlert);
if (first > 0) { if (first > 0) {
first--; first--;
lcd_clear(); lcd_clear();
@ -5974,6 +6001,7 @@ char reset_menu() {
lcd_print(" "); lcd_print(" ");
lcd_set_cursor(0, cursor_pos); lcd_set_cursor(0, cursor_pos);
lcd_print(">"); lcd_print(">");
Sound_MakeSound(e_SOUND_TYPE_EncoderMove);
enc_dif = lcd_encoder_diff; enc_dif = lcd_encoder_diff;
_delay(100); _delay(100);
} }
@ -5981,6 +6009,7 @@ char reset_menu() {
} }
if (lcd_clicked()) { if (lcd_clicked()) {
Sound_MakeSound(e_SOUND_TYPE_ButtonEcho);
return(cursor_pos + first); return(cursor_pos + first);
} }
@ -6289,6 +6318,7 @@ unsigned char lcd_choose_color() {
if (cursor_pos > active_rows) { if (cursor_pos > active_rows) {
cursor_pos = active_rows; cursor_pos = active_rows;
Sound_MakeSound(e_SOUND_TYPE_BlindAlert);
if (first < items_no - active_rows) { if (first < items_no - active_rows) {
first++; first++;
lcd_clear(); lcd_clear();
@ -6297,6 +6327,7 @@ unsigned char lcd_choose_color() {
if (cursor_pos < 1) { if (cursor_pos < 1) {
cursor_pos = 1; cursor_pos = 1;
Sound_MakeSound(e_SOUND_TYPE_BlindAlert);
if (first > 0) { if (first > 0) {
first--; first--;
lcd_clear(); lcd_clear();
@ -6310,12 +6341,14 @@ unsigned char lcd_choose_color() {
lcd_print(" "); lcd_print(" ");
lcd_set_cursor(0, cursor_pos); lcd_set_cursor(0, cursor_pos);
lcd_print(">"); lcd_print(">");
Sound_MakeSound(e_SOUND_TYPE_EncoderMove);
enc_dif = lcd_encoder_diff; enc_dif = lcd_encoder_diff;
_delay(100); _delay(100);
} }
if (lcd_clicked()) { if (lcd_clicked()) {
Sound_MakeSound(e_SOUND_TYPE_ButtonEcho);
switch(cursor_pos + first - 1) { switch(cursor_pos + first - 1) {
case 0: return 1; break; case 0: return 1; break;
case 1: return 0; break; case 1: return 0; break;
@ -6672,11 +6705,7 @@ static void lcd_main_menu()
} }
void stack_error() { void stack_error() {
SET_OUTPUT(BEEPER); Sound_MakeCustom(1000,0,true);
if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)||(eSoundMode==e_SOUND_MODE_SILENT))
WRITE(BEEPER, HIGH);
_delay(1000);
WRITE(BEEPER, LOW);
lcd_display_message_fullscreen_P(_i("Error - static memory has been overwritten"));////MSG_STACK_ERROR c=20 r=4 lcd_display_message_fullscreen_P(_i("Error - static memory has been overwritten"));////MSG_STACK_ERROR c=20 r=4
//err_triggered = 1; //err_triggered = 1;
while (1) delay_keep_alive(1000); while (1) delay_keep_alive(1000);
@ -6811,8 +6840,8 @@ static void lcd_tune_menu()
case e_SOUND_MODE_SILENT: case e_SOUND_MODE_SILENT:
MENU_ITEM_FUNCTION_P(_i(MSG_SOUND_MODE_SILENT),lcd_sound_state_set); MENU_ITEM_FUNCTION_P(_i(MSG_SOUND_MODE_SILENT),lcd_sound_state_set);
break; break;
case e_SOUND_MODE_MUTE: case e_SOUND_MODE_BLIND:
MENU_ITEM_FUNCTION_P(_i(MSG_SOUND_MODE_MUTE),lcd_sound_state_set); MENU_ITEM_FUNCTION_P(_i(MSG_SOUND_MODE_BLIND),lcd_sound_state_set);
break; break;
default: default:
MENU_ITEM_FUNCTION_P(_i(MSG_SOUND_MODE_LOUD),lcd_sound_state_set); MENU_ITEM_FUNCTION_P(_i(MSG_SOUND_MODE_LOUD),lcd_sound_state_set);
@ -6977,6 +7006,7 @@ void lcd_sdcard_stop()
if (lcd_clicked()) if (lcd_clicked())
{ {
Sound_MakeSound(e_SOUND_TYPE_ButtonEcho);
if ((int32_t)lcd_encoder == 1) if ((int32_t)lcd_encoder == 1)
{ {
lcd_return_to_status(); lcd_return_to_status();
@ -8493,6 +8523,7 @@ void menu_lcd_lcdupdate_func(void)
if (lcd_draw_update == 0) if (lcd_draw_update == 0)
lcd_draw_update = 1; lcd_draw_update = 1;
lcd_encoder += lcd_encoder_diff / ENCODER_PULSES_PER_STEP; lcd_encoder += lcd_encoder_diff / ENCODER_PULSES_PER_STEP;
Sound_MakeSound(e_SOUND_TYPE_EncoderMove);
lcd_encoder_diff = 0; lcd_encoder_diff = 0;
lcd_timeoutToStatus.start(); lcd_timeoutToStatus.start();
} }

10
Firmware/util.cpp
View File

@ -295,15 +295,9 @@ bool show_upgrade_dialog_if_version_newer(const char *version_string)
for (const char *c = version_string; ! is_whitespace_or_nl_or_eol(*c); ++ c) for (const char *c = version_string; ! is_whitespace_or_nl_or_eol(*c); ++ c)
lcd_putc(*c); lcd_putc(*c);
lcd_puts_at_P(0, 3, _i("Please upgrade."));////MSG_NEW_FIRMWARE_PLEASE_UPGRADE c=20 lcd_puts_at_P(0, 3, _i("Please upgrade."));////MSG_NEW_FIRMWARE_PLEASE_UPGRADE c=20
if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) Sound_MakeCustom(50,1000,false);
_tone(BEEPER, 1000);
delay_keep_alive(50);
_noTone(BEEPER);
delay_keep_alive(500); delay_keep_alive(500);
if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) Sound_MakeCustom(50,1000,false);
_tone(BEEPER, 1000);
delay_keep_alive(50);
_noTone(BEEPER);
lcd_wait_for_click_delay(30); lcd_wait_for_click_delay(30);
lcd_update_enable(true); lcd_update_enable(true);
lcd_clear(); lcd_clear();