renamed macros

This commit is contained in:
Joel Bodenmann 2012-10-21 01:47:11 +02:00
parent 06b9e3c1cd
commit 7b277edc59
46 changed files with 82 additions and 82 deletions

View File

@ -28,7 +28,7 @@
/*
* Please add the following to your halconf.h
*
* #define GDISP_NEED_CONSOLE TRUE
* #define GFX_USE_CONSOLE TRUE
* #define GDISP_NEED_SCROLL TRUE
*/

View File

@ -3,7 +3,7 @@ There are serval macros available to configure the behaviour of the GFX-Library.
HAL macros:
#define HAL_USE_GFX // enables the GDISP sub system. This is essentially needed to use the display
#define HAL_USE_TOUCHPAD // enables the TouchPad sub system. This is essentially needed to use the touchpad
#define GFX_USE_TOUCHPAD // enables the TouchPad sub system. This is essentially needed to use the touchpad
@ -27,7 +27,7 @@ GDISP macors:
#define GDISP_NEED_SCROLL // is scrolling is needed (pixel shift)
#define GDISP_NEED_QUERY // to make certain queries to the LCD controller
#define GDISP_NEED_CONSOLE // for the console abstraction
#define GFX_USE_CONSOLE // for the console abstraction
TouchPad macros:

View File

@ -14,8 +14,8 @@ To include any of these functions/drivers in your project...
5/ In your project halconf.h turn on the support you want. Please take a look to
docs/configure.txt for a list and description of all available macros. For example:
#define HAL_USE_GDISP TRUE
#define HAL_USE_TOUCHPAD TRUE
#define GFX_USE_GDISP TRUE
#define GFX_USE_TOUCHPAD TRUE
#define GDISP_USE_GPIO TRUE
#define GDISP_GDISP_SCREEN_WIDTH 240

View File

@ -30,7 +30,7 @@
#include "hal.h"
#include "gdisp.h"
#if HAL_USE_GDISP || defined(__DOXYGEN__)
#if GFX_USE_GDISP || defined(__DOXYGEN__)
/* Include the emulation code for things we don't support */
#include "gdisp_emulation.c"
@ -589,5 +589,5 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
}
#endif
#endif /* HAL_USE_GDISP */
#endif /* GFX_USE_GDISP */
/** @} */

View File

@ -29,7 +29,7 @@
#ifndef _GDISP_LLD_CONFIG_H
#define _GDISP_LLD_CONFIG_H
#if HAL_USE_GDISP
#if GFX_USE_GDISP
/*===========================================================================*/
/* Driver hardware support. */
@ -52,7 +52,7 @@
#define GDISP_PACKED_PIXELS FALSE
#define GDISP_PACKED_LINES FALSE
#endif /* HAL_USE_GDISP */
#endif /* GFX_USE_GDISP */
#endif /* _GDISP_LLD_CONFIG_H */
/** @} */

View File

@ -1,7 +1,7 @@
To use this driver:
1. Add in your halconf.h:
a) #define HAL_USE_GDISP TRUE
a) #define GFX_USE_GDISP TRUE
b) Any optional high level driver defines (see gdisp.h) eg: GDISP_NEED_MULTITHREAD
c) One (only) of:
#define GDISP_USE_GE8 /* The Epson controller */

View File

@ -30,7 +30,7 @@
#include "hal.h"
#include "gdisp.h"
#if HAL_USE_GDISP || defined(__DOXYGEN__)
#if GFX_USE_GDISP || defined(__DOXYGEN__)
/* Include the emulation code for things we don't support */
#include "gdisp_emulation.c"
@ -499,5 +499,5 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
}
#endif
#endif /* HAL_USE_GDISP */
#endif /* GFX_USE_GDISP */
/** @} */

View File

@ -29,7 +29,7 @@
#ifndef _GDISP_LLD_CONFIG_H
#define _GDISP_LLD_CONFIG_H
#if HAL_USE_GDISP
#if GFX_USE_GDISP
/*===========================================================================*/
/* Driver hardware support. */
@ -47,7 +47,7 @@
#define GDISP_PIXELFORMAT GDISP_PIXELFORMAT_RGB565
#endif /* HAL_USE_GDISP */
#endif /* GFX_USE_GDISP */
#endif /* _GDISP_LLD_CONFIG_H */
/** @} */

