diff options
Diffstat (limited to 'quantum')
| -rw-r--r-- | quantum/api/api_sysex.c | 60 | ||||
| -rw-r--r-- | quantum/config_common.h | 2 | ||||
| -rw-r--r-- | quantum/keymap.h | 313 | ||||
| -rw-r--r-- | quantum/keymap_common.c | 16 | ||||
| -rw-r--r-- | quantum/quantum.c | 2 | ||||
| -rw-r--r-- | quantum/quantum_keycodes.h | 313 | ||||
| -rw-r--r-- | quantum/rgblight.c | 1 | ||||
| -rw-r--r-- | quantum/rgblight.h | 2 |
8 files changed, 381 insertions, 328 deletions
diff --git a/quantum/api/api_sysex.c b/quantum/api/api_sysex.c index a4a554e76..868f854b9 100644 --- a/quantum/api/api_sysex.c +++ b/quantum/api/api_sysex.c | |||
| @@ -1,4 +1,6 @@ | |||
| 1 | #include "api_sysex.h" | 1 | #include "api_sysex.h" |
| 2 | #include "sysex_tools.h" | ||
| 3 | #include "print.h" | ||
| 2 | 4 | ||
| 3 | void send_bytes_sysex(uint8_t message_type, uint8_t data_type, uint8_t * bytes, uint16_t length) { | 5 | void send_bytes_sysex(uint8_t message_type, uint8_t data_type, uint8_t * bytes, uint16_t length) { |
| 4 | // SEND_STRING("\nTX: "); | 6 | // SEND_STRING("\nTX: "); |
| @@ -6,24 +8,50 @@ void send_bytes_sysex(uint8_t message_type, uint8_t data_type, uint8_t * bytes, | |||
| 6 | // send_byte(bytes[i]); | 8 | // send_byte(bytes[i]); |
| 7 | // SEND_STRING(" "); | 9 | // SEND_STRING(" "); |
| 8 | // } | 10 | // } |
| 9 | uint8_t * precode = malloc(sizeof(uint8_t) * (length + 2)); | 11 | if (length > API_SYSEX_MAX_SIZE) { |
| 10 | precode[0] = message_type; | 12 | xprintf("Sysex msg too big %d %d %d", message_type, data_type, length); |
| 11 | precode[1] = data_type; | 13 | return; |
| 12 | memcpy(precode + 2, bytes, length); | 14 | } |
| 13 | uint8_t * encoded = malloc(sizeof(uint8_t) * (sysex_encoded_length(length + 2))); | 15 | |
| 14 | uint16_t encoded_length = sysex_encode(encoded, precode, length + 2); | 16 | |
| 15 | uint8_t * array = malloc(sizeof(uint8_t) * (encoded_length + 5)); | 17 | // The buffer size required is calculated as the following |
| 16 | array[0] = 0xF0; | 18 | // API_SYSEX_MAX_SIZE is the maximum length |
| 17 | array[1] = 0x00; | 19 | // In addition to that we have a two byte message header consisting of the message_type and data_type |
| 18 | array[2] = 0x00; | 20 | // This has to be encoded with an additional overhead of one byte for every starting 7 bytes |
| 19 | array[3] = 0x00; | 21 | // We just add one extra byte in case it's not divisible by 7 |
| 20 | array[encoded_length + 4] = 0xF7; | 22 | // Then we have an unencoded header consisting of 4 bytes |
| 21 | memcpy(array + 4, encoded, encoded_length); | 23 | // Plus a one byte terminator |
| 22 | midi_send_array(&midi_device, encoded_length + 5, array); | 24 | const unsigned message_header = 2; |
| 25 | const unsigned unencoded_message = API_SYSEX_MAX_SIZE + message_header; | ||
| 26 | const unsigned encoding_overhead = unencoded_message / 7 + 1; | ||
| 27 | const unsigned encoded_size = unencoded_message + encoding_overhead; | ||
| 28 | const unsigned unencoded_header = 4; | ||
| 29 | const unsigned terminator = 1; | ||
| 30 | const unsigned buffer_size = encoded_size + unencoded_header + terminator; | ||
| 31 | uint8_t buffer[encoded_size + unencoded_header + terminator]; | ||
| 32 | // The unencoded header | ||
| 33 | buffer[0] = 0xF0; | ||
| 34 | buffer[1] = 0x00; | ||
| 35 | buffer[2] = 0x00; | ||
| 36 | buffer[3] = 0x00; | ||
| 37 | |||
| 38 | // We copy the message to the end of the array, this way we can do an inplace encoding, using the same | ||
| 39 | // buffer for both input and output | ||
| 40 | const unsigned message_size = length + message_header; | ||
| 41 | uint8_t* unencoded_start = buffer + buffer_size - message_size; | ||
| 42 | uint8_t* ptr = unencoded_start; | ||
| 43 | *(ptr++) = message_type; | ||
| 44 | *(ptr++) = data_type; | ||
| 45 | memcpy(ptr, bytes, length); | ||
| 46 | |||
| 47 | unsigned encoded_length = sysex_encode(buffer + unencoded_header, unencoded_start, message_size); | ||
| 48 | unsigned final_size = unencoded_header + encoded_length + terminator; | ||
| 49 | buffer[final_size - 1] = 0xF7; | ||
| 50 | midi_send_array(&midi_device, final_size, buffer); | ||
| 23 | 51 | ||
| 24 | // SEND_STRING("\nTD: "); | 52 | // SEND_STRING("\nTD: "); |
| 25 | // for (uint8_t i = 0; i < encoded_length + 5; i++) { | 53 | // for (uint8_t i = 0; i < encoded_length + 5; i++) { |
| 26 | // send_byte(array[i]); | 54 | // send_byte(buffer[i]); |
| 27 | // SEND_STRING(" "); | 55 | // SEND_STRING(" "); |
| 28 | // } | 56 | // } |
| 29 | } \ No newline at end of file | 57 | } |
diff --git a/quantum/config_common.h b/quantum/config_common.h index 17c11faeb..4bdb2065d 100644 --- a/quantum/config_common.h +++ b/quantum/config_common.h | |||
| @@ -80,4 +80,6 @@ | |||
| 80 | # endif | 80 | # endif |
| 81 | #endif | 81 | #endif |
| 82 | 82 | ||
| 83 | #define API_SYSEX_MAX_SIZE 32 | ||
| 84 | |||
| 83 | #endif | 85 | #endif |
diff --git a/quantum/keymap.h b/quantum/keymap.h index ae56d16c7..c000d2da8 100644 --- a/quantum/keymap.h +++ b/quantum/keymap.h | |||
| @@ -38,317 +38,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 38 | #define RESET QK_RESET | 38 | #define RESET QK_RESET |
| 39 | #endif | 39 | #endif |
| 40 | 40 | ||
| 41 | /* translates key to keycode */ | 41 | #include "quantum_keycodes.h" |
| 42 | |||
| 43 | // translates key to keycode | ||
| 42 | uint16_t keymap_key_to_keycode(uint8_t layer, keypos_t key); | 44 | uint16_t keymap_key_to_keycode(uint8_t layer, keypos_t key); |
| 43 | 45 | ||
| 46 | // translates function id to action | ||
| 47 | uint16_t keymap_function_id_to_action( uint16_t function_id ); | ||
| 48 | |||
| 44 | extern const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS]; | 49 | extern const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS]; |
| 45 | extern const uint16_t fn_actions[]; | 50 | extern const uint16_t fn_actions[]; |
| 46 | 51 | ||
| 47 | enum quantum_keycodes { | ||
| 48 | // Ranges used in shortucuts - not to be used directly | ||
| 49 | QK_TMK = 0x0000, | ||
| 50 | QK_TMK_MAX = 0x00FF, | ||
| 51 | QK_MODS = 0x0100, | ||
| 52 | QK_LCTL = 0x0100, | ||
| 53 | QK_LSFT = 0x0200, | ||
| 54 | QK_LALT = 0x0400, | ||
| 55 | QK_LGUI = 0x0800, | ||
| 56 | QK_RCTL = 0x1100, | ||
| 57 | QK_RSFT = 0x1200, | ||
| 58 | QK_RALT = 0x1400, | ||
| 59 | QK_RGUI = 0x1800, | ||
| 60 | QK_MODS_MAX = 0x1FFF, | ||
| 61 | QK_FUNCTION = 0x2000, | ||
| 62 | QK_FUNCTION_MAX = 0x2FFF, | ||
| 63 | QK_MACRO = 0x3000, | ||
| 64 | QK_MACRO_MAX = 0x3FFF, | ||
| 65 | QK_LAYER_TAP = 0x4000, | ||
| 66 | QK_LAYER_TAP_MAX = 0x4FFF, | ||
| 67 | QK_TO = 0x5000, | ||
| 68 | QK_TO_MAX = 0x50FF, | ||
| 69 | QK_MOMENTARY = 0x5100, | ||
| 70 | QK_MOMENTARY_MAX = 0x51FF, | ||
| 71 | QK_DEF_LAYER = 0x5200, | ||
| 72 | QK_DEF_LAYER_MAX = 0x52FF, | ||
| 73 | QK_TOGGLE_LAYER = 0x5300, | ||
| 74 | QK_TOGGLE_LAYER_MAX = 0x53FF, | ||
| 75 | QK_ONE_SHOT_LAYER = 0x5400, | ||
| 76 | QK_ONE_SHOT_LAYER_MAX = 0x54FF, | ||
| 77 | QK_ONE_SHOT_MOD = 0x5500, | ||
| 78 | QK_ONE_SHOT_MOD_MAX = 0x55FF, | ||
| 79 | #ifndef DISABLE_CHORDING | ||
| 80 | QK_CHORDING = 0x5600, | ||
| 81 | QK_CHORDING_MAX = 0x56FF, | ||
| 82 | #endif | ||
| 83 | QK_MOD_TAP = 0x6000, | ||
| 84 | QK_MOD_TAP_MAX = 0x6FFF, | ||
| 85 | QK_TAP_DANCE = 0x7100, | ||
| 86 | QK_TAP_DANCE_MAX = 0x71FF, | ||
| 87 | #ifdef UNICODEMAP_ENABLE | ||
| 88 | QK_UNICODE_MAP = 0x7800, | ||
| 89 | QK_UNICODE_MAP_MAX = 0x7FFF, | ||
| 90 | #endif | ||
| 91 | #ifdef UNICODE_ENABLE | ||
| 92 | QK_UNICODE = 0x8000, | ||
| 93 | QK_UNICODE_MAX = 0xFFFF, | ||
| 94 | #endif | ||
| 95 | |||
| 96 | // Loose keycodes - to be used directly | ||
| 97 | |||
| 98 | RESET = 0x7000, | ||
| 99 | DEBUG, | ||
| 100 | MAGIC_SWAP_CONTROL_CAPSLOCK, | ||
| 101 | MAGIC_CAPSLOCK_TO_CONTROL, | ||
| 102 | MAGIC_SWAP_LALT_LGUI, | ||
| 103 | MAGIC_SWAP_RALT_RGUI, | ||
| 104 | MAGIC_NO_GUI, | ||
| 105 | MAGIC_SWAP_GRAVE_ESC, | ||
| 106 | MAGIC_SWAP_BACKSLASH_BACKSPACE, | ||
| 107 | MAGIC_HOST_NKRO, | ||
| 108 | MAGIC_SWAP_ALT_GUI, | ||
| 109 | MAGIC_UNSWAP_CONTROL_CAPSLOCK, | ||
| 110 | MAGIC_UNCAPSLOCK_TO_CONTROL, | ||
| 111 | MAGIC_UNSWAP_LALT_LGUI, | ||
| 112 | MAGIC_UNSWAP_RALT_RGUI, | ||
| 113 | MAGIC_UNNO_GUI, | ||
| 114 | MAGIC_UNSWAP_GRAVE_ESC, | ||
| 115 | MAGIC_UNSWAP_BACKSLASH_BACKSPACE, | ||
| 116 | MAGIC_UNHOST_NKRO, | ||
| 117 | MAGIC_UNSWAP_ALT_GUI, | ||
| 118 | MAGIC_TOGGLE_NKRO, | ||
| 119 | |||
| 120 | // Leader key | ||
| 121 | #ifndef DISABLE_LEADER | ||
| 122 | KC_LEAD, | ||
| 123 | #endif | ||
| 124 | |||
| 125 | // Audio on/off/toggle | ||
| 126 | AU_ON, | ||
| 127 | AU_OFF, | ||
| 128 | AU_TOG, | ||
| 129 | |||
| 130 | // Music mode on/off/toggle | ||
| 131 | MU_ON, | ||
| 132 | MU_OFF, | ||
| 133 | MU_TOG, | ||
| 134 | |||
| 135 | // Music voice iterate | ||
| 136 | MUV_IN, | ||
| 137 | MUV_DE, | ||
| 138 | |||
| 139 | // Midi mode on/off | ||
| 140 | MIDI_ON, | ||
| 141 | MIDI_OFF, | ||
| 142 | |||
| 143 | // Backlight functionality | ||
| 144 | BL_0, | ||
| 145 | BL_1, | ||
| 146 | BL_2, | ||
| 147 | BL_3, | ||
| 148 | BL_4, | ||
| 149 | BL_5, | ||
| 150 | BL_6, | ||
| 151 | BL_7, | ||
| 152 | BL_8, | ||
| 153 | BL_9, | ||
| 154 | BL_10, | ||
| 155 | BL_11, | ||
| 156 | BL_12, | ||
| 157 | BL_13, | ||
| 158 | BL_14, | ||
| 159 | BL_15, | ||
| 160 | BL_DEC, | ||
| 161 | BL_INC, | ||
| 162 | BL_TOGG, | ||
| 163 | BL_STEP, | ||
| 164 | |||
| 165 | // RGB functionality | ||
| 166 | RGB_TOG, | ||
| 167 | RGB_MOD, | ||
| 168 | RGB_HUI, | ||
| 169 | RGB_HUD, | ||
| 170 | RGB_SAI, | ||
| 171 | RGB_SAD, | ||
| 172 | RGB_VAI, | ||
| 173 | RGB_VAD, | ||
| 174 | |||
| 175 | // Left shift, open paren | ||
| 176 | KC_LSPO, | ||
| 177 | |||
| 178 | // Right shift, close paren | ||
| 179 | KC_RSPC, | ||
| 180 | |||
| 181 | // Printing | ||
| 182 | PRINT_ON, | ||
| 183 | PRINT_OFF, | ||
| 184 | |||
| 185 | // always leave at the end | ||
| 186 | SAFE_RANGE | ||
| 187 | }; | ||
| 188 | |||
| 189 | // Ability to use mods in layouts | ||
| 190 | #define LCTL(kc) (kc | QK_LCTL) | ||
| 191 | #define LSFT(kc) (kc | QK_LSFT) | ||
| 192 | #define LALT(kc) (kc | QK_LALT) | ||
| 193 | #define LGUI(kc) (kc | QK_LGUI) | ||
| 194 | #define RCTL(kc) (kc | QK_RCTL) | ||
| 195 | #define RSFT(kc) (kc | QK_RSFT) | ||
| 196 | #define RALT(kc) (kc | QK_RALT) | ||
| 197 | #define RGUI(kc) (kc | QK_RGUI) | ||
| 198 | |||
| 199 | #define HYPR(kc) (kc | QK_LCTL | QK_LSFT | QK_LALT | QK_LGUI) | ||
| 200 | #define MEH(kc) (kc | QK_LCTL | QK_LSFT | QK_LALT) | ||
| 201 | #define LCAG(kc) (kc | QK_LCTL | QK_LALT | QK_LGUI) | ||
| 202 | #define ALTG(kc) (kc | QK_RCTL | QK_RALT) | ||
| 203 | |||
| 204 | #define MOD_HYPR 0xf | ||
| 205 | #define MOD_MEH 0x7 | ||
| 206 | |||
| 207 | |||
| 208 | // Aliases for shifted symbols | ||
| 209 | // Each key has a 4-letter code, and some have longer aliases too. | ||
| 210 | // While the long aliases are descriptive, the 4-letter codes | ||
| 211 | // make for nicer grid layouts (everything lines up), and are | ||
| 212 | // the preferred style for Quantum. | ||
| 213 | #define KC_TILD LSFT(KC_GRV) // ~ | ||
| 214 | #define KC_TILDE KC_TILD | ||
| 215 | |||
| 216 | #define KC_EXLM LSFT(KC_1) // ! | ||
| 217 | #define KC_EXCLAIM KC_EXLM | ||
| 218 | |||
| 219 | #define KC_AT LSFT(KC_2) // @ | ||
| 220 | |||
| 221 | #define KC_HASH LSFT(KC_3) // # | ||
| 222 | |||
| 223 | #define KC_DLR LSFT(KC_4) // $ | ||
| 224 | #define KC_DOLLAR KC_DLR | ||
| 225 | |||
| 226 | #define KC_PERC LSFT(KC_5) // % | ||
| 227 | #define KC_PERCENT KC_PERC | ||
| 228 | |||
| 229 | #define KC_CIRC LSFT(KC_6) // ^ | ||
| 230 | #define KC_CIRCUMFLEX KC_CIRC | ||
| 231 | |||
| 232 | #define KC_AMPR LSFT(KC_7) // & | ||
| 233 | #define KC_AMPERSAND KC_AMPR | ||
| 234 | |||
| 235 | #define KC_ASTR LSFT(KC_8) // * | ||
| 236 | #define KC_ASTERISK KC_ASTR | ||
| 237 | |||
| 238 | #define KC_LPRN LSFT(KC_9) // ( | ||
| 239 | #define KC_LEFT_PAREN KC_LPRN | ||
| 240 | |||
| 241 | #define KC_RPRN LSFT(KC_0) // ) | ||
| 242 | #define KC_RIGHT_PAREN KC_RPRN | ||
| 243 | |||
| 244 | #define KC_UNDS LSFT(KC_MINS) // _ | ||
| 245 | #define KC_UNDERSCORE KC_UNDS | ||
| 246 | |||
| 247 | #define KC_PLUS LSFT(KC_EQL) // + | ||
| 248 | |||
| 249 | #define KC_LCBR LSFT(KC_LBRC) // { | ||
| 250 | #define KC_LEFT_CURLY_BRACE KC_LCBR | ||
| 251 | |||
| 252 | #define KC_RCBR LSFT(KC_RBRC) // } | ||
| 253 | #define KC_RIGHT_CURLY_BRACE KC_RCBR | ||
| 254 | |||
| 255 | #define KC_LABK LSFT(KC_COMM) // < | ||
| 256 | #define KC_LEFT_ANGLE_BRACKET KC_LABK | ||
| 257 | |||
| 258 | #define KC_RABK LSFT(KC_DOT) // > | ||
| 259 | #define KC_RIGHT_ANGLE_BRACKET KC_RABK | ||
| 260 | |||
| 261 | #define KC_COLN LSFT(KC_SCLN) // : | ||
| 262 | #define KC_COLON KC_COLN | ||
| 263 | |||
| 264 | #define KC_PIPE LSFT(KC_BSLS) // | | ||
| 265 | |||
| 266 | #define KC_LT LSFT(KC_COMM) // < | ||
| 267 | |||
| 268 | #define KC_GT LSFT(KC_DOT) // > | ||
| 269 | |||
| 270 | #define KC_QUES LSFT(KC_SLSH) // ? | ||
| 271 | #define KC_QUESTION KC_QUES | ||
| 272 | |||
| 273 | #define KC_DQT LSFT(KC_QUOT) // " | ||
| 274 | #define KC_DOUBLE_QUOTE KC_DQT | ||
| 275 | #define KC_DQUO KC_DQT | ||
| 276 | |||
| 277 | #define KC_DELT KC_DELETE // Del key (four letter code) | ||
| 278 | |||
| 279 | // Alias for function layers than expand past FN31 | ||
| 280 | #define FUNC(kc) (kc | QK_FUNCTION) | ||
| 281 | |||
| 282 | // Aliases | ||
| 283 | #define S(kc) LSFT(kc) | ||
| 284 | #define F(kc) FUNC(kc) | ||
| 285 | |||
| 286 | #define M(kc) (kc | QK_MACRO) | ||
| 287 | |||
| 288 | #define MACRODOWN(...) (record->event.pressed ? MACRO(__VA_ARGS__) : MACRO_NONE) | ||
| 289 | |||
| 290 | // L-ayer, T-ap - 256 keycode max, 16 layer max | ||
| 291 | #define LT(layer, kc) (kc | QK_LAYER_TAP | ((layer & 0xF) << 8)) | ||
| 292 | |||
| 293 | #define AG_SWAP MAGIC_SWAP_ALT_GUI | ||
| 294 | #define AG_NORM MAGIC_UNSWAP_ALT_GUI | ||
| 295 | |||
| 296 | #define BL_ON BL_9 | ||
| 297 | #define BL_OFF BL_0 | ||
| 298 | |||
| 299 | #define MI_ON MIDI_ON | ||
| 300 | #define MI_OFF MIDI_OFF | ||
| 301 | |||
| 302 | // GOTO layer - 16 layers max | ||
| 303 | // when: | ||
| 304 | // ON_PRESS = 1 | ||
| 305 | // ON_RELEASE = 2 | ||
| 306 | // Unless you have a good reason not to do so, prefer ON_PRESS (1) as your default. | ||
| 307 | // In fact, we changed it to assume ON_PRESS for sanity/simplicity. If needed, you can add your own | ||
| 308 | // keycode modeled after the old version, kept below for this. | ||
| 309 | /* #define TO(layer, when) (layer | QK_TO | (when << 0x4)) */ | ||
| 310 | #define TO(layer) (layer | QK_TO | (ON_PRESS << 0x4)) | ||
| 311 | |||
| 312 | // Momentary switch layer - 256 layer max | ||
| 313 | #define MO(layer) (layer | QK_MOMENTARY) | ||
| 314 | |||
| 315 | // Set default layer - 256 layer max | ||
| 316 | #define DF(layer) (layer | QK_DEF_LAYER) | ||
| 317 | |||
| 318 | // Toggle to layer - 256 layer max | ||
| 319 | #define TG(layer) (layer | QK_TOGGLE_LAYER) | ||
| 320 | |||
| 321 | // One-shot layer - 256 layer max | ||
| 322 | #define OSL(layer) (layer | QK_ONE_SHOT_LAYER) | ||
| 323 | |||
| 324 | // One-shot mod | ||
| 325 | #define OSM(mod) (mod | QK_ONE_SHOT_MOD) | ||
| 326 | |||
| 327 | // M-od, T-ap - 256 keycode max | ||
| 328 | #define MT(mod, kc) (kc | QK_MOD_TAP | ((mod & 0xF) << 8)) | ||
| 329 | #define CTL_T(kc) MT(MOD_LCTL, kc) | ||
| 330 | #define SFT_T(kc) MT(MOD_LSFT, kc) | ||
| 331 | #define ALT_T(kc) MT(MOD_LALT, kc) | ||
| 332 | #define GUI_T(kc) MT(MOD_LGUI, kc) | ||
| 333 | #define C_S_T(kc) MT((MOD_LCTL | MOD_LSFT), kc) // Control + Shift e.g. for gnome-terminal | ||
| 334 | #define MEH_T(kc) MT((MOD_LCTL | MOD_LSFT | MOD_LALT), kc) // Meh is a less hyper version of the Hyper key -- doesn't include Win or Cmd, so just alt+shift+ctrl | ||
| 335 | #define LCAG_T(kc) MT((MOD_LCTL | MOD_LALT | MOD_LGUI), kc) // Left control alt and gui | ||
| 336 | #define ALL_T(kc) MT((MOD_LCTL | MOD_LSFT | MOD_LALT | MOD_LGUI), kc) // see http://brettterpstra.com/2012/12/08/a-useful-caps-lock-key/ | ||
| 337 | |||
| 338 | // Dedicated keycode versions for Hyper and Meh, if you want to use them as standalone keys rather than mod-tap | ||
| 339 | #define KC_HYPR HYPR(KC_NO) | ||
| 340 | #define KC_MEH MEH(KC_NO) | ||
| 341 | |||
| 342 | #ifdef UNICODE_ENABLE | ||
| 343 | // For sending unicode codes. | ||
| 344 | // You may not send codes over 7FFF -- this supports most of UTF8. | ||
| 345 | // To have a key that sends out Œ, go UC(0x0152) | ||
| 346 | #define UNICODE(n) (n | QK_UNICODE) | ||
| 347 | #define UC(n) UNICODE(n) | ||
| 348 | #endif | ||
| 349 | |||
| 350 | #ifdef UNICODEMAP_ENABLE | ||
| 351 | #define X(n) (n | QK_UNICODE_MAP) | ||
| 352 | #endif | ||
| 353 | 52 | ||
| 354 | #endif | 53 | #endif |
diff --git a/quantum/keymap_common.c b/quantum/keymap_common.c index 833e5a8f8..eced3d2bb 100644 --- a/quantum/keymap_common.c +++ b/quantum/keymap_common.c | |||
| @@ -48,12 +48,10 @@ action_t action_for_key(uint8_t layer, keypos_t key) | |||
| 48 | 48 | ||
| 49 | action_t action; | 49 | action_t action; |
| 50 | uint8_t action_layer, when, mod; | 50 | uint8_t action_layer, when, mod; |
| 51 | // The arm-none-eabi compiler generates out of bounds warnings when using the fn_actions directly for some reason | ||
| 52 | const uint16_t* actions = fn_actions; | ||
| 53 | 51 | ||
| 54 | switch (keycode) { | 52 | switch (keycode) { |
| 55 | case KC_FN0 ... KC_FN31: | 53 | case KC_FN0 ... KC_FN31: |
| 56 | action.code = pgm_read_word(&actions[FN_INDEX(keycode)]); | 54 | action.code = keymap_function_id_to_action(FN_INDEX(keycode)); |
| 57 | break; | 55 | break; |
| 58 | case KC_A ... KC_EXSEL: | 56 | case KC_A ... KC_EXSEL: |
| 59 | case KC_LCTRL ... KC_RGUI: | 57 | case KC_LCTRL ... KC_RGUI: |
| @@ -79,7 +77,7 @@ action_t action_for_key(uint8_t layer, keypos_t key) | |||
| 79 | case QK_FUNCTION ... QK_FUNCTION_MAX: ; | 77 | case QK_FUNCTION ... QK_FUNCTION_MAX: ; |
| 80 | // Is a shortcut for function action_layer, pull last 12bits | 78 | // Is a shortcut for function action_layer, pull last 12bits |
| 81 | // This means we have 4,096 FN macros at our disposal | 79 | // This means we have 4,096 FN macros at our disposal |
| 82 | action.code = pgm_read_word(&actions[(int)keycode & 0xFFF]); | 80 | action.code = keymap_function_id_to_action( (int)keycode & 0xFFF ); |
| 83 | break; | 81 | break; |
| 84 | case QK_MACRO ... QK_MACRO_MAX: | 82 | case QK_MACRO ... QK_MACRO_MAX: |
| 85 | action.code = ACTION_MACRO(keycode & 0xFF); | 83 | action.code = ACTION_MACRO(keycode & 0xFF); |
| @@ -163,9 +161,17 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) | |||
| 163 | { | 161 | { |
| 164 | } | 162 | } |
| 165 | 163 | ||
| 166 | /* translates key to keycode */ | 164 | // translates key to keycode |
| 165 | __attribute__ ((weak)) | ||
| 167 | uint16_t keymap_key_to_keycode(uint8_t layer, keypos_t key) | 166 | uint16_t keymap_key_to_keycode(uint8_t layer, keypos_t key) |
| 168 | { | 167 | { |
| 169 | // Read entire word (16bits) | 168 | // Read entire word (16bits) |
| 170 | return pgm_read_word(&keymaps[(layer)][(key.row)][(key.col)]); | 169 | return pgm_read_word(&keymaps[(layer)][(key.row)][(key.col)]); |
| 171 | } | 170 | } |
| 171 | |||
| 172 | // translates function id to action | ||
| 173 | __attribute__ ((weak)) | ||
| 174 | uint16_t keymap_function_id_to_action( uint16_t function_id ) | ||
| 175 | { | ||
| 176 | return pgm_read_word(&fn_actions[function_id]); | ||
| 177 | } | ||
diff --git a/quantum/quantum.c b/quantum/quantum.c index f653564a6..63ffe2074 100644 --- a/quantum/quantum.c +++ b/quantum/quantum.c | |||
| @@ -21,6 +21,8 @@ static void do_code16 (uint16_t code, void (*f) (uint8_t)) { | |||
| 21 | if (code & QK_LGUI) | 21 | if (code & QK_LGUI) |
| 22 | f(KC_LGUI); | 22 | f(KC_LGUI); |
| 23 | 23 | ||
| 24 | if (code < QK_RMODS_MIN) return; | ||
| 25 | |||
| 24 | if (code & QK_RCTL) | 26 | if (code & QK_RCTL) |
| 25 | f(KC_RCTL); | 27 | f(KC_RCTL); |
| 26 | if (code & QK_RSFT) | 28 | if (code & QK_RSFT) |
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h new file mode 100644 index 000000000..5cd3c8e78 --- /dev/null +++ b/quantum/quantum_keycodes.h | |||
| @@ -0,0 +1,313 @@ | |||
| 1 | |||
| 2 | #ifndef QUANTUM_KEYCODES_H | ||
| 3 | #define QUANTUM_KEYCODES_H | ||
| 4 | |||
| 5 | enum quantum_keycodes { | ||
| 6 | // Ranges used in shortucuts - not to be used directly | ||
| 7 | QK_TMK = 0x0000, | ||
| 8 | QK_TMK_MAX = 0x00FF, | ||
| 9 | QK_MODS = 0x0100, | ||
| 10 | QK_LCTL = 0x0100, | ||
| 11 | QK_LSFT = 0x0200, | ||
| 12 | QK_LALT = 0x0400, | ||
| 13 | QK_LGUI = 0x0800, | ||
| 14 | QK_RMODS_MIN = 0x1000, | ||
| 15 | QK_RCTL = 0x1100, | ||
| 16 | QK_RSFT = 0x1200, | ||
| 17 | QK_RALT = 0x1400, | ||
| 18 | QK_RGUI = 0x1800, | ||
| 19 | QK_MODS_MAX = 0x1FFF, | ||
| 20 | QK_FUNCTION = 0x2000, | ||
| 21 | QK_FUNCTION_MAX = 0x2FFF, | ||
| 22 | QK_MACRO = 0x3000, | ||
| 23 | QK_MACRO_MAX = 0x3FFF, | ||
| 24 | QK_LAYER_TAP = 0x4000, | ||
| 25 | QK_LAYER_TAP_MAX = 0x4FFF, | ||
| 26 | QK_TO = 0x5000, | ||
| 27 | QK_TO_MAX = 0x50FF, | ||
| 28 | QK_MOMENTARY = 0x5100, | ||
| 29 | QK_MOMENTARY_MAX = 0x51FF, | ||
| 30 | QK_DEF_LAYER = 0x5200, | ||
| 31 | QK_DEF_LAYER_MAX = 0x52FF, | ||
| 32 | QK_TOGGLE_LAYER = 0x5300, | ||
| 33 | QK_TOGGLE_LAYER_MAX = 0x53FF, | ||
| 34 | QK_ONE_SHOT_LAYER = 0x5400, | ||
| 35 | QK_ONE_SHOT_LAYER_MAX = 0x54FF, | ||
| 36 | QK_ONE_SHOT_MOD = 0x5500, | ||
| 37 | QK_ONE_SHOT_MOD_MAX = 0x55FF, | ||
| 38 | #ifndef DISABLE_CHORDING | ||
| 39 | QK_CHORDING = 0x5600, | ||
| 40 | QK_CHORDING_MAX = 0x56FF, | ||
| 41 | #endif | ||
| 42 | QK_MOD_TAP = 0x6000, | ||
| 43 | QK_MOD_TAP_MAX = 0x6FFF, | ||
| 44 | QK_TAP_DANCE = 0x7100, | ||
| 45 | QK_TAP_DANCE_MAX = 0x71FF, | ||
| 46 | #ifdef UNICODEMAP_ENABLE | ||
| 47 | QK_UNICODE_MAP = 0x7800, | ||
| 48 | QK_UNICODE_MAP_MAX = 0x7FFF, | ||
| 49 | #endif | ||
| 50 | #ifdef UNICODE_ENABLE | ||
| 51 | QK_UNICODE = 0x8000, | ||
| 52 | QK_UNICODE_MAX = 0xFFFF, | ||
| 53 | #endif | ||
| 54 | |||
| 55 | // Loose keycodes - to be used directly | ||
| 56 | |||
| 57 | RESET = 0x7000, | ||
| 58 | DEBUG, | ||
| 59 | MAGIC_SWAP_CONTROL_CAPSLOCK, | ||
| 60 | MAGIC_CAPSLOCK_TO_CONTROL, | ||
| 61 | MAGIC_SWAP_LALT_LGUI, | ||
| 62 | MAGIC_SWAP_RALT_RGUI, | ||
| 63 | MAGIC_NO_GUI, | ||
| 64 | MAGIC_SWAP_GRAVE_ESC, | ||
| 65 | MAGIC_SWAP_BACKSLASH_BACKSPACE, | ||
| 66 | MAGIC_HOST_NKRO, | ||
| 67 | MAGIC_SWAP_ALT_GUI, | ||
| 68 | MAGIC_UNSWAP_CONTROL_CAPSLOCK, | ||
| 69 | MAGIC_UNCAPSLOCK_TO_CONTROL, | ||
| 70 | MAGIC_UNSWAP_LALT_LGUI, | ||
| 71 | MAGIC_UNSWAP_RALT_RGUI, | ||
| 72 | MAGIC_UNNO_GUI, | ||
| 73 | MAGIC_UNSWAP_GRAVE_ESC, | ||
| 74 | MAGIC_UNSWAP_BACKSLASH_BACKSPACE, | ||
| 75 | MAGIC_UNHOST_NKRO, | ||
| 76 | MAGIC_UNSWAP_ALT_GUI, | ||
| 77 | MAGIC_TOGGLE_NKRO, | ||
| 78 | |||
| 79 | // Leader key | ||
| 80 | #ifndef DISABLE_LEADER | ||
| 81 | KC_LEAD, | ||
| 82 | #endif | ||
| 83 | |||
| 84 | // Audio on/off/toggle | ||
| 85 | AU_ON, | ||
| 86 | AU_OFF, | ||
| 87 | AU_TOG, | ||
| 88 | |||
| 89 | // Music mode on/off/toggle | ||
| 90 | MU_ON, | ||
| 91 | MU_OFF, | ||
| 92 | MU_TOG, | ||
| 93 | |||
| 94 | // Music voice iterate | ||
| 95 | MUV_IN, | ||
| 96 | MUV_DE, | ||
| 97 | |||
| 98 | // Midi mode on/off | ||
| 99 | MIDI_ON, | ||
| 100 | MIDI_OFF, | ||
| 101 | |||
| 102 | // Backlight functionality | ||
| 103 | BL_0, | ||
| 104 | BL_1, | ||
| 105 | BL_2, | ||
| 106 | BL_3, | ||
| 107 | BL_4, | ||
| 108 | BL_5, | ||
| 109 | BL_6, | ||
| 110 | BL_7, | ||
| 111 | BL_8, | ||
| 112 | BL_9, | ||
| 113 | BL_10, | ||
| 114 | BL_11, | ||
| 115 | BL_12, | ||
| 116 | BL_13, | ||
| 117 | BL_14, | ||
| 118 | BL_15, | ||
| 119 | BL_DEC, | ||
| 120 | BL_INC, | ||
| 121 | BL_TOGG, | ||
| 122 | BL_STEP, | ||
| 123 | |||
| 124 | // RGB functionality | ||
| 125 | RGB_TOG, | ||
| 126 | RGB_MOD, | ||
| 127 | RGB_HUI, | ||
| 128 | RGB_HUD, | ||
| 129 | RGB_SAI, | ||
| 130 | RGB_SAD, | ||
| 131 | RGB_VAI, | ||
| 132 | RGB_VAD, | ||
| 133 | |||
| 134 | // Left shift, open paren | ||
| 135 | KC_LSPO, | ||
| 136 | |||
| 137 | // Right shift, close paren | ||
| 138 | KC_RSPC, | ||
| 139 | |||
| 140 | // Printing | ||
| 141 | PRINT_ON, | ||
| 142 | PRINT_OFF, | ||
| 143 | |||
| 144 | // always leave at the end | ||
| 145 | SAFE_RANGE | ||
| 146 | }; | ||
| 147 | |||
| 148 | // Ability to use mods in layouts | ||
| 149 | #define LCTL(kc) (kc | QK_LCTL) | ||
| 150 | #define LSFT(kc) (kc | QK_LSFT) | ||
| 151 | #define LALT(kc) (kc | QK_LALT) | ||
| 152 | #define LGUI(kc) (kc | QK_LGUI) | ||
| 153 | #define RCTL(kc) (kc | QK_RCTL) | ||
| 154 | #define RSFT(kc) (kc | QK_RSFT) | ||
| 155 | #define RALT(kc) (kc | QK_RALT) | ||
| 156 | #define RGUI(kc) (kc | QK_RGUI) | ||
| 157 | |||
| 158 | #define HYPR(kc) (kc | QK_LCTL | QK_LSFT | QK_LALT | QK_LGUI) | ||
| 159 | #define MEH(kc) (kc | QK_LCTL | QK_LSFT | QK_LALT) | ||
| 160 | #define LCAG(kc) (kc | QK_LCTL | QK_LALT | QK_LGUI) | ||
| 161 | #define ALTG(kc) (kc | QK_RCTL | QK_RALT) | ||
| 162 | |||
| 163 | #define MOD_HYPR 0xf | ||
| 164 | #define MOD_MEH 0x7 | ||
| 165 | |||
| 166 | |||
| 167 | // Aliases for shifted symbols | ||
| 168 | // Each key has a 4-letter code, and some have longer aliases too. | ||
| 169 | // While the long aliases are descriptive, the 4-letter codes | ||
| 170 | // make for nicer grid layouts (everything lines up), and are | ||
| 171 | // the preferred style for Quantum. | ||
| 172 | #define KC_TILD LSFT(KC_GRV) // ~ | ||
| 173 | #define KC_TILDE KC_TILD | ||
| 174 | |||
| 175 | #define KC_EXLM LSFT(KC_1) // ! | ||
| 176 | #define KC_EXCLAIM KC_EXLM | ||
| 177 | |||
| 178 | #define KC_AT LSFT(KC_2) // @ | ||
| 179 | |||
| 180 | #define KC_HASH LSFT(KC_3) // # | ||
| 181 | |||
| 182 | #define KC_DLR LSFT(KC_4) // $ | ||
| 183 | #define KC_DOLLAR KC_DLR | ||
| 184 | |||
| 185 | #define KC_PERC LSFT(KC_5) // % | ||
| 186 | #define KC_PERCENT KC_PERC | ||
| 187 | |||
| 188 | #define KC_CIRC LSFT(KC_6) // ^ | ||
| 189 | #define KC_CIRCUMFLEX KC_CIRC | ||
| 190 | |||
| 191 | #define KC_AMPR LSFT(KC_7) // & | ||
| 192 | #define KC_AMPERSAND KC_AMPR | ||
| 193 | |||
| 194 | #define KC_ASTR LSFT(KC_8) // * | ||
| 195 | #define KC_ASTERISK KC_ASTR | ||
| 196 | |||
| 197 | #define KC_LPRN LSFT(KC_9) // ( | ||
| 198 | #define KC_LEFT_PAREN KC_LPRN | ||
| 199 | |||
| 200 | #define KC_RPRN LSFT(KC_0) // ) | ||
| 201 | #define KC_RIGHT_PAREN KC_RPRN | ||
| 202 | |||
| 203 | #define KC_UNDS LSFT(KC_MINS) // _ | ||
| 204 | #define KC_UNDERSCORE KC_UNDS | ||
| 205 | |||
| 206 | #define KC_PLUS LSFT(KC_EQL) // + | ||
| 207 | |||
| 208 | #define KC_LCBR LSFT(KC_LBRC) // { | ||
| 209 | #define KC_LEFT_CURLY_BRACE KC_LCBR | ||
| 210 | |||
| 211 | #define KC_RCBR LSFT(KC_RBRC) // } | ||
| 212 | #define KC_RIGHT_CURLY_BRACE KC_RCBR | ||
| 213 | |||
| 214 | #define KC_LABK LSFT(KC_COMM) // < | ||
| 215 | #define KC_LEFT_ANGLE_BRACKET KC_LABK | ||
| 216 | |||
| 217 | #define KC_RABK LSFT(KC_DOT) // > | ||
| 218 | #define KC_RIGHT_ANGLE_BRACKET KC_RABK | ||
| 219 | |||
| 220 | #define KC_COLN LSFT(KC_SCLN) // : | ||
| 221 | #define KC_COLON KC_COLN | ||
| 222 | |||
| 223 | #define KC_PIPE LSFT(KC_BSLS) // | | ||
| 224 | |||
| 225 | #define KC_LT LSFT(KC_COMM) // < | ||
| 226 | |||
| 227 | #define KC_GT LSFT(KC_DOT) // > | ||
| 228 | |||
| 229 | #define KC_QUES LSFT(KC_SLSH) // ? | ||
| 230 | #define KC_QUESTION KC_QUES | ||
| 231 | |||
| 232 | #define KC_DQT LSFT(KC_QUOT) // " | ||
| 233 | #define KC_DOUBLE_QUOTE KC_DQT | ||
| 234 | #define KC_DQUO KC_DQT | ||
| 235 | |||
| 236 | #define KC_DELT KC_DELETE // Del key (four letter code) | ||
| 237 | |||
| 238 | // Alias for function layers than expand past FN31 | ||
| 239 | #define FUNC(kc) (kc | QK_FUNCTION) | ||
| 240 | |||
| 241 | // Aliases | ||
| 242 | #define S(kc) LSFT(kc) | ||
| 243 | #define F(kc) FUNC(kc) | ||
| 244 | |||
| 245 | #define M(kc) (kc | QK_MACRO) | ||
| 246 | |||
| 247 | #define MACRODOWN(...) (record->event.pressed ? MACRO(__VA_ARGS__) : MACRO_NONE) | ||
| 248 | |||
| 249 | // L-ayer, T-ap - 256 keycode max, 16 layer max | ||
| 250 | #define LT(layer, kc) (kc | QK_LAYER_TAP | ((layer & 0xF) << 8)) | ||
| 251 | |||
| 252 | #define AG_SWAP MAGIC_SWAP_ALT_GUI | ||
| 253 | #define AG_NORM MAGIC_UNSWAP_ALT_GUI | ||
| 254 | |||
| 255 | #define BL_ON BL_9 | ||
| 256 | #define BL_OFF BL_0 | ||
| 257 | |||
| 258 | #define MI_ON MIDI_ON | ||
| 259 | #define MI_OFF MIDI_OFF | ||
| 260 | |||
| 261 | // GOTO layer - 16 layers max | ||
| 262 | // when: | ||
| 263 | // ON_PRESS = 1 | ||
| 264 | // ON_RELEASE = 2 | ||
| 265 | // Unless you have a good reason not to do so, prefer ON_PRESS (1) as your default. | ||
| 266 | // In fact, we changed it to assume ON_PRESS for sanity/simplicity. If needed, you can add your own | ||
| 267 | // keycode modeled after the old version, kept below for this. | ||
| 268 | /* #define TO(layer, when) (layer | QK_TO | (when << 0x4)) */ | ||
| 269 | #define TO(layer) (layer | QK_TO | (ON_PRESS << 0x4)) | ||
| 270 | |||
| 271 | // Momentary switch layer - 256 layer max | ||
| 272 | #define MO(layer) (layer | QK_MOMENTARY) | ||
| 273 | |||
| 274 | // Set default layer - 256 layer max | ||
| 275 | #define DF(layer) (layer | QK_DEF_LAYER) | ||
| 276 | |||
| 277 | // Toggle to layer - 256 layer max | ||
| 278 | #define TG(layer) (layer | QK_TOGGLE_LAYER) | ||
| 279 | |||
| 280 | // One-shot layer - 256 layer max | ||
| 281 | #define OSL(layer) (layer | QK_ONE_SHOT_LAYER) | ||
| 282 | |||
| 283 | // One-shot mod | ||
| 284 | #define OSM(mod) (mod | QK_ONE_SHOT_MOD) | ||
| 285 | |||
| 286 | // M-od, T-ap - 256 keycode max | ||
| 287 | #define MT(mod, kc) (kc | QK_MOD_TAP | ((mod & 0xF) << 8)) | ||
| 288 | #define CTL_T(kc) MT(MOD_LCTL, kc) | ||
| 289 | #define SFT_T(kc) MT(MOD_LSFT, kc) | ||
| 290 | #define ALT_T(kc) MT(MOD_LALT, kc) | ||
| 291 | #define GUI_T(kc) MT(MOD_LGUI, kc) | ||
| 292 | #define C_S_T(kc) MT((MOD_LCTL | MOD_LSFT), kc) // Control + Shift e.g. for gnome-terminal | ||
| 293 | #define MEH_T(kc) MT((MOD_LCTL | MOD_LSFT | MOD_LALT), kc) // Meh is a less hyper version of the Hyper key -- doesn't include Win or Cmd, so just alt+shift+ctrl | ||
| 294 | #define LCAG_T(kc) MT((MOD_LCTL | MOD_LALT | MOD_LGUI), kc) // Left control alt and gui | ||
| 295 | #define ALL_T(kc) MT((MOD_LCTL | MOD_LSFT | MOD_LALT | MOD_LGUI), kc) // see http://brettterpstra.com/2012/12/08/a-useful-caps-lock-key/ | ||
| 296 | |||
| 297 | // Dedicated keycode versions for Hyper and Meh, if you want to use them as standalone keys rather than mod-tap | ||
| 298 | #define KC_HYPR HYPR(KC_NO) | ||
| 299 | #define KC_MEH MEH(KC_NO) | ||
| 300 | |||
| 301 | #ifdef UNICODE_ENABLE | ||
| 302 | // For sending unicode codes. | ||
| 303 | // You may not send codes over 7FFF -- this supports most of UTF8. | ||
| 304 | // To have a key that sends out Œ, go UC(0x0152) | ||
| 305 | #define UNICODE(n) (n | QK_UNICODE) | ||
| 306 | #define UC(n) UNICODE(n) | ||
| 307 | #endif | ||
| 308 | |||
| 309 | #ifdef UNICODEMAP_ENABLE | ||
| 310 | #define X(n) (n | QK_UNICODE_MAP) | ||
| 311 | #endif | ||
| 312 | |||
| 313 | #endif // QUANTUM_KEYCODES_H | ||
diff --git a/quantum/rgblight.c b/quantum/rgblight.c index 6e335a483..52a09817a 100644 --- a/quantum/rgblight.c +++ b/quantum/rgblight.c | |||
| @@ -370,6 +370,7 @@ void rgblight_setrgb(uint8_t r, uint8_t g, uint8_t b) { | |||
| 370 | rgblight_set(); | 370 | rgblight_set(); |
| 371 | } | 371 | } |
| 372 | 372 | ||
| 373 | __attribute__ ((weak)) | ||
| 373 | void rgblight_set(void) { | 374 | void rgblight_set(void) { |
| 374 | if (rgblight_config.enable) { | 375 | if (rgblight_config.enable) { |
| 375 | #ifdef RGBW | 376 | #ifdef RGBW |
diff --git a/quantum/rgblight.h b/quantum/rgblight.h index ceb624692..726b8de72 100644 --- a/quantum/rgblight.h +++ b/quantum/rgblight.h | |||
| @@ -40,6 +40,8 @@ | |||
| 40 | #include "eeconfig.h" | 40 | #include "eeconfig.h" |
| 41 | #include "light_ws2812.h" | 41 | #include "light_ws2812.h" |
| 42 | 42 | ||
| 43 | extern LED_TYPE led[RGBLED_NUM]; | ||
| 44 | |||
| 43 | extern const uint8_t RGBLED_BREATHING_INTERVALS[4] PROGMEM; | 45 | extern const uint8_t RGBLED_BREATHING_INTERVALS[4] PROGMEM; |
| 44 | extern const uint8_t RGBLED_RAINBOW_MOOD_INTERVALS[3] PROGMEM; | 46 | extern const uint8_t RGBLED_RAINBOW_MOOD_INTERVALS[3] PROGMEM; |
| 45 | extern const uint8_t RGBLED_RAINBOW_SWIRL_INTERVALS[3] PROGMEM; | 47 | extern const uint8_t RGBLED_RAINBOW_SWIRL_INTERVALS[3] PROGMEM; |
