From b34819bb762916eb010444441b19b5ae7f680806 Mon Sep 17 00:00:00 2001 From: Joel Bodenmann Date: Sun, 11 May 2014 17:15:57 +0200 Subject: [PATCH] cleanup of Mikromedia STM32-M4 board support --- .../board_ILI9341.h | 5 ----- .../{example => example_chibios_2.x}/Makefile | 0 .../{example => example_chibios_2.x}/chconf.h | 0 .../halconf.h | 0 .../mcuconf.h | 0 .../openocd.cfg | 0 .../Makefile | 0 .../chconf.h | 0 .../halconf.h | 0 .../mcuconf.h | 0 .../openocd.cfg | 0 .../ginput_lld_mouse_board.h | 20 ------------------- .../ginput_lld_mouse_config.h | 11 ---------- .../Mikromedia-STM32-M4-ILI9341/readme.txt | 2 +- docs/releases.txt | 1 + 15 files changed, 2 insertions(+), 37 deletions(-) rename boards/base/Mikromedia-STM32-M4-ILI9341/{example => example_chibios_2.x}/Makefile (100%) rename boards/base/Mikromedia-STM32-M4-ILI9341/{example => example_chibios_2.x}/chconf.h (100%) rename boards/base/Mikromedia-STM32-M4-ILI9341/{example => example_chibios_2.x}/halconf.h (100%) rename boards/base/Mikromedia-STM32-M4-ILI9341/{example => example_chibios_2.x}/mcuconf.h (100%) rename boards/base/Mikromedia-STM32-M4-ILI9341/{example => example_chibios_2.x}/openocd.cfg (100%) rename boards/base/Mikromedia-STM32-M4-ILI9341/{example_chibios_3.0 => example_chibios_3.x}/Makefile (100%) rename boards/base/Mikromedia-STM32-M4-ILI9341/{example_chibios_3.0 => example_chibios_3.x}/chconf.h (100%) rename boards/base/Mikromedia-STM32-M4-ILI9341/{example_chibios_3.0 => example_chibios_3.x}/halconf.h (100%) rename boards/base/Mikromedia-STM32-M4-ILI9341/{example_chibios_3.0 => example_chibios_3.x}/mcuconf.h (100%) rename boards/base/Mikromedia-STM32-M4-ILI9341/{example_chibios_3.0 => example_chibios_3.x}/openocd.cfg (100%) diff --git a/boards/base/Mikromedia-STM32-M4-ILI9341/board_ILI9341.h b/boards/base/Mikromedia-STM32-M4-ILI9341/board_ILI9341.h index c73c68a9..b09d66c2 100644 --- a/boards/base/Mikromedia-STM32-M4-ILI9341/board_ILI9341.h +++ b/boards/base/Mikromedia-STM32-M4-ILI9341/board_ILI9341.h @@ -5,11 +5,6 @@ * http://ugfx.org/license.html */ -/** - * @file boards/base/Mikromedia-STM32-M4-ILI9341/board_ILI9341.h - * @brief GDISP Graphics Driver subsystem low level driver source for the ILI9341 display. - */ - #ifndef _GDISP_LLD_BOARD_H #define _GDISP_LLD_BOARD_H diff --git a/boards/base/Mikromedia-STM32-M4-ILI9341/example/Makefile b/boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_2.x/Makefile similarity index 100% rename from boards/base/Mikromedia-STM32-M4-ILI9341/example/Makefile rename to boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_2.x/Makefile diff --git a/boards/base/Mikromedia-STM32-M4-ILI9341/example/chconf.h b/boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_2.x/chconf.h similarity index 100% rename from boards/base/Mikromedia-STM32-M4-ILI9341/example/chconf.h rename to boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_2.x/chconf.h diff --git a/boards/base/Mikromedia-STM32-M4-ILI9341/example/halconf.h b/boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_2.x/halconf.h similarity index 100% rename from boards/base/Mikromedia-STM32-M4-ILI9341/example/halconf.h rename to boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_2.x/halconf.h diff --git a/boards/base/Mikromedia-STM32-M4-ILI9341/example/mcuconf.h b/boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_2.x/mcuconf.h similarity index 100% rename from boards/base/Mikromedia-STM32-M4-ILI9341/example/mcuconf.h rename to boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_2.x/mcuconf.h diff --git a/boards/base/Mikromedia-STM32-M4-ILI9341/example/openocd.cfg b/boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_2.x/openocd.cfg similarity index 100% rename from boards/base/Mikromedia-STM32-M4-ILI9341/example/openocd.cfg rename to boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_2.x/openocd.cfg diff --git a/boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_3.0/Makefile b/boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_3.x/Makefile similarity index 100% rename from boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_3.0/Makefile rename to boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_3.x/Makefile diff --git a/boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_3.0/chconf.h b/boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_3.x/chconf.h similarity index 100% rename from boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_3.0/chconf.h rename to boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_3.x/chconf.h diff --git a/boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_3.0/halconf.h b/boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_3.x/halconf.h similarity index 100% rename from boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_3.0/halconf.h rename to boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_3.x/halconf.h diff --git a/boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_3.0/mcuconf.h b/boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_3.x/mcuconf.h similarity index 100% rename from boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_3.0/mcuconf.h rename to boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_3.x/mcuconf.h diff --git a/boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_3.0/openocd.cfg b/boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_3.x/openocd.cfg similarity index 100% rename from boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_3.0/openocd.cfg rename to boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_3.x/openocd.cfg diff --git a/boards/base/Mikromedia-STM32-M4-ILI9341/ginput_lld_mouse_board.h b/boards/base/Mikromedia-STM32-M4-ILI9341/ginput_lld_mouse_board.h index 7e9948a5..75db2c62 100644 --- a/boards/base/Mikromedia-STM32-M4-ILI9341/ginput_lld_mouse_board.h +++ b/boards/base/Mikromedia-STM32-M4-ILI9341/ginput_lld_mouse_board.h @@ -5,11 +5,6 @@ * http://ugfx.org/license.html */ -/** - * @file boards/base/Mikromedia-STM32-M4-ILI9341/ginput_lld_mouse_board.h - * @brief GINPUT Touch low level driver source for the MCU. - */ - #ifndef _GINPUT_LLD_MOUSE_BOARD_H #define _GINPUT_LLD_MOUSE_BOARD_H @@ -31,29 +26,14 @@ static const ADCConversionGroup adcgrpcfg = { ADC_SQR3_SQ2_N(ADC_CHANNEL_IN8) | ADC_SQR3_SQ1_N(ADC_CHANNEL_IN9) }; -/** - * @brief Initialise the board for the touch. - * - * @notapi - */ static inline void init_board(void) { adcStart(&ADCD1, 0); } -/** - * @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) { } diff --git a/boards/base/Mikromedia-STM32-M4-ILI9341/ginput_lld_mouse_config.h b/boards/base/Mikromedia-STM32-M4-ILI9341/ginput_lld_mouse_config.h index 8fb29ffc..328e6337 100644 --- a/boards/base/Mikromedia-STM32-M4-ILI9341/ginput_lld_mouse_config.h +++ b/boards/base/Mikromedia-STM32-M4-ILI9341/ginput_lld_mouse_config.h @@ -5,16 +5,6 @@ * http://ugfx.org/license.html */ -/** - * @file boards/base/Mikromedia-STM32-M4-ILI9341/ginput_lld_mouse_config.h - * @brief GINPUT LLD header file for touch driver. - * - * @defgroup Mouse Mouse - * @ingroup GINPUT - * - * @{ - */ - #ifndef _LLD_GINPUT_MOUSE_CONFIG_H #define _LLD_GINPUT_MOUSE_CONFIG_H @@ -29,4 +19,3 @@ #define GINPUT_MOUSE_CLICK_TIME 500 #endif /* _LLD_GINPUT_MOUSE_CONFIG_H */ -/** @} */ diff --git a/boards/base/Mikromedia-STM32-M4-ILI9341/readme.txt b/boards/base/Mikromedia-STM32-M4-ILI9341/readme.txt index d37c58fb..d6efa93e 100644 --- a/boards/base/Mikromedia-STM32-M4-ILI9341/readme.txt +++ b/boards/base/Mikromedia-STM32-M4-ILI9341/readme.txt @@ -12,4 +12,4 @@ Note there are two variants of this board - one with the ILI9341 display As this is not a standard ChibiOS supported board the necessary board files have also been provided in the ChibiOS_Board directory. -There is an example Makefile and project in the examples directory. +There are two examples, one for ChibiOS/RT 2.x and one for ChibiOS/RT 3.x available. diff --git a/docs/releases.txt b/docs/releases.txt index b7c019aa..4f5e9706 100644 --- a/docs/releases.txt +++ b/docs/releases.txt @@ -39,6 +39,7 @@ FIX: Imagebox widget bug fix that could cause gwinImageOpenFile() to crash FEATURE: GWIN containers such as "container" and "frame" which provides parent/children widget management FEATURE: Added gdispContrastColor() FEATURE: Added gwinShow() and gwinHide() +FEATURE: ChibiOS/RT 3.x support and example for the Mikromedia STM32-M4 board. *** Release 2.0 ***