From b51e8bf7e58b025a4b29ba6ca50c18802bfa92bb Mon Sep 17 00:00:00 2001
From: Christian Thalhammer <christian_thalhammer@gmx.at>
Date: Mon, 6 Feb 2012 12:22:44 +0100
Subject: [PATCH] -disabled CARDDETECT if PIN is set to -1 - redo disable
Beeper if PIN is set to -1
---
Marlin/ultralcd.h | 6 +++++-
Marlin/ultralcd.pde | 12 +++++++++---
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/Marlin/ultralcd.h b/Marlin/ultralcd.h
index 08ac950d38..f89f346136 100644
--- a/Marlin/ultralcd.h
+++ b/Marlin/ultralcd.h
@@ -27,7 +27,11 @@
#define CLICKED (buttons&EN_C)
#define BLOCK {blocking=millis()+blocktime;}
- #define CARDINSERTED (READ(SDCARDDETECT)==0)
+ #if (SDCARDDETECT > -1)
+ {
+ #define CARDINSERTED (READ(SDCARDDETECT)==0)
+ }
+ #endif
#else
diff --git a/Marlin/ultralcd.pde b/Marlin/ultralcd.pde
index 720567f2ee..1c23383ed3 100644
--- a/Marlin/ultralcd.pde
+++ b/Marlin/ultralcd.pde
@@ -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++){
@@ -140,6 +140,7 @@ void beep()
delay(5);
}
}
+ #endif
#endif
}
@@ -147,7 +148,7 @@ void beepshort()
{
//return;
#ifdef ULTIPANEL
- if (BEEPER > -1)
+ #if (BEEPER > -1)
{
pinMode(BEEPER,OUTPUT);
for(int8_t i=0;i<10;i++){
@@ -157,6 +158,7 @@ void beepshort()
delay(3);
}
}
+ #endif
#endif
}
@@ -203,7 +205,11 @@ void buttons_init()
WRITE(BTN_EN1,HIGH);
WRITE(BTN_EN2,HIGH);
WRITE(BTN_ENC,HIGH);
- WRITE(SDCARDDETECT,HIGH);
+ #if (SDCARDDETECT > -1)
+ {
+ WRITE(SDCARDDETECT,HIGH);
+ }
+ #endif
#else
pinMode(SHIFT_CLK,OUTPUT);
pinMode(SHIFT_LD,OUTPUT);