Merge pull request #1 from brabo/master

Merging in my i2c-touchscreen example

Author: brabo

examples/stm32/f4/stm32f429i-discovery/ts-i2c/Makefile

@@ -0,0 +1,10 @@
+OBJS = sdram.o clock.o lcd-spi.o gfx.o stmpe811.o
+
+BINARY = ts-i2c
+
+# we use sin/cos from the library
+LDLIBS += -lm
+
+LDSCRIPT = ../stm32f429i-discovery.ld
+
+include ../../Makefile.include

examples/stm32/f4/stm32f429i-discovery/ts-i2c/README

@@ -0,0 +1,11 @@
+README ts-i2c
+-----------------
+
+This example sets up a very basic LCD display on the DISCO
+board and fills it with red.
+Pressing on the touchscreen will turn the screen green.
+
+It uses some graphics code that was inspired by AdaFruit graphics library.
+
+The stmpe811 example driver uses i2c to communicate with the
+touchscreen.

examples/stm32/f4/stm32f429i-discovery/ts-i2c/clock.c

@@ -0,0 +1,73 @@
+/*
+ * This file is part of the libopencm3 project.
+ *
+ * Copyright (C) 2014 Chuck McManis <[email protected]>
+ *
+ * This library is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * Now this is just the clock setup code from systick-blink as it is the
+ * transferrable part.
+ */
+
+#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/cm3/nvic.h>
+#include <libopencm3/cm3/systick.h>
+
+/* Common function descriptions */
+#include "clock.h"
+
+/* milliseconds since boot */
+static volatile uint32_t system_millis;
+
+/* Called when systick fires */
+void sys_tick_handler(void)
+{
+	system_millis++;
+}
+
+/* simple sleep for delay milliseconds */
+void msleep(uint32_t delay)
+{
+	uint32_t wake = system_millis + delay;
+	while (wake > system_millis);
+}
+
+/* Getter function for the current time */
+uint32_t mtime(void)
+{
+	return system_millis;
+}
+
+/*
+ * clock_setup(void)
+ *
+ * This function sets up both the base board clock rate
+ * and a 1khz "system tick" count. The SYSTICK counter is
+ * a standard feature of the Cortex-M series.
+ */
+void clock_setup(void)
+{
+	/* Base board frequency, set to 168Mhz */
+	rcc_clock_setup_hse_3v3(&rcc_hse_8mhz_3v3[RCC_CLOCK_3V3_168MHZ]);
+
+	/* clock rate / 168000 to get 1mS interrupt rate */
+	systick_set_reload(168000);
+	systick_set_clocksource(STK_CSR_CLKSOURCE_AHB);
+	systick_counter_enable();
+
+	/* this done last */
+	systick_interrupt_enable();
+}

examples/stm32/f4/stm32f429i-discovery/ts-i2c/clock.h

@@ -0,0 +1,15 @@
+/*
+ * This include file describes the functions exported by clock.c
+ */
+#ifndef __CLOCK_H
+#define __CLOCK_H
+
+/*
+ * Definitions for functions being abstracted out
+ */
+void msleep(uint32_t);
+uint32_t mtime(void);
+void clock_setup(void);
+
+#endif /* generic header protector */
+

examples/stm32/f4/stm32f429i-discovery/ts-i2c/gfx.c

