Merge pull request #27 from Tectu/master

Merge Tectu Changes

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 */

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;
+    }
+}
+
+/* ---------------------------------------------------------------------- */

demos/3rdparty/bubbles/gfxconf.h

@@ -17,27 +17,24 @@
 #define GFX_USE_GINPUT			FALSE
 
 /* Features for the GDISP sub-system. */
-#define GDISP_NEED_VALIDATION	TRUE
+#define GDISP_NEED_VALIDATION	        FALSE
-#define GDISP_NEED_CLIP			TRUE
+#define GDISP_NEED_CLIP			FALSE
-#define GDISP_NEED_TEXT			TRUE
+#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_PIXELREAD	        FALSE
-#define GDISP_NEED_CONTROL		TRUE
+#define GDISP_NEED_CONTROL		FALSE
-#define GDISP_NEED_MULTITHREAD	TRUE
+#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_SMALL        FALSE
-#define GDISP_INCLUDE_FONT_LARGER		FALSE
+#define GDISP_INCLUDE_FONT_LARGER       FALSE
-#define GDISP_INCLUDE_FONT_UI1			FALSE
+#define GDISP_INCLUDE_FONT_UI1          FALSE
-#define GDISP_INCLUDE_FONT_UI2			TRUE
+#define GDISP_INCLUDE_FONT_UI2          FALSE
-#define GDISP_INCLUDE_FONT_LARGENUMBERS	TRUE
+#define GDISP_INCLUDE_FONT_LARGENUMBERS FALSE
-
-/* Features for the GINPUT sub-system. */
-#define GINPUT_NEED_MOUSE		FALSE
 
 #endif /* _GFXCONF_H */

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;
+    }
+}
+
+/* ---------------------------------------------------------------------- */

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.
+

demos/applications/mandelbrot/gfxconf.h

@@ -1,9 +1,28 @@
-/**
+/*
- * This file has a different license to the rest of the GFX system.
+ * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>
- * You can copy, modify and distribute this file as you see fit.
+ * All rights reserved.
- * 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
+ * Redistribution and use in source and binary forms, with or without
- * under a different license.
+ * 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.
+ *    * Neither the name of the <organization> nor the
+ *      names of its contributors may be used to endorse or promote products
+ *      derived from this software without specific prior written permission.
+ *
+ * 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 <COPYRIGHT HOLDER> 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.
  */
 
 #ifndef _GFXCONF_H

demos/applications/mandelbrot/main.c

@@ -1,22 +1,29 @@
 /*
-    ChibiOS/GFX - Copyright (C) 2012, 2013
+ * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>
-                 Joel Bodenmann aka Tectu <joel@unormal.org>
+ * All rights reserved.
-
+ *
-    This file is part of ChibiOS/GFX.
+ * Redistribution and use in source and binary forms, with or without
-
+ * modification, are permitted provided that the following conditions are met:
-    ChibiOS/GFX is free software; you can redistribute it and/or modify
+ *    * Redistributions of source code must retain the above copyright
-    it under the terms of the GNU General Public License as published by
+ *      notice, this list of conditions and the following disclaimer.
-    the Free Software Foundation; either version 3 of the License, or
+ *    * Redistributions in binary form must reproduce the above copyright
-    (at your option) any later version.
+ *      notice, this list of conditions and the following disclaimer in the
-
+ *      documentation and/or other materials provided with the distribution.
-    ChibiOS/GFX is distributed in the hope that it will be useful,
+ *    * Neither the name of the <organization> nor the
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *      names of its contributors may be used to endorse or promote products
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *      derived from this software without specific prior written permission.
-    GNU General Public License for more details.
+ *
-
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-    You should have received a copy of the GNU General Public License
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-*/
+ * DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> 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.
+ */
 
 #include "ch.h"
 #include "hal.h"

demos/applications/notepad/gfxconf.h

@@ -1,9 +1,28 @@
-/**
+/*
- * This file has a different license to the rest of the GFX system.
+ * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>
- * You can copy, modify and distribute this file as you see fit.
+ * All rights reserved.
- * 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
+ * Redistribution and use in source and binary forms, with or without
- * under a different license.
+ * 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.
+ *    * Neither the name of the <organization> nor the
+ *      names of its contributors may be used to endorse or promote products
+ *      derived from this software without specific prior written permission.
+ *
+ * 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 <COPYRIGHT HOLDER> 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.
  */
 
 #ifndef _GFXCONF_H

demos/applications/notepad/main.c

@@ -1,22 +1,29 @@
 /*
-    ChibiOS/GFX - Copyright (C) 2012, 2013
+ * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>
-                 Joel Bodenmann aka Tectu <joel@unormal.org>
+ * All rights reserved.
-
+ *
-    This file is part of ChibiOS/GFX.
+ * Redistribution and use in source and binary forms, with or without
-
+ * modification, are permitted provided that the following conditions are met:
-    ChibiOS/GFX is free software; you can redistribute it and/or modify
+ *    * Redistributions of source code must retain the above copyright
-    it under the terms of the GNU General Public License as published by
+ *      notice, this list of conditions and the following disclaimer.
-    the Free Software Foundation; either version 3 of the License, or
+ *    * Redistributions in binary form must reproduce the above copyright
-    (at your option) any later version.
+ *      notice, this list of conditions and the following disclaimer in the
-
+ *      documentation and/or other materials provided with the distribution.
-    ChibiOS/GFX is distributed in the hope that it will be useful,
+ *    * Neither the name of the <organization> nor the
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *      names of its contributors may be used to endorse or promote products
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *      derived from this software without specific prior written permission.
-    GNU General Public License for more details.
+ *
-
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-    You should have received a copy of the GNU General Public License
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-*/
+ * DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> 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.
+ */
 
 #include "ch.h"
 #include "hal.h"

demos/benchmarks/gfxconf.h

@@ -1,9 +1,28 @@
-/**
+/*
- * This file has a different license to the rest of the GFX system.
+ * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>
- * You can copy, modify and distribute this file as you see fit.
+ * All rights reserved.
- * 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
+ * Redistribution and use in source and binary forms, with or without
- * under a different license.
+ * 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.
+ *    * Neither the name of the <organization> nor the
+ *      names of its contributors may be used to endorse or promote products
+ *      derived from this software without specific prior written permission.
+ *
+ * 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 <COPYRIGHT HOLDER> 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.
  */
 
 #ifndef _GFXCONF_H

demos/benchmarks/main.c

