.
Diff: Display/LCD.cpp
- Revision:
- 27:acb2594b8aa4
- Parent:
- 25:daacdcf34e52
- Child:
- 33:f87f06292637
diff -r 09c1d5110134 -r acb2594b8aa4 Display/LCD.cpp --- a/Display/LCD.cpp Sun Oct 18 17:31:33 2015 +0000 +++ b/Display/LCD.cpp Mon Oct 26 12:49:02 2015 +0000 @@ -17,20 +17,23 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "platform.h" +#include "LCD.h" -#include "LCD.h" +#if DEVICE_PORTINOUT +#include "PAR8.h" +#include "PAR16.h" +#endif //#include "mbed_debug.h" #define SWAP(a, b) { a ^= b; b ^= a; a ^= b; } - +#if DEVICE_PORTINOUT LCD::LCD(proto_t displayproto, PortName port, PinName CS, PinName reset, PinName DC, PinName WR, PinName RD, const int lcdsize_x, const int lcdsize_y, const int ic_x_segs, const int ic_y_coms, const char *name) : GraphicsDisplay(name), screensize_X(lcdsize_x), screensize_Y(lcdsize_y), _LCDPAGES(lcdsize_y>>3), _IC_X_SEGS(ic_x_segs), _IC_Y_COMS(ic_y_coms), _IC_PAGES(ic_y_coms>>3) { -#if DEVICE_PORTINOUT - if(displayproto==PAR_8) proto = new PAR8(port, CS, reset, DC, WR, RD); -#endif + if(displayproto==PAR_8) proto = new PAR8(port, CS, reset, DC, WR, RD); useNOP=false; buffer = (unsigned char*) malloc (screensize_X*_LCDPAGES); buffer16 = (unsigned short*)buffer; @@ -43,6 +46,8 @@ // cls(); // locate(0,0); } +#endif + LCD::LCD(proto_t displayproto, PinName* buspins, PinName CS, PinName reset, PinName DC, PinName WR, PinName RD, const int lcdsize_x, const int lcdsize_y, const int ic_x_segs, const int ic_y_coms, const char *name) : GraphicsDisplay(name), screensize_X(lcdsize_x), screensize_Y(lcdsize_y), _LCDPAGES(lcdsize_y>>3), _IC_X_SEGS(ic_x_segs), _IC_Y_COMS(ic_y_coms), _IC_PAGES(ic_y_coms>>3) {