View File

@ -1,7 +1,7 @@
To use this driver:
1. Add in your halconf.h:
a) #define HAL_USE_GDISP TRUE
a) #define GFX_USE_GDISP TRUE
b) Any optional high level driver defines (see gdisp.h) eg: GDISP_NEED_MULTITHREAD
c) One (only) of:
#define GDISP_USE_GPIO

View File

@ -30,7 +30,7 @@
#include "hal.h"
#include "gdisp.h"
#if HAL_USE_GDISP || defined(__DOXYGEN__)
#if GFX_USE_GDISP || defined(__DOXYGEN__)
/* Include the emulation code for things we don't support */
#include "gdisp_emulation.c"
@ -460,5 +460,5 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
}
#endif
#endif /* HAL_USE_GDISP */
#endif /* GFX_USE_GDISP */
/** @} */

View File

@ -29,7 +29,7 @@
#ifndef _GDISP_LLD_CONFIG_H
#define _GDISP_LLD_CONFIG_H
#if HAL_USE_GDISP
#if GFX_USE_GDISP
/*===========================================================================*/
/* Driver hardware support. */
@ -47,7 +47,7 @@
#define GDISP_PIXELFORMAT GDISP_PIXELFORMAT_RGB565
#endif /* HAL_USE_GDISP */
#endif /* GFX_USE_GDISP */
#endif /* _GDISP_LLD_CONFIG_H */
/** @} */

View File

@ -1,7 +1,7 @@
To use this driver:
1. Add in your halconf.h:
a) #define HAL_USE_GDISP TRUE
a) #define GFX_USE_GDISP TRUE
b) Any optional high level driver defines (see gdisp.h) eg: GDISP_NEED_MULTITHREAD

View File

@ -30,7 +30,7 @@
#include "hal.h"
#include "gdisp.h"
#if HAL_USE_GDISP || defined(__DOXYGEN__)
#if GFX_USE_GDISP || defined(__DOXYGEN__)
/* Include the emulation code for things we don't support */
#include "gdisp_emulation.c"
@ -602,5 +602,5 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
}
#endif
#endif /* HAL_USE_GDISP */
#endif /* GFX_USE_GDISP */
/** @} */

View File

@ -29,7 +29,7 @@
#ifndef _GDISP_LLD_CONFIG_H
#define _GDISP_LLD_CONFIG_H
#if HAL_USE_GDISP || defined(__DOXYGEN__)
#if GFX_USE_GDISP || defined(__DOXYGEN__)
/*===========================================================================*/
/* Driver hardware support. */
@ -46,7 +46,7 @@
#define GDISP_PIXELFORMAT GDISP_PIXELFORMAT_RGB565
#endif /* HAL_USE_GDISP */
#endif /* GFX_USE_GDISP */
#endif /* _GDISP_LLD_CONFIG_H */
/** @} */

View File

@ -1,7 +1,7 @@
To use this driver:
1. Add in your halconf.h:
a) #define HAL_USE_GDISP TRUE
a) #define GFX_USE_GDISP TRUE
b) Any optional high level driver defines (see gdisp.h) eg: #define GDISP_NEED_MULTITHREAD TRUE
c) One (only) of:
#define GDISP_USE_GPIO

View File

@ -30,7 +30,7 @@
#include "hal.h"
#include "gdisp.h"
#if HAL_USE_GDISP || defined(__DOXYGEN__)
#if GFX_USE_GDISP || defined(__DOXYGEN__)
/* Include the emulation code for things we don't support */
#include "gdisp_emulation.c"
@ -122,5 +122,5 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
}
#endif
#endif /* HAL_USE_GDISP */
#endif /* GFX_USE_GDISP */
/** @} */

View File

