summaryrefslogtreecommitdiffstats
path: root/tmk_core
Commit message (Collapse)AuthorAgeFilesLines
* Split MIDI functionality into MIDI_BASIC and MIDI_ADVANCEDGabriel Young2017-02-251-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MIDI_ENABLE = no text data bss dec hex filename 0 17080 0 17080 42b8 satan_midi.hex MIDI_ENABLE = yes MIDI_BASIC undefined MIDI_ADVANCED undefined text data bss dec hex filename 0 19494 0 19494 4c26 satan_midi.hex MIDI_ENABLE = yes #define MIDI_BASIC MIDI_ADVANCED undefined text data bss dec hex filename 0 19788 0 19788 4d4c satan_midi.hex MIDI_ENABLE = yes MIDI_BASIC undefined #define MIDI_ADVANCED text data bss dec hex filename 0 20846 0 20846 516e satan_midi.hex MIDI_ENABLE = yes #define MIDI_BASIC #define MIDI_ADVANCED text data bss dec hex filename 0 21140 0 21140 5294 satan_midi.hex
* implement modulationGabriel Young2017-02-191-1/+1
|
* initial implementation of polyphony using variable length array of notes onGabriel Young2017-02-192-5/+10
|
* Merge pull request #1101 from priyadi/layer_state_set_kbJack Humbert2017-02-142-0/+17
|\ | | | | Add weak layer_state_set_kb hook
| * Fix bug fix attemptPriyadi Iman Nurcahyo2017-02-151-2/+2
| |
| * Bug fix & added default_layer_state_set_kbPriyadi Iman Nurcahyo2017-02-152-2/+11
| |
| * Add layer_state_set_kb hookPriyadi Iman Nurcahyo2017-02-152-0/+8
| |
* | Implement faux-clicky featurePriyadi Iman Nurcahyo2017-02-132-0/+19
|/
* Supress warnings from ps2_mouse.hPriyadi Iman Nurcahyo2017-02-121-2/+3
|
* Merge pull request #1062 from luizribeiro/fix-winJack Humbert2017-02-071-2/+2
|\ | | | | Fix V-USB bug on Windows 10
| * Fix V-USB bug on Windows 10Luiz Ribeiro2017-02-011-2/+2
| |
* | Merge pull request #1068 from adzenith/masterJack Humbert2017-02-073-8/+2
|\ \ | | | | | | Minor cleanup
| * | Minor cleanupNikolaus Wittenstein2017-02-053-8/+2
| |/
* | Merge pull request #1046 from LukeSilva/masterJack Humbert2017-02-072-5/+31
|\ \ | | | | | | Add Tapping Macros to QMK
| * | Add support for various tapping macrosLuke Silva2017-01-281-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A macro key can now be easily set to act as a modifier on hold, and press a shifted key when tapped. Or to switch layers when held, and again press a shifted key when tapped. Various other helper defines have been created which send macros when the key is pressed, released and tapped, cleaning up the action_get_macro function inside keymap definitions. The layer switching macros require a GCC extension - 'compound statements enclosed within parentheses'. The use of this extension is already present within the macro subsystem of this project, so its use in this commit should not cause any additional issues. MACRO_NONE had to be cast to a (macro_t*) to suppress compiler warnings within some tapping macros.
| * | Fix documentation for TMK actionsLuke Silva2017-01-261-3/+7
| |/
* | Merge pull request #1057 from priyadi/selectable_outputJack Humbert2017-02-074-70/+146
|\ \ | | | | | | Implement runtime selectable output (USB or BT)
| * | Fix wrong includePriyadi Iman Nurcahyo2017-02-011-1/+1
| | |
| * | Limit outputselect to AVR only for nowPriyadi Iman Nurcahyo2017-02-013-2/+2
| | |
| * | Move outputselect to parent dir to satisfy non LUFA keyboardsPriyadi Iman Nurcahyo2017-02-012-0/+0
| | |
| * | Implement runtime selectable output (USB or BT)Priyadi Iman Nurcahyo2017-02-014-69/+145
| |/
* | Merge pull request #1010 from SjB/oneshot_timeout_fixJack Humbert2017-02-061-8/+8
|\ \ | |/ |/| oneshot timeout would only timeout after an event.
| * moved oneshot cancellation code outside of process_record.SjB2017-01-291-8/+8
| | | | | | | | | | | | | | The oneshot cancellation code do not depend on the action_tapping_process and since process_record get called via the action_tapping_process logic moved the oneshot cancellation code into the action_exec function just before the action_tapping_process call
| * oneshot timeout would only timeout after an event.SjB2017-01-151-7/+7
| | | | | | | | | | | | | | | | | | | | | | After setting a ONESHOT_TIMEOUT value, the oneshot layer state would not expire without an event being triggered (key pressed). The reason was that in the process_record function we would return priort to execute the process_action function if it detected a NOEVENT cycle. The process_action contained the codes to timeout the oneshot layer state. The codes to clear the oneshot layer state have been move just in front of where we check for the NOEVENT cycle in the process_record function.
* | Merge pull request #1014 from SjB/lcd_mods_statusJack Humbert2017-01-241-1/+1
|\ \ | | | | | | added mods status bit to visualizer.
| * | added mods status bit to visualizer.SjB2017-01-171-1/+1
| |/ | | | | | | | | | | | | | | Since we can't read the real_mods and oneshot_mods static variable directly within the update_user_visualizer_state function (Threading and serial link). We are know storing the mods states in the visualizer_keyboard_status_t structure. We can now display the status of the modifier keys on the LCD display.
* | Simplified and polished a bit the code changes on tmk_coreLuiz Ribeiro2017-01-214-6/+7
| |
* | Got ps2avrGB to work with the V-USB protocolLuiz Ribeiro2017-01-218-17/+73
|/
* Merge pull request #973 from Wilba6582/keycode_refactorJack Humbert2016-12-301-1/+1
|\ | | | | Keycode refactor
| * Keycode refactorWilba65822016-12-291-1/+1
| |
* | API Sysex fixesFred Sundvik2016-12-292-11/+25
|/ | | | | | | | Fix memory leaks by using stack instead of malloc Reduce memory usage by having less temporary bufffers Remove warnings by adding includes Decrease code size by 608 bytes (mostly due to not linking malloc) More robust handling of buffer overflows
* Fixes issue #900Wilba65822016-12-202-4/+4
|
* Allow power consumption to be set per-keyboard.Kyle Smith2016-12-141-1/+4
|
* Merge pull request #944 from priyadi/negmousefixJack Humbert2016-12-121-1/+1
|\ | | | | Allow negative values for mouse movements
| * Allow negative values for mouse movementsPriyadi Iman Nurcahyo2016-12-101-1/+1
| |
* | The adafruit BLE C++ code requires -std=c++11Priyadi Iman Nurcahyo2016-12-101-1/+1
|/
* Merge pull request #921 from Wilba6582/raw_hidJack Humbert2016-12-055-8/+220
|\ | | | | Initial version of Raw HID interface
| * Initial version of Raw HID interfaceWilba65822016-12-015-8/+220
| |
* | syntax error fixPriyadi Iman Nurcahyo2016-12-051-1/+1
| |
* | Implemented weak ps2_mouse_init_user()Priyadi Iman Nurcahyo2016-12-052-47/+56
| | | | | | | | | | | | There are a lot of PS/2 commands, some are vendor/device specific, so we provide a weak ps2_mouse_init_user() to be implemented in each keyboard that need it.
* | Merge pull request #931 from OferPlesser/feature/improve-ps2-mouseJack Humbert2016-12-032-164/+289
|\ \ | | | | | | Improving ps/2 mouse
| * | Forgot to use define in delay instead of hardcoded numberOfer Plesser2016-12-031-1/+1
| | |
| * | Added back PS2_MOUSE_INIT_DELAY defineOfer Plesser2016-12-032-1/+4
| | |
| * | Refactored and improved ps2 mouse featureofples2016-12-032-164/+286
| | |
* | | Connect the adafruit ble code to the lufa main loopWez Furlong2016-12-021-11/+71
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are now 3 potential locations to send HID reports: 1. USB 2. The bluefruit easy key 3. Adafruit BLE Generally speaking, if USB is connected then we should prefer to send the reports there; it is generally the best channel for this. The bluefruit module has no feedback about bluetooth connectivity so the code must speculatively send reports over both USB and bluetooth. The BLE module has connectivity feedback. In general we want to prefer to send HID reports over USB while connected there, even if BLE is connected. Except that it is convenient to force them over BLE while testing the implementation. This policy has been extracted out into a where_to_send function which returns a bitmask of which of the channels should be used.
* | Merge pull request #915 from wez/ble_3Jack Humbert2016-12-025-1/+940
|\ \ | | | | | | Add support for Adafruit BLE modules
| * | Add support for Adafruit BLE modulesWez Furlong2016-11-275-1/+940
| | | | | | | | | | | | | | | | | | | | | | | | | | | This implements some helper functions that allow sending key reports to an SPI based Bluetooth Low Energy module, such as the Adafruit Feather 32u4 Bluefruit LE. There is some plumbing required in lufa.c to enable this; that is in a follow-on commit.
* | | Merge pull request #913 from wez/ble_1Jack Humbert2016-12-022-34/+28
|\| | | |/ |/| Tidy up atomicity in timer.c and ring_buffer.h
| * Tidy up atomicity in timer.c and ring_buffer.hWez Furlong2016-11-272-34/+28
| | | | | | | | | | | | | | | | Adopt the macros for saving/restoring the interrupt state that are provided by the avr gcc environment. Removing intialization of the timer value; this shaves off a few bytes because globals are default initialized to zero.
* | Merge branch 'master' of github.com:jackhumbert/qmk_firmware into wu5y7Jack Humbert2016-11-283-8/+12
|\|