diff options
| author | Andrew Hannam <andrewh@inmarket.com.au> | 2012-11-11 00:00:23 -0800 |
|---|---|---|
| committer | Andrew Hannam <andrewh@inmarket.com.au> | 2012-11-11 00:00:23 -0800 |
| commit | e28a4dbd0e5306f40f2e778025fd0e4888d9d0ba (patch) | |
| tree | cfaa5add5f3ad13f51b3bc500048329dc9489df4 /include | |
| parent | 77e1371b86c6181da153d68b326c624486c1245c (diff) | |
| parent | 44bb28ed9259633d48bb526a681d0e6057c4da86 (diff) | |
| download | uGFX-e28a4dbd0e5306f40f2e778025fd0e4888d9d0ba.tar.gz uGFX-e28a4dbd0e5306f40f2e778025fd0e4888d9d0ba.tar.bz2 uGFX-e28a4dbd0e5306f40f2e778025fd0e4888d9d0ba.zip | |
Merge pull request #2 from Tectu/master
Merge Tectu changes
Diffstat (limited to 'include')
| -rw-r--r-- | include/gdisp.h | 1 | ||||
| -rw-r--r-- | include/touchscreen.h | 10 | ||||
| -rw-r--r-- | include/touchscreen_lld.h | 10 |
3 files changed, 10 insertions, 11 deletions
diff --git a/include/gdisp.h b/include/gdisp.h index db865284..9be97a12 100644 --- a/include/gdisp.h +++ b/include/gdisp.h @@ -293,7 +293,6 @@ void gdispDrawBox(coord_t x, coord_t y, coord_t cx, coord_t cy, color_t color); /* Now obsolete functions */
#define gdispBlitArea(x, y, cx, cy, buffer) gdispBlitAreaEx(x, y, cx, cy, 0, 0, cx, buffer)
-#define RGB565CONVERT(r,g,b) RGB2COLOR(r,g,b)
/* Macro definitions for common gets and sets */
#define gdispSetPowerMode(powerMode) gdispControl(GDISP_CONTROL_POWER, (void *)(unsigned)(powerMode))
diff --git a/include/touchscreen.h b/include/touchscreen.h index 4d48e38d..a6673cbd 100644 --- a/include/touchscreen.h +++ b/include/touchscreen.h @@ -31,6 +31,14 @@ #if GFX_USE_TOUCHSCREEN || defined(__DOXYGEN__) +#ifndef TOUCHSCREEN_STORE_CALIBRATION + #define TOUCHSCREEN_STORE_CALIBRATION FALSE +#endif + +#ifndef TOUCHSCREEN_VERIFY_CALIBRATION + #define TOUCHSCREEN_VERIFY_CALIBRATION FALSE +#endif + /** * @brief specifies how many conversions are made for a readout. * @@ -82,7 +90,7 @@ coord_t tsReadY(void); void tsCalibrate(void); #if TOUCHSCREEN_HAS_IRQ - bool_t tsIRQ(void); + bool_t tsPressed(void); #endif #if TOUCHSCREEN_HAS_PRESSURE diff --git a/include/touchscreen_lld.h b/include/touchscreen_lld.h index 53c66b53..3053b0e5 100644 --- a/include/touchscreen_lld.h +++ b/include/touchscreen_lld.h @@ -49,14 +49,6 @@ #define TOUCHSCREEN_XY_INVERTED FALSE #endif -#ifndef TOUCHSCREEN_STORE_CALIBRATION - #define TOUCHSCREEN_STORE_CALIBRATION FALSE -#endif - -#ifndef TOUCHSCREEN_VERIFY_CALIBRATION - #define TOUCHSCREEN_VERIFY_CALIBRATION FALSE -#endif - #ifndef TOUCHSCREEN_HAS_IRQ #define TOUCHSCREEN_HAS_IRQ FALSE #endif @@ -137,7 +129,7 @@ extern "C" { uint16_t ts_lld_read_y(void); #if TOUCHSCREEN_HAS_IRQ - uint8_t ts_lld_irq(void); + uint8_t ts_lld_pressed(void); #endif #if TOUCHSCREEN_HAS_PRESSURE |