@@ -0,0 +1,147 @@
+/*
+ * This is the core graphics library for all our displays, providing a common
+ * set of graphics primitives (points, lines, circles, etc.).  It needs to be
+ * paired with a hardware-specific library for each display device we carry
+ * (to handle the lower-level functions).
+ *
+ * Adafruit invests time and resources providing this open source code, please
+ * support Adafruit & open-source hardware by purchasing products from Adafruit!
+ *
+ * Copyright (c) 2013 Adafruit Industries.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright notice,
+ *   this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Modified the AdaFruit library to be a C library, changed the font and
+ * generally munged it in a variety of ways, creating a reasonably quick
+ * and dirty way to put something "interesting" on the LCD display.
+ * --Chuck McManis (2013, 2014)
+ *
+ */
+
+#include <stdint.h>
+#include <math.h>
+#include <stdlib.h>
+#include "gfx.h"
+
+struct gfx_state __gfx_state;
+
+void
+gfx_draw_pixel(int x, int y, uint16_t color)
+{
+	if ((x < 0) || (x >= __gfx_state._width) ||
+	    (y < 0) || (y >= __gfx_state._height)) {
+		return; /* off screen so don't draw it */
+	}
+	(__gfx_state.drawpixel)(x, y, color);
+}
+#define true 1
+
+void
+gfx_init(void (*pixel_func)(int, int, uint16_t), int width, int height)
+{
+	__gfx_state._width    = width;
+	__gfx_state._height   = height;
+	__gfx_state.rotation  = 0;
+	__gfx_state.cursor_y  = __gfx_state.cursor_x    = 0;
+	__gfx_state.textsize  = 1;
+	__gfx_state.textcolor = 0;
+	__gfx_state.textbgcolor = 0xFFFF;
+	__gfx_state.wrap      = true;
+	__gfx_state.drawpixel = pixel_func;
+}
+
+/* Bresenham's algorithm - thx wikpedia */
+void gfx_draw_line(int16_t x0, int16_t y0,
+			    int16_t x1, int16_t y1,
+			    uint16_t color)
+{
+	int16_t steep = abs(y1 - y0) > abs(x1 - x0);
+	if (steep) {
+		swap(x0, y0);
+		swap(x1, y1);
+	}
+
+	if (x0 > x1) {
+		swap(x0, x1);
+		swap(y0, y1);
+	}
+
+	int16_t dx, dy;
+	dx = x1 - x0;
+	dy = abs(y1 - y0);
+
+	int16_t err = dx / 2;
+	int16_t ystep;
+
+	if (y0 < y1) {
+		ystep = 1;
+	} else {
+		ystep = -1;
+	}
+
+	for (; x0 <= x1; x0++) {
+		if (steep) {
+			gfx_draw_pixel(y0, x0, color);
+		} else {
+			gfx_draw_pixel(x0, y0, color);
+		}
+		err -= dy;
+		if (err < 0) {
+			y0 += ystep;
+			err += dx;
+		}
+	}
+}
+
+void gfx_draw_fast_vline(int16_t x, int16_t y,
+		       int16_t h, uint16_t color)
+{
+	/* Update in subclasses if desired! */
+	gfx_draw_line(x, y, x, y + h - 1, color);
+}
+
+void gfx_fill_rect(int16_t x, int16_t y, int16_t w, int16_t h,
+		  uint16_t color)
+{
+	/* Update in subclasses if desired! */
+	int16_t i;
+	for (i = x; i < x + w; i++) {
+		gfx_draw_fast_vline(i, y, h, color);
+	}
+}
+
+void gfx_fill_screen(uint16_t color)
+{
+	gfx_fill_rect(0, 0, __gfx_state._width, __gfx_state._height, color);
+}
+
+/* Return the size of the display (per current rotation) */
+uint16_t gfx_width(void)
+{
+	return __gfx_state._width;
+}
+
+uint16_t gfx_height(void)
+{
+	return __gfx_state._height;
+}
+

examples/stm32/f4/stm32f429i-discovery/ts-i2c/gfx.h

@@ -0,0 +1,47 @@
+/*
+ * A simple port of the AdaFruit minimal graphics code to my
+ * demo code.
+ */
+#ifndef _GFX_H
+#define _GFX_H
+#include <stdint.h>
+
+#define swap(a, b) { int16_t t = a; a = b; b = t; }
+
+void gfx_draw_pixel(int x, int y, uint16_t color);
+void gfx_draw_line(int16_t x0, int16_t y0, int16_t x1, int16_t y1,
+		  uint16_t color);
+void gfx_draw_fast_vline(int16_t x, int16_t y, int16_t h, uint16_t color);
+void gfx_fill_rect(int16_t x, int16_t y, int16_t w, int16_t h, uint16_t color);
+void gfx_fill_screen(uint16_t color);
+
+void gfx_init(void (*draw)(int, int, uint16_t), int, int);
+
+uint16_t gfx_height(void);
+uint16_t gfx_width(void);
+
+#define GFX_WIDTH   320
+#define GFX_HEIGHT  240
+
+struct gfx_state {
+	int16_t _width, _height, cursor_x, cursor_y;
+	uint16_t textcolor, textbgcolor;
+	uint8_t textsize, rotation;
+	uint8_t wrap;
+	void (*drawpixel)(int, int, uint16_t);
+};
+
+extern struct gfx_state __gfx_state;
+
+#define GFX_COLOR_WHITE          0xFFFF
+#define GFX_COLOR_BLACK          0x0000
+#define GFX_COLOR_GREY           0xF7DE
+#define GFX_COLOR_BLUE           0x001F
+#define GFX_COLOR_BLUE2          0x051F
+#define GFX_COLOR_RED            0xF800
+#define GFX_COLOR_MAGENTA        0xF81F
+#define GFX_COLOR_GREEN          0x07E0
+#define GFX_COLOR_CYAN           0x7FFF
+#define GFX_COLOR_YELLOW         0xFFE0
+
+#endif /* _ADAFRUIT_GFX_H */