uGFX/ugfx
2
0
Fork 0
Code Issues 2 Pull requests Projects Releases Wiki Activity

Merge branch 'master' into Keil

Browse source
This commit is contained in:
Joel Bodenmann 2015-10-21 14:37:42 +02:00
commit 29251f33bd
2 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/ginput/ginput_mouse.c
View file

@ -55,7 +55,7 @@ static GTIMER_DECL(MouseTimer);
#if !GINPUT_TOUCH_NOCALIBRATE #if !GINPUT_TOUCH_NOCALIBRATE
#include <string.h> // Required for memcpy #include <string.h> // Required for memcpy
static inline void CalibrationTransform(GMouseReading *pt, const GMouseCalibration *c) { static INLINE void CalibrationTransform(GMouseReading *pt, const GMouseCalibration *c) {
pt->x = (coord_t) (c->ax * pt->x + c->bx * pt->y + c->cx); pt->x = (coord_t) (c->ax * pt->x + c->bx * pt->y + c->cx);
pt->y = (coord_t) (c->ay * pt->x + c->by * pt->y + c->cy); pt->y = (coord_t) (c->ay * pt->x + c->by * pt->y + c->cy);
} }
@ -330,7 +330,7 @@ static void MousePoll(void *param) {
#error "GINPUT: GFX_USE_GDISP must be defined when calibration is required" #error "GINPUT: GFX_USE_GDISP must be defined when calibration is required"
#endif #endif
static inline void CalibrationCrossDraw(GMouse *m, const point *pp) { static INLINE void CalibrationCrossDraw(GMouse *m, const point *pp) {
gdispGDrawLine(m->display, pp->x-CALIBRATION_CROSS_RADIUS, pp->y, pp->x-CALIBRATION_CROSS_INNERGAP, pp->y, CALIBRATION_CROSS_COLOR1); gdispGDrawLine(m->display, pp->x-CALIBRATION_CROSS_RADIUS, pp->y, pp->x-CALIBRATION_CROSS_INNERGAP, pp->y, CALIBRATION_CROSS_COLOR1);
gdispGDrawLine(m->display, pp->x+CALIBRATION_CROSS_INNERGAP, pp->y, pp->x+CALIBRATION_CROSS_RADIUS, pp->y, CALIBRATION_CROSS_COLOR1); gdispGDrawLine(m->display, pp->x+CALIBRATION_CROSS_INNERGAP, pp->y, pp->x+CALIBRATION_CROSS_RADIUS, pp->y, CALIBRATION_CROSS_COLOR1);
gdispGDrawLine(m->display, pp->x, pp->y-CALIBRATION_CROSS_RADIUS, pp->x, pp->y-CALIBRATION_CROSS_INNERGAP, CALIBRATION_CROSS_COLOR1); gdispGDrawLine(m->display, pp->x, pp->y-CALIBRATION_CROSS_RADIUS, pp->x, pp->y-CALIBRATION_CROSS_INNERGAP, CALIBRATION_CROSS_COLOR1);
@ -345,11 +345,11 @@ static void MousePoll(void *param) {
gdispGDrawLine(m->display, pp->x+CALIBRATION_CROSS_RADIUS, pp->y-CALIBRATION_CROSS_RADIUS, pp->x+CALIBRATION_CROSS_RADIUS, pp->y-CALIBRATION_CROSS_RADIUS/2, CALIBRATION_CROSS_COLOR2); gdispGDrawLine(m->display, pp->x+CALIBRATION_CROSS_RADIUS, pp->y-CALIBRATION_CROSS_RADIUS, pp->x+CALIBRATION_CROSS_RADIUS, pp->y-CALIBRATION_CROSS_RADIUS/2, CALIBRATION_CROSS_COLOR2);
} }
static inline void CalibrationCrossClear(GMouse *m, const point *pp) { static INLINE void CalibrationCrossClear(GMouse *m, const point *pp) {
gdispGFillArea(m->display, pp->x - CALIBRATION_CROSS_RADIUS, pp->y - CALIBRATION_CROSS_RADIUS, CALIBRATION_CROSS_RADIUS*2+1, CALIBRATION_CROSS_RADIUS*2+1, CALIBRATION_BACKGROUND); gdispGFillArea(m->display, pp->x - CALIBRATION_CROSS_RADIUS, pp->y - CALIBRATION_CROSS_RADIUS, CALIBRATION_CROSS_RADIUS*2+1, CALIBRATION_CROSS_RADIUS*2+1, CALIBRATION_BACKGROUND);
} }
static inline void CalibrationCalculate(GMouse *m, const point *cross, const point *points) { static INLINE void CalibrationCalculate(GMouse *m, const point *cross, const point *points) {
float dx; float dx;
coord_t c0, c1, c2; coord_t c0, c1, c2;
(void) m; (void) m;

27
src/gwin/gwin.c
View file

@ -36,6 +36,18 @@ static color_t defaultBgColor = Black;
static font_t defaultFont; static font_t defaultFont;
#endif #endif
/* These init functions are defined by each module but not published */
extern void _gwmInit(void);
extern void _gwmDeinit(void);
#if GWIN_NEED_WIDGET
extern void _gwidgetInit(void);
extern void _gwidgetDeinit(void);
#endif
#if GWIN_NEED_CONTAINERS
extern void _gcontainerInit(void);
extern void _gcontainerDeinit(void);
#endif
/*----------------------------------------------- /*-----------------------------------------------
* Helper Routines * Helper Routines
*-----------------------------------------------*/ *-----------------------------------------------*/
@ -46,33 +58,24 @@ static color_t defaultBgColor = Black;
void _gwinInit(void) void _gwinInit(void)
{ {
extern void _gwmInit(void);
_gwmInit(); _gwmInit();
#if GWIN_NEED_WIDGET
extern void _gwidgetInit(void);
#if GWIN_NEED_WIDGET
_gwidgetInit(); _gwidgetInit();
#endif #endif
#if GWIN_NEED_CONTAINERS
extern void _gcontainerInit(void);
#if GWIN_NEED_CONTAINERS
_gcontainerInit(); _gcontainerInit();
#endif #endif
} }
void _gwinDeinit(void) void _gwinDeinit(void)
{ {
extern void _gwmDeinit(void);
#if GWIN_NEED_CONTAINERS #if GWIN_NEED_CONTAINERS
extern void _gcontainerDeinit(void);
_gcontainerDeinit(); _gcontainerDeinit();
#endif #endif
#if GWIN_NEED_WIDGET
extern void _gwidgetDeinit(void);
#if GWIN_NEED_WIDGET
_gwidgetDeinit(); _gwidgetDeinit();
#endif #endif