Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/qmk/qmk_firmware into dual_audio | Jack Humbert | 2017-06-27 | 9 | -31/+123 |
|\ | |||||
| * | Adds parenthesis where they might be needed | Jack Humbert | 2017-06-27 | 1 | -2/+2 |
| | | | | | | Addresses #764 | ||||
| * | Create sv_SE Qwerty layout for ErgoDox | Andreas Lindhé | 2017-06-27 | 1 | -0/+52 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | *NOTE:* it might still be desirable to set the software layout to sv_SE in your OS. Swedish (sv_SE) Qwerty layout for ErgoDox, based on the Default configuration I have tried making this as close of a match I could between the [default ErgoDox EZ configuration](https://ergodox-ez.com/pages/our-firmware) and a standard Swedish Qwerty layout. Notable differences from default: ================================= * There are three special character buttons (acute accent, circumflex/tilde and apostrophe/asterisk) that don't have any buttons to map to naturally. I've put these at other places: * Acute accent (´) can be found in the lower left corner, conveniently placed to reach for making an é. * Apostrophe (') was put in the lower left corner, close to acute accent. * Circumflex (^) and asterisk (*) was placed in the lower right corner. * Tilde (~) and diaeresis (¨) I couldn't find a good place for, so I left those out. I could only get the buttons to produce a single one of the characters. How can I get it to work properly? * The Alt button on right thumb was exchanged for AltGr (RAlt). * I changed the backslash in the numpad (layer 1) for a minus. Thought it was more sensible. * I didn't find a good place for the "<>|" button, so that one was left out. That is a problem that really needs to be resolved. Pipe can be found on layer one, however. | ||||
| * | Allow mod swapping for mod tap (MT) (#1202) | Jack Humbert | 2017-06-26 | 3 | -1/+32 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * allow mod swapping for mod tap * quick include * fix the mod swapping * make changes consistent with action code * fix bug * re-enable no gui, etc * fix binary comps * solid logic | ||||
| * | Merge pull request #1431 from rai-suta/master | Jack Humbert | 2017-06-25 | 1 | -1/+1 |
| |\ | | | | | | | Bugg fix and add keymap for testing JIS_KEYCODE switch. | ||||
| | * | Fix bug. | rai-suta | 2017-06-26 | 1 | -1/+1 |
| | | | |||||
| * | | Whitefox LED control (#1432) | Ethan Madden | 2017-06-25 | 3 | -27/+36 |
| |/ | | | | | | | | | | | * use new grave_esc functionality * Port LED control from Ergodox Infinity to Whitefox | ||||
* | | no glide | Jack Humbert | 2017-06-27 | 1 | -1/+1 |
| | | |||||
* | | working duopholy | Jack Humbert | 2017-06-27 | 1 | -4/+58 |
| | | |||||
* | | b5 audio | Jack Humbert | 2017-06-27 | 1 | -20/+240 |
|/ | |||||
* | Merge pull request #1429 from fredizzimo/fixes_for_emulator | Jack Humbert | 2017-06-25 | 5 | -3/+9 |
|\ | | | | | Minor fixes to support the emulator | ||||
| * | Change M_2_PI to 2 * PI as it should be | Fred Sundvik | 2017-06-25 | 1 | -1/+1 |
| | | |||||
| * | Change inline to static inline | Fred Sundvik | 2017-06-24 | 1 | -1/+1 |
| | | |||||
| * | Add function for getting the LCD backlight brightness | Fred Sundvik | 2017-06-24 | 2 | -0/+5 |
| | | |||||
| * | Include config.h from visualizer.h | Fred Sundvik | 2017-06-24 | 1 | -0/+1 |
| | | |||||
| * | Include config.h before visualizer.h | Fred Sundvik | 2017-06-24 | 1 | -1/+1 |
| | | |||||
* | | Fix #1135 by changing the default to at90usb1286 | skullY | 2017-06-24 | 1 | -1/+1 |
| | | |||||
* | | Add JIS_KEYCODE layout for send_string() | rai-suta | 2017-06-24 | 1 | -22/+120 |
|/ | |||||
* | Merge pull request #1361 from fredizzimo/ergodox_infinity_backlight | Jack Humbert | 2017-06-18 | 5 | -6/+57 |
|\ | | | | | Add Ergodox Infinity backlight support | ||||
| * | Correctly calculate backlight level | Fred Sundvik | 2017-06-16 | 1 | -1/+1 |
| | | |||||
| * | Add backlight support to the default Ergodox Infinity animations | Fred Sundvik | 2017-06-03 | 2 | -0/+17 |
| | | |||||
| * | Backlight level handling for the visualizer | Fred Sundvik | 2017-06-03 | 2 | -2/+37 |
| | | |||||
| * | Let BACKLIGHT_ENABLE control the Infinity LEDs | Fred Sundvik | 2017-06-03 | 2 | -4/+3 |
| | | |||||
* | | Added Grave Escape (#1391) | jamesofarrell | 2017-06-16 | 2 | -0/+11 |
| | | | | | | | | | | | | | | | | | | | | * added QK_GRAVE_ESC and KC_GESC * fixed name * Fixed keycode emnu * Removed layer check, added left and right GUI mod detection for OSX GUI+~ | ||||
* | | Rename ES_RCRB to ES_RCBR for consistency reasons (left curly bracket is ↵ | Víctor | 2017-06-12 | 1 | -1/+1 |
| | | | | | | | | defined as ES_LCBR) | ||||
* | | Fix keymap definitions referencing inexistent macros | Víctor | 2017-06-12 | 1 | -2/+2 |
|/ | |||||
* | Prevent the recording of looping dynamic macros. | Daniel Shields | 2017-06-01 | 1 | -0/+4 |
| | | | | | | | If a macro play key is inadvertently recorded in a dynamic macro a loop is created and the macro will not terminate when played. This should be prevented. | ||||
* | switched to uint8 and 16 | Nick Choi | 2017-05-29 | 1 | -2/+2 |
| | |||||
* | removed need to set customtapping term 0. defaults to 0 already | Nick Choi | 2017-05-25 | 1 | -1/+0 |
| | |||||
* | changed -1 to 0 can't have negative unsigned ints 🤔 | Nick Choi | 2017-05-25 | 1 | -1/+1 |
| | |||||
* | moved specific tap term to its own function | Nick Choi | 2017-05-25 | 2 | -4/+14 |
| | | | | included custom_tapping_term in action struct | ||||
* | Added per case tapping term, updated FF-nikchi keymap. | Nick Choi | 2017-05-25 | 2 | -4/+10 |
| | |||||
* | emoji support but | Nick Choi | 2017-05-15 | 1 | -1/+1 |
| | |||||
* | dynamic_macro.h: Do not use backlight_toggle if backlight is disabled | Wojciech Siewierski | 2017-05-05 | 1 | -0/+2 |
| | | | | Fixes #1199. | ||||
* | dynamic_macro.h: Add debug logs | Wojciech Siewierski | 2017-05-04 | 1 | -0/+30 |
| | |||||
* | dynamic_macro.h: Make the documentation more clear | Wojciech Siewierski | 2017-05-04 | 1 | -2/+5 |
| | |||||
* | dynamic_macro.h: Do not save the keys being held when stopping the recording | Wojciech Siewierski | 2017-05-04 | 1 | -3/+15 |
| | | | | | | More specifically, we save them and then place the `macro_end` pointer before them so they are essentially ignored and the other macro may freely overwrite them. | ||||
* | dynamic_macro.h: Fix an off-by-two error | Wojciech Siewierski | 2017-05-04 | 1 | -3/+3 |
| | | | | | | We need to check whether we just passed the after-the-end point of the other macro. Instead we were checking whether we are going to reach it now. | ||||
* | dynamic_macro.h: Always toggle the backlight twice as a notification | Wojciech Siewierski | 2017-05-04 | 1 | -3/+1 |
| | | | | Apparently sometimes the backlight was toggled only once and it was left on. | ||||
* | dynamic_macro.h: Ignore all the initial key releases | Wojciech Siewierski | 2017-05-04 | 1 | -2/+9 |
| | | | | | | | | Right after the user initiates the macro recording, they usually need to release some keys used to access the DYN_REC_START layers. It makes sense to ignore them. Note: The keys used to access the DYN_REC_STOP key are *not* ignored. | ||||
* | Add `DYN_REC_STOP` to dynamic macros | Weiyi Lou | 2017-04-30 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | Dynamic macro functionality is modified to check for `DYN_REC_STOP`, so that macro recording can be stopped with a designated key combination (e.g. `qs` or anything) instead of mandating the use of a `_DYN` layer. `_DYN` layer stopping can still be done by passing `DYN_REC_STOP` within `process_record_user()`: bool process_record_user(uint16_t keycode, keyrecord_t *record) { uint16_t macro_kc = (keycode == MO(_DYN) ? DYN_REC_STOP : keycode); if (!process_record_dynamic_macro(macro_kc, record)) { return false; } return true; } | ||||
* | Faux clicky bug fixes | Priyadi Iman Nurcahyo | 2017-04-19 | 2 | -16/+9 |
| | |||||
* | Fix buffer overrun in lcd_keyframes | Fred Sundvik | 2017-04-13 | 1 | -2/+2 |
| | | | | | This would often cause the keyboard to crash when restarting the computer. | ||||
* | Fix warnings in process_printer | Fred Sundvik | 2017-04-13 | 3 | -13/+15 |
| | |||||
* | Fix name collision between ChibiOS and keymap_german | Fred Sundvik | 2017-04-13 | 1 | -0/+4 |
| | |||||
* | Disable array bounds warning in keymap_function_id_to_action | Fred Sundvik | 2017-04-13 | 1 | -0/+7 |
| | |||||
* | Fix undefined eeprom warnings in unicode processing | Fred Sundvik | 2017-04-13 | 2 | -0/+2 |
| | |||||
* | Rename led test to led_keyframes and move animation to Ergodox | Fred Sundvik | 2017-04-09 | 3 | -60/+19 |
| | |||||
* | Combine startup and resume animations | Fred Sundvik | 2017-04-09 | 1 | -4/+4 |
| | |||||
* | Move the logo drawing keyframe to lcd_keyframes | Fred Sundvik | 2017-04-09 | 2 | -0/+21 |
| |