mirror of
https://github.com/Keychron/qmk_firmware.git
synced 2024-12-24 02:05:01 +06:00
Avoid collisions with X_* send string constants
This commit is contained in:
parent
ddb0f39ebf
commit
7b11d740ea
@ -2,6 +2,6 @@
|
||||
|
||||
#ifdef UNICODEMAP_ENABLE
|
||||
const uint32_t PROGMEM unicode_map[] = {
|
||||
FOREACH_UNICODE(X_ENTRY)
|
||||
FOREACH_UNICODE(UCM_ENTRY)
|
||||
};
|
||||
#endif
|
||||
|
@ -13,9 +13,9 @@
|
||||
|
||||
#define UC_KEYCODE(name, code) name = UC(code),
|
||||
|
||||
#define X_NAME(name, code) X_ ## name,
|
||||
#define X_ENTRY(name, code) [X_ ## name] = code,
|
||||
#define X_KEYCODE(name, code) name = X(X_ ## name),
|
||||
#define UCM_NAME(name, code) UCM_ ## name,
|
||||
#define UCM_ENTRY(name, code) [UCM_ ## name] = code,
|
||||
#define UCM_KEYCODE(name, code) name = X(UCM_ ## name),
|
||||
|
||||
#if defined(UNICODE_ENABLE)
|
||||
enum unicode_keycodes {
|
||||
@ -23,12 +23,12 @@
|
||||
};
|
||||
#elif defined(UNICODEMAP_ENABLE)
|
||||
enum unicode_names {
|
||||
FOREACH_UNICODE(X_NAME)
|
||||
FOREACH_UNICODE(UCM_NAME)
|
||||
};
|
||||
|
||||
extern const uint32_t PROGMEM unicode_map[];
|
||||
|
||||
enum unicode_keycodes {
|
||||
FOREACH_UNICODE(X_KEYCODE)
|
||||
FOREACH_UNICODE(UCM_KEYCODE)
|
||||
};
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user