@ -29,7 +29,7 @@
#ifndef _GDISP_LLD_CONFIG_H
#define _GDISP_LLD_CONFIG_H
#if HAL_USE_GDISP
#if GFX_USE_GDISP
/*===========================================================================*/
/* Driver hardware support. */
@ -45,7 +45,7 @@
#define GDISP_PACKED_PIXELS FALSE
#define GDISP_PACKED_LINES FALSE
#endif /* HAL_USE_GDISP */
#endif /* GFX_USE_GDISP */
#endif /* _GDISP_LLD_CONFIG_H */
/** @} */

View File

@ -8,7 +8,7 @@ Do not use this driver as a template for new drivers. Use the
To use this driver:
1. Add in your halconf.h:
a) #define HAL_USE_GDISP TRUE
a) #define GFX_USE_GDISP TRUE
b) Any optional high level driver defines (see gdisp.h)
you want to compile test eg: GDISP_NEED_MULTITHREAD

View File

@ -30,7 +30,7 @@
#include "hal.h"
#include "gdisp.h"
#if HAL_USE_GDISP || defined(__DOXYGEN__)
#if GFX_USE_GDISP || defined(__DOXYGEN__)
#define GDISP_LLD_NO_STRUCT
@ -277,5 +277,5 @@ bool_t gdisp_lld_init_VMT(void) {
return FALSE;
}
#endif /* HAL_USE_GDISP */
#endif /* GFX_USE_GDISP */
/** @} */

View File

@ -29,7 +29,7 @@
#ifndef _GDISP_LLD_CONFIG_H
#define _GDISP_LLD_CONFIG_H
#if HAL_USE_GDISP
#if GFX_USE_GDISP
/*===========================================================================*/
/* Driver hardware support. */
@ -64,7 +64,7 @@
#define GDISP_PACKED_PIXELS FALSE
#define GDISP_PACKED_LINES FALSE
#endif /* HAL_USE_GDISP */
#endif /* GFX_USE_GDISP */
#endif /* _GDISP_LLD_CONFIG_H */
/** @} */

View File

@ -29,7 +29,7 @@
#include "ch.h"
#include "hal.h"
#if HAL_USE_GDISP || defined(__DOXYGEN__)
#if GFX_USE_GDISP || defined(__DOXYGEN__)
#define CONFIGFILE() <../GDISP_VMT_NAME1()/gdisp_lld_config.h>
#define DRIVERFILE() <../GDISP_VMT_NAME1()/gdisp_lld.c>
@ -47,5 +47,5 @@
/* Add the low level driver */
#include DRIVERFILE()
#endif /* HAL_USE_GDISP */
#endif /* GFX_USE_GDISP */
/** @} */

View File

@ -29,7 +29,7 @@
#include "ch.h"
#include "hal.h"
#if HAL_USE_GDISP || defined(__DOXYGEN__)
#if GFX_USE_GDISP || defined(__DOXYGEN__)
#define CONFIGFILE() <../GDISP_VMT_NAME2()/gdisp_lld_config.h>
#define DRIVERFILE() <../GDISP_VMT_NAME2()/gdisp_lld.c>
@ -47,5 +47,5 @@
/* Add the low level driver */
#include DRIVERFILE()
#endif /* HAL_USE_GDISP */
#endif /* GFX_USE_GDISP */
/** @} */

View File

@ -5,7 +5,7 @@ to initialise first (init returns TRUE).
To use this driver:
1. Add in your halconf.h:
a) #define HAL_USE_GDISP TRUE
a) #define GFX_USE_GDISP TRUE
b) Any optional high level driver defines (see gdisp.h) eg: GDISP_NEED_MULTITHREAD
c) Define these:
#define GDISP_VMT_NAME1(x) x##YourDriver1

View File

@ -1,7 +1,7 @@
To use this driver:
1. Add in your halconf.h:
a) #define HAL_USE_TOUCHPAD TRUE
a) #define GFX_USE_TOUCHPAD TRUE
2. To your makefile add the following lines:
include $(GFXLIB)/drivers/touchpadADS7843/touchpad_lld.mk

View File

