Revert "updated license headers"

This reverts commit 0a26d9983b6d1deab272ff6dde98f7c77ff2a56c.

44 files changed, 471 insertions, 347 deletions

diff --git a/demos/3rdparty/boing/gfxconf.h b/demos/3rdparty/boing/gfxconf.h
new file mode 100644
index 00000000..45b6d7ab
--- /dev/null
+++ b/demos/3rdparty/boing/gfxconf.h
@@ -0,0 +1,40 @@
+/**
+ * This file has a different license to the rest of the GFX system.
+ * You can copy, modify and distribute this file as you see fit.
+ * You do not need to publish your source modifications to this file.
+ * The only thing you are not permitted to do is to relicense it
+ * under a different license.
+ */
+
+#ifndef _GFXCONF_H
+#define _GFXCONF_H
+
+/* GFX sub-systems to turn on */
+#define GFX_USE_GDISP			TRUE
+#define GFX_USE_GWIN			FALSE
+#define GFX_USE_GEVENT			FALSE
+#define GFX_USE_GTIMER			FALSE
+#define GFX_USE_GINPUT			FALSE
+
+/* Features for the GDISP sub-system. */
+#define GDISP_NEED_VALIDATION	        FALSE
+#define GDISP_NEED_CLIP			FALSE
+#define GDISP_NEED_TEXT			FALSE
+#define GDISP_NEED_CIRCLE		FALSE
+#define GDISP_NEED_ELLIPSE		FALSE
+#define GDISP_NEED_ARC			FALSE
+#define GDISP_NEED_SCROLL		FALSE
+#define GDISP_NEED_PIXELREAD	        FALSE
+#define GDISP_NEED_CONTROL		FALSE
+#define GDISP_NEED_MULTITHREAD       	FALSE
+#define GDISP_NEED_ASYNC		FALSE
+#define GDISP_NEED_MSGAPI		FALSE
+
+/* Builtin Fonts */
+#define GDISP_INCLUDE_FONT_SMALL        FALSE
+#define GDISP_INCLUDE_FONT_LARGER       FALSE
+#define GDISP_INCLUDE_FONT_UI1          FALSE
+#define GDISP_INCLUDE_FONT_UI2          FALSE
+#define GDISP_INCLUDE_FONT_LARGENUMBERS FALSE
+
+#endif /* _GFXCONF_H */
diff --git a/demos/3rdparty/boing/main.c b/demos/3rdparty/boing/main.c
new file mode 100644
index 00000000..a34cd2a9
--- /dev/null
+++ b/demos/3rdparty/boing/main.c
@@ -0,0 +1,111 @@
+/* Derived from the 2011 IOCCC submission by peter.eastman@gmail.com
+ * http://www.ioccc.org/2011/eastman/eastman.c
+ * --
+ * Public Domain -- but you're looking at this for ideas of techniques
+ * and methods, not trying to cut&paste an entire application, anyway.
+ * --
+ * When you need to blit an entire screenfull of data to an LCD
+ * display, the basic idea is to exploit the auto-increment feature of
+ * the display controller when it writes to screen memory. You start
+ * by resetting the 'cursor' to the 0,0 position, and then stream
+ * width*height pixels out.
+ * --
+ * Chris Baird,, <cjb@brushtail.apana.org.au> April 2013
+ */
+
+#include <math.h>
+#include "ch.h"
+#include "hal.h"
+#include "gfx.h"
+#include "ssd2119.h"
+
+#define Lightgrey (HTML2COLOR(0xC0C0C0))
+#define Midgrey (HTML2COLOR(0x606060))
+#define Darkgrey (HTML2COLOR(0x303030))
+
+
+/* ---------------------------------------------------------------------- */
+/* As of early April 2013, the /gfx extension tries to keep the low-level
+ * stuff away from our filthy paws. So Code Duplication.
+ * (Possibly to be replaced with gdispStartStream(), gdispWriteStream()
+ * and gdispStopStream() in the future.)
+ */
+
+#define GDISP_REG (*((volatile uint16_t *) 0x60000000)) /* DC = 0 */
+#define GDISP_RAM (*((volatile uint16_t *) 0x60100000)) /* DC = 1 */
+
+inline void write_index (uint16_t index) { GDISP_REG = index; }
+inline void write_data (uint16_t data) { GDISP_RAM = data; }
+
+#define write_reg(reg, data) { write_index(reg); write_data(data); }
+
+void reset_cursor (void)
+{
+  write_reg (SSD2119_REG_X_RAM_ADDR, 0);
+  write_reg (SSD2119_REG_Y_RAM_ADDR, 0);
+}
+
+#define StartStream() { write_index (SSD2119_REG_RAM_DATA); }
+#define WriteStream(x) { write_data (x); }
+#define StopStream() /* NOP */
+
+
+/* ---------------------------------------------------------------------- */
+
+void main (void)
+{
+  uint16_t xx, yy, colour;
+
+  halInit();
+  chSysInit();
+  gdispInit();
+
+  uint16_t width = (uint16_t)gdispGetWidth();
+  uint16_t height = (uint16_t)gdispGetHeight();
+
+  float i=height/5+height%2+1, floorstart=height/5-1, spherespin=0.0,
+    l=width/2, m=height/4, n=.01*width, o=0.0, rotspeed=0.1, h, f, g;
+
+  while (TRUE)
+    {
+      reset_cursor ();
+      StartStream ();
+
+      for (xx=yy=0;
+	   h = (m-yy)/i, f=-.3*(g=(l-xx)/i)+.954*h, yy<height;
+	   yy += (xx = ++xx%width)==0 )
+	{
+	  if (g*g < 1-h*h)	/* if inside the ball */
+	    if (((int)(9-spherespin+(.954*g+.3*h)/sqrtf(1-f*f))+(int)(2+f*2))%2==0)
+	      colour = Red;
+	    else
+	      colour = White;
+	  else
+	    {
+	      if (xx<floorstart || xx>width-floorstart)
+		colour = Darkgrey; /* side wall */
+	      else
+		colour = Lightgrey; /* back wall */
+
+	      if (yy > height-floorstart)
+		if (xx < height-yy || height-yy > width-xx) /* floor */
+		  colour = Darkgrey;
+		else
+		  colour = Midgrey;
+
+	      if (g*(g+.6)+.09+h*h < 1)
+		colour >>= 1;	/* ball shadow; make it darker  */
+	    }
+
+	  WriteStream (colour);	/* pixel to the LCD */
+	}
+
+      StopStream();
+      spherespin += rotspeed;
+      m += o;
+      o = m > height-1.75*floorstart ? -.04*height : o+.002*height;
+      n = (l+=n)<i || l>width-i ? rotspeed=-rotspeed,-n : n;
+    }
+}
+
+/* ---------------------------------------------------------------------- */
diff --git a/demos/3rdparty/bubbles/gfxconf.h b/demos/3rdparty/bubbles/gfxconf.h
new file mode 100644
index 00000000..9b1f76a6
--- /dev/null
+++ b/demos/3rdparty/bubbles/gfxconf.h
@@ -0,0 +1,40 @@
+/**
+ * This file has a different license to the rest of the GFX system.
+ * You can copy, modify and distribute this file as you see fit.
+ * You do not need to publish your source modifications to this file.
+ * The only thing you are not permitted to do is to relicense it
+ * under a different license.
+ */
+
+#ifndef _GFXCONF_H
+#define _GFXCONF_H
+
+/* GFX sub-systems to turn on */
+#define GFX_USE_GDISP			TRUE
+#define GFX_USE_GWIN			FALSE
+#define GFX_USE_GEVENT			FALSE
+#define GFX_USE_GTIMER			FALSE
+#define GFX_USE_GINPUT			FALSE
+
+/* Features for the GDISP sub-system. */
+#define GDISP_NEED_VALIDATION	        FALSE
+#define GDISP_NEED_CLIP			FALSE
+#define GDISP_NEED_TEXT			FALSE
+#define GDISP_NEED_CIRCLE		TRUE
+#define GDISP_NEED_ELLIPSE		FALSE
+#define GDISP_NEED_ARC			FALSE
+#define GDISP_NEED_SCROLL		FALSE
+#define GDISP_NEED_PIXELREAD	        FALSE
+#define GDISP_NEED_CONTROL		FALSE
+#define GDISP_NEED_MULTITHREAD       	FALSE
+#define GDISP_NEED_ASYNC		FALSE
+#define GDISP_NEED_MSGAPI		FALSE
+
+/* Builtin Fonts */
+#define GDISP_INCLUDE_FONT_SMALL        FALSE
+#define GDISP_INCLUDE_FONT_LARGER       FALSE
+#define GDISP_INCLUDE_FONT_UI1          FALSE
+#define GDISP_INCLUDE_FONT_UI2          FALSE
+#define GDISP_INCLUDE_FONT_LARGENUMBERS FALSE
+
+#endif /* _GFXCONF_H */
diff --git a/demos/3rdparty/bubbles/main.c b/demos/3rdparty/bubbles/main.c
new file mode 100644
index 00000000..81c5dbe3
--- /dev/null
+++ b/demos/3rdparty/bubbles/main.c
@@ -0,0 +1,194 @@
+/* Microcontroller graphic demo by Pascal Piazzalunga
+ * admin@serveurperso.com http://www.serveurperso.com
+ * https://www.youtube.com/watch?v=wyuJ-dqS2to
+ * Ported to stm32/ChibiOS/glx by Chris Baird.
+ * It's spinnin' bubbles, man.
+ * --
+ * Licencing? Ask Pascal. Let's assume it is freely-distributable and
+ * modifiable, provided his name is kept in the source.
+ * --
+ * Chris Baird,, <cjb@brushtail.apana.org.au> April 2013
+ */
+
+#include <math.h>
+#include "ch.h"
+#include "hal.h"
+#include "gfx.h"
+
+
+/* ---------------------------------------------------------------------- */
+
+#define N 1024			/* Number of dots */
+#define SCALE 8192
+#define INCREMENT 512		/* INCREMENT = SCALE / sqrt(N) * 2 */
+#define PI2 6.283185307179586476925286766559
+
+#define background RGB2COLOR(0,0,0)
+
+uint16_t width, height;
+int16_t sine[SCALE+(SCALE/4)];
+int16_t *cosi = &sine[SCALE/4]; /* cos(x) = sin(x+90d)... */
+
+
+void initialize (void)
+{
+  uint16_t i;
+
+  /* if you change the SCALE*1.25 back to SCALE, the program will
+   * occassionally overrun the cosi array -- however this actually
+   * produces some interesting effects as the BUBBLES LOSE CONTROL!!!!
+   */
+  for (i = 0; i < SCALE+(SCALE/4); i++)
+    //sine[i] = (-SCALE/2) + (int)(sinf(PI2 * i / SCALE) * sinf(PI2 * i / SCALE) * SCALE);
+    sine[i] = (int)(sinf(PI2 * i / SCALE) * SCALE);
+}
+
+
+void matrix (int16_t xyz[3][N], color_t col[N])
+{
+  static uint32_t t = 0;
+  int16_t x = -SCALE, y = -SCALE;
+  uint16_t i, s, d;
+  uint8_t red,grn,blu;
+
+#define RED_COLORS (32)
+#define GREEN_COLORS (64)
+#define BLUE_COLORS (32)
+
+  for (i = 0; i < N; i++)
+    {
+      xyz[0][i] = x;
+      xyz[1][i] = y;
+
+      d = sqrtf(x * x + y * y);	/* originally a fastsqrt() call */
+      s = sine[(t * 30) % SCALE] + SCALE;
+
+      xyz[2][i] = sine[(d + s) % SCALE] * sine[(t * 10) % SCALE] / SCALE / 2;
+
+      red = (cosi[xyz[2][i] + SCALE / 2] + SCALE) *
+	(RED_COLORS - 1) / SCALE / 2;
+      grn = (cosi[(xyz[2][i] + SCALE / 2 + 2 * SCALE / 3) % SCALE] + SCALE) *
+	(GREEN_COLORS - 1) / SCALE / 2;
+      blu = (cosi[(xyz[2][i] + SCALE / 2 + SCALE / 3) % SCALE] + SCALE) *
+	(BLUE_COLORS - 1) / SCALE / 2;
+      col[i] = ((red << 11) + (grn << 5) + blu);
+
+      x += INCREMENT;
+
+      if (x >= SCALE) x = -SCALE, y += INCREMENT;
+    }
+  t++;
+}
+
+
+void rotate (int16_t xyz[3][N], uint16_t angleX, uint16_t angleY, uint16_t angleZ)
+{
+  uint16_t i;
+  int16_t tmpX, tmpY;
+  int16_t sinx = sine[angleX], cosx = cosi[angleX];
+  int16_t siny = sine[angleY], cosy = cosi[angleY];
+  int16_t sinz = sine[angleZ], cosz = cosi[angleZ];
+
+  for (i = 0; i < N; i++)
+    {
+      tmpX      = (xyz[0][i] * cosx - xyz[2][i] * sinx) / SCALE;
+      xyz[2][i] = (xyz[0][i] * sinx + xyz[2][i] * cosx) / SCALE;
+      xyz[0][i] = tmpX;
+
+      tmpY      = (xyz[1][i] * cosy - xyz[2][i] * siny) / SCALE;
+      xyz[2][i] = (xyz[1][i] * siny + xyz[2][i] * cosy) / SCALE;
+      xyz[1][i] = tmpY;
+
+      tmpX      = (xyz[0][i] * cosz - xyz[1][i] * sinz) / SCALE;
+      xyz[1][i] = (xyz[0][i] * sinz + xyz[1][i] * cosz) / SCALE;
+      xyz[0][i] = tmpX;
+    }
+}
+
+
+void draw(int16_t xyz[3][N], color_t col[N])
+{
+  static uint16_t oldProjX[N] = {0};
+  static uint16_t oldProjY[N] = {0};
+  static uint8_t oldDotSize[N] = {0};
+  uint16_t i, projX, projY, projZ, dotSize;
+
+  for (i = 0; i < N; i++)
+    {
+      projZ = SCALE - (xyz[2][i] + SCALE) / 4;
+      projX = width / 2 + (xyz[0][i] * projZ / SCALE) / 25;
+      projY = height / 2 + (xyz[1][i] * projZ / SCALE) / 25;
+      dotSize = 3 - (xyz[2][i] + SCALE) * 2 / SCALE;
+
+      gdispDrawCircle (oldProjX[i], oldProjY[i], oldDotSize[i], background);
+
+      if (projX > dotSize &&
+	  projY > dotSize &&
+	  projX < width - dotSize &&
+	  projY < height - dotSize)
+	{
+	  gdispDrawCircle (projX, projY, dotSize, col[i]);
+	  oldProjX[i] = projX;
+	  oldProjY[i] = projY;
+	  oldDotSize[i] = dotSize;
+	}
+    }
+}
+
+
+/* ---------------------------------------------------------------------- */
+
+int16_t angleX = 0, angleY = 0, angleZ = 0;
+int16_t speedX = 0, speedY = 0, speedZ = 0;
+
+int16_t xyz[3][N];
+color_t col[N];
+
+
+int main (void)
+{
+  int pass = 0;
+
+  halInit();
+  chSysInit();
+  gdispInit();
+
+  chThdSleepMilliseconds (10);
+  gdispClear (background); /* glitches.. */
+  chThdSleepMilliseconds (10);
+  gdispClear (background);  /* glitches.. */
+  chThdSleepMilliseconds (10);
+  gdispClear (background);  /* glitches.. */
+
+  width = (uint16_t)gdispGetWidth();
+  height = (uint16_t)gdispGetHeight();
+
+  initialize();
+
+  for (;;)
+    {
+      matrix(xyz, col);
+      rotate(xyz, angleX, angleY, angleZ);
+      draw(xyz, col);
+
+      angleX += speedX;
+      angleY += speedY;
+      angleZ += speedZ;
+
+      if (pass > 400) speedY = 1;
+      if (pass > 800) speedX = 1;
+      if (pass > 1200) speedZ = 1;
+      pass++;
+
+      if (angleX >= SCALE) angleX -= SCALE;
+      else if (angleX < 0) angleX += SCALE;
+
+      if (angleY >= SCALE) angleY -= SCALE;
+      else if (angleY < 0) angleY += SCALE;
+
+      if (angleZ >= SCALE) angleZ -= SCALE;
+      else if (angleZ < 0) angleZ += SCALE;
+    }
+}
+
+/* ---------------------------------------------------------------------- */
diff --git a/demos/3rdparty/readme.txt b/demos/3rdparty/readme.txt
new file mode 100644
index 00000000..3f97204a
--- /dev/null
+++ b/demos/3rdparty/readme.txt
@@ -0,0 +1,10 @@
+In this directory, you can find different demos showing how to use ChibiOS/GFX.
+The demos in these directories are contributions from users of the ChibiOS/GFX
+project and come from different sources. Therefore, the source files of these
+demos come with different licenses which can be found on top of the cor-
+responding files.
+Since these files are not part of the ChibiOS/GFX project, no support for these
+demos is provided. And as with all software which can be found in the /demos
+directory, use on your own risk. There's no warranty of the correctness
+and function of the demos provided.
+
diff --git a/demos/applications/mandelbrot/gfxconf.h b/demos/applications/mandelbrot/gfxconf.h
index aeb1f714..7093884f 100644
--- a/demos/applications/mandelbrot/gfxconf.h
+++ b/demos/applications/mandelbrot/gfxconf.h
@@ -1,12 +1,3 @@
-/* 
- * This source code form is a part of the ChibiOS/GFX project and stands
- * under the terms of the GFX License v1.0. If a copy of the license
- * was not distributed with this file, You can obtain one at: 
- * 
- * http://chibios-gfx.com/license.html
- *
- */
-
 /*

  * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>

  * All rights reserved.

diff --git a/demos/applications/mandelbrot/main.c b/demos/applications/mandelbrot/main.c
index cdcfb8f2..969a9c92 100644
--- a/demos/applications/mandelbrot/main.c
+++ b/demos/applications/mandelbrot/main.c
@@ -1,12 +1,3 @@
-/* 
- * This source code form is a part of the ChibiOS/GFX project and stands
- * under the terms of the GFX License v1.0. If a copy of the license
- * was not distributed with this file, You can obtain one at: 
- * 
- * http://chibios-gfx.com/license.html
- *
- */
-
 /*

  * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>

  * All rights reserved.

diff --git a/demos/applications/notepad/gfxconf.h b/demos/applications/notepad/gfxconf.h
index d44b0830..7ba6483b 100644
--- a/demos/applications/notepad/gfxconf.h
+++ b/demos/applications/notepad/gfxconf.h
@@ -1,12 +1,3 @@
-/* 
- * This source code form is a part of the ChibiOS/GFX project and stands
- * under the terms of the GFX License v1.0. If a copy of the license
- * was not distributed with this file, You can obtain one at: 
- * 
- * http://chibios-gfx.com/license.html
- *
- */
-
 /*

  * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>

  * All rights reserved.

diff --git a/demos/applications/notepad/main.c b/demos/applications/notepad/main.c
index 982b796a..1dcfd154 100644
--- a/demos/applications/notepad/main.c
+++ b/demos/applications/notepad/main.c
@@ -1,12 +1,3 @@
-/* 
- * This source code form is a part of the ChibiOS/GFX project and stands
- * under the terms of the GFX License v1.0. If a copy of the license
- * was not distributed with this file, You can obtain one at: 
- * 
- * http://chibios-gfx.com/license.html
- *
- */
-
 /*

  * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>

  * All rights reserved.

diff --git a/demos/benchmarks/gfxconf.h b/demos/benchmarks/gfxconf.h
index c4bacefd..d12025e5 100644
--- a/demos/benchmarks/gfxconf.h
+++ b/demos/benchmarks/gfxconf.h
@@ -1,12 +1,3 @@
-/* 
- * This source code form is a part of the ChibiOS/GFX project and stands
- * under the terms of the GFX License v1.0. If a copy of the license
- * was not distributed with this file, You can obtain one at: 
- * 
- * http://chibios-gfx.com/license.html
- *
- */
-
 /*
  * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>
  * All rights reserved.
diff --git a/demos/benchmarks/main.c b/demos/benchmarks/main.c
index 2740cd9f..c3cef762 100644
--- a/demos/benchmarks/main.c
+++ b/demos/benchmarks/main.c
@@ -1,12 +1,3 @@
-/* 
- * This source code form is a part of the ChibiOS/GFX project and stands
- * under the terms of the GFX License v1.0. If a copy of the license
- * was not distributed with this file, You can obtain one at: 
- * 
- * http://chibios-gfx.com/license.html
- *
- */
-
 /*

  * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>

  * All rights reserved.

diff --git a/demos/modules/gadc/gfxconf.h b/demos/modules/gadc/gfxconf.h
index e4da593f..557184cc 100644
--- a/demos/modules/gadc/gfxconf.h
+++ b/demos/modules/gadc/gfxconf.h
@@ -1,12 +1,3 @@
-/* 
- * This source code form is a part of the ChibiOS/GFX project and stands
- * under the terms of the GFX License v1.0. If a copy of the license
- * was not distributed with this file, You can obtain one at: 
- * 
- * http://chibios-gfx.com/license.html
- *
- */
-
 /*
  * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>
  * All rights reserved.
diff --git a/demos/modules/gadc/gwinosc.c b/demos/modules/gadc/gwinosc.c
index 4ef1f5f5..49d9fe22 100644
--- a/demos/modules/gadc/gwinosc.c
+++ b/demos/modules/gadc/gwinosc.c
@@ -1,12 +1,3 @@
-/* 
- * This source code form is a part of the ChibiOS/GFX project and stands
- * under the terms of the GFX License v1.0. If a copy of the license
- * was not distributed with this file, You can obtain one at: 
- * 
- * http://chibios-gfx.com/license.html
- *
- */
-
 /*
  * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>
  * All rights reserved.
diff --git a/demos/modules/gadc/gwinosc.h b/demos/modules/gadc/gwinosc.h
index 6f025669..11644be4 100644
--- a/demos/modules/gadc/gwinosc.h
+++ b/demos/modules/gadc/gwinosc.h
@@ -1,12 +1,3 @@
-/* 
- * This source code form is a part of the ChibiOS/GFX project and stands
- * under the terms of the GFX License v1.0. If a copy of the license
- * was not distributed with this file, You can obtain one at: 
- * 
- * http://chibios-gfx.com/license.html
- *
- */
-
 /*
  * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>
  * All rights reserved.
diff --git a/demos/modules/gadc/main.c b/demos/modules/gadc/main.c
index 8b649d30..f506a473 100644
--- a/demos/modules/gadc/main.c
+++ b/demos/modules/gadc/main.c
@@ -1,12 +1,3 @@
-/* 
- * This source code form is a part of the ChibiOS/GFX project and stands
- * under the terms of the GFX License v1.0. If a copy of the license
- * was not distributed with this file, You can obtain one at: 
- * 
- * http://chibios-gfx.com/license.html
- *
- */
-
 /*
  * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>
  * All rights reserved.
diff --git a/demos/modules/gaudin/gfxconf.h b/demos/modules/gaudin/gfxconf.h
index ec79e1f5..d9db73a5 100644
--- a/demos/modules/gaudin/gfxconf.h
+++ b/demos/modules/gaudin/gfxconf.h
@@ -1,12 +1,3 @@
-/* 
- * This source code form is a part of the ChibiOS/GFX project and stands
- * under the terms of the GFX License v1.0. If a copy of the license
- * was not distributed with this file, You can obtain one at: 
- * 
- * http://chibios-gfx.com/license.html
- *
- */
-
 /*
  * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>
  * All rights reserved.
diff --git a/demos/modules/gaudin/gwinosc.c b/demos/modules/gaudin/gwinosc.c
index 8422fb22..5a2867c1 100644
--- a/demos/modules/gaudin/gwinosc.c
+++ b/demos/modules/gaudin/gwinosc.c
@@ -1,12 +1,3 @@
-/* 
- * This source code form is a part of the ChibiOS/GFX project and stands
- * under the terms of the GFX License v1.0. If a copy of the license
- * was not distributed with this file, You can obtain one at: 
- * 
- * http://chibios-gfx.com/license.html
- *
- */
-
 /*
  * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>
  * All rights reserved.
diff --git a/demos/modules/gaudin/gwinosc.h b/demos/modules/gaudin/gwinosc.h
index 63cfc05b..9c51e548 100644
--- a/demos/modules/gaudin/gwinosc.h
+++ b/demos/modules/gaudin/gwinosc.h
@@ -1,12 +1,3 @@
-/* 
- * This source code form is a part of the ChibiOS/GFX project and stands
- * under the terms of the GFX License v1.0. If a copy of the license
- * was not distributed with this file, You can obtain one at: 
- * 
- * http://chibios-gfx.com/license.html
- *
- */
-
 /*
  * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>
  * All rights reserved.
diff --git a/demos/modules/gaudin/main.c b/demos/modules/gaudin/main.c
index 7a69989d..f532b324 100644
--- a/demos/modules/gaudin/main.c
+++ b/demos/modules/gaudin/main.c
@@ -1,12 +1,3 @@
-/* 
- * This source code form is a part of the ChibiOS/GFX project and stands
- * under the terms of the GFX License v1.0. If a copy of the license
- * was not distributed with this file, You can obtain one at: 
- * 
- * http://chibios-gfx.com/license.html
- *
- */
-
 /*
  * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>
  * All rights reserved.
diff --git a/demos/modules/gdisp/gdisp_basics/gfxconf.h b/demos/modules/gdisp/gdisp_basics/gfxconf.h
index ebebd1b3..f64884a0 100644
--- a/demos/modules/gdisp/gdisp_basics/gfxconf.h
+++ b/demos/modules/gdisp/gdisp_basics/gfxconf.h
@@ -1,12 +1,3 @@
-/* 
- * This source code form is a part of the ChibiOS/GFX project and stands
- * under the terms of the GFX License v1.0. If a copy of the license
- * was not distributed with this file, You can obtain one at: 
- * 
- * http://chibios-gfx.com/license.html
- *
- */
-
 /*

  * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>

  * All rights reserved.

diff --git a/demos/modules/gdisp/gdisp_basics/main.c b/demos/modules/gdisp/gdisp_basics/main.c
index bbc3e399..134f2473 100644
--- a/demos/modules/gdisp/gdisp_basics/main.c
+++ b/demos/modules/gdisp/gdisp_basics/main.c
@@ -1,12 +1,3 @@
-/* 
- * This source code form is a part of the ChibiOS/GFX project and stands
- * under the terms of the GFX License v1.0. If a copy of the license
- * was not distributed with this file, You can obtain one at: 
- * 
- * http://chibios-gfx.com/license.html
- *
- */
-
 /*

  * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>

  * All rights reserved.

diff --git a/demos/modules/gdisp/gdisp_circles/gfxconf.h b/demos/modules/gdisp/gdisp_circles/gfxconf.h
index b0a7b5c9..cc60c46b 100644
--- a/demos/modules/gdisp/gdisp_circles/gfxconf.h
+++ b/demos/modules/gdisp/gdisp_circles/gfxconf.h
@@ -1,12 +1,3 @@
-/* 
- * This source code form is a part of the ChibiOS/GFX project and stands
- * under the terms of the GFX License v1.0. If a copy of the license
- * was not distributed with this file, You can obtain one at: 
- * 
- * http://chibios-gfx.com/license.html
- *
- */
-
 /*

  * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>

  * All rights reserved.

diff --git a/demos/modules/gdisp/gdisp_circles/main.c b/demos/modules/gdisp/gdisp_circles/main.c
index e6b985dc..395af009 100644
--- a/demos/modules/gdisp/gdisp_circles/main.c
+++ b/demos/modules/gdisp/gdisp_circles/main.c
@@ -1,12 +1,3 @@
-/* 
- * This source code form is a part of the ChibiOS/GFX project and stands
- * under the terms of the GFX License v1.0. If a copy of the license
- * was not distributed with this file, You can obtain one at: 
- * 
- * http://chibios-gfx.com/license.html
- *
- */
-
 /*

  * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>

  * All rights reserved.

diff --git a/demos/modules/gdisp/gdisp_images/gfxconf.h b/demos/modules/gdisp/gdisp_images/gfxconf.h
index d4a18671..e76ddd72 100644
--- a/demos/modules/gdisp/gdisp_images/gfxconf.h
+++ b/demos/modules/gdisp/gdisp_images/gfxconf.h
@@ -1,12 +1,3 @@
-/* 
- * This source code form is a part of the ChibiOS/GFX project and stands
- * under the terms of the GFX License v1.0. If a copy of the license
- * was not distributed with this file, You can obtain one at: 
- * 
- * http://chibios-gfx.com/license.html
- *
- */
-
 /*
  * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>
  * All rights reserved.
diff --git a/demos/modules/gdisp/gdisp_images/main.c b/demos/modules/gdisp/gdisp_images/main.c
index 23170f5e..a6fa58d8 100644
--- a/demos/modules/gdisp/gdisp_images/main.c
+++ b/demos/modules/gdisp/gdisp_images/main.c
@@ -1,12 +1,3 @@
-/* 
- * This source code form is a part of the ChibiOS/GFX project and stands
- * under the terms of the GFX License v1.0. If a copy of the license
- * was not distributed with this file, You can obtain one at: 
- * 
- * http://chibios-gfx.com/license.html
- *
- */
-
 /*
  * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>
  * All rights reserved.
diff --git a/demos/modules/gdisp/gdisp_images_animated/gfxconf.h b/demos/modules/gdisp/gdisp_images_animated/gfxconf.h
index 461c965f..cd368e95 100644
--- a/demos/modules/gdisp/gdisp_images_animated/gfxconf.h
+++ b/demos/modules/gdisp/gdisp_images_animated/gfxconf.h
@@ -1,12 +1,3 @@
-/* 
- * This source code form is a part of the ChibiOS/GFX project and stands
- * under the terms of the GFX License v1.0. If a copy of the license
- * was not distributed with this file, You can obtain one at: 
- * 
- * http://chibios-gfx.com/license.html
- *
- */
-
 /**
  * This file has a different license to the rest of the GFX system.
  * You can copy, modify and distribute this file as you see fit.
diff --git a/demos/modules/gdisp/gdisp_images_animated/main.c b/demos/modules/gdisp/gdisp_images_animated/main.c
index cb0d5580..d5c3d712 100644
--- a/demos/modules/gdisp/gdisp_images_animated/main.c
+++ b/demos/modules/gdisp/gdisp_images_animated/main.c
@@ -1,11 +1,22 @@
-/* 
- * This source code form is a part of the ChibiOS/GFX project and stands
- * under the terms of the GFX License v1.0. If a copy of the license
- * was not distributed with this file, You can obtain one at: 
- * 
- * http://chibios-gfx.com/license.html
- *
- */
+/*
+    ChibiOS/GFX - Copyright (C) 2012, 2013
+                 Joel Bodenmann aka Tectu <joel@unormal.org>
+
+    This file is part of ChibiOS/GFX.
+
+    ChibiOS/GFX is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 3 of the License, or
+    (at your option) any later version.
+
+    ChibiOS/GFX 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 #include "ch.h"
 #include "hal.h"
diff --git a/demos/modules/gdisp/gdisp_images_animated/testanim.h b/demos/modules/gdisp/gdisp_images_animated/testanim.h
index a646a8d4..ce2ba8c7 100644
--- a/demos/modules/gdisp/gdisp_images_animated/testanim.h
+++ b/demos/modules/gdisp/gdisp_images_animated/testanim.h
@@ -1,12 +1,3 @@
-/* 
- * This source code form is a part of the ChibiOS/GFX project and stands
- * under the terms of the GFX License v1.0. If a copy of the license
- * was not distributed with this file, You can obtain one at: 
- * 
- * http://chibios-gfx.com/license.html
- *
- */
-
 /**
  * This file was generated from "testanim.gif" using...
  *
diff --git a/demos/modules/gdisp/gdisp_text/gfxconf.h b/demos/modules/gdisp/gdisp_text/gfxconf.h
index 22f27b18..007de8e4 100644
--- a/demos/modules/gdisp/gdisp_text/gfxconf.h
+++ b/demos/modules/gdisp/gdisp_text/gfxconf.h
@@ -1,12 +1,3 @@
-/* 
- * This source code form is a part of the ChibiOS/GFX project and stands
- * under the terms of the GFX License v1.0. If a copy of the license
- * was not distributed with this file, You can obtain one at: 
- * 
- * http://chibios-gfx.com/license.html
- *
- */
-
 /*

  * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>

  * All rights reserved.

diff --git a/demos/modules/gdisp/gdisp_text/main.c b/demos/modules/gdisp/gdisp_text/main.c
index 049334c0..4062e07c 100644
--- a/demos/modules/gdisp/gdisp_text/main.c
+++ b/demos/modules/gdisp/gdisp_text/main.c
@@ -1,12 +1,3 @@
-/* 
- * This source code form is a part of the ChibiOS/GFX project and stands
- * under the terms of the GFX License v1.0. If a copy of the license
- * was not distributed with this file, You can obtain one at: 
- * 
- * http://chibios-gfx.com/license.html
- *
- */
-
 /*

  * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>

  * All rights reserved.

diff --git a/demos/modules/ginput/touch_driver_test/gfxconf.h b/demos/modules/ginput/touch_driver_test/gfxconf.h
index 2bac9c37..87787527 100644
--- a/demos/modules/ginput/touch_driver_test/gfxconf.h
+++ b/demos/modules/ginput/touch_driver_test/gfxconf.h
@@ -1,12 +1,3 @@
-/* 
- * This source code form is a part of the ChibiOS/GFX project and stands
- * under the terms of the GFX License v1.0. If a copy of the license
- * was not distributed with this file, You can obtain one at: 
- * 
- * http://chibios-gfx.com/license.html
- *
- */
-
 /*
  * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>
  * All rights reserved.
diff --git a/demos/modules/ginput/touch_driver_test/main.c b/demos/modules/ginput/touch_driver_test/main.c
index 77b3daa6..80c85273 100644
--- a/demos/modules/ginput/touch_driver_test/main.c
+++ b/demos/modules/ginput/touch_driver_test/main.c
@@ -1,12 +1,3 @@
-/* 
- * This source code form is a part of the ChibiOS/GFX project and stands
- * under the terms of the GFX License v1.0. If a copy of the license
- * was not distributed with this file, You can obtain one at: 
- * 
- * http://chibios-gfx.com/license.html
- *
- */
-
 /*
  * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>
  * All rights reserved.
diff --git a/demos/modules/graph/gfxconf.h b/demos/modules/graph/gfxconf.h
index 2632edc5..ee36fb93 100644
--- a/demos/modules/graph/gfxconf.h
+++ b/demos/modules/graph/gfxconf.h
@@ -1,12 +1,3 @@
-/* 
- * This source code form is a part of the ChibiOS/GFX project and stands
- * under the terms of the GFX License v1.0. If a copy of the license
- * was not distributed with this file, You can obtain one at: 
- * 
- * http://chibios-gfx.com/license.html
- *
- */
-
 /*

  * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>

  * All rights reserved.

diff --git a/demos/modules/graph/main.c b/demos/modules/graph/main.c
index 47d30608..79935083 100644
--- a/demos/modules/graph/main.c
+++ b/demos/modules/graph/main.c
@@ -1,12 +1,3 @@
-/* 
- * This source code form is a part of the ChibiOS/GFX project and stands
- * under the terms of the GFX License v1.0. If a copy of the license
- * was not distributed with this file, You can obtain one at: 
- * 
- * http://chibios-gfx.com/license.html
- *
- */
-
 /*

  * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>

  * All rights reserved.

diff --git a/demos/modules/gtimer/gfxconf.h b/demos/modules/gtimer/gfxconf.h
index cef9232e..931357a5 100644
--- a/demos/modules/gtimer/gfxconf.h
+++ b/demos/modules/gtimer/gfxconf.h
@@ -1,12 +1,3 @@
-/* 
- * This source code form is a part of the ChibiOS/GFX project and stands
- * under the terms of the GFX License v1.0. If a copy of the license
- * was not distributed with this file, You can obtain one at: 
- * 
- * http://chibios-gfx.com/license.html
- *
- */
-
 /*

  * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>

  * All rights reserved.

diff --git a/demos/modules/gtimer/main.c b/demos/modules/gtimer/main.c
index a0e6de4c..403491ea 100644
--- a/demos/modules/gtimer/main.c
+++ b/demos/modules/gtimer/main.c
@@ -1,12 +1,3 @@
-/* 
- * This source code form is a part of the ChibiOS/GFX project and stands
- * under the terms of the GFX License v1.0. If a copy of the license
- * was not distributed with this file, You can obtain one at: 
- * 
- * http://chibios-gfx.com/license.html
- *
- */
-
 /*

  * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>

  * All rights reserved.

diff --git a/demos/modules/gwin/basic/gfxconf.h b/demos/modules/gwin/basic/gfxconf.h
index 5f3b6fe1..e567e5a0 100644
--- a/demos/modules/gwin/basic/gfxconf.h
+++ b/demos/modules/gwin/basic/gfxconf.h
@@ -1,12 +1,3 @@
-/* 
- * This source code form is a part of the ChibiOS/GFX project and stands
- * under the terms of the GFX License v1.0. If a copy of the license
- * was not distributed with this file, You can obtain one at: 
- * 
- * http://chibios-gfx.com/license.html
- *
- */
-
 /**
  * This file has a different license to the rest of the GFX system.
  * You can copy, modify and distribute this file as you see fit.
diff --git a/demos/modules/gwin/basic/main.c b/demos/modules/gwin/basic/main.c
index bf5f613a..a0326fac 100644
--- a/demos/modules/gwin/basic/main.c
+++ b/demos/modules/gwin/basic/main.c
@@ -1,11 +1,22 @@
-/* 
- * This source code form is a part of the ChibiOS/GFX project and stands
- * under the terms of the GFX License v1.0. If a copy of the license
- * was not distributed with this file, You can obtain one at: 
- * 
- * http://chibios-gfx.com/license.html
- *
- */
+/*
+    ChibiOS/GFX - Copyright (C) 2012, 2013
+                 Joel Bodenmann aka Tectu <joel@unormal.org>
+
+    This file is part of ChibiOS/GFX.
+
+    ChibiOS/GFX is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 3 of the License, or
+    (at your option) any later version.
+
+    ChibiOS/GFX 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 #include "ch.h"
 #include "hal.h"
diff --git a/demos/modules/gwin/console/gfxconf.h b/demos/modules/gwin/console/gfxconf.h
index bccd4b77..178beb86 100644
--- a/demos/modules/gwin/console/gfxconf.h
+++ b/demos/modules/gwin/console/gfxconf.h
@@ -1,12 +1,3 @@
-/* 
- * This source code form is a part of the ChibiOS/GFX project and stands
- * under the terms of the GFX License v1.0. If a copy of the license
- * was not distributed with this file, You can obtain one at: 
- * 
- * http://chibios-gfx.com/license.html
- *
- */
-
 /**
  * This file has a different license to the rest of the GFX system.
  * You can copy, modify and distribute this file as you see fit.
diff --git a/demos/modules/gwin/console/main.c b/demos/modules/gwin/console/main.c
index ee6ef099..90ebf86f 100644
--- a/demos/modules/gwin/console/main.c
+++ b/demos/modules/gwin/console/main.c
@@ -1,11 +1,22 @@
-/* 
- * This source code form is a part of the ChibiOS/GFX project and stands
- * under the terms of the GFX License v1.0. If a copy of the license
- * was not distributed with this file, You can obtain one at: 
- * 
- * http://chibios-gfx.com/license.html
- *
- */
+/*
+    ChibiOS/GFX - Copyright (C) 2012, 2013
+                 Joel Bodenmann aka Tectu <joel@unormal.org>
+
+    This file is part of ChibiOS/GFX.
+
+    ChibiOS/GFX is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 3 of the License, or
+    (at your option) any later version.
+
+    ChibiOS/GFX 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 #include "ch.h"
 #include "hal.h"
diff --git a/demos/modules/gwin/slider/gfxconf.h b/demos/modules/gwin/slider/gfxconf.h
index 7e763b41..947fc4c8 100644
--- a/demos/modules/gwin/slider/gfxconf.h
+++ b/demos/modules/gwin/slider/gfxconf.h
@@ -1,12 +1,3 @@
-/* 
- * This source code form is a part of the ChibiOS/GFX project and stands
- * under the terms of the GFX License v1.0. If a copy of the license
- * was not distributed with this file, You can obtain one at: 
- * 
- * http://chibios-gfx.com/license.html
- *
- */
-
 /**
  * This file has a different license to the rest of the GFX system.
  * You can copy, modify and distribute this file as you see fit.
diff --git a/demos/modules/gwin/slider/main.c b/demos/modules/gwin/slider/main.c
index b87d6bb8..19a56f6a 100644
--- a/demos/modules/gwin/slider/main.c
+++ b/demos/modules/gwin/slider/main.c
@@ -1,11 +1,22 @@
-/* 
- * This source code form is a part of the ChibiOS/GFX project and stands
- * under the terms of the GFX License v1.0. If a copy of the license
- * was not distributed with this file, You can obtain one at: 
- * 
- * http://chibios-gfx.com/license.html
- *
- */
+/*
+    ChibiOS/GFX - Copyright (C) 2012, 2013
+                 Joel Bodenmann aka Tectu <joel@unormal.org>
+
+    This file is part of ChibiOS/GFX.
+
+    ChibiOS/GFX is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 3 of the License, or
+    (at your option) any later version.
+
+    ChibiOS/GFX 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 #include "ch.h"
 #include "hal.h"
diff --git a/demos/modules/tdisp/gfxconf.h b/demos/modules/tdisp/gfxconf.h
index 6eadfd9d..cdc0dfdd 100644
--- a/demos/modules/tdisp/gfxconf.h
+++ b/demos/modules/tdisp/gfxconf.h
@@ -1,12 +1,3 @@
-/* 
- * This source code form is a part of the ChibiOS/GFX project and stands
- * under the terms of the GFX License v1.0. If a copy of the license
- * was not distributed with this file, You can obtain one at: 
- * 
- * http://chibios-gfx.com/license.html
- *
- */
-
 /*
  * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>
  * All rights reserved.
diff --git a/demos/modules/tdisp/main.c b/demos/modules/tdisp/main.c
index 35ed506f..41a6aa34 100644
--- a/demos/modules/tdisp/main.c
+++ b/demos/modules/tdisp/main.c
@@ -1,12 +1,3 @@
-/* 
- * This source code form is a part of the ChibiOS/GFX project and stands
- * under the terms of the GFX License v1.0. If a copy of the license
- * was not distributed with this file, You can obtain one at: 
- * 
- * http://chibios-gfx.com/license.html
- *
- */
-
 /*

  * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>

  * All rights reserved.