@@ -1,22 +1,29 @@
 /*
-    ChibiOS/GFX - Copyright (C) 2012, 2013
+ * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>
-                 Joel Bodenmann aka Tectu <joel@unormal.org>
+ * All rights reserved.
-
+ *
-    This file is part of ChibiOS/GFX.
+ * Redistribution and use in source and binary forms, with or without
-
+ * modification, are permitted provided that the following conditions are met:
-    ChibiOS/GFX is free software; you can redistribute it and/or modify
+ *    * Redistributions of source code must retain the above copyright
-    it under the terms of the GNU General Public License as published by
+ *      notice, this list of conditions and the following disclaimer.
-    the Free Software Foundation; either version 3 of the License, or
+ *    * Redistributions in binary form must reproduce the above copyright
-    (at your option) any later version.
+ *      notice, this list of conditions and the following disclaimer in the
-
+ *      documentation and/or other materials provided with the distribution.
-    ChibiOS/GFX is distributed in the hope that it will be useful,
+ *    * Neither the name of the <organization> nor the
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *      names of its contributors may be used to endorse or promote products
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *      derived from this software without specific prior written permission.
-    GNU General Public License for more details.
+ *
-
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-    You should have received a copy of the GNU General Public License
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-*/
+ * DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> 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.
+ */
 
 #include "ch.h"
 #include "hal.h"

demos/modules/gadc/gfxconf.h

@@ -1,9 +1,28 @@
-/**
+/*
- * This file has a different license to the rest of the GFX system.
+ * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>
- * You can copy, modify and distribute this file as you see fit.
+ * All rights reserved.
- * 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
+ * Redistribution and use in source and binary forms, with or without
- * under a different license.
+ * 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.
+ *    * Neither the name of the <organization> nor the
+ *      names of its contributors may be used to endorse or promote products
+ *      derived from this software without specific prior written permission.
+ *
+ * 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 <COPYRIGHT HOLDER> 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.
  */
 
 /**

demos/modules/gadc/gwinosc.c

@@ -1,22 +1,29 @@
 /*
-    ChibiOS/GFX - Copyright (C) 2012, 2013
+ * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>
-                 Joel Bodenmann aka Tectu <joel@unormal.org>
+ * All rights reserved.
-
+ *
-    This file is part of ChibiOS/GFX.
+ * Redistribution and use in source and binary forms, with or without
-
+ * modification, are permitted provided that the following conditions are met:
-    ChibiOS/GFX is free software; you can redistribute it and/or modify
+ *    * Redistributions of source code must retain the above copyright
-    it under the terms of the GNU General Public License as published by
+ *      notice, this list of conditions and the following disclaimer.
-    the Free Software Foundation; either version 3 of the License, or
+ *    * Redistributions in binary form must reproduce the above copyright
-    (at your option) any later version.
+ *      notice, this list of conditions and the following disclaimer in the
-
+ *      documentation and/or other materials provided with the distribution.
-    ChibiOS/GFX is distributed in the hope that it will be useful,
+ *    * Neither the name of the <organization> nor the
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *      names of its contributors may be used to endorse or promote products
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *      derived from this software without specific prior written permission.
-    GNU General Public License for more details.
+ *
-
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-    You should have received a copy of the GNU General Public License
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-*/
+ * DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> 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.
+ */
 
 /**
  * --------------------------- Our Custom GWIN Oscilloscope ---------------

demos/modules/gadc/gwinosc.h

@@ -1,22 +1,29 @@
 /*
-    ChibiOS/GFX - Copyright (C) 2012, 2013
+ * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>
-                 Joel Bodenmann aka Tectu <joel@unormal.org>
+ * All rights reserved.
-
+ *
-    This file is part of ChibiOS/GFX.
+ * Redistribution and use in source and binary forms, with or without
-
+ * modification, are permitted provided that the following conditions are met:
-    ChibiOS/GFX is free software; you can redistribute it and/or modify
+ *    * Redistributions of source code must retain the above copyright
-    it under the terms of the GNU General Public License as published by
+ *      notice, this list of conditions and the following disclaimer.
-    the Free Software Foundation; either version 3 of the License, or
+ *    * Redistributions in binary form must reproduce the above copyright
-    (at your option) any later version.
+ *      notice, this list of conditions and the following disclaimer in the
-
+ *      documentation and/or other materials provided with the distribution.
-    ChibiOS/GFX is distributed in the hope that it will be useful,
+ *    * Neither the name of the <organization> nor the
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *      names of its contributors may be used to endorse or promote products
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *      derived from this software without specific prior written permission.
-    GNU General Public License for more details.
+ *
-
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-    You should have received a copy of the GNU General Public License
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-*/
+ * DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> 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.
+ */
 
 #ifndef _GWINOSC_H
 #define _GWINOSC_H

demos/modules/gadc/main.c

@@ -1,22 +1,29 @@
 /*
-    ChibiOS/GFX - Copyright (C) 2012, 2013
+ * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>
-                 Joel Bodenmann aka Tectu <joel@unormal.org>
+ * All rights reserved.
-
+ *
-    This file is part of ChibiOS/GFX.
+ * Redistribution and use in source and binary forms, with or without
-
+ * modification, are permitted provided that the following conditions are met:
-    ChibiOS/GFX is free software; you can redistribute it and/or modify
+ *    * Redistributions of source code must retain the above copyright
-    it under the terms of the GNU General Public License as published by
+ *      notice, this list of conditions and the following disclaimer.
-    the Free Software Foundation; either version 3 of the License, or
+ *    * Redistributions in binary form must reproduce the above copyright
-    (at your option) any later version.
+ *      notice, this list of conditions and the following disclaimer in the
-
+ *      documentation and/or other materials provided with the distribution.
-    ChibiOS/GFX is distributed in the hope that it will be useful,
+ *    * Neither the name of the <organization> nor the
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *      names of its contributors may be used to endorse or promote products
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *      derived from this software without specific prior written permission.
-    GNU General Public License for more details.
+ *
-
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-    You should have received a copy of the GNU General Public License
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-*/
+ * DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> 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.
+ */
 
 /**
  * This demo demonstrates the use of the GADC module using it read both a microphone,

demos/modules/gaudin/gfxconf.h

@@ -1,9 +1,28 @@
-/**
+/*
- * This file has a different license to the rest of the GFX system.
+ * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>
- * You can copy, modify and distribute this file as you see fit.
+ * All rights reserved.
- * 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
+ * Redistribution and use in source and binary forms, with or without
- * under a different license.
+ * 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.
+ *    * Neither the name of the <organization> nor the
+ *      names of its contributors may be used to endorse or promote products
+ *      derived from this software without specific prior written permission.
+ *
+ * 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 <COPYRIGHT HOLDER> 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.
  */
 
 /**

demos/modules/gaudin/gwinosc.c

@@ -1,22 +1,29 @@
 /*
-    ChibiOS/GFX - Copyright (C) 2012, 2013
+ * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>
-                 Joel Bodenmann aka Tectu <joel@unormal.org>
+ * All rights reserved.
-
+ *
-    This file is part of ChibiOS/GFX.
+ * Redistribution and use in source and binary forms, with or without
-
+ * modification, are permitted provided that the following conditions are met:
-    ChibiOS/GFX is free software; you can redistribute it and/or modify
+ *    * Redistributions of source code must retain the above copyright
-    it under the terms of the GNU General Public License as published by
+ *      notice, this list of conditions and the following disclaimer.
-    the Free Software Foundation; either version 3 of the License, or
+ *    * Redistributions in binary form must reproduce the above copyright
-    (at your option) any later version.
+ *      notice, this list of conditions and the following disclaimer in the
-
+ *      documentation and/or other materials provided with the distribution.
-    ChibiOS/GFX is distributed in the hope that it will be useful,
+ *    * Neither the name of the <organization> nor the
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *      names of its contributors may be used to endorse or promote products
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *      derived from this software without specific prior written permission.
-    GNU General Public License for more details.
+ *
-
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-    You should have received a copy of the GNU General Public License
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-*/
+ * DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> 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.
+ */
 
 /**
  * --------------------------- Our Custom GWIN Oscilloscope ---------------

demos/modules/gaudin/gwinosc.h

@@ -1,22 +1,29 @@
 /*
-    ChibiOS/GFX - Copyright (C) 2012, 2013
+ * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>
-                 Joel Bodenmann aka Tectu <joel@unormal.org>
+ * All rights reserved.
-
+ *
-    This file is part of ChibiOS/GFX.
+ * Redistribution and use in source and binary forms, with or without
-
+ * modification, are permitted provided that the following conditions are met:
-    ChibiOS/GFX is free software; you can redistribute it and/or modify
+ *    * Redistributions of source code must retain the above copyright
-    it under the terms of the GNU General Public License as published by
+ *      notice, this list of conditions and the following disclaimer.
-    the Free Software Foundation; either version 3 of the License, or
+ *    * Redistributions in binary form must reproduce the above copyright
-    (at your option) any later version.
+ *      notice, this list of conditions and the following disclaimer in the
-
+ *      documentation and/or other materials provided with the distribution.
-    ChibiOS/GFX is distributed in the hope that it will be useful,
+ *    * Neither the name of the <organization> nor the
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *      names of its contributors may be used to endorse or promote products
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *      derived from this software without specific prior written permission.
-    GNU General Public License for more details.
+ *
-
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-    You should have received a copy of the GNU General Public License
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-*/
+ * DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> 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.
+ */
 
 #ifndef _GWINOSC_H
 #define _GWINOSC_H

