Merge commit 'd8db148a149541f658cc9729785b3694f80e2624' into GWIN

Conflicts:
	demos/applications/mandelbrot/gfxconf.h
	demos/applications/mandelbrot/main.c
	demos/applications/notepad/gfxconf.h
	demos/applications/notepad/main.c
	demos/benchmarks/gfxconf.h
	demos/benchmarks/main.c
	demos/modules/gadc/gfxconf.h
	demos/modules/gadc/gwinosc.c
	demos/modules/gadc/gwinosc.h
	demos/modules/gadc/main.c
	demos/modules/gaudin/gfxconf.h
	demos/modules/gaudin/gwinosc.c
	demos/modules/gaudin/gwinosc.h
	demos/modules/gaudin/main.c
	demos/modules/gdisp/gdisp_basics/gfxconf.h
	demos/modules/gdisp/gdisp_basics/main.c
	demos/modules/gdisp/gdisp_circles/gfxconf.h
	demos/modules/gdisp/gdisp_circles/main.c
	demos/modules/gdisp/gdisp_images/gfxconf.h
	demos/modules/gdisp/gdisp_images/main.c
	demos/modules/gdisp/gdisp_images_animated/gfxconf.h
	demos/modules/gdisp/gdisp_images_animated/main.c
	demos/modules/gdisp/gdisp_text/gfxconf.h
	demos/modules/gdisp/gdisp_text/main.c
	demos/modules/ginput/touch_driver_test/gfxconf.h
	demos/modules/ginput/touch_driver_test/main.c
	demos/modules/graph/gfxconf.h
	demos/modules/graph/main.c
	demos/modules/gtimer/gfxconf.h
	demos/modules/gtimer/main.c
	demos/modules/gwin/basic/gfxconf.h
	demos/modules/gwin/basic/main.c
	demos/modules/gwin/console/gfxconf.h
	demos/modules/gwin/console/main.c
	demos/modules/gwin/slider/gfxconf.h
	demos/modules/gwin/slider/main.c
	demos/modules/tdisp/gfxconf.h
	demos/modules/tdisp/main.c
	drivers/gdisp/ILI9320/gdisp_lld_config.h
	drivers/gdisp/ILI9325/gdisp_lld_config.h
	drivers/gdisp/Nokia6610GE12/GE12.h
	drivers/gdisp/Nokia6610GE12/gdisp_lld_board_example.h
	drivers/gdisp/Nokia6610GE12/gdisp_lld_board_olimexsam7ex256.h
	drivers/gdisp/Nokia6610GE12/gdisp_lld_config.h
	drivers/gdisp/Nokia6610GE8/GE8.h
	drivers/gdisp/Nokia6610GE8/gdisp_lld_board_example.h
	drivers/gdisp/Nokia6610GE8/gdisp_lld_config.h
	drivers/gdisp/S6D1121/gdisp_lld_board_example.h
	drivers/gdisp/S6D1121/gdisp_lld_board_olimex_e407.h
	drivers/gdisp/S6D1121/gdisp_lld_config.h
	drivers/gdisp/SSD1289/gdisp_lld_board_example.h
	drivers/gdisp/SSD1289/gdisp_lld_board_firebullstm32f103.h
	drivers/gdisp/SSD1289/gdisp_lld_config.h
	drivers/gdisp/SSD1963/gdisp_lld_board_example_gpio.h
	drivers/gdisp/TestStub/gdisp_lld_config.h
	drivers/ginput/toggle/Pal/ginput_lld_toggle_board_example.h
	drivers/ginput/toggle/Pal/ginput_lld_toggle_config.h
	drivers/ginput/touch/ADS7843/ginput_lld_mouse_board_example.h
	drivers/ginput/touch/ADS7843/ginput_lld_mouse_board_firebull_stm32f103.h
	drivers/ginput/touch/ADS7843/ginput_lld_mouse_board_olimex_stm32_e407.h
	drivers/ginput/touch/MCU/ginput_lld_mouse_board_example.h
	drivers/ginput/touch/MCU/ginput_lld_mouse_board_olimex_pic32mx_lcd.h
	drivers/ginput/touch/STMPE811/ginput_lld_mouse_board_embest_dmstf4bb.h
	drivers/ginput/touch/STMPE811/ginput_lld_mouse_board_example.h
	drivers/multiple/Win32/gdisp_lld_config.h
	drivers/multiple/Win32/ginput_lld_toggle_config.h
	include/gaudin/options.h
	include/gaudout/options.h
	include/ginput/options.h
	include/gtimer/options.h
	include/gwin/internal.h
	license.html

