aboutsummaryrefslogtreecommitdiffstats
path: root/src/ginput
diff options
context:
space:
mode:
Diffstat (limited to 'src/ginput')
-rw-r--r--src/ginput/ginput.h2
-rw-r--r--src/ginput/ginput_dial.h4
-rw-r--r--src/ginput/ginput_keyboard.c2
-rw-r--r--src/ginput/ginput_mouse.c42
-rw-r--r--src/ginput/ginput_mouse.h8
-rw-r--r--src/ginput/ginput_options.h50
-rw-r--r--src/ginput/ginput_rules.h16
-rw-r--r--src/ginput/ginput_toggle.h4
8 files changed, 72 insertions, 56 deletions
diff --git a/src/ginput/ginput.h b/src/ginput/ginput.h
index 0aae5391..0a52e543 100644
--- a/src/ginput/ginput.h
+++ b/src/ginput/ginput.h
@@ -15,7 +15,7 @@
* @details GINPUT provides an easy and common interface to use different input devices
* such as touchscreens and mices.
*
- * @pre GFX_USE_GINPUT must be set to TRUE in your gfxconf.h
+ * @pre GFX_USE_GINPUT must be set to GFXON in your gfxconf.h
*
* @{
*/
diff --git a/src/ginput/ginput_dial.h b/src/ginput/ginput_dial.h
index e0292cb6..77c1b05c 100644
--- a/src/ginput/ginput_dial.h
+++ b/src/ginput/ginput_dial.h
@@ -16,8 +16,8 @@
* @details A dial provides a powerful way to navigate through menus
* on a display.
*
- * @pre GFX_USE_GINPUT must be set to TRUE in your gfxconf.h
- * @pre GINPUT_NEED_DIAL must be set to TRUE in your gfxconf.h
+ * @pre GFX_USE_GINPUT must be set to GFXON in your gfxconf.h
+ * @pre GINPUT_NEED_DIAL must be set to GFXON in your gfxconf.h
*
* @{
*/
diff --git a/src/ginput/ginput_keyboard.c b/src/ginput/ginput_keyboard.c
index 141bdd2b..68f05cea 100644
--- a/src/ginput/ginput_keyboard.c
+++ b/src/ginput/ginput_keyboard.c
@@ -17,7 +17,7 @@
#if GFX_USE_GINPUT && GINPUT_NEED_KEYBOARD
-#define MICROCODE_DEBUG FALSE
+#define MICROCODE_DEBUG GFXOFF
#if MICROCODE_DEBUG
#include <stdio.h>
diff --git a/src/ginput/ginput_mouse.c b/src/ginput/ginput_mouse.c
index 58abfce2..356ad11e 100644
--- a/src/ginput/ginput_mouse.c
+++ b/src/ginput/ginput_mouse.c
@@ -23,25 +23,41 @@
#define CALIBRATION_MINPRESS_PERIOD 300 // milliseconds
#define CALIBRATION_MAXPRESS_PERIOD 5000 // milliseconds
-#define CALIBRATION_FONT "* Double"
-#define CALIBRATION_FONT2 "* Narrow"
-#define CALIBRATION_BACKGROUND Blue
+#ifdef GINPUT_TOUCH_CALIBRATION_FONT1
+ #define CALIBRATION_FONT1 GINPUT_TOUCH_CALIBRATION_FONT1
+#else
+ #define CALIBRATION_FONT1 "* Double"
+#endif
+#ifdef GINPUT_TOUCH_CALIBRATION_FONT2
+ #define CALIBRATION_FONT2 GINPUT_TOUCH_CALIBRATION_FONT2
+#else
+ #define CALIBRATION_FONT2 "* Narrow"
+#endif
+#define CALIBRATION_BACKGROUND GFX_BLUE
-#define CALIBRATION_CROSS_COLOR1 White
+#define CALIBRATION_CROSS_COLOR1 GFX_WHITE
#define CALIBRATION_CROSS_COLOR2 RGB2COLOR(184,158,131)
#define CALIBRATION_CROSS_INNERGAP 2
#define CALIBRATION_CROSS_RADIUS 15
-#define CALIBRATION_TITLE "Calibration"
+#ifdef GINPUT_TOUCH_CALIBRATION_TITLE
+ #define CALIBRATION_TITLE GINPUT_TOUCH_CALIBRATION_TITLE
+#else
+ #define CALIBRATION_TITLE "Calibration"
+#endif
#define CALIBRATION_TITLE_Y 5
#define CALIBRATION_TITLE_HEIGHT 30
-#define CALIBRATION_TITLE_COLOR White
-#define CALIBRATION_TITLE_BACKGROUND Blue
+#define CALIBRATION_TITLE_COLOR GFX_WHITE
+#define CALIBRATION_TITLE_BACKGROUND GFX_BLUE
-#define CALIBRATION_ERROR_TEXT "Calibration Failed!"
+#ifdef GINPUT_TOUCH_CALIBRATION_ERROR
+ #define CALIBRATION_ERROR_TEXT GINPUT_TOUCH_CALIBRATION_ERROR
+#else
+ #define CALIBRATION_ERROR_TEXT "Calibration Failed!"
+#endif
#define CALIBRATION_ERROR_DELAY 3000
-#define CALIBRATION_ERROR_COLOR Red
-#define CALIBRATION_ERROR_BACKGROUND Yellow
+#define CALIBRATION_ERROR_COLOR GFX_RED
+#define CALIBRATION_ERROR_BACKGROUND GFX_YELLOW
#define CALIBRATION_ERROR_Y 35
#define CALIBRATION_ERROR_HEIGHT 40
@@ -60,7 +76,7 @@ static GTIMER_DECL(MouseTimer);
x = (coord_t) (c->ax * pt->x + c->bx * pt->y + c->cx);
y = (coord_t) (c->ay * pt->x + c->by * pt->y + c->cy);
-
+
pt->x = x;
pt->y = y;
}
@@ -455,7 +471,7 @@ static void MousePoll(void *param) {
#endif
#if GDISP_NEED_TEXT
- font1 = gdispOpenFont(CALIBRATION_FONT);
+ font1 = gdispOpenFont(CALIBRATION_FONT1);
if (!font1) font1 = gdispOpenFont("*");
font2 = gdispOpenFont(CALIBRATION_FONT2);
if (!font2) font2 = gdispOpenFont("*");
@@ -484,7 +500,7 @@ static void MousePoll(void *param) {
}
// Set up the calibration display
- gdispGClear(m->display, Blue);
+ gdispGClear(m->display, GFX_BLUE);
#if GDISP_NEED_TEXT
gdispGFillStringBox(m->display,
0, CALIBRATION_TITLE_Y, w, CALIBRATION_TITLE_HEIGHT,
diff --git a/src/ginput/ginput_mouse.h b/src/ginput/ginput_mouse.h
index 24005fe6..8d8b3b9a 100644
--- a/src/ginput/ginput_mouse.h
+++ b/src/ginput/ginput_mouse.h
@@ -15,8 +15,8 @@
*
* @details Both resistive and capacitive touchscreens are supported.
*
- * @pre GFX_USE_GINPUT must be set to TRUE in your gfxconf.h
- * @pre GINPUT_NEED_MOUSE must be set to TRUE in your gfxconf.h
+ * @pre GFX_USE_GINPUT must be set to GFXON in your gfxconf.h
+ * @pre GINPUT_NEED_MOUSE must be set to GFXON in your gfxconf.h
*
* @{
*/
@@ -160,7 +160,7 @@ extern "C" {
* @param[in] sz The size in bytes of the data to retrieve.
*
* @note This routine is provided by the user application. It is only
- * called if GINPUT_TOUCH_USER_CALIBRATION_LOAD has been set to TRUE in the
+ * called if GINPUT_TOUCH_USER_CALIBRATION_LOAD has been set to GFXON in the
* users gfxconf.h file.
*/
bool_t LoadMouseCalibration(unsigned instance, void *data, size_t sz);
@@ -174,7 +174,7 @@ extern "C" {
* @param[in] sz The size in bytes of the data to retrieve.
*
* @note This routine is provided by the user application. It is only
- * called if GINPUT_TOUCH_USER_CALIBRATION_SAVE has been set to TRUE in the
+ * called if GINPUT_TOUCH_USER_CALIBRATION_SAVE has been set to GFXON in the
* users gfxconf.h file.
*/
bool_t SaveMouseCalibration(unsigned instance, const void *data, size_t sz);
diff --git a/src/ginput/ginput_options.h b/src/ginput/ginput_options.h
index 9fba51f9..f02a5a09 100644
--- a/src/ginput/ginput_options.h
+++ b/src/ginput/ginput_options.h
@@ -22,43 +22,43 @@
*/
/**
* @brief Should mouse/touch functions be included.
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
* @note Also add a mouse/touch hardware driver to your makefile.
* Eg.
* include $(GFXLIB)/drivers/ginput/touch/MCU/driver.mk
*/
#ifndef GINPUT_NEED_MOUSE
- #define GINPUT_NEED_MOUSE FALSE
+ #define GINPUT_NEED_MOUSE GFXOFF
#endif
/**
* @brief Should keyboard functions be included.
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
* @note Also add a keyboard hardware driver to your makefile.
* Eg.
* include $(GFXLIB)/drivers/ginput/keyboard/XXXX/driver.mk
*/
#ifndef GINPUT_NEED_KEYBOARD
- #define GINPUT_NEED_KEYBOARD FALSE
+ #define GINPUT_NEED_KEYBOARD GFXOFF
#endif
/**
* @brief Should hardware toggle/switch/button functions be included.
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
* @note Also add a toggle hardware driver to your makefile.
* Eg.
* include $(GFXLIB)/drivers/ginput/toggle/Pal/driver.mk
*/
#ifndef GINPUT_NEED_TOGGLE
- #define GINPUT_NEED_TOGGLE FALSE
+ #define GINPUT_NEED_TOGGLE GFXOFF
#endif
/**
* @brief Should analog dial functions be included.
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
* @note Also add a dial hardware driver to your makefile.
* Eg.
* include $(GFXLIB)/drivers/ginput/dial/analog/driver.mk
*/
#ifndef GINPUT_NEED_DIAL
- #define GINPUT_NEED_DIAL FALSE
+ #define GINPUT_NEED_DIAL GFXOFF
#endif
/**
* @}
@@ -74,16 +74,16 @@
*/
/**
* @brief Start touch devices without loading or running calibration.
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
* @note This is used if you want to manually control the initial calibration
* process. In practice this is only useful for a touch driver test program.
*/
#ifndef GINPUT_TOUCH_STARTRAW
- #define GINPUT_TOUCH_STARTRAW FALSE
+ #define GINPUT_TOUCH_STARTRAW GFXOFF
#endif
/**
* @brief Turn off the touch calibration GUI.
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
* @note Turning off the calibration GUI just turns off the manual calibration
* process. Readings may still be calibrated if calibration data
* can be loaded.
@@ -91,28 +91,28 @@
* using this option can save a lot of space.
*/
#ifndef GINPUT_TOUCH_NOCALIBRATE_GUI
- #define GINPUT_TOUCH_NOCALIBRATE_GUI FALSE
+ #define GINPUT_TOUCH_NOCALIBRATE_GUI GFXOFF
#endif
/**
* @brief Turn off all touch calibration support.
- * @details Defaults to FALSE
- * @note With this set to TRUE touch readings will not be calibrated.
+ * @details Defaults to GFXOFF
+ * @note With this set to GFXON touch readings will not be calibrated.
* @note This automatically turns off the calibration GUI too!
* @note Calibration requires a lot of code. If your device doesn't require it
* using this option can save a lot of space.
*/
#ifndef GINPUT_TOUCH_NOCALIBRATE
- #define GINPUT_TOUCH_NOCALIBRATE FALSE
+ #define GINPUT_TOUCH_NOCALIBRATE GFXOFF
#endif
/**
* @brief Turn off all touch support.
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
* @note This automatically turns off all calibration and the calibration GUI too!
* @note Touch device handling requires a lot of code. If your device doesn't require it
* using this option can save a lot of space.
*/
#ifndef GINPUT_TOUCH_NOTOUCH
- #define GINPUT_TOUCH_NOTOUCH FALSE
+ #define GINPUT_TOUCH_NOTOUCH GFXOFF
#endif
/**
* @brief Milliseconds between mouse polls.
@@ -143,19 +143,19 @@
#endif
/**
* @brief There is a user supplied routine to load mouse calibration data
- * @details Defaults to FALSE
- * @note If TRUE the user must supply the @p LoadMouseCalibration() routine.
+ * @details Defaults to GFXOFF
+ * @note If GFXON the user must supply the @p LoadMouseCalibration() routine.
*/
#ifndef GINPUT_TOUCH_USER_CALIBRATION_LOAD
- #define GINPUT_TOUCH_USER_CALIBRATION_LOAD FALSE
+ #define GINPUT_TOUCH_USER_CALIBRATION_LOAD GFXOFF
#endif
/**
* @brief There is a user supplied routine to save mouse calibration data
- * @details Defaults to FALSE
- * @note If TRUE the user must supply the @p SaveMouseCalibration() routine.
+ * @details Defaults to GFXOFF
+ * @note If GFXON the user must supply the @p SaveMouseCalibration() routine.
*/
#ifndef GINPUT_TOUCH_USER_CALIBRATION_SAVE
- #define GINPUT_TOUCH_USER_CALIBRATION_SAVE FALSE
+ #define GINPUT_TOUCH_USER_CALIBRATION_SAVE GFXOFF
#endif
#if defined(__DOXYGEN__)
/**
@@ -198,7 +198,7 @@
* @note Turning off the layout engine just saves code if it is not needed.
*/
#ifndef GKEYBOARD_LAYOUT_OFF
- #define GKEYBOARD_LAYOUT_OFF FALSE
+ #define GKEYBOARD_LAYOUT_OFF GFXOFF
#endif
/**
* @brief Various Keyboard Layouts that can be included.
@@ -212,7 +212,7 @@
* @{
*/
#ifndef GKEYBOARD_LAYOUT_SCANCODE2_US
- #define GKEYBOARD_LAYOUT_SCANCODE2_US FALSE // US Keyboard using the ScanCode 2 set.
+ #define GKEYBOARD_LAYOUT_SCANCODE2_US GFXOFF // US Keyboard using the ScanCode 2 set.
#endif
/** @} */
/** @} */
diff --git a/src/ginput/ginput_rules.h b/src/ginput/ginput_rules.h
index 5825e2f0..d78f0c4c 100644
--- a/src/ginput/ginput_rules.h
+++ b/src/ginput/ginput_rules.h
@@ -20,35 +20,35 @@
#if !GFX_USE_GEVENT
#if GFX_DISPLAY_RULE_WARNINGS
#if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT
- #warning "GINPUT: GFX_USE_GEVENT is required if GFX_USE_GINPUT is TRUE. It has been turned on for you."
+ #warning "GINPUT: GFX_USE_GEVENT is required if GFX_USE_GINPUT is GFXON. It has been turned on for you."
#elif GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_MACRO
- COMPILER_WARNING("GINPUT: GFX_USE_GEVENT is required if GFX_USE_GINPUT is TRUE. It has been turned on for you.")
+ COMPILER_WARNING("GINPUT: GFX_USE_GEVENT is required if GFX_USE_GINPUT is GFXON. It has been turned on for you.")
#endif
#endif
#undef GFX_USE_GEVENT
- #define GFX_USE_GEVENT TRUE
+ #define GFX_USE_GEVENT GFXON
#endif
#if !GFX_USE_GTIMER
#if GFX_DISPLAY_RULE_WARNINGS
#if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT
- #warning "GINPUT: GFX_USE_GTIMER is required if GFX_USE_GINPUT is TRUE. It has been turned on for you."
+ #warning "GINPUT: GFX_USE_GTIMER is required if GFX_USE_GINPUT is GFXON. It has been turned on for you."
#elif GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_MACRO
- COMPILER_WARNING("GINPUT: GFX_USE_GTIMER is required if GFX_USE_GINPUT is TRUE. It has been turned on for you.")
+ COMPILER_WARNING("GINPUT: GFX_USE_GTIMER is required if GFX_USE_GINPUT is GFXON. It has been turned on for you.")
#endif
#endif
#undef GFX_USE_GTIMER
- #define GFX_USE_GTIMER TRUE
+ #define GFX_USE_GTIMER GFXON
#endif
#if GINPUT_NEED_MOUSE
#if GINPUT_TOUCH_NOTOUCH
// No warning needed for this
#undef GINPUT_TOUCH_NOCALIBRATE
- #define GINPUT_TOUCH_NOCALIBRATE TRUE
+ #define GINPUT_TOUCH_NOCALIBRATE GFXON
#endif
#if GINPUT_TOUCH_NOCALIBRATE
// No warning needed for this
#undef GINPUT_TOUCH_NOCALIBRATE_GUI
- #define GINPUT_TOUCH_NOCALIBRATE_GUI TRUE
+ #define GINPUT_TOUCH_NOCALIBRATE_GUI GFXON
#endif
#if !GINPUT_TOUCH_NOTOUCH && GINPUT_MOUSE_CLICK_TIME > GINPUT_TOUCH_CXTCLICK_TIME
#error "GINPUT MOUSE: The GINPUT_MOUSE_CLICK_TIME must be <= GINPUT_TOUCH_CXTCLICK_TIME"
diff --git a/src/ginput/ginput_toggle.h b/src/ginput/ginput_toggle.h
index ad896bf6..7d028301 100644
--- a/src/ginput/ginput_toggle.h
+++ b/src/ginput/ginput_toggle.h
@@ -16,8 +16,8 @@
* @details GINPUT allows it to interface toggle buttons easily to your
* application.
*
- * @pre GFX_USE_GINPUT must be set to TRUE in your gfxconf.h
- * @pre GINPUT_NEED_TOGGLE must be set to TRUE in your gfxconf.h
+ * @pre GFX_USE_GINPUT must be set to GFXON in your gfxconf.h
+ * @pre GINPUT_NEED_TOGGLE must be set to GFXON in your gfxconf.h
*
* @{
*/
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-06 20:27:50 +0000