Improved support for panelolu2 encoder and buzzer
I added #define for LCD_FEEDBACK_FREQUENCY_HZ and LCD_FEEDBACK_FREQUENCY_DURATION_MS which is used to alter the default buzzer sound. When selecting Panelolu2 in configuration.h: - it automatically sets the correct ENCODER_PULSES_PER_STEP and ENCODER_STEPS_PER_MENU_ITEM. - if LCD_USE_I2C_BUZZER is defined it will also set the default LCD_FEEDBACK_FREQUENCY_HZ and LCD_FEEDBACK_FREQUENCY_DURATION_MS When selecting the sanguinololu 1284p the following is true: - its now enables LARGE_FLASH - It enables the gcode M300 when the panelolu2 LCD_USE_I2C_BUZZER is defined
This commit is contained in:
parent
f303129fb6
commit
8d162e5bd7
4 changed files with 35 additions and 4 deletions
|
@ -447,6 +447,8 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
|
||||||
//#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking
|
//#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking
|
||||||
//#define ULTIMAKERCONTROLLER //as available from the ultimaker online store.
|
//#define ULTIMAKERCONTROLLER //as available from the ultimaker online store.
|
||||||
//#define ULTIPANEL //the ultipanel as on thingiverse
|
//#define ULTIPANEL //the ultipanel as on thingiverse
|
||||||
|
//#define LCD_FEEDBACK_FREQUENCY_HZ 1000 // this is the tone frequency the buzzer plays when on UI feedback. ie Screen Click
|
||||||
|
//#define LCD_FEEDBACK_FREQUENCY_DURATION_MS 100 // the duration the buzzer plays the UI feedback sound. ie Screen Click
|
||||||
|
|
||||||
// The MaKr3d Makr-Panel with graphic controller and SD support
|
// The MaKr3d Makr-Panel with graphic controller and SD support
|
||||||
// http://reprap.org/wiki/MaKr3d_MaKrPanel
|
// http://reprap.org/wiki/MaKr3d_MaKrPanel
|
||||||
|
@ -532,6 +534,21 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
|
||||||
#define LCD_USE_I2C_BUZZER //comment out to disable buzzer on LCD
|
#define LCD_USE_I2C_BUZZER //comment out to disable buzzer on LCD
|
||||||
#define NEWPANEL
|
#define NEWPANEL
|
||||||
#define ULTIPANEL
|
#define ULTIPANEL
|
||||||
|
|
||||||
|
#ifndef ENCODER_PULSES_PER_STEP
|
||||||
|
#define ENCODER_PULSES_PER_STEP 4
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef ENCODER_STEPS_PER_MENU_ITEM
|
||||||
|
#define ENCODER_STEPS_PER_MENU_ITEM 1
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
#ifdef LCD_USE_I2C_BUZZER
|
||||||
|
#define LCD_FEEDBACK_FREQUENCY_HZ 1000
|
||||||
|
#define LCD_FEEDBACK_FREQUENCY_DURATION_MS 100
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Panucatt VIKI LCD with status LEDs, integrated click & L/R/U/P buttons, separate encoder inputs
|
// Panucatt VIKI LCD with status LEDs, integrated click & L/R/U/P buttons, separate encoder inputs
|
||||||
|
|
|
@ -2466,7 +2466,7 @@ void process_commands()
|
||||||
break;
|
break;
|
||||||
#endif // NUM_SERVOS > 0
|
#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
|
case 300: // M300
|
||||||
{
|
{
|
||||||
int beepS = code_seen('S') ? code_value() : 110;
|
int beepS = code_seen('S') ? code_value() : 110;
|
||||||
|
@ -2478,7 +2478,9 @@ void process_commands()
|
||||||
delay(beepP);
|
delay(beepP);
|
||||||
noTone(BEEPER);
|
noTone(BEEPER);
|
||||||
#elif defined(ULTRALCD)
|
#elif defined(ULTRALCD)
|
||||||
lcd_buzz(beepS, beepP);
|
lcd_buzz(beepS, beepP);
|
||||||
|
#elif defined(LCD_USE_I2C_BUZZER)
|
||||||
|
lcd_buzz(beepP, beepS);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -2736,7 +2738,11 @@ void process_commands()
|
||||||
WRITE(BEEPER,LOW);
|
WRITE(BEEPER,LOW);
|
||||||
delay(3);
|
delay(3);
|
||||||
#else
|
#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
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -971,6 +971,10 @@
|
||||||
#undef MOTHERBOARD
|
#undef MOTHERBOARD
|
||||||
#define MOTHERBOARD 6
|
#define MOTHERBOARD 6
|
||||||
#define SANGUINOLOLU_V_1_2
|
#define SANGUINOLOLU_V_1_2
|
||||||
|
|
||||||
|
#if defined(__AVR_ATmega1284P__)
|
||||||
|
#define LARGE_FLASH true
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
#if MOTHERBOARD == 6
|
#if MOTHERBOARD == 6
|
||||||
#define KNOWN_BOARD 1
|
#define KNOWN_BOARD 1
|
||||||
|
|
|
@ -711,7 +711,11 @@ static void lcd_implementation_drawmenu_sddirectory(uint8_t row, const char* pst
|
||||||
static void lcd_implementation_quick_feedback()
|
static void lcd_implementation_quick_feedback()
|
||||||
{
|
{
|
||||||
#ifdef LCD_USE_I2C_BUZZER
|
#ifdef LCD_USE_I2C_BUZZER
|
||||||
lcd.buzz(60,1000/6);
|
#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
|
||||||
#elif defined(BEEPER) && BEEPER > -1
|
#elif defined(BEEPER) && BEEPER > -1
|
||||||
SET_OUTPUT(BEEPER);
|
SET_OUTPUT(BEEPER);
|
||||||
for(int8_t i=0;i<10;i++)
|
for(int8_t i=0;i<10;i++)
|
||||||
|
|
Reference in a new issue