tudattr
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add missing parentheses to some important macros (#4775) 

* Add missing parentheses to quantum_keycodes macros

* Add missing parentheses to progmem macros
master
Konstantin Đorđević 2019-01-09 00:08:17 +01:00 committed by Drashna Jaelre
parent 9eb7b7919f
commit 64c957d907
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
quantum/quantum_keycodes.h
View File

@ -489,10 +489,9 @@ enum quantum_keycodes {
#define SWIN(kc) SGUI(kc) #define SWIN(kc) SGUI(kc)
#define LCA(kc) (QK_LCTL | QK_LALT | (kc)) #define LCA(kc) (QK_LCTL | QK_LALT | (kc))
#define MOD_HYPR 0xf #define MOD_HYPR 0xF
#define MOD_MEH 0x7 #define MOD_MEH 0x7
// Aliases for shifted symbols // Aliases for shifted symbols
// Each key has a 4-letter code, and some have longer aliases too. // Each key has a 4-letter code, and some have longer aliases too.
// While the long aliases are descriptive, the 4-letter codes // While the long aliases are descriptive, the 4-letter codes
@ -601,7 +600,7 @@ enum quantum_keycodes {
#define RGB_M_T RGB_MODE_RGBTEST #define RGB_M_T RGB_MODE_RGBTEST
// L-ayer, T-ap - 256 keycode max, 16 layer max // L-ayer, T-ap - 256 keycode max, 16 layer max
#define LT(layer, kc) (QK_LAYER_TAP | ((layer & 0xF) << 8) | ((kc) & 0xFF)) #define LT(layer, kc) (QK_LAYER_TAP | (((layer) & 0xF) << 8) | ((kc) & 0xFF))
#define AG_SWAP MAGIC_SWAP_ALT_GUI #define AG_SWAP MAGIC_SWAP_ALT_GUI
#define AG_NORM MAGIC_UNSWAP_ALT_GUI #define AG_NORM MAGIC_UNSWAP_ALT_GUI
@ -615,28 +614,28 @@ enum quantum_keycodes {
// In fact, we changed it to assume ON_PRESS for sanity/simplicity. If needed, you can add your own // In fact, we changed it to assume ON_PRESS for sanity/simplicity. If needed, you can add your own
// keycode modeled after the old version, kept below for this. // keycode modeled after the old version, kept below for this.
/* #define TO(layer, when) (QK_TO | (when << 0x4) | (layer & 0xFF)) */ /* #define TO(layer, when) (QK_TO | (when << 0x4) | (layer & 0xFF)) */
#define TO(layer) (QK_TO | (ON_PRESS << 0x4) | (layer & 0xFF)) #define TO(layer) (QK_TO | (ON_PRESS << 0x4) | ((layer) & 0xFF))
// Momentary switch layer - 256 layer max // Momentary switch layer - 256 layer max
#define MO(layer) (QK_MOMENTARY | (layer & 0xFF)) #define MO(layer) (QK_MOMENTARY | ((layer) & 0xFF))
// Set default layer - 256 layer max // Set default layer - 256 layer max
#define DF(layer) (QK_DEF_LAYER | (layer & 0xFF)) #define DF(layer) (QK_DEF_LAYER | ((layer) & 0xFF))
// Toggle to layer - 256 layer max // Toggle to layer - 256 layer max
#define TG(layer) (QK_TOGGLE_LAYER | (layer & 0xFF)) #define TG(layer) (QK_TOGGLE_LAYER | ((layer) & 0xFF))
// One-shot layer - 256 layer max // One-shot layer - 256 layer max
#define OSL(layer) (QK_ONE_SHOT_LAYER | (layer & 0xFF)) #define OSL(layer) (QK_ONE_SHOT_LAYER | ((layer) & 0xFF))
// L-ayer M-od: Momentary switch layer with modifiers active - 16 layer max, left mods only // L-ayer M-od: Momentary switch layer with modifiers active - 16 layer max, left mods only
#define LM(layer, mod) (QK_LAYER_MOD | ((layer & 0xF) << 4) | ((mod) & 0xF)) #define LM(layer, mod) (QK_LAYER_MOD | (((layer) & 0xF) << 4) | ((mod) & 0xF))
// One-shot mod // One-shot mod
#define OSM(mod) (QK_ONE_SHOT_MOD | ((mod) & 0xFF)) #define OSM(mod) (QK_ONE_SHOT_MOD | ((mod) & 0xFF))
// Layer tap-toggle // Layer tap-toggle
#define TT(layer) (QK_LAYER_TAP_TOGGLE | (layer & 0xFF)) #define TT(layer) (QK_LAYER_TAP_TOGGLE | ((layer) & 0xFF))
// M-od, T-ap - 256 keycode max // M-od, T-ap - 256 keycode max
#define MT(mod, kc) (QK_MOD_TAP | (((mod) & 0x1F) << 8) | ((kc) & 0xFF)) #define MT(mod, kc) (QK_MOD_TAP | (((mod) & 0x1F) << 8) | ((kc) & 0xFF))

6
tmk_core/common/progmem.h
View File

@ -5,9 +5,9 @@
# include <avr/pgmspace.h> # include <avr/pgmspace.h>
#else #else
# define PROGMEM # define PROGMEM
# define pgm_read_byte(p) *((unsigned char*)p) # define pgm_read_byte(p) *((unsigned char*)(p))
# define pgm_read_word(p) *((uint16_t*)p) # define pgm_read_word(p) *((uint16_t*)(p))
# define pgm_read_dword(p) *((uint32_t*)p) # define pgm_read_dword(p) *((uint32_t*)(p))
#endif #endif
#endif #endif