aboutsummaryrefslogtreecommitdiffstats
path: root/demos
diff options
context:
space:
mode:
authorAndrew Hannam <andrewh@inmarket.com.au>2012-11-11 00:00:23 -0800
committerAndrew Hannam <andrewh@inmarket.com.au>2012-11-11 00:00:23 -0800
commite28a4dbd0e5306f40f2e778025fd0e4888d9d0ba (patch)
treecfaa5add5f3ad13f51b3bc500048329dc9489df4 /demos
parent77e1371b86c6181da153d68b326c624486c1245c (diff)
parent44bb28ed9259633d48bb526a681d0e6057c4da86 (diff)
downloaduGFX-e28a4dbd0e5306f40f2e778025fd0e4888d9d0ba.tar.gz
uGFX-e28a4dbd0e5306f40f2e778025fd0e4888d9d0ba.tar.bz2
uGFX-e28a4dbd0e5306f40f2e778025fd0e4888d9d0ba.zip
Merge pull request #2 from Tectu/master
Merge Tectu changes
Diffstat (limited to 'demos')
-rw-r--r--demos/mandelbrot/main.c1
-rw-r--r--demos/notepad/main.c3
2 files changed, 0 insertions, 4 deletions
diff --git a/demos/mandelbrot/main.c b/demos/mandelbrot/main.c
index 0c8dc47d..92f4aaa2 100644
--- a/demos/mandelbrot/main.c
+++ b/demos/mandelbrot/main.c
@@ -43,7 +43,6 @@ void mandelbrot(float x1, float y1, float x2, float y2) {
x = xx - yy + cx;
}
color = ((iter << 8) | (iter&0xFF));
- //color = RGB565CONVERT(iter*4, iter*13, iter*10);
gdispDrawPixel(i, j, color);
}
}
diff --git a/demos/notepad/main.c b/demos/notepad/main.c
index 5d9e5ffc..7fec864f 100644
--- a/demos/notepad/main.c
+++ b/demos/notepad/main.c
@@ -53,8 +53,6 @@ TouchscreenDriver TOUCHPADD1 = {
void drawScreen(void) {
char *msg = "ChibiOS/GFX";
- uint16_t colorsize = COLOR_SIZE;
- uint16_t pensize = PEN_SIZE;
gdispSetOrientation(GDISP_ROTATE_90);
gdispClear(White);
@@ -86,7 +84,6 @@ int main(void) {
gdispInit();
tsInit(&TOUCHPADD1);
- tsCalibrate();
drawScreen();