demos/modules/gaudin/main.c

@@ -1,22 +1,29 @@
 /*
-    ChibiOS/GFX - Copyright (C) 2012, 2013
+ * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>
-                 Joel Bodenmann aka Tectu <joel@unormal.org>
+ * All rights reserved.
-
+ *
-    This file is part of ChibiOS/GFX.
+ * Redistribution and use in source and binary forms, with or without
-
+ * modification, are permitted provided that the following conditions are met:
-    ChibiOS/GFX is free software; you can redistribute it and/or modify
+ *    * Redistributions of source code must retain the above copyright
-    it under the terms of the GNU General Public License as published by
+ *      notice, this list of conditions and the following disclaimer.
-    the Free Software Foundation; either version 3 of the License, or
+ *    * Redistributions in binary form must reproduce the above copyright
-    (at your option) any later version.
+ *      notice, this list of conditions and the following disclaimer in the
-
+ *      documentation and/or other materials provided with the distribution.
-    ChibiOS/GFX is distributed in the hope that it will be useful,
+ *    * Neither the name of the <organization> nor the
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *      names of its contributors may be used to endorse or promote products
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *      derived from this software without specific prior written permission.
-    GNU General Public License for more details.
+ *
-
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-    You should have received a copy of the GNU General Public License
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-*/
+ * DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> 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.
+ */
 
 /**
  * This demo demonstrates the use of the GAUDIN module to read audio channel 0.

demos/modules/gdisp/gdisp_basics/gfxconf.h

@@ -1,9 +1,28 @@
-/**
+/*
- * This file has a different license to the rest of the GFX system.
+ * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>
- * You can copy, modify and distribute this file as you see fit.
+ * All rights reserved.
- * 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
+ * Redistribution and use in source and binary forms, with or without
- * under a different license.
+ * 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.
+ *    * Neither the name of the <organization> nor the
+ *      names of its contributors may be used to endorse or promote products
+ *      derived from this software without specific prior written permission.
+ *
+ * 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 <COPYRIGHT HOLDER> 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.
  */
 
 #ifndef _GFXCONF_H

demos/modules/gdisp/gdisp_basics/main.c

@@ -1,22 +1,29 @@
 /*
-    ChibiOS/GFX - Copyright (C) 2012, 2013
+ * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>
-                 Joel Bodenmann aka Tectu <joel@unormal.org>
+ * All rights reserved.
-
+ *
-    This file is part of ChibiOS/GFX.
+ * Redistribution and use in source and binary forms, with or without
-
+ * modification, are permitted provided that the following conditions are met:
-    ChibiOS/GFX is free software; you can redistribute it and/or modify
+ *    * Redistributions of source code must retain the above copyright
-    it under the terms of the GNU General Public License as published by
+ *      notice, this list of conditions and the following disclaimer.
-    the Free Software Foundation; either version 3 of the License, or
+ *    * Redistributions in binary form must reproduce the above copyright
-    (at your option) any later version.
+ *      notice, this list of conditions and the following disclaimer in the
-
+ *      documentation and/or other materials provided with the distribution.
-    ChibiOS/GFX is distributed in the hope that it will be useful,
+ *    * Neither the name of the <organization> nor the
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *      names of its contributors may be used to endorse or promote products
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *      derived from this software without specific prior written permission.
-    GNU General Public License for more details.
+ *
-
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-    You should have received a copy of the GNU General Public License
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-*/
+ * DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> 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.
+ */
 
 #include "ch.h"
 #include "hal.h"

demos/modules/gdisp/gdisp_circles/gfxconf.h

@@ -1,9 +1,28 @@
-/**
+/*
- * This file has a different license to the rest of the GFX system.
+ * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>
- * You can copy, modify and distribute this file as you see fit.
+ * All rights reserved.
- * 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
+ * Redistribution and use in source and binary forms, with or without
- * under a different license.
+ * 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.
+ *    * Neither the name of the <organization> nor the
+ *      names of its contributors may be used to endorse or promote products
+ *      derived from this software without specific prior written permission.
+ *
+ * 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 <COPYRIGHT HOLDER> 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.
  */
 
 #ifndef _GFXCONF_H

demos/modules/gdisp/gdisp_circles/main.c