@ -30,7 +30,7 @@
#include "hal.h"
#include "touchpad.h"
#if HAL_USE_TOUCHPAD || defined(__DOXYGEN__)
#if GFX_USE_TOUCHPAD || defined(__DOXYGEN__)
/*===========================================================================*/
/* Driver local definitions. */
@ -234,6 +234,6 @@ uint16_t tp_lld_read_y(void) {
}
#endif
#endif /* HAL_USE_TOUCHPAD */
#endif /* GFX_USE_TOUCHPAD */
/** @} */

View File

@ -29,7 +29,7 @@
#ifndef _TOUCHPAD_LLD_CONFIG_H
#define _TOUCHPAD_LLD_CONFIG_H
#if HAL_USE_TOUCHPAD || defined(__DOXYGEN__)
#if GFX_USE_TOUCHPAD || defined(__DOXYGEN__)
/*===========================================================================*/
/* Driver hardware support. */
@ -38,7 +38,7 @@
#define TOUCHPAD_HAS_IRQ TRUE
#define TOUCHPAD_HAS_PRESSURE FALSE
#endif /* HAL_USE_TOUCHPAD */
#endif /* GFX_USE_TOUCHPAD */
#endif /* _TOUCHPAD_LLD_CONFIG_H */
/** @} */

View File

@ -1,7 +1,7 @@
To use this driver:
1. Add in your halconf.h:
a) #define HAL_USE_TOUCHPAD TRUE
a) #define GFX_USE_TOUCHPAD TRUE
2. To your makefile add the following lines:
include $(GFXLIB)/drivers/touchpad/XPT2046/touchpad_lld.mk

View File

@ -30,7 +30,7 @@
#include "hal.h"
#include "touchpad.h"
#if HAL_USE_TOUCHPAD || defined(__DOXYGEN__)
#if GFX_USE_TOUCHPAD || defined(__DOXYGEN__)
/*===========================================================================*/
/* Driver local definitions. */
@ -234,6 +234,6 @@ uint16_t tp_lld_read_y(void) {
}
#endif
#endif /* HAL_USE_TOUCHPAD */
#endif /* GFX_USE_TOUCHPAD */
/** @} */

View File

@ -29,7 +29,7 @@
#ifndef _TOUCHPAD_LLD_CONFIG_H
#define _TOUCHPAD_LLD_CONFIG_H
#if HAL_USE_TOUCHPAD || defined(__DOXYGEN__)
#if GFX_USE_TOUCHPAD || defined(__DOXYGEN__)
/*===========================================================================*/
/* Driver hardware support. */
@ -38,7 +38,7 @@
#define TOUCHPAD_HAS_IRQ TRUE
#define TOUCHPAD_HAS_PRESSURE TRUE
#endif /* HAL_USE_TOUCHPAD */
#endif /* GFX_USE_TOUCHPAD */
#endif /* _TOUCHPAD_LLD_CONFIG_H */
/** @} */

View File

@ -21,11 +21,11 @@
#ifndef CONSOLE_H
#define CONSOLE_H
#ifndef GDISP_NEED_CONSOLE
#define GDISP_NEED_CONSOLE FALSE
#ifndef GFX_USE_CONSOLE
#define GFX_USE_CONSOLE FALSE
#endif
#if GDISP_NEED_CONSOLE
#if GFX_USE_CONSOLE
#include "gdisp.h"
@ -78,7 +78,7 @@ msg_t gfxConsoleWrite(GConsole *console, const uint8_t *bp, size_t n);
}
#endif
#endif /* GDISP_NEED_CONSOLE */
#endif /* GFX_USE_CONSOLE */
#endif /* CONSOLE_H */

View File

@ -27,7 +27,7 @@
#ifndef _GDISP_H
#define _GDISP_H
#if HAL_USE_GDISP || defined(__DOXYGEN__)
#if GFX_USE_GDISP || defined(__DOXYGEN__)
/*===========================================================================*/
/* Driver constants. */
@ -286,7 +286,7 @@ void gdispDrawBox(coord_t x, coord_t y, coord_t cx, coord_t cy, color_t color);
}
#endif
#endif /* HAL_USE_GDISP */
#endif /* GFX_USE_GDISP */
#endif /* _GDISP_H */
/** @} */

