Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New feature: Non blocking tone queue #3962

Closed
wants to merge 11 commits into from
+456 −108
Closed

New feature: Non blocking tone queue #3962

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6941d28
New object: Circular Queue (aka ring buffer)
jbrazio Jun 4, 2016
27297bc
Fixes BQ ZUM Mega warnings when changing the BEEPER pin
jbrazio Jun 4, 2016
7e76850
New objects Buzzer and Speaker for non-blocking tone playback
jbrazio Jun 4, 2016
4198a7c
Moves LCD_FEEDBACK stuff into Conditionals.h and updates the buzzer t…
jbrazio Jun 4, 2016
64694e0
Makes use of the new non-blocking tone lib
jbrazio Jun 4, 2016
a500aa0
Removes inline comments from BEEPER_PIN #define due to FastIO issues
jbrazio Jun 4, 2016
6ecd397
Less wavy sound produce by Speaker due to optimization
jbrazio Jun 5, 2016
773964e
Makes CircularQueue statically allocate memory
jbrazio Jun 9, 2016
c0e8151
Adds travis test for SPEAKER
jbrazio Jun 9, 2016
63f10eb
Documents the Buzzer, Speaker and CircularQueue classes
jbrazio Jun 9, 2016
079ec35
Buzzer::tone() now calls the watchdog reset
jbrazio Jun 10, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Moves LCD_FEEDBACK stuff into Conditionals.h and updates the buzzer t… 
…o the new libs
  • Loading branch information
@jbrazio
jbrazio committed Jun 9, 2016
commit 4198a7cfb092498c85b63efbfe0689b07a1a81f1
30 changes: 23 additions & 7 deletions Marlin/Conditionals.h
View file
Original file line number Diff line number Diff line change
@@ -43,8 +43,7 @@
#endif

#ifndef CONFIGURATION_LCD // Get the LCD defines which are needed first

#define CONFIGURATION_LCD
#define CONFIGURATION_LCD

#define LCD_HAS_DIRECTIONAL_BUTTONS (BUTTON_EXISTS(UP) || BUTTON_EXISTS(DWN) || BUTTON_EXISTS(LFT) || BUTTON_EXISTS(RT))

@@ -154,11 +153,6 @@
#define ENCODER_STEPS_PER_MENU_ITEM 1
#endif

#if ENABLED(LCD_USE_I2C_BUZZER)
#define LCD_FEEDBACK_FREQUENCY_HZ 1000
#define LCD_FEEDBACK_FREQUENCY_DURATION_MS 100
#endif

#define ULTIPANEL
#define NEWPANEL
#endif
@@ -806,5 +800,27 @@
#endif
#endif

/**
* Buzzer/Speaker
*/
#if ENABLED(LCD_USE_I2C_BUZZER)
#ifndef LCD_FEEDBACK_FREQUENCY_HZ
#define LCD_FEEDBACK_FREQUENCY_HZ 1000
#endif
#ifndef LCD_FEEDBACK_FREQUENCY_DURATION_MS
#define LCD_FEEDBACK_FREQUENCY_DURATION_MS 100
#endif
#elif PIN_EXISTS(BEEPER)
#ifndef LCD_FEEDBACK_FREQUENCY_HZ
#define LCD_FEEDBACK_FREQUENCY_HZ 5000
#endif
#ifndef LCD_FEEDBACK_FREQUENCY_DURATION_MS
#define LCD_FEEDBACK_FREQUENCY_DURATION_MS 2
#endif
#else
#ifndef LCD_FEEDBACK_FREQUENCY_DURATION_MS
#define LCD_FEEDBACK_FREQUENCY_DURATION_MS 2
#endif
#endif
#endif //CONFIGURATION_LCD
#endif //CONDITIONALS_H
21 changes: 3 additions & 18 deletions Marlin/ultralcd.cpp
View file
Original file line number Diff line number Diff line change
@@ -978,8 +978,8 @@ void lcd_cooldown() {
lcd_return_to_status();
//LCD_MESSAGEPGM(MSG_LEVEL_BED_DONE);
#if HAS_BUZZER
buzz(200, 659);
buzz(200, 698);
buzzer.tone(200, 659);
buzzer.tone(200, 698);
#endif
}
else {
@@ -1978,25 +1978,10 @@ void lcd_quick_feedback() {
next_button_update_ms = millis() + 500;

#if ENABLED(LCD_USE_I2C_BUZZER)
#ifndef LCD_FEEDBACK_FREQUENCY_HZ
#define LCD_FEEDBACK_FREQUENCY_HZ 100
#endif
#ifndef LCD_FEEDBACK_FREQUENCY_DURATION_MS
#define LCD_FEEDBACK_FREQUENCY_DURATION_MS (1000/6)
#endif
lcd.buzz(LCD_FEEDBACK_FREQUENCY_DURATION_MS, LCD_FEEDBACK_FREQUENCY_HZ);
#elif PIN_EXISTS(BEEPER)
#ifndef LCD_FEEDBACK_FREQUENCY_HZ
#define LCD_FEEDBACK_FREQUENCY_HZ 5000
#endif
#ifndef LCD_FEEDBACK_FREQUENCY_DURATION_MS
#define LCD_FEEDBACK_FREQUENCY_DURATION_MS 2
#endif
buzz(LCD_FEEDBACK_FREQUENCY_DURATION_MS, LCD_FEEDBACK_FREQUENCY_HZ);
buzzer.tone(LCD_FEEDBACK_FREQUENCY_DURATION_MS, LCD_FEEDBACK_FREQUENCY_HZ);
#else
#ifndef LCD_FEEDBACK_FREQUENCY_DURATION_MS
#define LCD_FEEDBACK_FREQUENCY_DURATION_MS 2
#endif
delay(LCD_FEEDBACK_FREQUENCY_DURATION_MS);
#endif
}