@@ -1,22 +1,29 @@
 /*
-    ChibiOS/GFX - Copyright (C) 2012, 2013
+ * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>
-                 Joel Bodenmann aka Tectu <joel@unormal.org>
+ * All rights reserved.
-
+ *
-    This file is part of ChibiOS/GFX.
+ * Redistribution and use in source and binary forms, with or without
-
+ * modification, are permitted provided that the following conditions are met:
-    ChibiOS/GFX is free software; you can redistribute it and/or modify
+ *    * Redistributions of source code must retain the above copyright
-    it under the terms of the GNU General Public License as published by
+ *      notice, this list of conditions and the following disclaimer.
-    the Free Software Foundation; either version 3 of the License, or
+ *    * Redistributions in binary form must reproduce the above copyright
-    (at your option) any later version.
+ *      notice, this list of conditions and the following disclaimer in the
-
+ *      documentation and/or other materials provided with the distribution.
-    ChibiOS/GFX is distributed in the hope that it will be useful,
+ *    * Neither the name of the <organization> nor the
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *      names of its contributors may be used to endorse or promote products
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *      derived from this software without specific prior written permission.
-    GNU General Public License for more details.
+ *
-
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-    You should have received a copy of the GNU General Public License
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-*/
+ * DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> 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.
+ */
 
 #include "ch.h"
 #include "hal.h"

demos/modules/gdisp/gdisp_compiled_pictures/main.c

@@ -1,26 +0,0 @@
-#include "ch.h"
-#include "hal.h"
-#include "gfx.h"
-#include "matterhorn1.h"
-#include "matterhorn2.h"
-#include "fruits1.h"
-
-int main(void) {
-	halInit();
-	chSysInit();
-
-	gdispInit();
-	gdispSetOrientation(GDISP_ROTATE_90);
-
-	while(1) {
-		gdispBlitArea(0, 0, fruits1.width, fruits1.height, (const pixel_t*)fruits1.pixel_data);
-		chThdSleepMilliseconds(3000);
-
-		gdispBlitArea(0, 0, matterhorn1.width, matterhorn1.height, (const pixel_t*)matterhorn1.pixel_data);
-		chThdSleepMilliseconds(3000);
-
-		gdispBlitArea(0, 0, matterhorn2.width, matterhorn2.height, (const pixel_t*)matterhorn2.pixel_data);
-		chThdSleepMilliseconds(3000);
-	}
-}
-

demos/modules/gdisp/gdisp_images/gfxconf.h

@@ -1,9 +1,28 @@
-/**
+/*
- * This file has a different license to the rest of the GFX system.
+ * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>
- * You can copy, modify and distribute this file as you see fit.
+ * All rights reserved.
- * 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
+ * Redistribution and use in source and binary forms, with or without
- * under a different license.
+ * 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.
+ *    * Neither the name of the <organization> nor the
+ *      names of its contributors may be used to endorse or promote products
+ *      derived from this software without specific prior written permission.
+ *
+ * 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 <COPYRIGHT HOLDER> 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.
  */
 
 #ifndef _GFXCONF_H

demos/modules/gdisp/gdisp_images/main.c

@@ -1,22 +1,29 @@
 /*
-    ChibiOS/GFX - Copyright (C) 2012, 2013
+ * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>
-                 Joel Bodenmann aka Tectu <joel@unormal.org>
+ * All rights reserved.
-
+ *
-    This file is part of ChibiOS/GFX.
+ * Redistribution and use in source and binary forms, with or without
-
+ * modification, are permitted provided that the following conditions are met:
-    ChibiOS/GFX is free software; you can redistribute it and/or modify
+ *    * Redistributions of source code must retain the above copyright
-    it under the terms of the GNU General Public License as published by
+ *      notice, this list of conditions and the following disclaimer.
-    the Free Software Foundation; either version 3 of the License, or
+ *    * Redistributions in binary form must reproduce the above copyright
-    (at your option) any later version.
+ *      notice, this list of conditions and the following disclaimer in the
-
+ *      documentation and/or other materials provided with the distribution.
-    ChibiOS/GFX is distributed in the hope that it will be useful,
+ *    * Neither the name of the <organization> nor the
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *      names of its contributors may be used to endorse or promote products
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *      derived from this software without specific prior written permission.
-    GNU General Public License for more details.
+ *
-
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-    You should have received a copy of the GNU General Public License
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-*/
+ * DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> 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.
+ */
 
 #include "ch.h"
 #include "hal.h"

demos/modules/gdisp/gdisp_text/gfxconf.h

@@ -1,9 +1,28 @@
-/**
+/*
- * This file has a different license to the rest of the GFX system.
+ * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>
- * You can copy, modify and distribute this file as you see fit.
+ * All rights reserved.
- * 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
+ * Redistribution and use in source and binary forms, with or without
- * under a different license.
+ * 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.
+ *    * Neither the name of the <organization> nor the
+ *      names of its contributors may be used to endorse or promote products
+ *      derived from this software without specific prior written permission.
+ *
+ * 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 <COPYRIGHT HOLDER> 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.
  */
 
 #ifndef _GFXCONF_H

demos/modules/gdisp/gdisp_text/main.c

@@ -1,22 +1,29 @@
 /*
-    ChibiOS/GFX - Copyright (C) 2012, 2013
+ * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>
-                 Joel Bodenmann aka Tectu <joel@unormal.org>
+ * All rights reserved.
-
+ *
-    This file is part of ChibiOS/GFX.
+ * Redistribution and use in source and binary forms, with or without
-
+ * modification, are permitted provided that the following conditions are met:
-    ChibiOS/GFX is free software; you can redistribute it and/or modify
+ *    * Redistributions of source code must retain the above copyright
-    it under the terms of the GNU General Public License as published by
+ *      notice, this list of conditions and the following disclaimer.
-    the Free Software Foundation; either version 3 of the License, or
+ *    * Redistributions in binary form must reproduce the above copyright
-    (at your option) any later version.
+ *      notice, this list of conditions and the following disclaimer in the
-
+ *      documentation and/or other materials provided with the distribution.
-    ChibiOS/GFX is distributed in the hope that it will be useful,
+ *    * Neither the name of the <organization> nor the
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *      names of its contributors may be used to endorse or promote products
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *      derived from this software without specific prior written permission.
-    GNU General Public License for more details.
+ *
-
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-    You should have received a copy of the GNU General Public License
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-*/
+ * DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> 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.
+ */
 
 #include "ch.h"
 #include "hal.h"

demos/modules/ginput/touch_driver_test/gfxconf.h

@@ -1,9 +1,28 @@
-/**
+/*
- * This file has a different license to the rest of the GFX system.
+ * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>
- * You can copy, modify and distribute this file as you see fit.
+ * All rights reserved.
- * 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
+ * Redistribution and use in source and binary forms, with or without
- * under a different license.
+ * 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.
+ *    * Neither the name of the <organization> nor the
+ *      names of its contributors may be used to endorse or promote products
+ *      derived from this software without specific prior written permission.
+ *
+ * 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 <COPYRIGHT HOLDER> 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.
  */
 
 #ifndef _GFXCONF_H