View File

@ -31,7 +31,7 @@
#ifndef GDISP_EMULATION_C
#define GDISP_EMULATION_C
#if HAL_USE_GDISP || defined(__DOXYGEN__)
#if GFX_USE_GDISP || defined(__DOXYGEN__)
#ifndef GDISP_LLD_NO_STRUCT
static struct GDISPDriver {
@ -683,5 +683,5 @@ void *GDISP_LLD(query)(unsigned what) {
}
#endif
#endif /* HAL_USE_GDISP */
#endif /* GFX_USE_GDISP */
#endif /* GDISP_EMULATION_C */

View File

@ -30,7 +30,7 @@
#ifndef _GDISP_FONTS_H
#define _GDISP_FONTS_H
/* Don't test against HAL_USE_GDISP as we may want to use this in other non-GDISP utilities. */
/* Don't test against GFX_USE_GDISP as we may want to use this in other non-GDISP utilities. */
/**
* @brief The maximum height of a font.

View File

@ -28,7 +28,7 @@
#ifndef _GDISP_LLD_H
#define _GDISP_LLD_H
#if HAL_USE_GDISP || defined(__DOXYGEN__)
#if GFX_USE_GDISP || defined(__DOXYGEN__)
/*===========================================================================*/
/* Low level driver configuration needs */
@ -644,7 +644,7 @@ extern "C" {
}
#endif
#endif /* HAL_USE_GDISP */
#endif /* GFX_USE_GDISP */
#endif /* _GDISP_LLD_H */
/** @} */

View File

@ -29,7 +29,7 @@
#define _GDISP_LLD_MSGS_H
/* This file describes the message API for gdisp_lld */
#if HAL_USE_GDISP && GDISP_NEED_MSGAPI
#if GFX_USE_GDISP && GDISP_NEED_MSGAPI
typedef enum gdisp_msgaction {
GDISP_LLD_MSG_NOP,
@ -188,6 +188,6 @@ typedef union gdisp_lld_msg {
} query;
} gdisp_lld_msg_t;
#endif /* HAL_USE_GDISP */
#endif /* GFX_USE_GDISP */
#endif /* _GDISP_LLD_MSGS_H */
/** @} */

View File

@ -28,7 +28,7 @@
#ifndef _TOUCHPAD_H
#define _TOUCHPAD_H
#if HAL_USE_TOUCHPAD || defined(__DOXYGEN__)
#if GFX_USE_TOUCHPAD || defined(__DOXYGEN__)
/**
* @brief specifies how many conversions are made for a readout.
@ -87,7 +87,7 @@ void tpCalibrate(void);
}
#endif
#endif /* HAL_USE_TOUCHPAD */
#endif /* GFX_USE_TOUCHPAD */
#endif /* _TOUCHPAD_H */
/** @} */

View File

@ -29,7 +29,7 @@
#ifndef _TOUCHPAD_LLD_H
#define _TOUCHPAD_LLD_H
#if HAL_USE_TOUCHPAD || defined(__DOXYGEN__)
#if GFX_USE_TOUCHPAD || defined(__DOXYGEN__)
/*===========================================================================*/
/* Include the low level driver configuration information */
@ -144,7 +144,7 @@ extern "C" {
}
#endif
#endif /* HAL_USE_TOUCHPAD */
#endif /* GFX_USE_TOUCHPAD */
#endif /* _TOUCHPAD_LLD_H */
/** @} */

View File

@ -22,7 +22,7 @@
#include "hal.h"
#include "console.h"
#if GDISP_NEED_CONSOLE
#if GFX_USE_CONSOLE
/*
* Interface implementation. The interface is write only

View File

@ -33,7 +33,7 @@
#ifndef _GDISP_C
#define _GDISP_C
#if HAL_USE_GDISP || defined(__DOXYGEN__)
#if GFX_USE_GDISP || defined(__DOXYGEN__)
#ifdef GDISP_NEED_TEXT
#include "gdisp_fonts.h"
@ -1118,7 +1118,7 @@ void gdispDrawBox(coord_t x, coord_t y, coord_t cx, coord_t cy, color_t color) {
}
#endif
#endif /* HAL_USE_GDISP */
#endif /* GFX_USE_GDISP */
#endif /* _GDISP_C */
/** @} */

View File

@ -24,7 +24,7 @@
#include "hal.h"
#include "gdisp.h"
#if HAL_USE_GDISP || defined(__DOXYGEN__)
#if GFX_USE_GDISP || defined(__DOXYGEN__)
#if GDISP_NEED_TEXT
@ -652,4 +652,4 @@
#endif /* GDISP_NEED_TEXT */
#endif /* HAL_USE_GDISP */
#endif /* GFX_USE_GDISP */

View File

@ -30,7 +30,7 @@
#include "gdisp.h"
#include "touchpad.h"
#if HAL_USE_TOUCHPAD || defined(__DOXYGEN__)
#if GFX_USE_TOUCHPAD || defined(__DOXYGEN__)
#if TOUCHPAD_STORE_CALIBRATION
extern void lld_tpWriteCalibration(struct cal_t cal);
@ -265,6 +265,6 @@ void tpCalibrate(void) {
}
#endif
#endif /* HAL_USE_TOUCHPAD */
#endif /* GFX_USE_TOUCHPAD */
/** @} */

View File

@ -30,7 +30,7 @@
#include "hal.h"
#include "gdisp.h"
#if HAL_USE_GDISP || defined(__DOXYGEN__)
#if GFX_USE_GDISP || defined(__DOXYGEN__)
/* Include the emulation code for things we don't support */
#include "gdisp_emulation.c"
@ -554,5 +554,5 @@ void *GDISP_LLD(query)(unsigned what) {
}
#endif
#endif /* HAL_USE_GDISP */
#endif /* GFX_USE_GDISP */
/** @} */

View File

@ -29,7 +29,7 @@
#ifndef _GDISP_LLD_CONFIG_H
#define _GDISP_LLD_CONFIG_H
#if HAL_USE_GDISP || defined(__DOXYGEN__)
#if GFX_USE_GDISP || defined(__DOXYGEN__)
/*===========================================================================*/
/* Driver hardware support. */
@ -63,7 +63,7 @@
#define GDISP_PACKED_PIXELS FALSE
#define GDISP_PACKED_LINES FALSE
#endif /* HAL_USE_GDISP */
#endif /* GFX_USE_GDISP */
#endif /* _GDISP_LLD_CONFIG_H */
/** @} */

View File

@ -14,7 +14,7 @@ To use this driver template
To use this driver:
1. Add in your halconf.h:
a) #define HAL_USE_GDISP TRUE
a) #define GFX_USE_GDISP TRUE
b) Any optional high level driver defines (see gdisp.h) eg: GDISP_NEED_MULTITHREAD
c) One (only) of:
#define GDISP_USE_GPIO

