summaryrefslogtreecommitdiff
path: root/quantum
AgeCommit message (Collapse)Author
2016-07-24ensure there's a recording to play before playing; also enables the LGUI ↵Robert Dale
button to play a tone
2016-07-24Fix some errors in bepo mappingVivien Alger
2016-07-22tap-dance: Code cleanupGergely Nagy
Removes a number of duplicated code, by passing actions around instead of keycodes, so the various dance action functions do not have to look up the action, but the caller does that for them. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-07-22tap-dance: Support user_data for the callbacksGergely Nagy
Refactored the code a little, so all callbacks now receive a `user_data` pointer, which can be anything. As an example, the key pairs from `ACTION_TAP_DANCE_DOUBLE` now use this, and custom, built-in functions. This makes it easier to extend the tap dance functionality, and also simplifies the code a little. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-07-22tap-dance: Support for holding keysGergely Nagy
With this change, tap dance will now store the pressed state of the tap-dance key, and allow one to make an action sooner, while the key is still held, and only unregister when the key is released. The registration must happen in the `on_dance_finished` callback, while unregistering goes to `on_reset`. The surrounding code makes sure not to call either multiple times. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-07-21Merge pull request #518 from jakllsch/upstreamJack Humbert
keymap_extras changes
2016-07-19add a couple of commentsPavlos Vinieratos
2016-07-19on_each_tap_fn is called on tap down and tap upPavlos Vinieratos
2016-07-18in the default case, it should be called if there is actually a tapPavlos Vinieratos
dance happening, and in the normal case, it should be called when the tap down is happening.
2016-07-17change naming, and remove extraneous definitionPavlos Vinieratos
2016-07-16add an `anyway` and a `reset` callbackPavlos Vinieratos
when using tap dance, we have the `regular` callback that is called on the last tap. this commit adds an `anyway` callback that is called on every tap, and a `reset` callback that is called on reset of the tap dance taps.
2016-07-16in case its NULLPavlos Vinieratos
2016-07-14keymap_dvorak.h: add missing shifted keys, fix whitespaceJonathan A. Kollasch
2016-07-14extra_keymaps: use RALT() instead of 0x1400 for AltGrJonathan A. Kollasch
2016-07-14keymap_extras: add newline at end of filesJonathan A. Kollasch
2016-07-13extract reset keyboard into a functionPavlos Vinieratos
that makes it easy to call reset_keyboard() from a function in a keymap
2016-07-11Merge pull request #477 from Smilliam/masterJack Humbert
Canceling Space Cadet state with opposite shift key
2016-07-10Made rollover behavior for space cadet optionalSmilliam
2016-07-08Move return out of event if blockTerryMathews
According to Jack, this makes the return case not be processed. Doesn't break anything in the firmware.
2016-07-07Create keycodes for RGB control functionsTerryMathews
Moves RGB controls out of the macro function and assigns them their own keycodes: RGB_TOG (toggle on/off) RGB_MOD (mode step) RGB_HUI (increase hue) RGB_HUD (decrease hue) RGB_SAI (increase saturation) RGB_SAD (decrease saturation) RGB_VAI (increase brightness) RGB_VAD (decrease brightness)
2016-07-07Fix the range for consumer keysFred Sundvik
2016-07-07fixes quantum template (actually)Jack Humbert
2016-07-07updates rgblight implementation, makes non-timer stuff compatible with audioJack Humbert
2016-07-07Merge pull request #490 from fredizzimo/integrate_visualizerJack Humbert
Integrate visualizer for ChibiOS and Infinity Ergodox
2016-07-07corrects quantum templateJack Humbert
2016-07-07Move the visualizer_user file to keymap folderFred Sundvik
Also rename it to visualizer.c
2016-07-07Delete lcd_backlight_hal.cFred Sundvik
The functionality can now be found in the infinity_erogodox.c file instead.
2016-07-07Fix the SERIAL_LINK_ENABLE macro in VisualizerFred Sundvik
Rename from USE_SERIAL_LINK -> SERIAL_LINK_ENABLE
2016-07-07Fix visualizer crash at startupFred Sundvik
Visualizer and serial link initialized in the wrong order. The LED_ENABLED define wasn't set properly uGfx is always initialized
2016-07-07Makefile fixes and update of VisualizerFred Sundvik
2016-07-06default keymap, reset sorted out for now, added serial to makefileJack Humbert
2016-07-07Makefile changes and files to compile VisualizerFred Sundvik
2016-07-06Merge commit '73d890a2c9c34b905cd5e74e7146fdd4578dcb96' into add_visualizerFred Sundvik
2016-07-06Delete .gitmodules from visualizerFred Sundvik
2016-07-06Add 'quantum/visualizer/' from commit 'bde869aa7ec8601459bc63b9636081d21108d1be'Fred Sundvik
git-subtree-dir: quantum/visualizer git-subtree-mainline: 19f480992c015aec0a15dca43e740bad8b7834e6 git-subtree-split: bde869aa7ec8601459bc63b9636081d21108d1be
2016-07-06Merge pull request #482 from fredizzimo/serial_linkJack Humbert
Add serial link library
2016-07-06Remove extra serial_link subdirectoryFred Sundvik
2016-07-06Remove CGreen make filesFred Sundvik
2016-07-06Remove serial_link .gitignore and .gitmodulesFred Sundvik
2016-07-06fix/annotate wait_us linesJack Humbert
2016-07-05Add 'quantum/serial_link/' from commit ↵Fred Sundvik
'a20d513e3cdacbf6e0e70a80402497ad10166434' git-subtree-dir: quantum/serial_link git-subtree-mainline: 7d28d6a7bc81578bb5a83f1d55810ee3d1458e96 git-subtree-split: a20d513e3cdacbf6e0e70a80402497ad10166434
2016-07-05Merge pull request #471 from Chipairon/patch-1Jack Humbert
Fix for '~' in spanish layout
2016-07-04fixed indentation.Smilliam
2016-07-04Allow Space Cadet state to be canceled by alternate Shift keySmilliam
Allows you to press RSHIFT to cancel the insertion of a "(" when holding down LSHIFT. Alternatively, allows you to press LSHIFT to cancel the insertion of a ")" when holding down RSHIFT. This change enables you to renege from outputting a character should you press a shift key erroneously.
2016-07-04reverts #343 for the most part (#474)Jack Humbert
2016-07-02Fix for '~' in spanish layoutRubén Díaz-Jorge
2016-07-01Add ChibiOS support for QMK (#465)fredizzimo
* Modularity and gcc warnings fixes. * Add ChibiOS support (USB stack + support files). * Make usb_main more USB_DRIVER #define independent. * Move chibios to tool. * Implement jump-to-bootloader. * Small updates. * Fix bootloader-jump compiling. * Move AVR specific sleep_led.c into avr. * Add basic sleep_led for chibios. * Update chibios README. * NKRO fixes. * Rename some Makefile defines. * Move STM32 bootloader address config to separate .h file. * Add ARM Teensies bootloader code. * Fix chibios/usb_main GET_REPORT handing. * Add missing #include to keymap.c. * Make bootmagic.c code portable (_delay_ms -> wait_ms). * Move declaration of keymap_config. Should really not declare variables in .h files - since it's included in different .c files, a proper linker then complains that the same variable is declared more than once (once for each .c file that the offending .h is included in). * Add eeprom support for chibios/kinetis. * Rename chibios example keyboard. * Move chibios/cortex selection to local Makefiles. * Chibios: use WFI in idle. WIP suspend stuff. * ChibiOS/kinetis: sending remote wakeup. * ChibiOS/STM32: send remote wakeup. * Fix report size of boot protocol. * Fix drop key stroke Keyboard report should be checked if its transfer finishs successfully. Otherwise key stroke can be missing when other key event occurs before the last report transfer is done. Boot protocol 10ms interval probably causes this problem in case it receives key events in a row within the period. NKRO protocol suffers less or nothing due to its interval 1ms. * Chibios/usb_main: rename a variable for clarity. * Add correct chibios/bootloader_jump for infinity KB. * ChibiOS: make reset request more CMSISy. * Chibios: Add breathing sleep LED on Kinetis MCUs. * ChibiOS: Update infinity bootloader code to match updated ChibiOS. * ChibiOS: prettify/document sleep_led code. * Chibios: Remove the wait in the main loop. * Add maple mini code. * Do timeout when writing to CONSOLE EP queue. Fixes TMK bug #266. * Chibios: add 'core/protocol' to the makefiles' search path. * Chibios: Update to new USB API. * Chibios: add more guards for transmitting (fix a deadlock bug). * Add update for chibios in README * Chibios: Fix a HardFault bug (wait after start). * Chibios: cleanup usb_main code. * Chibios: Revert common.mk change (fix AVR linking problem). * core: Fix chibios user compile options Compile options can be defined in project Makefile such as UDEFS, UADEFS, UINCDIR, ULIBDIR and ULIBS. * Sysv format for ChibiOS arm-none-eabi-size Some new patches to ChibiOS puts heap as it's own section. So the berkeley format is now useless, as the heap will be included in the BSS report. The sysv format displays the bss size correctly. * Fix hard-coded path of CHIBIOS * Add support for new version of ChibiOS and Contrib The Kinetis support has moved to a separate Contrib repository in the newest version of Chibios. There has also been some structure changes. So this adds support for those, while maintaining back- wards compability. * Update ChibiOS instructions * Chibios: implement sleep LED for STM32. * Chibios: Update the main chibios README. * Chibios: fix STM32_BOOTLOADER_ADDRESS name. * Chibios: make the default bootloader_jump redefinable (weak). * Chibios: disable LTO (link-time optimisation). With LTO enabled, sometimes things fail for mysterious reasons (e.g. bootloader jump on WF with LEDs enabled), just because the linker optimisation is too aggressive. * Chibios: add default location for chibios-contrib. * ChibiOS: update mk to match chibios/master. * ChibiOS: update instructions.md. * Add chibi_onekey example. * Add comments to chibi_onekey Makefile. * Rename some Makefile defines. * Move STM32 bootloader address config to separate .h file. * Rename chibios example keyboard. * Move chibios/cortex selection to local Makefiles. * Add Teensy LC onekey example. * Chibios: use WFI in idle. WIP suspend stuff. * Update chibi/teensy instructions. * Update chibios/Teensy instructions. * Add infinity_chibios * Add keymap_hasu.c * Infinity_chibios: select correct bootloader_jump. * Infinity_chibios: improve comments. * Add generic STM32F103C8T6 example. * Add maple mini code. * STM32F103x fixes. * Add maple mini pinout pic. * Chibios: updates for 3.0.4 git. * Chibios: rename example stm32_onekey -> stm32_f072_onekey. * Chibios: add makefiles for Teensy 3.x examples. * Chibios: update Teensy 3.x instructions. * Chibios: Tsy LC is cortex-m0plus. * Chibios: add more guards for transmitting (fix a deadlock bug). * Change README for chibios * Chibios: update examples to current chibios git. Match the changes in mainline chibios: - update chconf.h - update supplied ld scripts structure - update Teensy instructions (switch to official chibios and introduce contrib) * Add ChibiOS and ChibiOS-Contrib submodules Also fix the makefile path for them. * Moves chibios keyboards to keyboards folder * First version of ChibiOS compilation Only the stm32_f072_onkey keyboard is ported at the moment. It compiles, but still doesn't link. * More chibios fixes It now compiles without warnings and links * Move the teensy_lc_onekey to the keyboards folder * Clean up the make file rule structure * Remove keymap_fn_to_action * Update more ChibiOS keyboards to QMK Most of them does not compile at the moment though. * Use older version of Chibios libraries The newest ones have problems with compilation * Remove USB_UNCONFIGURED event It isn't present in the older version of ChibiOS * Fix the infinity_chibios compilation * Fix potentially uninitialized variable * Add missing include * Fix the ChibiOS makefile * Fix some Chibios keyboard compilation * Revert the rules.mk file back to master version * Combine the chibios and AVR makefiles With just the required overrides in the respective platform specific one. * Slight makefile restrucuring Platform specific compiler options * Move avr specific targets out of the main rules * Fix ChibiOS objcopy The ChibiOS objcopy needs different parameters, so the parameters are moved to the corresponding platform rule file * Fix the objcopy for real this time The comands were moved around, so chibios used avr and the ohter way around. Also change the objsize output format * Fix the thumb flags * Fix the infinity hasu keymap * Per platform cpp flags * Add gcc-arm-none-eabi package to travis * Add arm-none-eabi-newlib to travis * Fix the name of the libnewlib-arm-none-eabi lib * Fix the ChibiOS paths So that they are properly relative, and builds don't generate extra folders * Fix the board path of stm32_f103_onekey * Only consider folders with Makefiles as subproject
2016-06-29gets rid of rand warning [skip ci]Jack Humbert
2016-06-29rand supports other chipsJack Humbert
2016-06-29adds random base64 character generatorJack Humbert