Skip to content

Latest Adafruit_GFX fixes + moved GFX lib to utility folder #1566

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 6, 2013
Merged

Latest Adafruit_GFX fixes + moved GFX lib to utility folder #1566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions libraries/Robot_Control/Arduino_LCD.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,9 @@


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

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

constructor(ILI9163C_TFTWIDTH, ILI9163C_TFTHEIGHT);
colstart = rowstart = 0; // May be overridden in init func
colstart = rowstart = 0; // May be overridden in init func

pinMode(_rs, OUTPUT);
pinMode(_cs, OUTPUT);
Expand Down
2 changes: 1 addition & 1 deletion libraries/Robot_Control/Arduino_LCD.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#else
#include "WProgram.h"
#endif
#include "Adafruit_GFX.h"
#include "utility/Adafruit_GFX.h"
//#include <avr/pgmspace.h>

// some flags for initR() :(
Expand Down
Loading