bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Merge pull request #743 from Opticalworm/Marlin_v1

Browse Source 
Improved support for panelolu2 encoder and buzzer
This commit is contained in:
ErikZalm
2014-02-03 12:33:10 -08:00
parent 1cc9212c05 c2b3e88787
commit e1ae7952eb
5 changed files with 59 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Marlin/Marlin_main.cpp
View File

@ -2477,7 +2477,7 @@ void process_commands()
break;
#endif // NUM_SERVOS > 0
#if LARGE_FLASH == true && ( BEEPER > 0 || defined(ULTRALCD) )
#if (LARGE_FLASH == true && ( BEEPER > 0 || defined(ULTRALCD) || defined(LCD_USE_I2C_BUZZER)))
case 300: // M300
{
int beepS = code_seen('S') ? code_value() : 110;
@ -2489,7 +2489,9 @@ void process_commands()
delay(beepP);
noTone(BEEPER);
#elif defined(ULTRALCD)
lcd_buzz(beepS, beepP);
lcd_buzz(beepS, beepP);
#elif defined(LCD_USE_I2C_BUZZER)
lcd_buzz(beepP, beepS);
#endif
}
else
@ -2747,7 +2749,11 @@ void process_commands()
WRITE(BEEPER,LOW);
delay(3);
#else
lcd_buzz(1000/6,100);
#if !defined(LCD_FEEDBACK_FREQUENCY_HZ) || !defined(LCD_FEEDBACK_FREQUENCY_DURATION_MS)
lcd_buzz(1000/6,100);
#else
lcd_buzz(LCD_FEEDBACK_FREQUENCY_DURATION_MS,LCD_FEEDBACK_FREQUENCY_HZ);
#endif
#endif
}
}