-disabled CARDDETECT if PIN is set to -1
- redo disable Beeper if PIN is set to -1
This commit is contained in:
parent
3183a14755
commit
b51e8bf7e5
2 changed files with 14 additions and 4 deletions
|
@ -27,7 +27,11 @@
|
|||
|
||||
#define CLICKED (buttons&EN_C)
|
||||
#define BLOCK {blocking=millis()+blocktime;}
|
||||
#if (SDCARDDETECT > -1)
|
||||
{
|
||||
#define CARDINSERTED (READ(SDCARDDETECT)==0)
|
||||
}
|
||||
#endif
|
||||
|
||||
#else
|
||||
|
||||
|
|
|
@ -130,7 +130,7 @@ void beep()
|
|||
{
|
||||
//return;
|
||||
#ifdef ULTIPANEL
|
||||
if (BEEPER > -1)
|
||||
#if (BEEPER > -1)
|
||||
{
|
||||
pinMode(BEEPER,OUTPUT);
|
||||
for(int8_t i=0;i<20;i++){
|
||||
|
@ -141,13 +141,14 @@ void beep()
|
|||
}
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
|
||||
void beepshort()
|
||||
{
|
||||
//return;
|
||||
#ifdef ULTIPANEL
|
||||
if (BEEPER > -1)
|
||||
#if (BEEPER > -1)
|
||||
{
|
||||
pinMode(BEEPER,OUTPUT);
|
||||
for(int8_t i=0;i<10;i++){
|
||||
|
@ -158,6 +159,7 @@ void beepshort()
|
|||
}
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
|
||||
void lcd_status()
|
||||
|
@ -203,7 +205,11 @@ void buttons_init()
|
|||
WRITE(BTN_EN1,HIGH);
|
||||
WRITE(BTN_EN2,HIGH);
|
||||
WRITE(BTN_ENC,HIGH);
|
||||
#if (SDCARDDETECT > -1)
|
||||
{
|
||||
WRITE(SDCARDDETECT,HIGH);
|
||||
}
|
||||
#endif
|
||||
#else
|
||||
pinMode(SHIFT_CLK,OUTPUT);
|
||||
pinMode(SHIFT_LD,OUTPUT);
|
||||
|
|
Reference in a new issue