SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

-disabled CARDDETECT if PIN is set to -1

Browse source 
- redo disable Beeper if PIN is set to -1
This commit is contained in:
Christian Thalhammer 2012-02-06 12:22:44 +01:00
parent 3183a14755
commit b51e8bf7e5
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Marlin/ultralcd.h
View file

@ -27,7 +27,11 @@
#define CLICKED (buttons&EN_C) #define CLICKED (buttons&EN_C)
#define BLOCK {blocking=millis()+blocktime;} #define BLOCK {blocking=millis()+blocktime;}
#define CARDINSERTED (READ(SDCARDDETECT)==0) #if (SDCARDDETECT > -1)
{
#define CARDINSERTED (READ(SDCARDDETECT)==0)
}
#endif
#else #else

12
Marlin/ultralcd.pde
View file

@ -130,7 +130,7 @@ void beep()
{ {
//return; //return;
#ifdef ULTIPANEL #ifdef ULTIPANEL
if (BEEPER > -1) #if (BEEPER > -1)
{ {
pinMode(BEEPER,OUTPUT); pinMode(BEEPER,OUTPUT);
for(int8_t i=0;i<20;i++){ for(int8_t i=0;i<20;i++){
@ -140,6 +140,7 @@ void beep()
delay(5); delay(5);
} }
} }
#endif
#endif #endif
} }
@ -147,7 +148,7 @@ void beepshort()
{ {
//return; //return;
#ifdef ULTIPANEL #ifdef ULTIPANEL
if (BEEPER > -1) #if (BEEPER > -1)
{ {
pinMode(BEEPER,OUTPUT); pinMode(BEEPER,OUTPUT);
for(int8_t i=0;i<10;i++){ for(int8_t i=0;i<10;i++){
@ -157,6 +158,7 @@ void beepshort()
delay(3); delay(3);
} }
} }
#endif
#endif #endif
} }
@ -203,7 +205,11 @@ void buttons_init()
WRITE(BTN_EN1,HIGH); WRITE(BTN_EN1,HIGH);
WRITE(BTN_EN2,HIGH); WRITE(BTN_EN2,HIGH);
WRITE(BTN_ENC,HIGH); WRITE(BTN_ENC,HIGH);
WRITE(SDCARDDETECT,HIGH); #if (SDCARDDETECT > -1)
{
WRITE(SDCARDDETECT,HIGH);
}
#endif
#else #else
pinMode(SHIFT_CLK,OUTPUT); pinMode(SHIFT_CLK,OUTPUT);
pinMode(SHIFT_LD,OUTPUT); pinMode(SHIFT_LD,OUTPUT);