diff --git a/src/LedControl.cpp b/src/LedControl.cpp index ced71085..8ae48242 100644 --- a/src/LedControl.cpp +++ b/src/LedControl.cpp @@ -97,11 +97,11 @@ void LedControl::setIntensity(int addr, int intensity) { } void LedControl::clearDisplay(int addr) { - int offset; - if(addr<0 || addr>=maxDevices) return; - offset=addr*8; +#ifndef MF_REDUCE_FUNCT_LEDCONTROL + int offset=addr*8; +#endif for(int i=0;i<8;i++) { #ifndef MF_REDUCE_FUNCT_LEDCONTROL status[offset+i]=0; @@ -123,7 +123,7 @@ void LedControl::setLed(int addr, int row, int column, boolean state) { if(row<0 || row>7 || column<0 || column>7) return; offset=addr*8; - val=B10000000 >> column; + val=0b10000000 >> column; if(state) status[offset+row]=status[offset+row]|val; else { @@ -160,17 +160,17 @@ void LedControl::setColumn(int addr, int col, byte value) { #endif void LedControl::setDigit(int addr, int digit, byte value, boolean dp) { - int offset; - byte v; - if(addr<0 || addr>=maxDevices) return; if(digit<0 || digit>7 || value>15) return; - offset=addr*8; +#ifndef MF_REDUCE_FUNCT_LEDCONTROL + int offset=addr*8; +#endif + byte v; v=pgm_read_byte_near(charTable + value); if(dp) - v|=B10000000; + v|=0b10000000; #ifndef MF_REDUCE_FUNCT_LEDCONTROL status[offset+digit]=v; #endif @@ -178,14 +178,15 @@ void LedControl::setDigit(int addr, int digit, byte value, boolean dp) { } void LedControl::setChar(int addr, int digit, char value, boolean dp) { - int offset; - byte index,v; - if(addr<0 || addr>=maxDevices) return; if(digit<0 || digit>7) return; - offset=addr*8; +#ifndef MF_REDUCE_FUNCT_LEDCONTROL + int offset=addr*8; +#endif + byte index,v; + index=(byte)value; if(index >127) { //nothing define we use the space char @@ -193,7 +194,7 @@ void LedControl::setChar(int addr, int digit, char value, boolean dp) { } v=pgm_read_byte_near(charTable + index); if(dp) - v|=B10000000; + v|=0b10000000; #ifndef MF_REDUCE_FUNCT_LEDCONTROL status[offset+digit]=v; #endif diff --git a/src/LedControl.h b/src/LedControl.h index cc1729a8..dfd8559b 100644 --- a/src/LedControl.h +++ b/src/LedControl.h @@ -27,13 +27,7 @@ #ifndef LedControl_h #define LedControl_h -#include - -#if (ARDUINO >= 100) #include -#else -#include -#endif /* * Segments to be switched on for characters and digits on