zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4265 from thinkyhead/rc_buzzer_patchup

Browse source 
Two strategies to address a stuck buzzer
This commit is contained in:
Scott Lahteine 2016-07-10 19:46:15 -07:00 committed by GitHub
parent 4a100c6832 d1dffc7ad1
commit 6121c9018a
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Marlin/buzzer.h
View file

@ -46,7 +46,7 @@ class Buzzer {
private: private:
struct state_t { struct state_t {
tone_t tone; tone_t tone;
uint32_t timestamp; uint32_t endtime;
} state; } state;
protected: protected:
@ -82,7 +82,7 @@ class Buzzer {
*/ */
void reset() { void reset() {
this->off(); this->off();
this->state.timestamp = 0; this->state.endtime = 0;
} }
public: public:
@ -97,7 +97,7 @@ class Buzzer {
/** /**
* @brief Add a tone to the queue * @brief Add a tone to the queue
* @details Adds a tone_t structure to the ring buffer, will block IO if the * @details Adds a tone_t structure to the ring buffer, will block IO if the
* queue is full waiting for one slot to get available. * queue is full waiting for one slot to get available.
* *
* @param duration Duration of the tone in milliseconds * @param duration Duration of the tone in milliseconds
* @param frequency Frequency of the tone in hertz * @param frequency Frequency of the tone in hertz
@ -114,17 +114,17 @@ class Buzzer {
/** /**
* @brief Loop function * @brief Loop function
* @details This function should be called at loop, it will take care of * @details This function should be called at loop, it will take care of
* playing the tones in the queue. * playing the tones in the queue.
*/ */
virtual void tick() { virtual void tick() {
if (!this->state.timestamp) { if (!this->state.endtime) {
if (this->buffer.isEmpty()) return; if (this->buffer.isEmpty()) return;
this->state.tone = this->buffer.dequeue(); this->state.tone = this->buffer.dequeue();
this->state.timestamp = millis() + this->state.tone.duration; this->state.endtime = millis() + this->state.tone.duration;
if (this->state.tone.frequency > 0) this->on(); if (this->state.tone.frequency > 0) this->on();
} }
else if (millis() >= this->state.timestamp) this->reset(); else if (ELAPSED(millis(), this->state.endtime)) this->reset();
} }
}; };

4
Marlin/ultralcd.cpp
View file

@ -2334,12 +2334,14 @@ void kill_screen(const char* lcd_msg) {
lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW; lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW;
next_button_update_ms = millis() + 500; next_button_update_ms = millis() + 500;
// Buzz and wait. The delay is needed for buttons to settle!
#if ENABLED(LCD_USE_I2C_BUZZER) #if ENABLED(LCD_USE_I2C_BUZZER)
lcd.buzz(LCD_FEEDBACK_FREQUENCY_DURATION_MS, LCD_FEEDBACK_FREQUENCY_HZ); lcd.buzz(LCD_FEEDBACK_FREQUENCY_DURATION_MS, LCD_FEEDBACK_FREQUENCY_HZ);
delay(10);
#elif PIN_EXISTS(BEEPER) #elif PIN_EXISTS(BEEPER)
buzzer.tone(LCD_FEEDBACK_FREQUENCY_DURATION_MS, LCD_FEEDBACK_FREQUENCY_HZ); buzzer.tone(LCD_FEEDBACK_FREQUENCY_DURATION_MS, LCD_FEEDBACK_FREQUENCY_HZ);
for (int8_t i = 5; i--;) { buzzer.tick(); delay(2); }
#endif #endif
delay(10); // needed for buttons to settle
} }
/** /**