summaryrefslogtreecommitdiff
path: root/quantum/visualizer
diff options
context:
space:
mode:
authorJames Young <xxiinophobia@yahoo.com>2020-02-29 12:00:00 -0800
committerFlorian Didron <fdidron@users.noreply.github.com>2020-06-12 17:00:27 +0900
commitf01c45ef54039366b666c28747fd57136d81c472 (patch)
treea09c6a4e1f7f1b447fc508f4ca542d2640443e71 /quantum/visualizer
parentae8641748e4b2adb5b4f091027975e3884e325c9 (diff)
2020 February 29 Breaking Changes Update (#8064)
Diffstat (limited to 'quantum/visualizer')
-rw-r--r--quantum/visualizer/common_gfxconf.h453
-rw-r--r--quantum/visualizer/visualizer.c4
-rw-r--r--quantum/visualizer/visualizer.h4
3 files changed, 251 insertions, 210 deletions
diff --git a/quantum/visualizer/common_gfxconf.h b/quantum/visualizer/common_gfxconf.h
index 865e588693..e5bbddbb02 100644
--- a/quantum/visualizer/common_gfxconf.h
+++ b/quantum/visualizer/common_gfxconf.h
@@ -23,294 +23,335 @@
#define COMMON_GFXCONF_H
///////////////////////////////////////////////////////////////////////////
+// GFX - Compatibility options //
+///////////////////////////////////////////////////////////////////////////
+//#define GFX_COMPAT_V2 GFXON
+//#define GFX_COMPAT_OLDCOLORS GFXON
+
+///////////////////////////////////////////////////////////////////////////
// GOS - One of these must be defined, preferably in your Makefile //
///////////////////////////////////////////////////////////////////////////
-//#define GFX_USE_OS_CHIBIOS TRUE
-//#define GFX_USE_OS_FREERTOS FALSE
-// #define GFX_FREERTOS_USE_TRACE FALSE
-//#define GFX_USE_OS_WIN32 FALSE
-//#define GFX_USE_OS_LINUX FALSE
-//#define GFX_USE_OS_OSX FALSE
-//#define GFX_USE_OS_ECOS FALSE
-//#define GFX_USE_OS_RAWRTOS FALSE
-//#define GFX_USE_OS_ARDUINO FALSE
-//#define GFX_USE_OS_KEIL FALSE
-//#define GFX_USE_OS_CMSIS FALSE
-//#define GFX_USE_OS_RAW32 FALSE
+//#define GFX_USE_OS_CHIBIOS GFXOFF
+//#define GFX_USE_OS_FREERTOS GFXOFF
+// #define GFX_FREERTOS_USE_TRACE GFXOFF
+//#define GFX_USE_OS_WIN32 GFXOFF
+//#define GFX_USE_OS_LINUX GFXOFF
+//#define GFX_USE_OS_OSX GFXOFF
+//#define GFX_USE_OS_ECOS GFXOFF
+//#define GFX_USE_OS_RAWRTOS GFXOFF
+//#define GFX_USE_OS_ARDUINO GFXOFF
+//#define GFX_USE_OS_KEIL GFXOFF
+//#define GFX_USE_OS_RTX5 GFXOFF
+//#define GFX_USE_OS_CMSIS GFXOFF
+//#define GFX_USE_OS_CMSIS2 GFXOFF
+//#define GFX_USE_OS_RAW32 GFXOFF
+//#define GFX_USE_OS_ZEPHYR GFXOFF
+//#define GFX_USE_OS_NIOS GFXOFF
+//#define GFX_USE_OS_QT GFXOFF
// #define INTERRUPTS_OFF() optional_code
// #define INTERRUPTS_ON() optional_code
-// These are not defined by default for some reason
-#define GOS_NEED_X_THREADS FALSE
-#define GOS_NEED_X_HEAP FALSE
// Options that (should where relevant) apply to all operating systems
-#define GFX_NO_INLINE FALSE
+#define GFX_NO_INLINE GFXON
// #define GFX_COMPILER GFX_COMPILER_UNKNOWN
+// #define GFX_SHOW_COMPILER GFXOFF
// #define GFX_CPU GFX_CPU_UNKNOWN
+// #define GFX_CPU_NO_ALIGNMENT_FAULTS GFXOFF
+// #define GFX_CPU_ENDIAN GFX_CPU_ENDIAN_UNKNOWN
// #define GFX_OS_HEAP_SIZE 0
-// #define GFX_OS_NO_INIT FALSE
-// #define GFX_OS_INIT_NO_WARNING FALSE
+// #define GFX_OS_NO_INIT GFXOFF
+// #define GFX_OS_INIT_NO_WARNING GFXOFF
// #define GFX_OS_PRE_INIT_FUNCTION myHardwareInitRoutine
// #define GFX_OS_EXTRA_INIT_FUNCTION myOSInitRoutine
// #define GFX_OS_EXTRA_DEINIT_FUNCTION myOSDeInitRoutine
+// #define GFX_OS_CALL_UGFXMAIN GFXOFF
+// #define GFX_OS_UGFXMAIN_STACKSIZE 0
+// #define GFX_EMULATE_MALLOC GFXOFF
+// #define GFX_MEM_LT64K GFXOFF
///////////////////////////////////////////////////////////////////////////
// GDISP //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GDISP TRUE
-
-//#define GDISP_NEED_AUTOFLUSH FALSE
-//#define GDISP_NEED_TIMERFLUSH FALSE
-//#define GDISP_NEED_VALIDATION TRUE
-//#define GDISP_NEED_CLIP TRUE
-#define GDISP_NEED_CIRCLE TRUE
-#define GDISP_NEED_ELLIPSE TRUE
-#define GDISP_NEED_ARC TRUE
-#define GDISP_NEED_ARCSECTORS TRUE
-#define GDISP_NEED_CONVEX_POLYGON TRUE
-//#define GDISP_NEED_SCROLL FALSE
-#define GDISP_NEED_PIXELREAD TRUE
-#define GDISP_NEED_CONTROL TRUE
-//#define GDISP_NEED_QUERY FALSE
-//#define GDISP_NEED_MULTITHREAD FALSE
-//#define GDISP_NEED_STREAMING FALSE
-#define GDISP_NEED_TEXT TRUE
-// #define GDISP_NEED_TEXT_WORDWRAP FALSE
-// #define GDISP_NEED_ANTIALIAS FALSE
-// #define GDISP_NEED_UTF8 FALSE
-#define GDISP_NEED_TEXT_KERNING TRUE
-// #define GDISP_INCLUDE_FONT_UI1 FALSE
-// #define GDISP_INCLUDE_FONT_UI2 FALSE // The smallest preferred font.
-// #define GDISP_INCLUDE_FONT_LARGENUMBERS FALSE
-// #define GDISP_INCLUDE_FONT_DEJAVUSANS10 FALSE
-// #define GDISP_INCLUDE_FONT_DEJAVUSANS12 FALSE
-// #define GDISP_INCLUDE_FONT_DEJAVUSANS16 FALSE
-// #define GDISP_INCLUDE_FONT_DEJAVUSANS20 FALSE
-// #define GDISP_INCLUDE_FONT_DEJAVUSANS24 FALSE
-// #define GDISP_INCLUDE_FONT_DEJAVUSANS32 FALSE
-#define GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12 TRUE
-// #define GDISP_INCLUDE_FONT_FIXED_10X20 FALSE
-// #define GDISP_INCLUDE_FONT_FIXED_7X14 FALSE
-#define GDISP_INCLUDE_FONT_FIXED_5X8 TRUE
-// #define GDISP_INCLUDE_FONT_DEJAVUSANS12_AA FALSE
-// #define GDISP_INCLUDE_FONT_DEJAVUSANS16_AA FALSE
-// #define GDISP_INCLUDE_FONT_DEJAVUSANS20_AA FALSE
-// #define GDISP_INCLUDE_FONT_DEJAVUSANS24_AA FALSE
-// #define GDISP_INCLUDE_FONT_DEJAVUSANS32_AA FALSE
-// #define GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12_AA FALSE
-// #define GDISP_INCLUDE_USER_FONTS FALSE
-
-//#define GDISP_NEED_IMAGE FALSE
-// #define GDISP_NEED_IMAGE_NATIVE FALSE
-// #define GDISP_NEED_IMAGE_GIF FALSE
-// #define GDISP_NEED_IMAGE_BMP FALSE
-// #define GDISP_NEED_IMAGE_BMP_1 FALSE
-// #define GDISP_NEED_IMAGE_BMP_4 FALSE
-// #define GDISP_NEED_IMAGE_BMP_4_RLE FALSE
-// #define GDISP_NEED_IMAGE_BMP_8 FALSE
-// #define GDISP_NEED_IMAGE_BMP_8_RLE FALSE
-// #define GDISP_NEED_IMAGE_BMP_16 FALSE
-// #define GDISP_NEED_IMAGE_BMP_24 FALSE
-// #define GDISP_NEED_IMAGE_BMP_32 FALSE
-// #define GDISP_NEED_IMAGE_JPG FALSE
-// #define GDISP_NEED_IMAGE_PNG FALSE
-// #define GDISP_NEED_IMAGE_ACCOUNTING FALSE
-#ifdef EMULATOR
-# define GDISP_NEED_PIXMAP TRUE
-#endif
-// #define GDISP_NEED_PIXMAP_IMAGE FALSE
-
-//#define GDISP_DEFAULT_ORIENTATION GDISP_ROTATE_LANDSCAPE // If not defined the native hardware orientation is used.
+#define GFX_USE_GDISP GFXON
+
+//#define GDISP_NEED_AUTOFLUSH GFXOFF
+//#define GDISP_NEED_TIMERFLUSH GFXOFF
+//#define GDISP_NEED_VALIDATION GFXON
+//#define GDISP_NEED_CLIP GFXON
+#define GDISP_NEED_CIRCLE GFXON
+//#define GDISP_NEED_DUALCIRCLE GFXOFF
+#define GDISP_NEED_ELLIPSE GFXON
+#define GDISP_NEED_ARC GFXON
+#define GDISP_NEED_ARCSECTORS GFXON
+#define GDISP_NEED_CONVEX_POLYGON GFXON
+//#define GDISP_NEED_SCROLL GFXOFF
+#define GDISP_NEED_PIXELREAD GFXON
+#define GDISP_NEED_CONTROL GFXON
+//#define GDISP_NEED_QUERY GFXOFF
+//#define GDISP_NEED_MULTITHREAD GFXOFF
+//#define GDISP_NEED_STREAMING GFXOFF
+#define GDISP_NEED_TEXT GFXON
+// #define GDISP_NEED_TEXT_WORDWRAP GFXOFF
+// #define GDISP_NEED_TEXT_BOXPADLR 1
+// #define GDISP_NEED_TEXT_BOXPADTB 1
+// #define GDISP_NEED_ANTIALIAS GFXOFF
+// #define GDISP_NEED_UTF8 GFXOFF
+#define GDISP_NEED_TEXT_KERNING GFXON
+// #define GDISP_INCLUDE_FONT_UI1 GFXOFF
+// #define GDISP_INCLUDE_FONT_UI2 GFXOFF // The smallest preferred font.
+// #define GDISP_INCLUDE_FONT_LARGENUMBERS GFXOFF
+// #define GDISP_INCLUDE_FONT_DEJAVUSANS10 GFXOFF
+// #define GDISP_INCLUDE_FONT_DEJAVUSANS12 GFXOFF
+// #define GDISP_INCLUDE_FONT_DEJAVUSANS16 GFXOFF
+// #define GDISP_INCLUDE_FONT_DEJAVUSANS20 GFXOFF
+// #define GDISP_INCLUDE_FONT_DEJAVUSANS24 GFXOFF
+// #define GDISP_INCLUDE_FONT_DEJAVUSANS32 GFXOFF
+#define GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12 GFXON
+// #define GDISP_INCLUDE_FONT_FIXED_10X20 GFXOFF
+// #define GDISP_INCLUDE_FONT_FIXED_7X14 GFXOFF
+#define GDISP_INCLUDE_FONT_FIXED_5X8 GFXON
+// #define GDISP_INCLUDE_FONT_DEJAVUSANS12_AA GFXOFF
+// #define GDISP_INCLUDE_FONT_DEJAVUSANS16_AA GFXOFF
+// #define GDISP_INCLUDE_FONT_DEJAVUSANS20_AA GFXOFF
+// #define GDISP_INCLUDE_FONT_DEJAVUSANS24_AA GFXOFF
+// #define GDISP_INCLUDE_FONT_DEJAVUSANS32_AA GFXOFF
+// #define GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12_AA GFXOFF
+// #define GDISP_INCLUDE_USER_FONTS GFXOFF
+
+//#define GDISP_NEED_IMAGE GFXOFF
+// #define GDISP_NEED_IMAGE_NATIVE GFXOFF
+// #define GDISP_NEED_IMAGE_GIF GFXOFF
+// #define GDISP_IMAGE_GIF_BLIT_BUFFER_SIZE 32
+// #define GDISP_NEED_IMAGE_BMP GFXOFF
+// #define GDISP_NEED_IMAGE_BMP_1 GFXON
+// #define GDISP_NEED_IMAGE_BMP_4 GFXON
+// #define GDISP_NEED_IMAGE_BMP_4_RLE GFXON
+// #define GDISP_NEED_IMAGE_BMP_8 GFXON
+// #define GDISP_NEED_IMAGE_BMP_8_RLE GFXON
+// #define GDISP_NEED_IMAGE_BMP_16 GFXON
+// #define GDISP_NEED_IMAGE_BMP_24 GFXON
+// #define GDISP_NEED_IMAGE_BMP_32 GFXON
+// #define GDISP_IMAGE_BMP_BLIT_BUFFER_SIZE 32
+// #define GDISP_NEED_IMAGE_JPG GFXOFF
+// #define GDISP_NEED_IMAGE_PNG GFXOFF
+// #define GDISP_NEED_IMAGE_PNG_INTERLACED GFXOFF
+// #define GDISP_NEED_IMAGE_PNG_TRANSPARENCY GFXON
+// #define GDISP_NEED_IMAGE_PNG_BACKGROUND GFXON
+// #define GDISP_NEED_IMAGE_PNG_ALPHACLIFF 32
+// #define GDISP_NEED_IMAGE_PNG_PALETTE_124 GFXON
+// #define GDISP_NEED_IMAGE_PNG_PALETTE_8 GFXON
+// #define GDISP_NEED_IMAGE_PNG_GRAYSCALE_124 GFXON
+// #define GDISP_NEED_IMAGE_PNG_GRAYSCALE_8 GFXON
+// #define GDISP_NEED_IMAGE_PNG_GRAYSCALE_16 GFXON
+// #define GDISP_NEED_IMAGE_PNG_GRAYALPHA_8 GFXON
+// #define GDISP_NEED_IMAGE_PNG_GRAYALPHA_16 GFXON
+// #define GDISP_NEED_IMAGE_PNG_RGB_8 GFXON
+// #define GDISP_NEED_IMAGE_PNG_RGB_16 GFXON
+// #define GDISP_NEED_IMAGE_PNG_RGBALPHA_8 GFXON
+// #define GDISP_NEED_IMAGE_PNG_RGBALPHA_16 GFXON
+// #define GDISP_IMAGE_PNG_BLIT_BUFFER_SIZE 32
+// #define GDISP_IMAGE_PNG_FILE_BUFFER_SIZE 8
+// #define GDISP_IMAGE_PNG_Z_BUFFER_SIZE 32768
+// #define GDISP_NEED_IMAGE_ACCOUNTING GFXOFF
+
+//#define GDISP_NEED_PIXMAP GFXOFF
+// #define GDISP_NEED_PIXMAP_IMAGE GFXOFF
+
+//#define GDISP_DEFAULT_ORIENTATION gOrientationLandscape // If not defined the native hardware orientation is used.
//#define GDISP_LINEBUF_SIZE 128
-//#define GDISP_STARTUP_COLOR Black
-#define GDISP_NEED_STARTUP_LOGO FALSE
+//#define GDISP_STARTUP_COLOR GFX_BLACK
+#define GDISP_NEED_STARTUP_LOGO GFXOFF
-//#define GDISP_TOTAL_DISPLAYS 2
+//#define GDISP_TOTAL_DISPLAYS 1
+//#define GDISP_DRIVER_LIST GDISPVMT_Win32, GDISPVMT_Win32
#ifdef GDISP_DRIVER_LIST
-// For code and speed optimization define as TRUE or FALSE if all controllers have the same capability
-# define GDISP_HARDWARE_STREAM_WRITE FALSE
-# define GDISP_HARDWARE_STREAM_READ FALSE
-# define GDISP_HARDWARE_STREAM_POS FALSE
-# define GDISP_HARDWARE_DRAWPIXEL TRUE
-# define GDISP_HARDWARE_CLEARS FALSE
-# define GDISP_HARDWARE_FILLS FALSE
-//#define GDISP_HARDWARE_BITFILLS FALSE
-# define GDISP_HARDWARE_SCROLL FALSE
-# define GDISP_HARDWARE_PIXELREAD TRUE
-# define GDISP_HARDWARE_CONTROL TRUE
-# define GDISP_HARDWARE_QUERY FALSE
-# define GDISP_HARDWARE_CLIP FALSE
+// // For code and speed optimization define as GFXON or GFXOFF if all controllers have the same capability
+# define GDISP_HARDWARE_STREAM_WRITE GFXOFF
+# define GDISP_HARDWARE_STREAM_READ GFXOFF
+# define GDISP_HARDWARE_STREAM_POS GFXOFF
+# define GDISP_HARDWARE_DRAWPIXEL GFXON
+# define GDISP_HARDWARE_CLEARS GFXOFF
+# define GDISP_HARDWARE_FILLS GFXOFF
+//#define GDISP_HARDWARE_BITFILLS GFXOFF
+# define GDISP_HARDWARE_SCROLL GFXOFF
+# define GDISP_HARDWARE_PIXELREAD GFXON
+# define GDISP_HARDWARE_CONTROL GFXON
+# define GDISP_HARDWARE_QUERY GFXOFF
+# define GDISP_HARDWARE_CLIP GFXOFF
# define GDISP_PIXELFORMAT GDISP_PIXELFORMAT_RGB888
#endif
-// The custom format is not defined for some reason, so define it as error
-// so we don't get compiler warnings
-#define GDISP_PIXELFORMAT_CUSTOM GDISP_PIXELFORMAT_ERROR
-
-#define GDISP_USE_GFXNET FALSE
+#define GDISP_USE_GFXNET GFXOFF
// #define GDISP_GFXNET_PORT 13001
-// #define GDISP_GFXNET_CUSTOM_LWIP_STARTUP FALSE
-// #define GDISP_DONT_WAIT_FOR_NET_DISPLAY FALSE
-// #define GDISP_GFXNET_UNSAFE_SOCKETS FALSE
+// #define GDISP_GFXNET_CUSTOM_LWIP_STARTUP GFXOFF
+// #define GDISP_DONT_WAIT_FOR_NET_DISPLAY GFXOFF
+// #define GDISP_GFXNET_UNSAFE_SOCKETS GFXOFF
///////////////////////////////////////////////////////////////////////////
// GWIN //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GWIN FALSE
+#define GFX_USE_GWIN GFXOFF
-//#define GWIN_NEED_WINDOWMANAGER FALSE
-// #define GWIN_REDRAW_IMMEDIATE FALSE
-// #define GWIN_REDRAW_SINGLEOP FALSE
-// #define GWIN_NEED_FLASHING FALSE
+//#define GWIN_NEED_WINDOWMANAGER GFXOFF
+// #define GWIN_REDRAW_IMMEDIATE GFXOFF
+// #define GWIN_REDRAW_SINGLEOP GFXOFF
+// #define GWIN_NEED_FLASHING GFXOFF
// #define GWIN_FLASHING_PERIOD 250
-//#define GWIN_NEED_CONSOLE FALSE
-// #define GWIN_CONSOLE_USE_HISTORY FALSE
-// #define GWIN_CONSOLE_HISTORY_AVERAGING FALSE
-// #define GWIN_CONSOLE_HISTORY_ATCREATE FALSE
-// #define GWIN_CONSOLE_ESCSEQ FALSE
-// #define GWIN_CONSOLE_USE_BASESTREAM FALSE
-// #define GWIN_CONSOLE_USE_FLOAT FALSE
-//#define GWIN_NEED_GRAPH FALSE
-//#define GWIN_NEED_GL3D FALSE
-
-//#define GWIN_NEED_WIDGET FALSE
+//#define GWIN_NEED_CONSOLE GFXOFF
+// #define GWIN_CONSOLE_USE_HISTORY GFXOFF
+// #define GWIN_CONSOLE_HISTORY_AVERAGING GFXOFF
+// #define GWIN_CONSOLE_HISTORY_ATCREATE GFXOFF
+// #define GWIN_CONSOLE_ESCSEQ GFXOFF
+// #define GWIN_CONSOLE_USE_BASESTREAM GFXOFF
+// #define GWIN_CONSOLE_USE_FLOAT GFXOFF
+//#define GWIN_NEED_GRAPH GFXOFF
+//#define GWIN_NEED_GL3D GFXOFF
+
+//#define GWIN_NEED_WIDGET GFXOFF
//#define GWIN_FOCUS_HIGHLIGHT_WIDTH 1
-// #define GWIN_NEED_LABEL FALSE
-// #define GWIN_LABEL_ATTRIBUTE FALSE
-// #define GWIN_NEED_BUTTON FALSE
-// #define GWIN_BUTTON_LAZY_RELEASE FALSE
-// #define GWIN_NEED_SLIDER FALSE
-// #define GWIN_SLIDER_NOSNAP FALSE
+// #define GWIN_NEED_LABEL GFXOFF
+// #define GWIN_LABEL_ATTRIBUTE GFXOFF
+// #define GWIN_NEED_BUTTON GFXOFF
+// #define GWIN_BUTTON_LAZY_RELEASE GFXOFF
+// #define GWIN_NEED_SLIDER GFXOFF
+// #define GWIN_SLIDER_NOSNAP GFXOFF
// #define GWIN_SLIDER_DEAD_BAND 5
// #define GWIN_SLIDER_TOGGLE_INC 20
-// #define GWIN_NEED_CHECKBOX FALSE
-// #define GWIN_NEED_IMAGE FALSE
-// #define GWIN_NEED_IMAGE_ANIMATION FALSE
-// #define GWIN_NEED_RADIO FALSE
-// #define GWIN_NEED_LIST FALSE
-// #define GWIN_NEED_LIST_IMAGES FALSE
-// #define GWIN_NEED_PROGRESSBAR FALSE
-// #define GWIN_PROGRESSBAR_AUTO FALSE
-// #define GWIN_NEED_KEYBOARD FALSE
+// #define GWIN_NEED_CHECKBOX GFXOFF
+// #define GWIN_NEED_IMAGE GFXOFF
+// #define GWIN_NEED_IMAGE_ANIMATION GFXOFF
+// #define GWIN_NEED_RADIO GFXOFF
+// #define GWIN_NEED_LIST GFXOFF
+// #define GWIN_NEED_LIST_IMAGES GFXOFF
+// #define GWIN_NEED_PROGRESSBAR GFXOFF
+// #define GWIN_PROGRESSBAR_AUTO GFXOFF
+// #define GWIN_NEED_KEYBOARD GFXOFF
// #define GWIN_KEYBOARD_DEFAULT_LAYOUT VirtualKeyboard_English1
-// #define GWIN_NEED_KEYBOARD_ENGLISH1 TRUE
-// #define GWIN_NEED_TEXTEDIT FALSE
-// #define GWIN_FLAT_STYLING FALSE
-// #define GWIN_WIDGET_TAGS FALSE
-
-//#define GWIN_NEED_CONTAINERS FALSE
-// #define GWIN_NEED_CONTAINER FALSE
-// #define GWIN_NEED_FRAME FALSE
-// #define GWIN_NEED_TABSET FALSE
+// #define GWIN_NEED_KEYBOARD_ENGLISH1 GFXON
+// #define GWIN_NEED_TEXTEDIT GFXOFF
+// #define GWIN_FLAT_STYLING GFXOFF
+// #define GWIN_WIDGET_TAGS GFXOFF
+
+//#define GWIN_NEED_CONTAINERS GFXOFF
+// #define GWIN_NEED_CONTAINER GFXOFF
+// #define GWIN_NEED_FRAME GFXOFF
+// #define GWIN_NEED_TABSET GFXOFF
// #define GWIN_TABSET_TABHEIGHT 18
///////////////////////////////////////////////////////////////////////////
+// GTRANS //
+///////////////////////////////////////////////////////////////////////////
+//#define GFX_USE_GTRANS GFXOFF
+
+///////////////////////////////////////////////////////////////////////////
// GEVENT //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GEVENT TRUE
+#define GFX_USE_GEVENT GFXON
-//#define GEVENT_ASSERT_NO_RESOURCE FALSE
+//#define GEVENT_ASSERT_NO_RESOURCE GFXOFF
//#define GEVENT_MAXIMUM_SIZE 32
//#define GEVENT_MAX_SOURCE_LISTENERS 32
///////////////////////////////////////////////////////////////////////////
// GTIMER //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GTIMER FALSE
+#define GFX_USE_GTIMER GFXOFF
-//#define GTIMER_THREAD_PRIORITY HIGH_PRIORITY
+//#define GTIMER_THREAD_PRIORITY gThreadpriorityHigh
//#define GTIMER_THREAD_WORKAREA_SIZE 2048
///////////////////////////////////////////////////////////////////////////
// GQUEUE //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GQUEUE FALSE
+#define GFX_USE_GQUEUE GFXOFF
-//#define GQUEUE_NEED_ASYNC FALSE
-//#define GQUEUE_NEED_GSYNC FALSE
-//#define GQUEUE_NEED_FSYNC FALSE
-//#define GQUEUE_NEED_BUFFERS FALSE
+//#define GQUEUE_NEED_ASYNC GFXOFF
+//#define GQUEUE_NEED_GSYNC GFXOFF
+//#define GQUEUE_NEED_FSYNC GFXOFF
+//#define GQUEUE_NEED_BUFFERS GFXOFF
///////////////////////////////////////////////////////////////////////////
// GINPUT //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GINPUT FALSE
+#define GFX_USE_GINPUT GFXOFF
-//#define GINPUT_NEED_MOUSE FALSE
-// #define GINPUT_TOUCH_STARTRAW FALSE
-// #define GINPUT_TOUCH_NOTOUCH FALSE
-// #define GINPUT_TOUCH_NOCALIBRATE FALSE
-// #define GINPUT_TOUCH_NOCALIBRATE_GUI FALSE
+//#define GINPUT_NEED_MOUSE GFXOFF
+// #define GINPUT_TOUCH_STARTRAW GFXOFF
+// #define GINPUT_TOUCH_NOTOUCH GFXOFF
+// #define GINPUT_TOUCH_NOCALIBRATE GFXOFF
+// #define GINPUT_TOUCH_NOCALIBRATE_GUI GFXOFF
// #define GINPUT_MOUSE_POLL_PERIOD 25
// #define GINPUT_MOUSE_CLICK_TIME 300
// #define GINPUT_TOUCH_CXTCLICK_TIME 700
-// #define GINPUT_TOUCH_USER_CALIBRATION_LOAD FALSE
-// #define GINPUT_TOUCH_USER_CALIBRATION_SAVE FALSE
+// #define GINPUT_TOUCH_USER_CALIBRATION_LOAD GFXOFF
+// #define GINPUT_TOUCH_USER_CALIBRATION_SAVE GFXOFF
// #define GMOUSE_DRIVER_LIST GMOUSEVMT_Win32, GMOUSEVMT_Win32
-//#define GINPUT_NEED_KEYBOARD FALSE
+// #define GINPUT_TOUCH_CALIBRATION_FONT1 "* Double"
+// #define GINPUT_TOUCH_CALIBRATION_FONT2 "* Narrow"
+// #define GINPUT_TOUCH_CALIBRATION_TITLE "Calibration"
+// #define GINPUT_TOUCH_CALIBRATION_ERROR "Calibration Failed!"
+//#define GINPUT_NEED_KEYBOARD GFXOFF
// #define GINPUT_KEYBOARD_POLL_PERIOD 200
// #define GKEYBOARD_DRIVER_LIST GKEYBOARDVMT_Win32, GKEYBOARDVMT_Win32
-// #define GKEYBOARD_LAYOUT_OFF FALSE
-// #define GKEYBOARD_LAYOUT_SCANCODE2_US FALSE
-//#define GINPUT_NEED_TOGGLE FALSE
-//#define GINPUT_NEED_DIAL FALSE
+// #define GKEYBOARD_LAYOUT_OFF GFXOFF
+// #define GKEYBOARD_LAYOUT_SCANCODE2_US GFXOFF
+//#define GINPUT_NEED_TOGGLE GFXOFF
+//#define GINPUT_NEED_DIAL GFXOFF
///////////////////////////////////////////////////////////////////////////
// GFILE //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GFILE FALSE
-
-//#define GFILE_NEED_PRINTG FALSE
-//#define GFILE_NEED_SCANG FALSE
-//#define GFILE_NEED_STRINGS FALSE
-//#define GFILE_NEED_FILELISTS FALSE
-//#define GFILE_NEED_STDIO FALSE
-//#define GFILE_NEED_NOAUTOMOUNT FALSE
-//#define GFILE_NEED_NOAUTOSYNC FALSE
-
-//#define GFILE_NEED_MEMFS FALSE
-//#define GFILE_NEED_ROMFS FALSE
-//#define GFILE_NEED_RAMFS FALSE
-//#define GFILE_NEED_FATFS FALSE
-//#define GFILE_NEED_NATIVEFS FALSE
-//#define GFILE_NEED_CHBIOSFS FALSE
-
-//#define GFILE_ALLOW_FLOATS FALSE
-//#define GFILE_ALLOW_DEVICESPECIFIC FALSE
+#define GFX_USE_GFILE GFXOFF
+
+//#define GFILE_NEED_PRINTG GFXOFF
+//#define GFILE_NEED_SCANG GFXOFF
+//#define GFILE_NEED_STRINGS GFXOFF
+//#define GFILE_NEED_FILELISTS GFXOFF
+//#define GFILE_NEED_STDIO GFXOFF
+//#define GFILE_NEED_NOAUTOMOUNT GFXOFF
+//#define GFILE_NEED_NOAUTOSYNC GFXOFF
+
+//#define GFILE_NEED_MEMFS GFXOFF
+//#define GFILE_NEED_ROMFS GFXOFF
+//#define GFILE_NEED_RAMFS GFXOFF
+//#define GFILE_NEED_FATFS GFXOFF
+//#define GFILE_NEED_NATIVEFS GFXOFF
+//#define GFILE_NEED_CHBIOSFS GFXOFF
+//#define GFILE_NEED_USERFS GFXOFF
+
+//#define GFILE_ALLOW_FLOATS GFXOFF
+//#define GFILE_ALLOW_DEVICESPECIFIC GFXOFF
//#define GFILE_MAX_GFILES 3
///////////////////////////////////////////////////////////////////////////
// GADC //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GADC FALSE
-
-//#define GADC_MAX_LOWSPEED_DEVICES 4
+#define GFX_USE_GADC GFXOFF
+// #define GADC_MAX_LOWSPEED_DEVICES 4
///////////////////////////////////////////////////////////////////////////
// GAUDIO //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GAUDIO FALSE
-// There seems to be a bug in the ugfx code, the wrong define is used
-// So define it in order to avoid warnings
-#define GFX_USE_GAUDIN GFX_USE_GAUDIO
-// #define GAUDIO_NEED_PLAY FALSE
-// #define GAUDIO_NEED_RECORD FALSE
+#define GFX_USE_GAUDIO GFXOFF
+// #define GAUDIO_NEED_PLAY GFXOFF
+// #define GAUDIO_NEED_RECORD GFXOFF
///////////////////////////////////////////////////////////////////////////
// GMISC //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GMISC TRUE
-
-//#define GMISC_NEED_ARRAYOPS FALSE
-//#define GMISC_NEED_FASTTRIG FALSE
-//#define GMISC_NEED_FIXEDTRIG FALSE
-//#define GMISC_NEED_INVSQRT FALSE
-// #define GMISC_INVSQRT_MIXED_ENDIAN FALSE
-// #define GMISC_INVSQRT_REAL_SLOW FALSE
-#define GMISC_NEED_MATRIXFLOAT2D TRUE
-#define GMISC_NEED_MATRIXFIXED2D FALSE
+#define GFX_USE_GMISC GFXON
+
+//#define GMISC_NEED_ARRAYOPS GFXOFF
+//#define GMISC_NEED_FASTTRIG GFXOFF
+//#define GMISC_NEED_FIXEDTRIG GFXOFF
+//#define GMISC_NEED_INVSQRT GFXOFF
+// #define GMISC_INVSQRT_MIXED_ENDIAN GFXOFF
+// #define GMISC_INVSQRT_REAL_SLOW GFXOFF
+#define GMISC_NEED_MATRIXFLOAT2D GFXON
+#define GMISC_NEED_MATRIXFIXED2D GFXOFF
+//#define GMISC_NEED_HITTEST_POLY GFXOFF
#endif /* COMMON_GFXCONF_H */
diff --git a/quantum/visualizer/visualizer.c b/quantum/visualizer/visualizer.c
index 3f182e74d8..9e9cb6d410 100644
--- a/quantum/visualizer/visualizer.c
+++ b/quantum/visualizer/visualizer.c
@@ -352,7 +352,7 @@ static DECLARE_THREAD_FUNCTION(visualizerThread, arg) {
// On windows the system ticks is the same as milliseconds anyway
if (sleep_time != TIME_INFINITE) {
- sleep_time = ST2MS(sleep_time);
+ sleep_time = TIME_I2MS(sleep_time);
}
#endif
geventEventWait(&event_listener, sleep_time);
@@ -400,7 +400,7 @@ void update_status(bool changed) {
static systime_t last_update = 0;
systime_t current_update = chVTGetSystemTimeX();
systime_t delta = current_update - last_update;
- if (changed || delta > MS2ST(10)) {
+ if (changed || delta > TIME_MS2I(10)) {
last_update = current_update;
visualizer_keyboard_status_t* r = begin_write_current_status();
*r = current_status;
diff --git a/quantum/visualizer/visualizer.h b/quantum/visualizer/visualizer.h
index 7ca6837ce6..488d130dec 100644
--- a/quantum/visualizer/visualizer.h
+++ b/quantum/visualizer/visualizer.h
@@ -97,8 +97,8 @@ typedef struct visualizer_state_t {
uint32_t current_lcd_color;
uint32_t prev_lcd_color;
#ifdef LCD_ENABLE
- font_t font_fixed5x8;
- font_t font_dejavusansbold12;
+ gFont font_fixed5x8;
+ gFont font_dejavusansbold12;
#endif
} visualizer_state_t;