View File

@ -30,7 +30,7 @@
#include "hal.h"
#include "touchpad.h"
#if HAL_USE_TOUCHPAD || defined(__DOXYGEN__)
#if GFX_USE_TOUCHPAD || defined(__DOXYGEN__)
/*===========================================================================*/
/* Driver local definitions. */
@ -140,6 +140,6 @@ uint16_t tp_lld_read_y(void) {
}
#endif
#endif /* HAL_USE_TOUCHPAD */
#endif /* GFX_USE_TOUCHPAD */
/** @} */

View File

@ -29,7 +29,7 @@
#ifndef _TOUCHPAD_LLD_CONFIG_H
#define _TOUCHPAD_LLD_CONFIG_H
#if HAL_USE_TOUCHPAD || defined(__DOXYGEN__)
#if GFX_USE_TOUCHPAD || defined(__DOXYGEN__)
/*===========================================================================*/
/* Driver hardware support. */
@ -38,7 +38,7 @@
#define TOUCHPAD_HAS_IRQ TRUE
#define TOUCHPAD_HAS_PRESSURE TRUE
#endif /* HAL_USE_TOUCHPAD */
#endif /* GFX_USE_TOUCHPAD */
#endif /* _TOUCHPAD_LLD_CONFIG_H */
/** @} */