diff options
| author | inmarket <andrewh@inmarket.com.au> | 2013-10-28 19:06:16 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2013-10-28 19:06:16 +1000 |
| commit | 737ac5be9743e37b80133706faf02e959e803459 (patch) | |
| tree | eb0bf63c333e6d51f19ee20676d475f8eb607c98 /drivers/ginput | |
| parent | b05a29f830008ab0e9a36d8384ed7cf4ea3fb18b (diff) | |
| download | uGFX-737ac5be9743e37b80133706faf02e959e803459.tar.gz uGFX-737ac5be9743e37b80133706faf02e959e803459.tar.bz2 uGFX-737ac5be9743e37b80133706faf02e959e803459.zip | |
Create uGFX board directories which include example Makefiles.
Currently only done for the Olimex-SAM7EX256 board.
Diffstat (limited to 'drivers/ginput')
| -rw-r--r-- | drivers/ginput/dial/GADC/ginput_lld_dial_board_template.h (renamed from drivers/ginput/dial/GADC/ginput_lld_dial_board_olimexsam7ex256.h) | 9 | ||||
| -rw-r--r-- | drivers/ginput/dial/GADC/ginput_lld_dial_config.h | 11 | ||||
| -rw-r--r-- | drivers/ginput/toggle/Pal/ginput_lld_toggle_board_olimexsam7ex256.h | 44 | ||||
| -rw-r--r-- | drivers/ginput/toggle/Pal/ginput_lld_toggle_board_template.h (renamed from drivers/ginput/toggle/Pal/ginput_lld_toggle_board_example.h) | 84 | ||||
| -rw-r--r-- | drivers/ginput/toggle/Pal/ginput_lld_toggle_config.h | 11 |
5 files changed, 51 insertions, 108 deletions
diff --git a/drivers/ginput/dial/GADC/ginput_lld_dial_board_olimexsam7ex256.h b/drivers/ginput/dial/GADC/ginput_lld_dial_board_template.h index 09ca3dc0..202b5386 100644 --- a/drivers/ginput/dial/GADC/ginput_lld_dial_board_olimexsam7ex256.h +++ b/drivers/ginput/dial/GADC/ginput_lld_dial_board_template.h @@ -6,7 +6,7 @@ */ /** - * @file drivers/ginput/dial/GADC/ginput_lld_dial_board_olimexsam7ex256.h + * @file drivers/ginput/dial/GADC/ginput_lld_dial_board_template.h * @brief GINPUT Dial Driver config file. * * @defgroup Dial Dial @@ -14,8 +14,8 @@ * @{ */ -#ifndef _GINPUT_LLD_DIAL_BOARD_OLIMEXSAM7EX256_H -#define _GINPUT_LLD_DIAL_BOARD_OLIMEXSAM7EX256_H +#ifndef _GINPUT_LLD_DIAL_BOARD_H +#define _GINPUT_LLD_DIAL_BOARD_H #if GFX_USE_GINPUT && GINPUT_NEED_DIAL @@ -23,6 +23,7 @@ /* Analogue devices on this board */ /*===========================================================================*/ +/* Example values */ #define GINPUT_DIAL_NUM_PORTS 1 #define GINPUT_DIAL_DEVICE0 GADC_PHYSDEV_DIAL #define GINPUT_DIAL_POLL_PERIOD 200 @@ -30,6 +31,6 @@ #endif /* GFX_USE_GINPUT && GINPUT_NEED_DIAL */ -#endif /* _GINPUT_LLD_DIAL_BOARD_OLIMEXSAM7EX256_H */ +#endif /* _GINPUT_LLD_DIAL_BOARD_H */ /** @} */ diff --git a/drivers/ginput/dial/GADC/ginput_lld_dial_config.h b/drivers/ginput/dial/GADC/ginput_lld_dial_config.h index 3dc7bfca..3e54b4ca 100644 --- a/drivers/ginput/dial/GADC/ginput_lld_dial_config.h +++ b/drivers/ginput/dial/GADC/ginput_lld_dial_config.h @@ -21,15 +21,8 @@ #define GINPUT_DIAL_MAX_VALUE ((1<<GADC_BITS_PER_SAMPLE)-1) -#if GINPUT_TOGGLE_USE_CUSTOM_BOARD - /* Include the user supplied board definitions */ - #include "ginput_lld_dial_board.h" -#elif defined(BOARD_OLIMEX_SAM7_EX256) - #include "ginput_lld_dial_board_olimexsam7ex256.h" -#else - /* Include the user supplied board definitions */ - #include "ginput_lld_dial_board.h" -#endif +/* Include the user supplied board definitions */ +#include "ginput_lld_dial_board.h" #endif /* GFX_USE_GDISP && GINPUT_NEED_DIAL */ diff --git a/drivers/ginput/toggle/Pal/ginput_lld_toggle_board_olimexsam7ex256.h b/drivers/ginput/toggle/Pal/ginput_lld_toggle_board_olimexsam7ex256.h deleted file mode 100644 index 5861b6f5..00000000 --- a/drivers/ginput/toggle/Pal/ginput_lld_toggle_board_olimexsam7ex256.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - * 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://ugfx.org/license.html - */ - -/** - * @file drivers/ginput/toggle/Pal/ginput_lld_toggle_board_olimexsam7ex256.h - * @brief GINPUT Toggle low level driver source for the ChibiOS PAL hardware on the Olimex SAM7EX256 board. - * - * @defgroup Toggle Toggle - * @ingroup GINPUT - * @{ - */ - -#ifndef _GDISP_LLD_TOGGLE_BOARD_H -#define _GDISP_LLD_TOGGLE_BOARD_H - -#define GINPUT_TOGGLE_NUM_PORTS 7 // The total number of toggle inputs -#define GINPUT_TOGGLE_CONFIG_ENTRIES 2 // The total number of GToggleConfig entries - -#define GINPUT_TOGGLE_SW1 0 // Switch 1 -#define GINPUT_TOGGLE_SW2 1 // Switch 2 -#define GINPUT_TOGGLE_LEFT 2 // Joystick Left -#define GINPUT_TOGGLE_DOWN 3 // Joystick Down -#define GINPUT_TOGGLE_UP 4 // Joystick Up -#define GINPUT_TOGGLE_RIGHT 5 // Joystick Right -#define GINPUT_TOGGLE_CENTER 6 // Joystick Center - -#define GINPUT_TOGGLE_DECLARE_STRUCTURE() \ - const GToggleConfig GInputToggleConfigTable[GINPUT_TOGGLE_CONFIG_ENTRIES] = { \ - {AT91C_BASE_PIOB, /* Switch 1 and Switch 2 */ \ - PIOB_SW1_MASK|PIOB_SW2_MASK, \ - PIOB_SW1_MASK|PIOB_SW2_MASK, \ - PAL_MODE_INPUT}, \ - {AT91C_BASE_PIOA, /* B1..4 Joystick */ \ - PIOA_B1_MASK|PIOA_B2_MASK|PIOA_B3_MASK|PIOA_B4_MASK|PIOA_B5_MASK, \ - PIOA_B1_MASK|PIOA_B2_MASK|PIOA_B3_MASK|PIOA_B4_MASK|PIOA_B5_MASK, \ - PAL_MODE_INPUT}, \ - } - -#endif /* _GDISP_LLD_TOGGLE_BOARD_H */ -/** @} */ diff --git a/drivers/ginput/toggle/Pal/ginput_lld_toggle_board_example.h b/drivers/ginput/toggle/Pal/ginput_lld_toggle_board_template.h index e0a501df..84038d16 100644 --- a/drivers/ginput/toggle/Pal/ginput_lld_toggle_board_example.h +++ b/drivers/ginput/toggle/Pal/ginput_lld_toggle_board_template.h @@ -4,45 +4,45 @@ * * http://ugfx.org/license.html */ -
-/**
- * @file drivers/ginput/toggle/Pal/ginput_lld_toggle_board_example.h
- * @brief GINPUT Toggle low level driver source for the ChibiOS PAL hardware on the example board.
- *
- * @defgroup Toggle Toggle
- * @ingroup GINPUT
- * @{
- */
-
-#ifndef _GDISP_LLD_TOGGLE_BOARD_H
-#define _GDISP_LLD_TOGGLE_BOARD_H
-
-#error "GINPUT Toggle Pal Driver: You need to define your board definitions"
-
-// The below are example values
-
-#define GINPUT_TOGGLE_NUM_PORTS 7 // The total number of toggle inputs
-#define GINPUT_TOGGLE_CONFIG_ENTRIES 2 // The total number of GToggleConfig entries
-
-#define GINPUT_TOGGLE_SW1 0 // Switch 1
-#define GINPUT_TOGGLE_SW2 1 // Switch 2
-#define GINPUT_TOGGLE_UP 2 // Joystick Up
-#define GINPUT_TOGGLE_DOWN 3 // Joystick Down
-#define GINPUT_TOGGLE_LEFT 4 // Joystick Left
-#define GINPUT_TOGGLE_RIGHT 5 // Joystick Right
-#define GINPUT_TOGGLE_CENTER 6 // Joystick Center
-
-#define GINPUT_TOGGLE_DECLARE_STRUCTURE() \
- const GToggleConfig GInputToggleConfigTable[GINPUT_TOGGLE_CONFIG_ENTRIES] = { \
- {AT91C_BASE_PIOB, /* Switch 1 and Switch 2 */ \
- PIOB_SW1_MASK|PIOB_SW2_MASK, \
- PIOB_SW1_MASK|PIOB_SW2_MASK, \
- PAL_MODE_INPUT}, \
- {AT91C_BASE_PIOA, /* B1..4 Joystick */ \
- PIOA_B1_MASK|PIOA_B2_MASK|PIOA_B3_MASK|PIOA_B4_MASK|PIOA_B5_MASK, \
- PIOA_B1_MASK|PIOA_B2_MASK|PIOA_B3_MASK|PIOA_B4_MASK|PIOA_B5_MASK, \
- PAL_MODE_INPUT}, \
- }
-
-#endif /* _GDISP_LLD_TOGGLE_BOARD_H */
-/** @} */
+ +/** + * @file drivers/ginput/toggle/Pal/ginput_lld_toggle_board_template.h + * @brief GINPUT Toggle low level driver source for the ChibiOS PAL hardware on the example board. + * + * @defgroup Toggle Toggle + * @ingroup GINPUT + * @{ + */ + +#ifndef _GDISP_LLD_TOGGLE_BOARD_H +#define _GDISP_LLD_TOGGLE_BOARD_H + +#error "GINPUT Toggle Pal Driver: You need to define your board definitions" + +// The below are example values + +#define GINPUT_TOGGLE_NUM_PORTS 7 // The total number of toggle inputs +#define GINPUT_TOGGLE_CONFIG_ENTRIES 2 // The total number of GToggleConfig entries + +#define GINPUT_TOGGLE_SW1 0 // Switch 1 +#define GINPUT_TOGGLE_SW2 1 // Switch 2 +#define GINPUT_TOGGLE_UP 2 // Joystick Up +#define GINPUT_TOGGLE_DOWN 3 // Joystick Down +#define GINPUT_TOGGLE_LEFT 4 // Joystick Left +#define GINPUT_TOGGLE_RIGHT 5 // Joystick Right +#define GINPUT_TOGGLE_CENTER 6 // Joystick Center + +#define GINPUT_TOGGLE_DECLARE_STRUCTURE() \ + const GToggleConfig GInputToggleConfigTable[GINPUT_TOGGLE_CONFIG_ENTRIES] = { \ + {AT91C_BASE_PIOB, /* Switch 1 and Switch 2 */ \ + PIOB_SW1_MASK|PIOB_SW2_MASK, \ + PIOB_SW1_MASK|PIOB_SW2_MASK, \ + PAL_MODE_INPUT}, \ + {AT91C_BASE_PIOA, /* B1..4 Joystick */ \ + PIOA_B1_MASK|PIOA_B2_MASK|PIOA_B3_MASK|PIOA_B4_MASK|PIOA_B5_MASK, \ + PIOA_B1_MASK|PIOA_B2_MASK|PIOA_B3_MASK|PIOA_B4_MASK|PIOA_B5_MASK, \ + PAL_MODE_INPUT}, \ + } + +#endif /* _GDISP_LLD_TOGGLE_BOARD_H */ +/** @} */ diff --git a/drivers/ginput/toggle/Pal/ginput_lld_toggle_config.h b/drivers/ginput/toggle/Pal/ginput_lld_toggle_config.h index e2bff490..84155956 100644 --- a/drivers/ginput/toggle/Pal/ginput_lld_toggle_config.h +++ b/drivers/ginput/toggle/Pal/ginput_lld_toggle_config.h @@ -19,15 +19,8 @@ #if GFX_USE_GINPUT && GINPUT_NEED_TOGGLE
-#if GINPUT_TOGGLE_USE_CUSTOM_BOARD
- /* Include the user supplied board definitions */
- #include "ginput_lld_toggle_board.h"
-#elif defined(BOARD_OLIMEX_SAM7_EX256)
- #include "ginput_lld_toggle_board_olimexsam7ex256.h"
-#else
- /* Include the user supplied board definitions */
- #include "ginput_lld_toggle_board.h"
-#endif
+/* Include the user supplied board definitions */
+#include "ginput_lld_toggle_board.h"
#endif /* GFX_USE_GDISP && GINPUT_NEED_TOGGLE */
|