diff options
author | James Young <xxiinophobia@yahoo.com> | 2020-02-29 12:00:00 -0800 |
---|---|---|
committer | James Young <xxiinophobia@yahoo.com> | 2020-02-29 11:59:30 -0800 |
commit | 26eef35f07698d23aafae90e1c230b52e100a334 (patch) | |
tree | eb8e43fc58ca55788e6e89430af0db55ea79e324 /quantum/visualizer | |
parent | 85041ff05bf0e5f4ff4535caf6e638491a5614c8 (diff) | |
download | qmk_firmware-26eef35f07698d23aafae90e1c230b52e100a334.tar.gz qmk_firmware-26eef35f07698d23aafae90e1c230b52e100a334.zip |
2020 February 29 Breaking Changes Update (#8064)
Diffstat (limited to 'quantum/visualizer')
-rw-r--r-- | quantum/visualizer/common_gfxconf.h | 453 | ||||
-rw-r--r-- | quantum/visualizer/visualizer.c | 4 | ||||
-rw-r--r-- | quantum/visualizer/visualizer.h | 4 |
3 files changed, 251 insertions, 210 deletions
diff --git a/quantum/visualizer/common_gfxconf.h b/quantum/visualizer/common_gfxconf.h index 865e58869..e5bbddbb0 100644 --- a/quantum/visualizer/common_gfxconf.h +++ b/quantum/visualizer/common_gfxconf.h | |||
@@ -23,294 +23,335 @@ | |||
23 | #define COMMON_GFXCONF_H | 23 | #define COMMON_GFXCONF_H |
24 | 24 | ||
25 | /////////////////////////////////////////////////////////////////////////// | 25 | /////////////////////////////////////////////////////////////////////////// |
26 | // GFX - Compatibility options // | ||
27 | /////////////////////////////////////////////////////////////////////////// | ||
28 | //#define GFX_COMPAT_V2 GFXON | ||
29 | //#define GFX_COMPAT_OLDCOLORS GFXON | ||
30 | |||
31 | /////////////////////////////////////////////////////////////////////////// | ||
26 | // GOS - One of these must be defined, preferably in your Makefile // | 32 | // GOS - One of these must be defined, preferably in your Makefile // |
27 | /////////////////////////////////////////////////////////////////////////// | 33 | /////////////////////////////////////////////////////////////////////////// |
28 | //#define GFX_USE_OS_CHIBIOS TRUE | 34 | //#define GFX_USE_OS_CHIBIOS GFXOFF |
29 | //#define GFX_USE_OS_FREERTOS FALSE | 35 | //#define GFX_USE_OS_FREERTOS GFXOFF |
30 | // #define GFX_FREERTOS_USE_TRACE FALSE | 36 | // #define GFX_FREERTOS_USE_TRACE GFXOFF |
31 | //#define GFX_USE_OS_WIN32 FALSE | 37 | //#define GFX_USE_OS_WIN32 GFXOFF |
32 | //#define GFX_USE_OS_LINUX FALSE | 38 | //#define GFX_USE_OS_LINUX GFXOFF |
33 | //#define GFX_USE_OS_OSX FALSE | 39 | //#define GFX_USE_OS_OSX GFXOFF |
34 | //#define GFX_USE_OS_ECOS FALSE | 40 | //#define GFX_USE_OS_ECOS GFXOFF |
35 | //#define GFX_USE_OS_RAWRTOS FALSE | 41 | //#define GFX_USE_OS_RAWRTOS GFXOFF |
36 | //#define GFX_USE_OS_ARDUINO FALSE | 42 | //#define GFX_USE_OS_ARDUINO GFXOFF |
37 | //#define GFX_USE_OS_KEIL FALSE | 43 | //#define GFX_USE_OS_KEIL GFXOFF |
38 | //#define GFX_USE_OS_CMSIS FALSE | 44 | //#define GFX_USE_OS_RTX5 GFXOFF |
39 | //#define GFX_USE_OS_RAW32 FALSE | 45 | //#define GFX_USE_OS_CMSIS GFXOFF |
46 | //#define GFX_USE_OS_CMSIS2 GFXOFF | ||
47 | //#define GFX_USE_OS_RAW32 GFXOFF | ||
48 | //#define GFX_USE_OS_ZEPHYR GFXOFF | ||
49 | //#define GFX_USE_OS_NIOS GFXOFF | ||
50 | //#define GFX_USE_OS_QT GFXOFF | ||
40 | // #define INTERRUPTS_OFF() optional_code | 51 | // #define INTERRUPTS_OFF() optional_code |
41 | // #define INTERRUPTS_ON() optional_code | 52 | // #define INTERRUPTS_ON() optional_code |
42 | // These are not defined by default for some reason | ||
43 | #define GOS_NEED_X_THREADS FALSE | ||
44 | #define GOS_NEED_X_HEAP FALSE | ||
45 | 53 | ||
46 | // Options that (should where relevant) apply to all operating systems | 54 | // Options that (should where relevant) apply to all operating systems |
47 | #define GFX_NO_INLINE FALSE | 55 | #define GFX_NO_INLINE GFXON |
48 | // #define GFX_COMPILER GFX_COMPILER_UNKNOWN | 56 | // #define GFX_COMPILER GFX_COMPILER_UNKNOWN |
57 | // #define GFX_SHOW_COMPILER GFXOFF | ||
49 | // #define GFX_CPU GFX_CPU_UNKNOWN | 58 | // #define GFX_CPU GFX_CPU_UNKNOWN |
59 | // #define GFX_CPU_NO_ALIGNMENT_FAULTS GFXOFF | ||
60 | // #define GFX_CPU_ENDIAN GFX_CPU_ENDIAN_UNKNOWN | ||
50 | // #define GFX_OS_HEAP_SIZE 0 | 61 | // #define GFX_OS_HEAP_SIZE 0 |
51 | // #define GFX_OS_NO_INIT FALSE | 62 | // #define GFX_OS_NO_INIT GFXOFF |
52 | // #define GFX_OS_INIT_NO_WARNING FALSE | 63 | // #define GFX_OS_INIT_NO_WARNING GFXOFF |
53 | // #define GFX_OS_PRE_INIT_FUNCTION myHardwareInitRoutine | 64 | // #define GFX_OS_PRE_INIT_FUNCTION myHardwareInitRoutine |
54 | // #define GFX_OS_EXTRA_INIT_FUNCTION myOSInitRoutine | 65 | // #define GFX_OS_EXTRA_INIT_FUNCTION myOSInitRoutine |
55 | // #define GFX_OS_EXTRA_DEINIT_FUNCTION myOSDeInitRoutine | 66 | // #define GFX_OS_EXTRA_DEINIT_FUNCTION myOSDeInitRoutine |
67 | // #define GFX_OS_CALL_UGFXMAIN GFXOFF | ||
68 | // #define GFX_OS_UGFXMAIN_STACKSIZE 0 | ||
69 | // #define GFX_EMULATE_MALLOC GFXOFF | ||
70 | // #define GFX_MEM_LT64K GFXOFF | ||
56 | 71 | ||
57 | /////////////////////////////////////////////////////////////////////////// | 72 | /////////////////////////////////////////////////////////////////////////// |
58 | // GDISP // | 73 | // GDISP // |
59 | /////////////////////////////////////////////////////////////////////////// | 74 | /////////////////////////////////////////////////////////////////////////// |
60 | #define GFX_USE_GDISP TRUE | 75 | #define GFX_USE_GDISP GFXON |
61 | 76 | ||
62 | //#define GDISP_NEED_AUTOFLUSH FALSE | 77 | //#define GDISP_NEED_AUTOFLUSH GFXOFF |
63 | //#define GDISP_NEED_TIMERFLUSH FALSE | 78 | //#define GDISP_NEED_TIMERFLUSH GFXOFF |
64 | //#define GDISP_NEED_VALIDATION TRUE | 79 | //#define GDISP_NEED_VALIDATION GFXON |
65 | //#define GDISP_NEED_CLIP TRUE | 80 | //#define GDISP_NEED_CLIP GFXON |
66 | #define GDISP_NEED_CIRCLE TRUE | 81 | #define GDISP_NEED_CIRCLE GFXON |
67 | #define GDISP_NEED_ELLIPSE TRUE | 82 | //#define GDISP_NEED_DUALCIRCLE GFXOFF |
68 | #define GDISP_NEED_ARC TRUE | 83 | #define GDISP_NEED_ELLIPSE GFXON |
69 | #define GDISP_NEED_ARCSECTORS TRUE | 84 | #define GDISP_NEED_ARC GFXON |
70 | #define GDISP_NEED_CONVEX_POLYGON TRUE | 85 | #define GDISP_NEED_ARCSECTORS GFXON |
71 | //#define GDISP_NEED_SCROLL FALSE | 86 | #define GDISP_NEED_CONVEX_POLYGON GFXON |
72 | #define GDISP_NEED_PIXELREAD TRUE | 87 | //#define GDISP_NEED_SCROLL GFXOFF |
73 | #define GDISP_NEED_CONTROL TRUE | 88 | #define GDISP_NEED_PIXELREAD GFXON |
74 | //#define GDISP_NEED_QUERY FALSE | 89 | #define GDISP_NEED_CONTROL GFXON |
75 | //#define GDISP_NEED_MULTITHREAD FALSE | 90 | //#define GDISP_NEED_QUERY GFXOFF |
76 | //#define GDISP_NEED_STREAMING FALSE | 91 | //#define GDISP_NEED_MULTITHREAD GFXOFF |
77 | #define GDISP_NEED_TEXT TRUE | 92 | //#define GDISP_NEED_STREAMING GFXOFF |
78 | // #define GDISP_NEED_TEXT_WORDWRAP FALSE | 93 | #define GDISP_NEED_TEXT GFXON |
79 | // #define GDISP_NEED_ANTIALIAS FALSE | 94 | // #define GDISP_NEED_TEXT_WORDWRAP GFXOFF |
80 | // #define GDISP_NEED_UTF8 FALSE | 95 | // #define GDISP_NEED_TEXT_BOXPADLR 1 |
81 | #define GDISP_NEED_TEXT_KERNING TRUE | 96 | // #define GDISP_NEED_TEXT_BOXPADTB 1 |
82 | // #define GDISP_INCLUDE_FONT_UI1 FALSE | 97 | // #define GDISP_NEED_ANTIALIAS GFXOFF |
83 | // #define GDISP_INCLUDE_FONT_UI2 FALSE // The smallest preferred font. | 98 | // #define GDISP_NEED_UTF8 GFXOFF |
84 | // #define GDISP_INCLUDE_FONT_LARGENUMBERS FALSE | 99 | #define GDISP_NEED_TEXT_KERNING GFXON |
85 | // #define GDISP_INCLUDE_FONT_DEJAVUSANS10 FALSE | 100 | // #define GDISP_INCLUDE_FONT_UI1 GFXOFF |
86 | // #define GDISP_INCLUDE_FONT_DEJAVUSANS12 FALSE | 101 | // #define GDISP_INCLUDE_FONT_UI2 GFXOFF // The smallest preferred font. |
87 | // #define GDISP_INCLUDE_FONT_DEJAVUSANS16 FALSE | 102 | // #define GDISP_INCLUDE_FONT_LARGENUMBERS GFXOFF |
88 | // #define GDISP_INCLUDE_FONT_DEJAVUSANS20 FALSE | 103 | // #define GDISP_INCLUDE_FONT_DEJAVUSANS10 GFXOFF |
89 | // #define GDISP_INCLUDE_FONT_DEJAVUSANS24 FALSE | 104 | // #define GDISP_INCLUDE_FONT_DEJAVUSANS12 GFXOFF |
90 | // #define GDISP_INCLUDE_FONT_DEJAVUSANS32 FALSE | 105 | // #define GDISP_INCLUDE_FONT_DEJAVUSANS16 GFXOFF |
91 | #define GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12 TRUE | 106 | // #define GDISP_INCLUDE_FONT_DEJAVUSANS20 GFXOFF |
92 | // #define GDISP_INCLUDE_FONT_FIXED_10X20 FALSE | 107 | // #define GDISP_INCLUDE_FONT_DEJAVUSANS24 GFXOFF |
93 | // #define GDISP_INCLUDE_FONT_FIXED_7X14 FALSE | 108 | // #define GDISP_INCLUDE_FONT_DEJAVUSANS32 GFXOFF |
94 | #define GDISP_INCLUDE_FONT_FIXED_5X8 TRUE | 109 | #define GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12 GFXON |
95 | // #define GDISP_INCLUDE_FONT_DEJAVUSANS12_AA FALSE | 110 | // #define GDISP_INCLUDE_FONT_FIXED_10X20 GFXOFF |
96 | // #define GDISP_INCLUDE_FONT_DEJAVUSANS16_AA FALSE | 111 | // #define GDISP_INCLUDE_FONT_FIXED_7X14 GFXOFF |
97 | // #define GDISP_INCLUDE_FONT_DEJAVUSANS20_AA FALSE | 112 | #define GDISP_INCLUDE_FONT_FIXED_5X8 GFXON |
98 | // #define GDISP_INCLUDE_FONT_DEJAVUSANS24_AA FALSE | 113 | // #define GDISP_INCLUDE_FONT_DEJAVUSANS12_AA GFXOFF |
99 | // #define GDISP_INCLUDE_FONT_DEJAVUSANS32_AA FALSE | 114 | // #define GDISP_INCLUDE_FONT_DEJAVUSANS16_AA GFXOFF |
100 | // #define GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12_AA FALSE | 115 | // #define GDISP_INCLUDE_FONT_DEJAVUSANS20_AA GFXOFF |
101 | // #define GDISP_INCLUDE_USER_FONTS FALSE | 116 | // #define GDISP_INCLUDE_FONT_DEJAVUSANS24_AA GFXOFF |
102 | 117 | // #define GDISP_INCLUDE_FONT_DEJAVUSANS32_AA GFXOFF | |
103 | //#define GDISP_NEED_IMAGE FALSE | 118 | // #define GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12_AA GFXOFF |
104 | // #define GDISP_NEED_IMAGE_NATIVE FALSE | 119 | // #define GDISP_INCLUDE_USER_FONTS GFXOFF |
105 | // #define GDISP_NEED_IMAGE_GIF FALSE | 120 | |
106 | // #define GDISP_NEED_IMAGE_BMP FALSE | 121 | //#define GDISP_NEED_IMAGE GFXOFF |
107 | // #define GDISP_NEED_IMAGE_BMP_1 FALSE | 122 | // #define GDISP_NEED_IMAGE_NATIVE GFXOFF |
108 | // #define GDISP_NEED_IMAGE_BMP_4 FALSE | 123 | // #define GDISP_NEED_IMAGE_GIF GFXOFF |
109 | // #define GDISP_NEED_IMAGE_BMP_4_RLE FALSE | 124 | // #define GDISP_IMAGE_GIF_BLIT_BUFFER_SIZE 32 |
110 | // #define GDISP_NEED_IMAGE_BMP_8 FALSE | 125 | // #define GDISP_NEED_IMAGE_BMP GFXOFF |
111 | // #define GDISP_NEED_IMAGE_BMP_8_RLE FALSE | 126 | // #define GDISP_NEED_IMAGE_BMP_1 GFXON |
112 | // #define GDISP_NEED_IMAGE_BMP_16 FALSE | 127 | // #define GDISP_NEED_IMAGE_BMP_4 GFXON |
113 | // #define GDISP_NEED_IMAGE_BMP_24 FALSE | 128 | // #define GDISP_NEED_IMAGE_BMP_4_RLE GFXON |
114 | // #define GDISP_NEED_IMAGE_BMP_32 FALSE | 129 | // #define GDISP_NEED_IMAGE_BMP_8 GFXON |
115 | // #define GDISP_NEED_IMAGE_JPG FALSE | 130 | // #define GDISP_NEED_IMAGE_BMP_8_RLE GFXON |
116 | // #define GDISP_NEED_IMAGE_PNG FALSE | 131 | // #define GDISP_NEED_IMAGE_BMP_16 GFXON |
117 | // #define GDISP_NEED_IMAGE_ACCOUNTING FALSE | 132 | // #define GDISP_NEED_IMAGE_BMP_24 GFXON |
118 | #ifdef EMULATOR | 133 | // #define GDISP_NEED_IMAGE_BMP_32 GFXON |
119 | # define GDISP_NEED_PIXMAP TRUE | 134 | // #define GDISP_IMAGE_BMP_BLIT_BUFFER_SIZE 32 |
120 | #endif | 135 | // #define GDISP_NEED_IMAGE_JPG GFXOFF |
121 | // #define GDISP_NEED_PIXMAP_IMAGE FALSE | 136 | // #define GDISP_NEED_IMAGE_PNG GFXOFF |
122 | 137 | // #define GDISP_NEED_IMAGE_PNG_INTERLACED GFXOFF | |
123 | //#define GDISP_DEFAULT_ORIENTATION GDISP_ROTATE_LANDSCAPE // If not defined the native hardware orientation is used. | 138 | // #define GDISP_NEED_IMAGE_PNG_TRANSPARENCY GFXON |
139 | // #define GDISP_NEED_IMAGE_PNG_BACKGROUND GFXON | ||
140 | // #define GDISP_NEED_IMAGE_PNG_ALPHACLIFF 32 | ||
141 | // #define GDISP_NEED_IMAGE_PNG_PALETTE_124 GFXON | ||
142 | // #define GDISP_NEED_IMAGE_PNG_PALETTE_8 GFXON | ||
143 | // #define GDISP_NEED_IMAGE_PNG_GRAYSCALE_124 GFXON | ||
144 | // #define GDISP_NEED_IMAGE_PNG_GRAYSCALE_8 GFXON | ||
145 | // #define GDISP_NEED_IMAGE_PNG_GRAYSCALE_16 GFXON | ||
146 | // #define GDISP_NEED_IMAGE_PNG_GRAYALPHA_8 GFXON | ||
147 | // #define GDISP_NEED_IMAGE_PNG_GRAYALPHA_16 GFXON | ||
148 | // #define GDISP_NEED_IMAGE_PNG_RGB_8 GFXON | ||
149 | // #define GDISP_NEED_IMAGE_PNG_RGB_16 GFXON | ||
150 | // #define GDISP_NEED_IMAGE_PNG_RGBALPHA_8 GFXON | ||
151 | // #define GDISP_NEED_IMAGE_PNG_RGBALPHA_16 GFXON | ||
152 | // #define GDISP_IMAGE_PNG_BLIT_BUFFER_SIZE 32 | ||
153 | // #define GDISP_IMAGE_PNG_FILE_BUFFER_SIZE 8 | ||
154 | // #define GDISP_IMAGE_PNG_Z_BUFFER_SIZE 32768 | ||
155 | // #define GDISP_NEED_IMAGE_ACCOUNTING GFXOFF | ||
156 | |||
157 | //#define GDISP_NEED_PIXMAP GFXOFF | ||
158 | // #define GDISP_NEED_PIXMAP_IMAGE GFXOFF | ||
159 | |||
160 | //#define GDISP_DEFAULT_ORIENTATION gOrientationLandscape // If not defined the native hardware orientation is used. | ||
124 | //#define GDISP_LINEBUF_SIZE 128 | 161 | //#define GDISP_LINEBUF_SIZE 128 |
125 | //#define GDISP_STARTUP_COLOR Black | 162 | //#define GDISP_STARTUP_COLOR GFX_BLACK |
126 | #define GDISP_NEED_STARTUP_LOGO FALSE | 163 | #define GDISP_NEED_STARTUP_LOGO GFXOFF |
127 | 164 | ||
128 | //#define GDISP_TOTAL_DISPLAYS 2 | 165 | //#define GDISP_TOTAL_DISPLAYS 1 |
129 | 166 | ||
167 | //#define GDISP_DRIVER_LIST GDISPVMT_Win32, GDISPVMT_Win32 | ||
130 | #ifdef GDISP_DRIVER_LIST | 168 | #ifdef GDISP_DRIVER_LIST |
131 | // For code and speed optimization define as TRUE or FALSE if all controllers have the same capability | 169 | // // For code and speed optimization define as GFXON or GFXOFF if all controllers have the same capability |
132 | # define GDISP_HARDWARE_STREAM_WRITE FALSE | 170 | # define GDISP_HARDWARE_STREAM_WRITE GFXOFF |
133 | # define GDISP_HARDWARE_STREAM_READ FALSE | 171 | # define GDISP_HARDWARE_STREAM_READ GFXOFF |
134 | # define GDISP_HARDWARE_STREAM_POS FALSE | 172 | # define GDISP_HARDWARE_STREAM_POS GFXOFF |
135 | # define GDISP_HARDWARE_DRAWPIXEL TRUE | 173 | # define GDISP_HARDWARE_DRAWPIXEL GFXON |
136 | # define GDISP_HARDWARE_CLEARS FALSE | 174 | # define GDISP_HARDWARE_CLEARS GFXOFF |
137 | # define GDISP_HARDWARE_FILLS FALSE | 175 | # define GDISP_HARDWARE_FILLS GFXOFF |
138 | //#define GDISP_HARDWARE_BITFILLS FALSE | 176 | //#define GDISP_HARDWARE_BITFILLS GFXOFF |
139 | # define GDISP_HARDWARE_SCROLL FALSE | 177 | # define GDISP_HARDWARE_SCROLL GFXOFF |
140 | # define GDISP_HARDWARE_PIXELREAD TRUE | 178 | # define GDISP_HARDWARE_PIXELREAD GFXON |
141 | # define GDISP_HARDWARE_CONTROL TRUE | 179 | # define GDISP_HARDWARE_CONTROL GFXON |
142 | # define GDISP_HARDWARE_QUERY FALSE | 180 | # define GDISP_HARDWARE_QUERY GFXOFF |
143 | # define GDISP_HARDWARE_CLIP FALSE | 181 | # define GDISP_HARDWARE_CLIP GFXOFF |
144 | 182 | ||
145 | # define GDISP_PIXELFORMAT GDISP_PIXELFORMAT_RGB888 | 183 | # define GDISP_PIXELFORMAT GDISP_PIXELFORMAT_RGB888 |
146 | #endif | 184 | #endif |
147 | 185 | ||
148 | // The custom format is not defined for some reason, so define it as error | 186 | #define GDISP_USE_GFXNET GFXOFF |
149 | // so we don't get compiler warnings | ||
150 | #define GDISP_PIXELFORMAT_CUSTOM GDISP_PIXELFORMAT_ERROR | ||
151 | |||
152 | #define GDISP_USE_GFXNET FALSE | ||
153 | // #define GDISP_GFXNET_PORT 13001 | 187 | // #define GDISP_GFXNET_PORT 13001 |
154 | // #define GDISP_GFXNET_CUSTOM_LWIP_STARTUP FALSE | 188 | // #define GDISP_GFXNET_CUSTOM_LWIP_STARTUP GFXOFF |
155 | // #define GDISP_DONT_WAIT_FOR_NET_DISPLAY FALSE | 189 | // #define GDISP_DONT_WAIT_FOR_NET_DISPLAY GFXOFF |
156 | // #define GDISP_GFXNET_UNSAFE_SOCKETS FALSE | 190 | // #define GDISP_GFXNET_UNSAFE_SOCKETS GFXOFF |
157 | 191 | ||
158 | /////////////////////////////////////////////////////////////////////////// | 192 | /////////////////////////////////////////////////////////////////////////// |
159 | // GWIN // | 193 | // GWIN // |
160 | /////////////////////////////////////////////////////////////////////////// | 194 | /////////////////////////////////////////////////////////////////////////// |
161 | #define GFX_USE_GWIN FALSE | 195 | #define GFX_USE_GWIN GFXOFF |
162 | 196 | ||
163 | //#define GWIN_NEED_WINDOWMANAGER FALSE | 197 | //#define GWIN_NEED_WINDOWMANAGER GFXOFF |
164 | // #define GWIN_REDRAW_IMMEDIATE FALSE | 198 | // #define GWIN_REDRAW_IMMEDIATE GFXOFF |
165 | // #define GWIN_REDRAW_SINGLEOP FALSE | 199 | // #define GWIN_REDRAW_SINGLEOP GFXOFF |
166 | // #define GWIN_NEED_FLASHING FALSE | 200 | // #define GWIN_NEED_FLASHING GFXOFF |
167 | // #define GWIN_FLASHING_PERIOD 250 | 201 | // #define GWIN_FLASHING_PERIOD 250 |
168 | 202 | ||
169 | //#define GWIN_NEED_CONSOLE FALSE | 203 | //#define GWIN_NEED_CONSOLE GFXOFF |
170 | // #define GWIN_CONSOLE_USE_HISTORY FALSE | 204 | // #define GWIN_CONSOLE_USE_HISTORY GFXOFF |
171 | // #define GWIN_CONSOLE_HISTORY_AVERAGING FALSE | 205 | // #define GWIN_CONSOLE_HISTORY_AVERAGING GFXOFF |
172 | // #define GWIN_CONSOLE_HISTORY_ATCREATE FALSE | 206 | // #define GWIN_CONSOLE_HISTORY_ATCREATE GFXOFF |
173 | // #define GWIN_CONSOLE_ESCSEQ FALSE | 207 | // #define GWIN_CONSOLE_ESCSEQ GFXOFF |
174 | // #define GWIN_CONSOLE_USE_BASESTREAM FALSE | 208 | // #define GWIN_CONSOLE_USE_BASESTREAM GFXOFF |
175 | // #define GWIN_CONSOLE_USE_FLOAT FALSE | 209 | // #define GWIN_CONSOLE_USE_FLOAT GFXOFF |
176 | //#define GWIN_NEED_GRAPH FALSE | 210 | //#define GWIN_NEED_GRAPH GFXOFF |
177 | //#define GWIN_NEED_GL3D FALSE | 211 | //#define GWIN_NEED_GL3D GFXOFF |
178 | 212 | ||
179 | //#define GWIN_NEED_WIDGET FALSE | 213 | //#define GWIN_NEED_WIDGET GFXOFF |
180 | //#define GWIN_FOCUS_HIGHLIGHT_WIDTH 1 | 214 | //#define GWIN_FOCUS_HIGHLIGHT_WIDTH 1 |
181 | // #define GWIN_NEED_LABEL FALSE | 215 | // #define GWIN_NEED_LABEL GFXOFF |
182 | // #define GWIN_LABEL_ATTRIBUTE FALSE | 216 | // #define GWIN_LABEL_ATTRIBUTE GFXOFF |
183 | // #define GWIN_NEED_BUTTON FALSE | 217 | // #define GWIN_NEED_BUTTON GFXOFF |
184 | // #define GWIN_BUTTON_LAZY_RELEASE FALSE | 218 | // #define GWIN_BUTTON_LAZY_RELEASE GFXOFF |
185 | // #define GWIN_NEED_SLIDER FALSE | 219 | // #define GWIN_NEED_SLIDER GFXOFF |
186 | // #define GWIN_SLIDER_NOSNAP FALSE | 220 | // #define GWIN_SLIDER_NOSNAP GFXOFF |
187 | // #define GWIN_SLIDER_DEAD_BAND 5 | 221 | // #define GWIN_SLIDER_DEAD_BAND 5 |
188 | // #define GWIN_SLIDER_TOGGLE_INC 20 | 222 | // #define GWIN_SLIDER_TOGGLE_INC 20 |
189 | // #define GWIN_NEED_CHECKBOX FALSE | 223 | // #define GWIN_NEED_CHECKBOX GFXOFF |
190 | // #define GWIN_NEED_IMAGE FALSE | 224 | // #define GWIN_NEED_IMAGE GFXOFF |
191 | // #define GWIN_NEED_IMAGE_ANIMATION FALSE | 225 | // #define GWIN_NEED_IMAGE_ANIMATION GFXOFF |
192 | // #define GWIN_NEED_RADIO FALSE | 226 | // #define GWIN_NEED_RADIO GFXOFF |
193 | // #define GWIN_NEED_LIST FALSE | 227 | // #define GWIN_NEED_LIST GFXOFF |
194 | // #define GWIN_NEED_LIST_IMAGES FALSE | 228 | // #define GWIN_NEED_LIST_IMAGES GFXOFF |
195 | // #define GWIN_NEED_PROGRESSBAR FALSE | 229 | // #define GWIN_NEED_PROGRESSBAR GFXOFF |
196 | // #define GWIN_PROGRESSBAR_AUTO FALSE | 230 | // #define GWIN_PROGRESSBAR_AUTO GFXOFF |
197 | // #define GWIN_NEED_KEYBOARD FALSE | 231 | // #define GWIN_NEED_KEYBOARD GFXOFF |
198 | // #define GWIN_KEYBOARD_DEFAULT_LAYOUT VirtualKeyboard_English1 | 232 | // #define GWIN_KEYBOARD_DEFAULT_LAYOUT VirtualKeyboard_English1 |
199 | // #define GWIN_NEED_KEYBOARD_ENGLISH1 TRUE | 233 | // #define GWIN_NEED_KEYBOARD_ENGLISH1 GFXON |
200 | // #define GWIN_NEED_TEXTEDIT FALSE | 234 | // #define GWIN_NEED_TEXTEDIT GFXOFF |
201 | // #define GWIN_FLAT_STYLING FALSE | 235 | // #define GWIN_FLAT_STYLING GFXOFF |
202 | // #define GWIN_WIDGET_TAGS FALSE | 236 | // #define GWIN_WIDGET_TAGS GFXOFF |
203 | 237 | ||
204 | //#define GWIN_NEED_CONTAINERS FALSE | 238 | //#define GWIN_NEED_CONTAINERS GFXOFF |
205 | // #define GWIN_NEED_CONTAINER FALSE | 239 | // #define GWIN_NEED_CONTAINER GFXOFF |
206 | // #define GWIN_NEED_FRAME FALSE | 240 | // #define GWIN_NEED_FRAME GFXOFF |
207 | // #define GWIN_NEED_TABSET FALSE | 241 | // #define GWIN_NEED_TABSET GFXOFF |
208 | // #define GWIN_TABSET_TABHEIGHT 18 | 242 | // #define GWIN_TABSET_TABHEIGHT 18 |
209 | 243 | ||
210 | /////////////////////////////////////////////////////////////////////////// | 244 | /////////////////////////////////////////////////////////////////////////// |
245 | // GTRANS // | ||
246 | /////////////////////////////////////////////////////////////////////////// | ||
247 | //#define GFX_USE_GTRANS GFXOFF | ||
248 | |||
249 | /////////////////////////////////////////////////////////////////////////// | ||
211 | // GEVENT // | 250 | // GEVENT // |
212 | /////////////////////////////////////////////////////////////////////////// | 251 | /////////////////////////////////////////////////////////////////////////// |
213 | #define GFX_USE_GEVENT TRUE | 252 | #define GFX_USE_GEVENT GFXON |
214 | 253 | ||
215 | //#define GEVENT_ASSERT_NO_RESOURCE FALSE | 254 | //#define GEVENT_ASSERT_NO_RESOURCE GFXOFF |
216 | //#define GEVENT_MAXIMUM_SIZE 32 | 255 | //#define GEVENT_MAXIMUM_SIZE 32 |
217 | //#define GEVENT_MAX_SOURCE_LISTENERS 32 | 256 | //#define GEVENT_MAX_SOURCE_LISTENERS 32 |
218 | 257 | ||
219 | /////////////////////////////////////////////////////////////////////////// | 258 | /////////////////////////////////////////////////////////////////////////// |
220 | // GTIMER // | 259 | // GTIMER // |
221 | /////////////////////////////////////////////////////////////////////////// | 260 | /////////////////////////////////////////////////////////////////////////// |
222 | #define GFX_USE_GTIMER FALSE | 261 | #define GFX_USE_GTIMER GFXOFF |
223 | 262 | ||
224 | //#define GTIMER_THREAD_PRIORITY HIGH_PRIORITY | 263 | //#define GTIMER_THREAD_PRIORITY gThreadpriorityHigh |
225 | //#define GTIMER_THREAD_WORKAREA_SIZE 2048 | 264 | //#define GTIMER_THREAD_WORKAREA_SIZE 2048 |
226 | 265 | ||
227 | /////////////////////////////////////////////////////////////////////////// | 266 | /////////////////////////////////////////////////////////////////////////// |
228 | // GQUEUE // | 267 | // GQUEUE // |
229 | /////////////////////////////////////////////////////////////////////////// | 268 | /////////////////////////////////////////////////////////////////////////// |
230 | #define GFX_USE_GQUEUE FALSE | 269 | #define GFX_USE_GQUEUE GFXOFF |
231 | 270 | ||
232 | //#define GQUEUE_NEED_ASYNC FALSE | 271 | //#define GQUEUE_NEED_ASYNC GFXOFF |
233 | //#define GQUEUE_NEED_GSYNC FALSE | 272 | //#define GQUEUE_NEED_GSYNC GFXOFF |
234 | //#define GQUEUE_NEED_FSYNC FALSE | 273 | //#define GQUEUE_NEED_FSYNC GFXOFF |
235 | //#define GQUEUE_NEED_BUFFERS FALSE | 274 | //#define GQUEUE_NEED_BUFFERS GFXOFF |
236 | 275 | ||
237 | /////////////////////////////////////////////////////////////////////////// | 276 | /////////////////////////////////////////////////////////////////////////// |
238 | // GINPUT // | 277 | // GINPUT // |
239 | /////////////////////////////////////////////////////////////////////////// | 278 | /////////////////////////////////////////////////////////////////////////// |
240 | #define GFX_USE_GINPUT FALSE | 279 | #define GFX_USE_GINPUT GFXOFF |
241 | 280 | ||
242 | //#define GINPUT_NEED_MOUSE FALSE | 281 | //#define GINPUT_NEED_MOUSE GFXOFF |
243 | // #define GINPUT_TOUCH_STARTRAW FALSE | 282 | // #define GINPUT_TOUCH_STARTRAW GFXOFF |
244 | // #define GINPUT_TOUCH_NOTOUCH FALSE | 283 | // #define GINPUT_TOUCH_NOTOUCH GFXOFF |
245 | // #define GINPUT_TOUCH_NOCALIBRATE FALSE | 284 | // #define GINPUT_TOUCH_NOCALIBRATE GFXOFF |
246 | // #define GINPUT_TOUCH_NOCALIBRATE_GUI FALSE | 285 | // #define GINPUT_TOUCH_NOCALIBRATE_GUI GFXOFF |
247 | // #define GINPUT_MOUSE_POLL_PERIOD 25 | 286 | // #define GINPUT_MOUSE_POLL_PERIOD 25 |
248 | // #define GINPUT_MOUSE_CLICK_TIME 300 | 287 | // #define GINPUT_MOUSE_CLICK_TIME 300 |
249 | // #define GINPUT_TOUCH_CXTCLICK_TIME 700 | 288 | // #define GINPUT_TOUCH_CXTCLICK_TIME 700 |
250 | // #define GINPUT_TOUCH_USER_CALIBRATION_LOAD FALSE | 289 | // #define GINPUT_TOUCH_USER_CALIBRATION_LOAD GFXOFF |
251 | // #define GINPUT_TOUCH_USER_CALIBRATION_SAVE FALSE | 290 | // #define GINPUT_TOUCH_USER_CALIBRATION_SAVE GFXOFF |
252 | // #define GMOUSE_DRIVER_LIST GMOUSEVMT_Win32, GMOUSEVMT_Win32 | 291 | // #define GMOUSE_DRIVER_LIST GMOUSEVMT_Win32, GMOUSEVMT_Win32 |
253 | //#define GINPUT_NEED_KEYBOARD FALSE | 292 | // #define GINPUT_TOUCH_CALIBRATION_FONT1 "* Double" |
293 | // #define GINPUT_TOUCH_CALIBRATION_FONT2 "* Narrow" | ||
294 | // #define GINPUT_TOUCH_CALIBRATION_TITLE "Calibration" | ||
295 | // #define GINPUT_TOUCH_CALIBRATION_ERROR "Calibration Failed!" | ||
296 | //#define GINPUT_NEED_KEYBOARD GFXOFF | ||
254 | // #define GINPUT_KEYBOARD_POLL_PERIOD 200 | 297 | // #define GINPUT_KEYBOARD_POLL_PERIOD 200 |
255 | // #define GKEYBOARD_DRIVER_LIST GKEYBOARDVMT_Win32, GKEYBOARDVMT_Win32 | 298 | // #define GKEYBOARD_DRIVER_LIST GKEYBOARDVMT_Win32, GKEYBOARDVMT_Win32 |
256 | // #define GKEYBOARD_LAYOUT_OFF FALSE | 299 | // #define GKEYBOARD_LAYOUT_OFF GFXOFF |
257 | // #define GKEYBOARD_LAYOUT_SCANCODE2_US FALSE | 300 | // #define GKEYBOARD_LAYOUT_SCANCODE2_US GFXOFF |
258 | //#define GINPUT_NEED_TOGGLE FALSE | 301 | //#define GINPUT_NEED_TOGGLE GFXOFF |
259 | //#define GINPUT_NEED_DIAL FALSE | 302 | //#define GINPUT_NEED_DIAL GFXOFF |
260 | 303 | ||
261 | /////////////////////////////////////////////////////////////////////////// | 304 | /////////////////////////////////////////////////////////////////////////// |
262 | // GFILE // | 305 | // GFILE // |
263 | /////////////////////////////////////////////////////////////////////////// | 306 | /////////////////////////////////////////////////////////////////////////// |
264 | #define GFX_USE_GFILE FALSE | 307 | #define GFX_USE_GFILE GFXOFF |
265 | 308 | ||
266 | //#define GFILE_NEED_PRINTG FALSE | 309 | //#define GFILE_NEED_PRINTG GFXOFF |
267 | //#define GFILE_NEED_SCANG FALSE | 310 | //#define GFILE_NEED_SCANG GFXOFF |
268 | //#define GFILE_NEED_STRINGS FALSE | 311 | //#define GFILE_NEED_STRINGS GFXOFF |
269 | //#define GFILE_NEED_FILELISTS FALSE | 312 | //#define GFILE_NEED_FILELISTS GFXOFF |
270 | //#define GFILE_NEED_STDIO FALSE | 313 | //#define GFILE_NEED_STDIO GFXOFF |
271 | //#define GFILE_NEED_NOAUTOMOUNT FALSE | 314 | //#define GFILE_NEED_NOAUTOMOUNT GFXOFF |
272 | //#define GFILE_NEED_NOAUTOSYNC FALSE | 315 | //#define GFILE_NEED_NOAUTOSYNC GFXOFF |
273 | 316 | ||
274 | //#define GFILE_NEED_MEMFS FALSE | 317 | //#define GFILE_NEED_MEMFS GFXOFF |
275 | //#define GFILE_NEED_ROMFS FALSE | 318 | //#define GFILE_NEED_ROMFS GFXOFF |
276 | //#define GFILE_NEED_RAMFS FALSE | 319 | //#define GFILE_NEED_RAMFS GFXOFF |
277 | //#define GFILE_NEED_FATFS FALSE | 320 | //#define GFILE_NEED_FATFS GFXOFF |
278 | //#define GFILE_NEED_NATIVEFS FALSE | 321 | //#define GFILE_NEED_NATIVEFS GFXOFF |
279 | //#define GFILE_NEED_CHBIOSFS FALSE | 322 | //#define GFILE_NEED_CHBIOSFS GFXOFF |
280 | 323 | //#define GFILE_NEED_USERFS GFXOFF | |
281 | //#define GFILE_ALLOW_FLOATS FALSE | 324 | |
282 | //#define GFILE_ALLOW_DEVICESPECIFIC FALSE | 325 | //#define GFILE_ALLOW_FLOATS GFXOFF |
326 | //#define GFILE_ALLOW_DEVICESPECIFIC GFXOFF | ||
283 | //#define GFILE_MAX_GFILES 3 | 327 | //#define GFILE_MAX_GFILES 3 |
284 | 328 | ||
285 | /////////////////////////////////////////////////////////////////////////// | 329 | /////////////////////////////////////////////////////////////////////////// |
286 | // GADC // | 330 | // GADC // |
287 | /////////////////////////////////////////////////////////////////////////// | 331 | /////////////////////////////////////////////////////////////////////////// |
288 | #define GFX_USE_GADC FALSE | 332 | #define GFX_USE_GADC GFXOFF |
289 | 333 | // #define GADC_MAX_LOWSPEED_DEVICES 4 | |
290 | //#define GADC_MAX_LOWSPEED_DEVICES 4 | ||
291 | 334 | ||
292 | /////////////////////////////////////////////////////////////////////////// | 335 | /////////////////////////////////////////////////////////////////////////// |
293 | // GAUDIO // | 336 | // GAUDIO // |
294 | /////////////////////////////////////////////////////////////////////////// | 337 | /////////////////////////////////////////////////////////////////////////// |
295 | #define GFX_USE_GAUDIO FALSE | 338 | #define GFX_USE_GAUDIO GFXOFF |
296 | // There seems to be a bug in the ugfx code, the wrong define is used | 339 | // #define GAUDIO_NEED_PLAY GFXOFF |
297 | // So define it in order to avoid warnings | 340 | // #define GAUDIO_NEED_RECORD GFXOFF |
298 | #define GFX_USE_GAUDIN GFX_USE_GAUDIO | ||
299 | // #define GAUDIO_NEED_PLAY FALSE | ||
300 | // #define GAUDIO_NEED_RECORD FALSE | ||
301 | 341 | ||
302 | /////////////////////////////////////////////////////////////////////////// | 342 | /////////////////////////////////////////////////////////////////////////// |
303 | // GMISC // | 343 | // GMISC // |
304 | /////////////////////////////////////////////////////////////////////////// | 344 | /////////////////////////////////////////////////////////////////////////// |
305 | #define GFX_USE_GMISC TRUE | 345 | #define GFX_USE_GMISC GFXON |
306 | 346 | ||
307 | //#define GMISC_NEED_ARRAYOPS FALSE | 347 | //#define GMISC_NEED_ARRAYOPS GFXOFF |
308 | //#define GMISC_NEED_FASTTRIG FALSE | 348 | //#define GMISC_NEED_FASTTRIG GFXOFF |
309 | //#define GMISC_NEED_FIXEDTRIG FALSE | 349 | //#define GMISC_NEED_FIXEDTRIG GFXOFF |
310 | //#define GMISC_NEED_INVSQRT FALSE | 350 | //#define GMISC_NEED_INVSQRT GFXOFF |
311 | // #define GMISC_INVSQRT_MIXED_ENDIAN FALSE | 351 | // #define GMISC_INVSQRT_MIXED_ENDIAN GFXOFF |
312 | // #define GMISC_INVSQRT_REAL_SLOW FALSE | 352 | // #define GMISC_INVSQRT_REAL_SLOW GFXOFF |
313 | #define GMISC_NEED_MATRIXFLOAT2D TRUE | 353 | #define GMISC_NEED_MATRIXFLOAT2D GFXON |
314 | #define GMISC_NEED_MATRIXFIXED2D FALSE | 354 | #define GMISC_NEED_MATRIXFIXED2D GFXOFF |
355 | //#define GMISC_NEED_HITTEST_POLY GFXOFF | ||
315 | 356 | ||
316 | #endif /* COMMON_GFXCONF_H */ | 357 | #endif /* COMMON_GFXCONF_H */ |
diff --git a/quantum/visualizer/visualizer.c b/quantum/visualizer/visualizer.c index 3f182e74d..9e9cb6d41 100644 --- a/quantum/visualizer/visualizer.c +++ b/quantum/visualizer/visualizer.c | |||
@@ -352,7 +352,7 @@ static DECLARE_THREAD_FUNCTION(visualizerThread, arg) { | |||
352 | 352 | ||
353 | // On windows the system ticks is the same as milliseconds anyway | 353 | // On windows the system ticks is the same as milliseconds anyway |
354 | if (sleep_time != TIME_INFINITE) { | 354 | if (sleep_time != TIME_INFINITE) { |
355 | sleep_time = ST2MS(sleep_time); | 355 | sleep_time = TIME_I2MS(sleep_time); |
356 | } | 356 | } |
357 | #endif | 357 | #endif |
358 | geventEventWait(&event_listener, sleep_time); | 358 | geventEventWait(&event_listener, sleep_time); |
@@ -400,7 +400,7 @@ void update_status(bool changed) { | |||
400 | static systime_t last_update = 0; | 400 | static systime_t last_update = 0; |
401 | systime_t current_update = chVTGetSystemTimeX(); | 401 | systime_t current_update = chVTGetSystemTimeX(); |
402 | systime_t delta = current_update - last_update; | 402 | systime_t delta = current_update - last_update; |
403 | if (changed || delta > MS2ST(10)) { | 403 | if (changed || delta > TIME_MS2I(10)) { |
404 | last_update = current_update; | 404 | last_update = current_update; |
405 | visualizer_keyboard_status_t* r = begin_write_current_status(); | 405 | visualizer_keyboard_status_t* r = begin_write_current_status(); |
406 | *r = current_status; | 406 | *r = current_status; |
diff --git a/quantum/visualizer/visualizer.h b/quantum/visualizer/visualizer.h index 7ca6837ce..488d130de 100644 --- a/quantum/visualizer/visualizer.h +++ b/quantum/visualizer/visualizer.h | |||
@@ -97,8 +97,8 @@ typedef struct visualizer_state_t { | |||
97 | uint32_t current_lcd_color; | 97 | uint32_t current_lcd_color; |
98 | uint32_t prev_lcd_color; | 98 | uint32_t prev_lcd_color; |
99 | #ifdef LCD_ENABLE | 99 | #ifdef LCD_ENABLE |
100 | font_t font_fixed5x8; | 100 | gFont font_fixed5x8; |
101 | font_t font_dejavusansbold12; | 101 | gFont font_dejavusansbold12; |
102 | #endif | 102 | #endif |
103 | } visualizer_state_t; | 103 | } visualizer_state_t; |
104 | 104 | ||