demos/modules/ginput/touch_driver_test/main.c

@@ -1,22 +1,29 @@
 /*
-    ChibiOS/GFX - Copyright (C) 2012, 2013
+ * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>
-                 Joel Bodenmann aka Tectu <joel@unormal.org>
+ * All rights reserved.
-
+ *
-    This file is part of ChibiOS/GFX.
+ * Redistribution and use in source and binary forms, with or without
-
+ * modification, are permitted provided that the following conditions are met:
-    ChibiOS/GFX is free software; you can redistribute it and/or modify
+ *    * Redistributions of source code must retain the above copyright
-    it under the terms of the GNU General Public License as published by
+ *      notice, this list of conditions and the following disclaimer.
-    the Free Software Foundation; either version 3 of the License, or
+ *    * Redistributions in binary form must reproduce the above copyright
-    (at your option) any later version.
+ *      notice, this list of conditions and the following disclaimer in the
-
+ *      documentation and/or other materials provided with the distribution.
-    ChibiOS/GFX is distributed in the hope that it will be useful,
+ *    * Neither the name of the <organization> nor the
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *      names of its contributors may be used to endorse or promote products
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *      derived from this software without specific prior written permission.
-    GNU General Public License for more details.
+ *
-
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-    You should have received a copy of the GNU General Public License
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-*/
+ * DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> 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.
+ */
 
 #include "ch.h"
 #include "hal.h"

demos/modules/graph/gfxconf.h

@@ -1,9 +1,28 @@
-/**
+/*
- * This file has a different license to the rest of the GFX system.
+ * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>
- * You can copy, modify and distribute this file as you see fit.
+ * All rights reserved.
- * 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
+ * Redistribution and use in source and binary forms, with or without
- * under a different license.
+ * 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.
+ *    * Neither the name of the <organization> nor the
+ *      names of its contributors may be used to endorse or promote products
+ *      derived from this software without specific prior written permission.
+ *
+ * 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 <COPYRIGHT HOLDER> 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.
  */
 
 #ifndef _GFXCONF_H

demos/modules/graph/main.c

@@ -1,3 +1,30 @@
+/*
+ * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>
+ * 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.
+ *    * Neither the name of the <organization> nor the
+ *      names of its contributors may be used to endorse or promote products
+ *      derived from this software without specific prior written permission.
+ *
+ * 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 <COPYRIGHT HOLDER> 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.
+ */
+
 #include "ch.h"
 #include "hal.h"
 #include "gfx.h"

demos/modules/gtimer/gfxconf.h

@@ -1,9 +1,28 @@
-/**
+/*
- * This file has a different license to the rest of the GFX system.
+ * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>
- * You can copy, modify and distribute this file as you see fit.
+ * All rights reserved.
- * 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
+ * Redistribution and use in source and binary forms, with or without
- * under a different license.
+ * 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.
+ *    * Neither the name of the <organization> nor the
+ *      names of its contributors may be used to endorse or promote products
+ *      derived from this software without specific prior written permission.
+ *
+ * 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 <COPYRIGHT HOLDER> 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.
  */
 
 #ifndef _GFXCONF_H

demos/modules/gtimer/main.c

@@ -1,22 +1,29 @@
 /*
-    ChibiOS/GFX - Copyright (C) 2012, 2013
+ * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>
-                 Joel Bodenmann aka Tectu <joel@unormal.org>
+ * All rights reserved.
-
+ *
-    This file is part of ChibiOS/GFX.
+ * Redistribution and use in source and binary forms, with or without
-
+ * modification, are permitted provided that the following conditions are met:
-    ChibiOS/GFX is free software; you can redistribute it and/or modify
+ *    * Redistributions of source code must retain the above copyright
-    it under the terms of the GNU General Public License as published by
+ *      notice, this list of conditions and the following disclaimer.
-    the Free Software Foundation; either version 3 of the License, or
+ *    * Redistributions in binary form must reproduce the above copyright
-    (at your option) any later version.
+ *      notice, this list of conditions and the following disclaimer in the
-
+ *      documentation and/or other materials provided with the distribution.
-    ChibiOS/GFX is distributed in the hope that it will be useful,
+ *    * Neither the name of the <organization> nor the
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *      names of its contributors may be used to endorse or promote products
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *      derived from this software without specific prior written permission.
-    GNU General Public License for more details.
+ *
-
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-    You should have received a copy of the GNU General Public License
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-*/
+ * DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> 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.
+ */
 
 #include "ch.h"
 #include "hal.h"

demos/modules/tdisp/gfxconf.h

@@ -1,9 +1,28 @@
-/**
+/*
- * This file has a different license to the rest of the GFX system.
+ * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>
- * You can copy, modify and distribute this file as you see fit.
+ * All rights reserved.
- * 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
+ * Redistribution and use in source and binary forms, with or without
- * under a different license.
+ * 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.
+ *    * Neither the name of the <organization> nor the
+ *      names of its contributors may be used to endorse or promote products
+ *      derived from this software without specific prior written permission.
+ *
+ * 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 <COPYRIGHT HOLDER> 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.
  */
 
 #ifndef _GFXCONF_H

demos/modules/tdisp/main.c

@@ -1,22 +1,29 @@
 /*
-    ChibiOS/GFX - Copyright (C) 2012, 2013
+ * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>
-                 Joel Bodenmann aka Tectu <joel@unormal.org>
+ * All rights reserved.
-
+ *
-    This file is part of ChibiOS/GFX.
+ * Redistribution and use in source and binary forms, with or without
-
+ * modification, are permitted provided that the following conditions are met:
-    ChibiOS/GFX is free software; you can redistribute it and/or modify
+ *    * Redistributions of source code must retain the above copyright
-    it under the terms of the GNU General Public License as published by
+ *      notice, this list of conditions and the following disclaimer.
-    the Free Software Foundation; either version 3 of the License, or
+ *    * Redistributions in binary form must reproduce the above copyright
-    (at your option) any later version.
+ *      notice, this list of conditions and the following disclaimer in the
-
+ *      documentation and/or other materials provided with the distribution.
-    ChibiOS/GFX is distributed in the hope that it will be useful,
+ *    * Neither the name of the <organization> nor the
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *      names of its contributors may be used to endorse or promote products
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *      derived from this software without specific prior written permission.
-    GNU General Public License for more details.
+ *
-
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-    You should have received a copy of the GNU General Public License
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-    along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-*/
+ * DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> 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.
+ */
 
 #include "ch.h"
 #include "hal.h"

demos/readme.txt

@@ -2,3 +2,33 @@ This folder contains a few demos which explain how to use the library.
 
 Only the main files are contained. No compile-able projects
 
