Small fixes after merge

This commit is contained in:
Erik van der Zalm
2012-02-21 20:36:43 +01:00
parent d298dd121f
commit 8816ef1c64
3 changed files with 12 additions and 18 deletions

View File

@ -28,17 +28,12 @@
#define CLICKED (buttons&EN_C)
#define BLOCK {blocking=millis()+blocktime;}
#if (SDCARDDETECT > -1)
{
#ifdef SDCARDDETECTINVERTED
#define CARDINSERTED (READ(SDCARDDETECT)!=0)
#else
#define CARDINSERTED (READ(SDCARDDETECT)==0)
}
#endif
#endif //SDCARDTETECTINVERTED
#ifdef SDCARDDETECTINVERTED
#define CARDINSERTED (READ(SDCARDDETECT)!=0)
#else
#define CARDINSERTED (READ(SDCARDDETECT)==0)
#endif
#endif //SDCARDTETECTINVERTED
#else