Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

Avoid collisions with X_* send string constants

Browse source
This commit is contained in:
Konstantin Đorđević 2019-02-12 00:18:52 +01:00
parent ddb0f39ebf
commit 7b11d740ea
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
users/konstantin/unicode.c
View file

@ -2,6 +2,6 @@
#ifdef UNICODEMAP_ENABLE #ifdef UNICODEMAP_ENABLE
const uint32_t PROGMEM unicode_map[] = { const uint32_t PROGMEM unicode_map[] = {
FOREACH_UNICODE(X_ENTRY) FOREACH_UNICODE(UCM_ENTRY)
}; };
#endif #endif

10
users/konstantin/unicode.h
View file

@ -13,9 +13,9 @@
#define UC_KEYCODE(name, code) name = UC(code), #define UC_KEYCODE(name, code) name = UC(code),
#define X_NAME(name, code) X_ ## name, #define UCM_NAME(name, code) UCM_ ## name,
#define X_ENTRY(name, code) [X_ ## name] = code, #define UCM_ENTRY(name, code) [UCM_ ## name] = code,
#define X_KEYCODE(name, code) name = X(X_ ## name), #define UCM_KEYCODE(name, code) name = X(UCM_ ## name),
#if defined(UNICODE_ENABLE) #if defined(UNICODE_ENABLE)
enum unicode_keycodes { enum unicode_keycodes {
@ -23,12 +23,12 @@
}; };
#elif defined(UNICODEMAP_ENABLE) #elif defined(UNICODEMAP_ENABLE)
enum unicode_names { enum unicode_names {
FOREACH_UNICODE(X_NAME) FOREACH_UNICODE(UCM_NAME)
}; };
extern const uint32_t PROGMEM unicode_map[]; extern const uint32_t PROGMEM unicode_map[];
enum unicode_keycodes { enum unicode_keycodes {
FOREACH_UNICODE(X_KEYCODE) FOREACH_UNICODE(UCM_KEYCODE)
}; };
#endif #endif