2 files changed, 21 insertions, 21 deletions

diff --git a/drivers/multiple/Win32/gdisp_lld_config.h b/drivers/multiple/Win32/gdisp_lld_config.h
index 5e0af71b..699fcaeb 100644
--- a/drivers/multiple/Win32/gdisp_lld_config.h
+++ b/drivers/multiple/Win32/gdisp_lld_config.h
@@ -1,9 +1,9 @@
-/*

- * This file is subject to the terms of the GFX License. If a copy of

- * the license was not distributed with this file, you can obtain one at:

- *

- *              http://chibios-gfx.com/license.html

- */

+/*
+ * This file is subject to the terms of the GFX License. If a copy of
+ * the license was not distributed with this file, you can obtain one at:
+ *
+ *              http://chibios-gfx.com/license.html
+ */
 

 /**

  * @file    drivers/multiple/Win32/gdisp_lld_config.h

diff --git a/drivers/multiple/Win32/ginput_lld_toggle_config.h b/drivers/multiple/Win32/ginput_lld_toggle_config.h
index 4418a683..591b6e78 100644
--- a/drivers/multiple/Win32/ginput_lld_toggle_config.h
+++ b/drivers/multiple/Win32/ginput_lld_toggle_config.h
@@ -1,9 +1,9 @@
-/*

- * This file is subject to the terms of the GFX License. If a copy of

- * the license was not distributed with this file, you can obtain one at:

- *

- *              http://chibios-gfx.com/license.html

- */

+/*
+ * This file is subject to the terms of the GFX License. If a copy of
+ * the license was not distributed with this file, you can obtain one at:
+ *
+ *              http://chibios-gfx.com/license.html
+ */
 

 /**

  * @file    drivers/multiple/Win32/ginput_lld_toggle_config.h

@@ -20,19 +20,19 @@
 

 #if GFX_USE_GINPUT && GINPUT_NEED_TOGGLE

 

-#define GINPUT_TOGGLE_POLL_PERIOD		TIME_INFINITE	// We are interrupt driven (or polled - either works here)

+#define GINPUT_TOGGLE_POLL_PERIOD		TIME_INFINITE	// We are interrupt driven (or polled - ether works here)

 #define GINPUT_TOGGLE_NUM_PORTS			8			// The total number of toggle inputs

 #define GINPUT_TOGGLE_CONFIG_ENTRIES	1			// The total number of GToggleConfig entries

 

-#define GINPUT_TOGGLE_MOMENTARY1	0				// Switch 5	- Momentary

-#define GINPUT_TOGGLE_MOMENTARY2	1				// Switch 6	- Momentary

-#define GINPUT_TOGGLE_MOMENTARY3	2				// Switch 7	- Momentary

-#define GINPUT_TOGGLE_MOMENTARY4	3				// Switch 8	- Momentary

+#define GINPUT_TOGGLE_SW1			0				// Switch 1	- Toggle

+#define GINPUT_TOGGLE_SW2			1				// Switch 2	- Toggle

+#define GINPUT_TOGGLE_SW3			2				// Switch 3	- Toggle

+#define GINPUT_TOGGLE_SW4			3				// Switch 4	- Toggle

 

-#define GINPUT_TOGGLE_SW1			4				// Switch 1	- Toggle

-#define GINPUT_TOGGLE_SW2			5				// Switch 2	- Toggle

-#define GINPUT_TOGGLE_SW3			6				// Switch 3	- Toggle

-#define GINPUT_TOGGLE_SW4			7				// Switch 4	- Toggle

+#define GINPUT_TOGGLE_MOMENTARY1	4				// Switch 5	- Momentary

+#define GINPUT_TOGGLE_MOMENTARY2	5				// Switch 6	- Momentary

+#define GINPUT_TOGGLE_MOMENTARY3	6				// Switch 7	- Momentary

+#define GINPUT_TOGGLE_MOMENTARY4	7				// Switch 8	- Momentary

 

 #endif	/* GFX_USE_GDISP && GINPUT_NEED_TOGGLE */