Skip to content

Commit a06ccb7

Browse files
Latest Adafruit_GFX fixes + moved GFX lib to utility folder
Updated constructor and dependent code, other minor fixes. Robot LCD examples all compile, but not yet tested against actual hardware.
1 parent 0f0d5fe commit a06ccb7

File tree

4 files changed

+171
-168
lines changed

4 files changed

+171
-168
lines changed

libraries/Robot_Control/Arduino_LCD.cpp

+6-5
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,9 @@
2525

2626

2727
// Constructor when using software SPI. All output pins are configurable.
28-
Arduino_LCD::Arduino_LCD(uint8_t cs, uint8_t rs, uint8_t sid,
29-
uint8_t sclk, uint8_t rst) {
28+
Arduino_LCD::Arduino_LCD(uint8_t cs, uint8_t rs, uint8_t sid, uint8_t sclk,
29+
uint8_t rst) : Adafruit_GFX(ILI9163C_TFTWIDTH, ILI9163C_TFTHEIGHT)
30+
{
3031
_cs = cs;
3132
_rs = rs;
3233
_sid = sid;
@@ -38,7 +39,8 @@ Arduino_LCD::Arduino_LCD(uint8_t cs, uint8_t rs, uint8_t sid,
3839

3940
// Constructor when using hardware SPI. Faster, but must use SPI pins
4041
// specific to each board type (e.g. 11,13 for Uno, 51,52 for Mega, etc.)
41-
Arduino_LCD::Arduino_LCD(uint8_t cs, uint8_t rs, uint8_t rst) {
42+
Arduino_LCD::Arduino_LCD(uint8_t cs, uint8_t rs, uint8_t rst) :
43+
Adafruit_GFX(ILI9163C_TFTWIDTH, ILI9163C_TFTHEIGHT) {
4244
_cs = cs;
4345
_rs = rs;
4446
_rst = rst;
@@ -325,8 +327,7 @@ void Arduino_LCD::commandList(uint8_t *addr) {
325327
//void Arduino_LCD::commonInit(prog_uchar *cmdList) {
326328
void Arduino_LCD::commonInit(uint8_t *cmdList) {
327329

328-
constructor(ILI9163C_TFTWIDTH, ILI9163C_TFTHEIGHT);
329-
colstart = rowstart = 0; // May be overridden in init func
330+
colstart = rowstart = 0; // May be overridden in init func
330331

331332
pinMode(_rs, OUTPUT);
332333
pinMode(_cs, OUTPUT);

libraries/Robot_Control/Arduino_LCD.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#else
2626
#include "WProgram.h"
2727
#endif
28-
#include "Adafruit_GFX.h"
28+
#include "utility/Adafruit_GFX.h"
2929
//#include <avr/pgmspace.h>
3030

3131
// some flags for initR() :(

0 commit comments

Comments
 (0)