+All demos and examples stand under the BSD license as declared below and
+within each file:
+
+/*
+ * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>
+ * 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.
+ *    * Neither the name of the <organization> nor the
+ *      names of its contributors may be used to endorse or promote products
+ *      derived from this software without specific prior written permission.
+ *
+ * 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 <COPYRIGHT HOLDER> 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.
+ */
+

drivers/gdisp/ILI9320/gdisp_lld_board_olimex_pic32mx_lcd.h

@@ -77,11 +77,16 @@ static noinline void gdisp_lld_reset_pin(bool_t state) {
 }
 
 static noinline void gdisp_lld_write_index(uint16_t data) {
+  volatile uint16_t dummy;
+
   PmpWaitBusy();
   palClearPad(IOPORTA, 10);
   PMDIN = data;
   PmpWaitBusy();
   palSetPad(IOPORTA, 10);
+
+  dummy = PMDIN;
+  (void)dummy;
 }
 
 static noinline void gdisp_lld_write_data(uint16_t data) {

drivers/gdisp/SSD1963/gdisp_lld_board_example_gpio.h

@@ -19,7 +19,7 @@
 */
 
 /**
- * @file    drivers/gdisp/SSD1963/gdisp_lld_board_example.h
+ * @file    drivers/gdisp/SSD1963/gdisp_lld_board_example_gpio.h
  * @brief   GDISP Graphic Driver subsystem board interface for the SSD1963 display.
  *
  * @addtogroup GDISP

drivers/gdisp/SSD1963/gdisp_lld_panel_example.h

@@ -19,7 +19,7 @@
 */
 
 /**
- * @file    SSD1963/gdisp_lld_panel.h
+ * @file    drivers/gdisp/SSD1963/gdisp_lld_panel_example.h
  * @brief   TFT LCD panel properties.
  *
  * @addtogroup GDISP

drivers/ginput/touch/MCU/ginput_lld_mouse.c

@@ -40,6 +40,8 @@
 	#include "ginput_lld_mouse_board.h"
 #elif defined(BOARD_OLIMEX_STM32_LCD)
 	#include "ginput_lld_mouse_board_olimex_stm32_lcd.h"
+#elif defined(BOARD_OLIMEX_PIC32MX_LCD)
+	#include "ginput_lld_mouse_board_olimex_pic32mx_lcd.h"
 #else
 	#include "ginput_lld_mouse_board.h"
 #endif

drivers/ginput/touch/MCU/ginput_lld_mouse_board_olimex_pic32mx_lcd.h

@@ -0,0 +1,164 @@
+/*
+    ChibiOS/GFX - Copyright (C) 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/>.
+*/
+
+/**
+ * @file    drivers/ginput/touch/MCU/ginput_lld_mouse_board_olimex_stm32_lcd.h
+ * @brief   GINPUT Touch low level driver source for the MCU on the example board.
+ *
+ * @defgroup Mouse Mouse
+ * @ingroup GINPUT
+ *
+ * @{
+ */
+
+#ifndef _GINPUT_LLD_MOUSE_BOARD_H
+#define _GINPUT_LLD_MOUSE_BOARD_H
+
+static const ADCConfig ADCC = {
+  .vref = ADC_VREF_CFG_AVDD_AVSS,
+  .stime = 15,
+  .irq = EIC_IRQ_ADC,
+  .base = _ADC10_BASE_ADDRESS,
+};
+static struct ADCDriver ADCD;
+
+#define YNEG 13 // U
+#define XNEG 15 // R
+#define XPOS 12 // L
+#define YPOS 11 // D
+
+#define ADC_MAX 1023
+
+#define TOUCH_THRESHOULD 50
+
+static const ADCConversionGroup ADC_X_CG = {
+  .circular = FALSE,
+  .num_channels = 1,
+  .channels = 1 << XNEG,
+};
+
+static const ADCConversionGroup ADC_Y_CG = {
+  .circular = FALSE,
+  .num_channels = 1,
+  .channels = 1 << YPOS,
+};
+
+/**
+ * @brief   Initialise the board for the touch.
+ *
+ * @notapi
+ */
+static inline void init_board(void) {
+  adcObjectInit(&ADCD);
+  adcStart(&ADCD, &ADCC);
+}
+
+/**
+ * @brief   Check whether the surface is currently touched
+ * @return	TRUE if the surface is currently touched
+ *
+ * @notapi
+ */
+static inline bool_t getpin_pressed(void) {
+  adcsample_t samples[2] = {0, };
+
+  // Set X+ to ground
+  palSetPadMode(IOPORTB, XPOS, PAL_MODE_OUTPUT);
+  palClearPad(IOPORTB, XPOS);
+
+  // Set Y- to VCC
+  palSetPadMode(IOPORTB, YNEG, PAL_MODE_OUTPUT);
+  palSetPad(IOPORTB, YNEG);
+
+  palSetPadMode(IOPORTB, XNEG, PAL_MODE_INPUT_ANALOG);
+  palSetPadMode(IOPORTB, YPOS, PAL_MODE_INPUT_ANALOG);
+
+  adcConvert(&ADCD, &ADC_X_CG, &samples[0], 1);
+  adcConvert(&ADCD, &ADC_Y_CG, &samples[1], 1);
+
+  return (ADC_MAX - (samples[1] - samples[0])) > TOUCH_THRESHOULD;
+}
+
+/**
+ * @brief   Aquire the bus ready for readings
+ *
+ * @notapi
+ */
+static inline void aquire_bus(void) {
+}
+
+/**
+ * @brief   Release the bus after readings
+ *
+ * @notapi
+ */
+static inline void release_bus(void) {
+}
+
+/**
+ * @brief   Read an x value from touch controller
+ * @return	The value read from the controller
+ *
+ * @notapi
+ */
+static inline uint16_t read_x_value(void) {
+  adcsample_t sample;
+
+  palSetPadMode(IOPORTB, XPOS, PAL_MODE_OUTPUT);
+  palSetPad(IOPORTB, XPOS);
+
+  palSetPadMode(IOPORTB, XNEG, PAL_MODE_OUTPUT);
+  palClearPad(IOPORTB, XNEG);
+
+  palSetPadMode(IOPORTB, YNEG, PAL_MODE_INPUT);
+
+  palSetPadMode(IOPORTB, YPOS, PAL_MODE_INPUT_ANALOG);
+
+  adcConvert(&ADCD, &ADC_Y_CG, &sample, 1);
+
+  return ADC_MAX - sample;
+}
+
+/**
+ * @brief   Read an y value from touch controller
+ * @return	The value read from the controller
+ *
+ * @notapi
+ */
+static inline uint16_t read_y_value(void) {
+  adcsample_t sample;
+
+  palSetPadMode(IOPORTB, YNEG, PAL_MODE_OUTPUT);
+  palClearPad(IOPORTB, YNEG);
+
+  palSetPadMode(IOPORTB, YPOS, PAL_MODE_OUTPUT);
+  palSetPad(IOPORTB, YPOS);
+
+  palSetPadMode(IOPORTB, XPOS, PAL_MODE_INPUT);
+
+  palSetPadMode(IOPORTB, XNEG, PAL_MODE_INPUT_ANALOG);
+
+  adcConvert(&ADCD, &ADC_X_CG, &sample, 1);
+
+  return ADC_MAX - sample;
+}
+
+#endif /* _GINPUT_LLD_MOUSE_BOARD_H */
+/** @} */

drivers/tdisp/HD44780/tdisp_lld.c

@@ -32,21 +32,23 @@
 
 #if GFX_USE_TDISP /*|| defined(__DOXYGEN__)*/
 
-/* Include the hardware interface details */
+/* check first if the user has defined his/her own lowlevel-board file */
-#if defined(BOARD_OLIMEX_STM32_E407)
+#if defined(TDISP_USE_CUSTOM_BOARD) && TDISP_USE_CUSTOM_BOARD
+	/* Include the user supplied board definitions */
+	#include "tdisp_lld_board.h"
+#elif defined(BOARD_OLIMEX_STM32_E407)
 	#include "tdisp_lld_board_olimex_e407.h"
 #elif defined(BOARD_ST_STM32F4_DISCOVERY)
-	#include "tdisp_lld_board_st_stm32f4_discovery.h"
-#else
 	#include "tdisp_lld_board_example.h"
 #endif
 
+
 /* The user may override the default display size */
 #ifndef TDISP_COLUMNS
 	#define TDISP_COLUMNS		16
 #endif
 #ifndef TDISP_ROWS
-	#define TDISP_ROWS			2
+	#define TDISP_ROWS		2
 #endif
 
 /* Controller Specific Properties */
@@ -56,15 +58,15 @@
 
 /* Define the properties of our controller */
 tdispStruct	TDISP = {
-	TDISP_COLUMNS, TDISP_ROWS,				/* cols, rows */
+	TDISP_COLUMNS, TDISP_ROWS,		/* cols, rows */
 	CUSTOM_CHAR_XBITS, CUSTOM_CHAR_YBITS,	/* charBitsX, charBitsY */
-	CUSTOM_CHAR_COUNT						/* maxCustomChars */
+	CUSTOM_CHAR_COUNT			/* maxCustomChars */
 };
 
 /* Our display control */
-#define DISPLAY_ON		0x04
+#define TDISP_DISPLAY_ON		0x04
-#define CURSOR_ON		0x02
+#define TDISP_CURSOR_ON			0x02
-#define CURSOR_BLINK	0x01
+#define TDISP_CURSOR_BLINK		0x01
 
 static uint8_t	displaycontrol;
 
@@ -72,28 +74,77 @@ static uint8_t	displaycontrol;
 bool_t tdisp_lld_init(void) { 
 	/* initialise hardware */
 	init_board();
+	
+	/* The first part is the initialing code.
+	 * In this part only the lower nibble of the
+	 * byte is written directly to the display, thus
+	 * without write_cmd, which sends both high and
+	 * low nibble.
+	 */
+	
+	/* Give the LCD a little time to wake up */
+	chThdSleepMilliseconds(15);
+	
+	/* write three times 0x03 to display
+	 * with RS = low.
+	 */
+	palClearPad(PORT_CTRL, PIN_RS);
+	#if BUS_4BITS
+		writeToLCD(0x03); // 1x
+		writeToLCD(0x03); // 2x
+		writeToLCD(0x03); // 3x
+		/* Put display in 4-bit mode by
+		* write 0x02 to display.
+		*/
+		writeToLCD(0x02); // 4bit-modus
+	#else
+		writeToLCD(0x30); // 1x
+		writeToLCD(0x30); // 2x
+		writeToLCD(0x30); // 3x
+	#endif	
 
-	/* wait some time */
+	/* From this point on, the LCD accepts
-	chThdSleepMilliseconds(50);
+	 * bytes sent with highnibbel first and than
-
+	 *the lownibble.
-	write_cmd(0x38);
+	 */
-	chThdSleepMilliseconds(64);
+	
-
+	/* 4-bit modus, 2 lines en 5x7 characters */
-	displaycontrol = DISPLAY_ON | CURSOR_ON | CURSOR_BLINK;		// The default displaycontrol
+	write_cmd(0x28);
-	write_cmd(0x08 | displaycontrol);
+	
-	chThdSleepMicroseconds(50);
+	displaycontrol = TDISP_DISPLAY_ON;
-
+	
-	write_cmd(0x01);					// Clear the screen
+	/* set display on, cursor off and no blinking */
-	chThdSleepMilliseconds(5);
+	write_cmd(0x0C);
-
+	/* set cursor move direction */
 	write_cmd(0x06);
-	chThdSleepMicroseconds(50);
+	/* END OF INITIALISATION */
+
+// 	/* wait some time */
+// 	chThdSleepMilliseconds(50);
+// 
+// 	write_cmd(0x38);
+// 	chThdSleepMilliseconds(64);
+// 
+// 	displaycontrol = DISPLAY_ON | CURSOR_ON | CURSOR_BLINK;		// The default displaycontrol
+// 	write_cmd(0x08 | displaycontrol);
+// 	chThdSleepMicroseconds(50);
+// 
+// 	write_cmd(0x01);					// Clear the screen
+// 	chThdSleepMilliseconds(5);
+// 
+// 	write_cmd(0x06);
+// 	chThdSleepMicroseconds(50);
 
 	return TRUE;
 }
 
+/* Clears the display. The display needs
+ * a long time to process this command. So
+ * an extra delay is insterted.
+ */
 void tdisp_lld_clear(void) {
 	write_cmd(0x01);
+// 	chThdSleepMilliseconds(LONG_DELAY_MS);
 }
 
 void tdisp_lld_draw_char(char c) {
@@ -122,11 +173,14 @@ void tdisp_lld_create_char(uint8_t address, uint8_t *charmap) {
 	int i;
 
 	write_cmd(0x40 | (address << 3));
-	for(i = 0; i < CUSTOM_CHAR_YBITS; i++)
+	for(i = 0; i < CUSTOM_CHAR_YBITS; i++) {
 		write_data(charmap[i]);
+	}
+
 }
 
-void tdisp_lld_control(uint16_t what, void *value) {
+void tdisp_lld_control(uint16_t what, uint16_t value) {
+      
 	switch(what) {
 		case TDISP_CTRL_BACKLIGHT:
 			if ((uint8_t)value)
@@ -136,7 +190,7 @@ void tdisp_lld_control(uint16_t what, void *value) {
 			write_cmd(0x08 | displaycontrol);
 			break;
 		case TDISP_CTRL_CURSOR:
-			switch((cursorshape)value) {
+			switch((uint8_t)value) {
 			case cursorOff:
 				displaycontrol &= ~CURSOR_ON;
 				break;

drivers/tdisp/HD44780/tdisp_lld_board_st_stm32f4_discovery.h

@@ -30,41 +30,104 @@
 #define _TDISP_LLD_BOARD_H
 
 /* Configure these to match the hardware connections on your board */
-#define BUS_4BITS	FALSE
+#define BUS_4BITS	TRUE
-#define PORT_DATA	GPIOG
+
-#define PORT_CTRL	GPIOE
+/* Configure the bitoffset in the dataport so they match with the
+ * hardware pins. An offset of 0 means bit0 stays at bit0 of the dataport.
+ * If the offset is set to 3, bit0 of the nibble will be positioned at
+ * P[A..G]3 of the hardware-port.
+ */
+#define hardware_offset	3
+
+/* The port where the data is sent to. In the
+ * low-leveldriver het hardware_offset is taken
+ * into account. If for example the hardware_offset
+ * is set to 3, then de data will be sent to
+ * PE3, PE4, PE5 en PE6, if the dataport where GPIOE.
+ */
+#define PORT_DATA	GPIOE
+
+/* The port used to controle the controle lines of
+ * the display.
+ */
+#define PORT_CTRL	GPIOD
+/* Pin to controle the R/S-line of the display */
 #define PIN_RS		0
-#define PIN_RW		1
+/* Pin to controle the EN-line of the display */
-#define PIN_EN		2
+#define PIN_EN		1
+/* Pin to controle the R/W-pin of the display.
+ * If reading of the display is not used disable
+ * reading in the gfxconf.h and put a dummy value here
+ * as it will not be used.
+ */
+#define PIN_RW		7
+
 
 static void init_board(void) {
+	/* Initialize the ports for data and controle-lines */
 	palSetGroupMode(PORT_CTRL, PAL_WHOLE_PORT, 0, PAL_MODE_OUTPUT_PUSHPULL);
 	palSetGroupMode(PORT_DATA, PAL_WHOLE_PORT, 0, PAL_MODE_OUTPUT_PUSHPULL);
-	palClearPad(PORT_CTRL, PIN_RW);
+	/* Set alle controle pins to low */
+	palClearPad(PORT_CTRL, PIN_RS);
+	palClearPad(PORT_CTRL, PIN_EN);
+	#if TDISP_NEED_READ
+	  palClearPad(PORT_CTRL, PIN_RW);
+	#endif
 }
 
+/* This is the low-level routine for sending the bits
+ * to the LCD-display. This routine shifts
+ * the bits so they match the hardware port.
+ */
 static void writeToLCD(uint8_t data) {
-	palWritePort(PORT_DATA, data);
+	palWritePort(PORT_DATA, data<<hardware_offset);
 	palSetPad(PORT_CTRL, PIN_EN);
 	chThdSleepMicroseconds(1);
 	palClearPad(PORT_CTRL, PIN_EN);
+	/* wait a little while so that de display can process the data */
 	chThdSleepMicroseconds(5);
 }
 
+/* Writes a command to the display. The
+ * RS-line is pulled low and than the
+ * data is send.
+ */
 static void write_cmd(uint8_t data) {
 	palClearPad(PORT_CTRL, PIN_RS);
 	#if BUS_4BITS
+		/* first send the high-nibble */
 		writeToLCD(data>>4);
 	#endif
-	writeToLCD(data);
+	/* send the low-nibble */
+	#if BUS_4BITS
+		/* in 4-bit mode the high-nibble is zeroed out */
+		writeToLCD(data & 0x0F);
+	#else
+		writeToLCD(data);
+	#endif
 }
 
+// static void write_initcmd(uint8_t data) {
+//   write_cmd(data);
+// }
+
+/* Write data to the display. The
+ * RS-line is pulled high and than the
+ * data is send.
+ */
 static void write_data(uint8_t data) {
 	palSetPad(PORT_CTRL, PIN_RS);
 	#if BUS_4BITS
+		/* first send the high-nibble */
 		writeToLCD(data>>4);
 	#endif
-	writeToLCD(data);
+	/* send the low-nibble */
+	#if BUS_4BITS
+		/* in 4-bit mode the high-nibble is zeroed out */
+		writeToLCD(data & 0x0F);
+	#else
+		writeToLCD(data);
+	#endif
 }
 
 #endif /* _TDISP_LLD_BOARD_H */

include/gadc/lld/gadc_lld.h

@@ -70,7 +70,18 @@ typedef struct GadcLldNonTimerData_t {
  * @notapi
  * @{
  */
+
+/**
+ * @param[in] adcp		The ADC driver
+ * @param[in] buffer	The sample buffer
+ * @param[in] n			The amount of samples
+ */
 extern void GADC_ISR_CompleteI(ADCDriver *adcp, adcsample_t *buffer, size_t n);
+
+/**
+ * @param[in] adcp 		The ADC driver
+ * @param[in] err 		ADC error
+ */
 extern void GADC_ISR_ErrorI(ADCDriver *adcp, adcerror_t err);
 /**
  * @}

include/gaudin/lld/gaudin_lld.h

@@ -61,7 +61,13 @@ typedef struct gaudin_params_t {
  *
  * @{
  */
+
+/**
+ * @param[in] buffer	The buffer
+ * @param[in] n			The amount of samples
+ * */
 extern void GAUDIN_ISR_CompleteI(audin_sample_t *buffer, size_t n);
+
 extern void GAUDIN_ISR_ErrorI(void);
 /**
  * @}
@@ -78,6 +84,8 @@ extern "C" {
 /**
  * @brief				Initialise the driver
  *
+ * @param[in] paud		Initialisation parameters
+ *
  * @api
  */
 void gaudin_lld_init(const gaudin_params *paud);

include/ginput/lld/mouse.h

@@ -166,7 +166,7 @@ extern "C" {
 	 * @note	This routine is provided to low level drivers by the high level code
 	 * @note	Particularly useful if GINPUT_MOUSE_POLL_PERIOD = TIME_INFINITE
 	 *
-	 * @icode
+	 * @iclass
 	 * @notapi
 	 */
 	void ginputMouseWakeupI(void);

releases.txt

@@ -21,9 +21,11 @@ FEATURE:	Added the ability to specify a custom button drawing routine
 FEATURE:	SSD1963 rework by username 'fred'
 FEATURE:	Added Picture converter tool
 FEATURE:	Added slider widget
+FEATURE:	First MIPS32 (PIC32) board files contributed by user 'Dmytro'
 FEATURE:	Added gwinDraw() routine
 FEATURE:	Added GINPUT Dial support and driver using GADC
 FEATURE:	Simplified assigning inputs to buttons and sliders
+FIX:		Some fixes for the HD44780 TDISP driver by the user 'Frysk'
 
 
 *** changes after 1.4 ***