Commit Graph

468 Commits (3fdc45b4e9581c823ac09545241241e0c6d3f313)

Author SHA1 Message Date
Jack Humbert 287eb7ad14 Converted audio play functions to *_user (#349)
* Updated personal layouts

* tweaked personal

* Nightly - Audio Cleanup

Refactored the LUTs. Abstracted some of the registers out of audio to
use more functional names. Split audio into audio and audio_pwm. WIP

* nightly - collapsed code

* Added check for note playing to LEDs

* Usability tweaks

* TWEAE

* nightly

added extra kcs to keymap common

* turned on Plank audio

* Added backlight breathing to atomic

* reverted accidental merge

* Added music and audio toggles to Quantum.c

* Redid the audio callbacks

* Adjusted default planck layout to use the user tone naming

* tabs to spaces

* Rewrote the ALL recipe to allow for faster parallel make

* tabs to spaces

* Renamed custom event functions to be 'startup_user' and 'shutdown_user'. Also moved the prototypes around.

* Tweaked pvc atomic layout to work with the pvc planck.

* updates midi scale calling
9 years ago
Eric Tang 1ae6011cef Clean up #343's code (#348) 9 years ago
Eric Tang aaa758f1d3 Optimize matrix scanning (#343) 9 years ago
purpleP 0275d444d7 fixed small bug with AUDIO_ENABLED (#339) 9 years ago
Jack Humbert b732b79b49 adapts unicode to quantum.c (#333)
* Unicode

to have unicode input you need to:

- set your OS input method to UNICODE if needed
- enable unicode in your makefile
- copy the action_function from
keyboard/planck/keymaps/unicode/unicode.c to your keymap.c
set the target OS method in your keymap.c: void matrix_init_user() {
set_unicode_mode(UC_OSX); } you can then switch when you want with:
set_unicode_mode(UC_OSX); set_unicode_mode(UC_LNX);
set_unicode_mode(UC_WIN);
put some unicode codes in your keymap like so: UC(0x0061)
I did change the bit mask in quantum/keymap_common.c and .h
I’m afraid we will need uint32 to get a total support for all unicode
tables or relocate the handler as @mbarkhau did.

* rearranges keycode values, hooks-up unicode

* removes extra lalt ref

* adds unicode shortcuts and example
9 years ago
Jack Humbert 0428214b90 adds music and audio toggles (#337)
* Updated personal layouts

* tweaked personal

* Nightly - Audio Cleanup

Refactored the LUTs. Abstracted some of the registers out of audio to
use more functional names. Split audio into audio and audio_pwm. WIP

* nightly - collapsed code

* Added check for note playing to LEDs

* Usability tweaks

* TWEAE

* nightly

added extra kcs to keymap common

* turned on Plank audio

* Added backlight breathing to atomic

* reverted accidental merge

* Added music and audio toggles to Quantum.c

* Redid the audio callbacks

* music/audio_on_user
9 years ago
heartsekai 465aabe11d Added Swiss-German keymap. (#335) 9 years ago
Jack Humbert fde477a927 updates midi functionality (#331)
* implements leader key for planck experimental

* allows override of leader timeout

* adds ability to use the leader key in seq

* fixes leader keycode

* adds chording prototype

* fixes keycode detection

* moves music mode to quantum.c

* disables chording by default

* adds music sequencer functionality

* implements audio/music functions in quantum.c

* splits up process_action to allow independent processing of actions

* moves midi stuff to quantum.c

* adds additional scales for midi
9 years ago
Jack Humbert bf5c2ccee5 splits process_action up to handle records separately (#329)
* implements leader key for planck experimental

* allows override of leader timeout

* adds ability to use the leader key in seq

* fixes leader keycode

* adds chording prototype

* fixes keycode detection

* moves music mode to quantum.c

* disables chording by default

* adds music sequencer functionality

* implements audio/music functions in quantum.c

* splits up process_action to allow independent processing of actions

* merging?
9 years ago
Jack Humbert 15719f3574 adds a sequencer to the music mode (#330)
* implements leader key for planck experimental

* allows override of leader timeout

* adds ability to use the leader key in seq

* fixes leader keycode

* adds chording prototype

* fixes keycode detection

* moves music mode to quantum.c

* disables chording by default

* adds music sequencer functionality

* implements audio/music functions in quantum.c

* Merge branch 'master' into process-record
9 years ago
Erez Zukerman 1a8c0dd22d Leader key implementation (#326)
* implements leader key for planck experimental

* allows override of leader timeout

* adds ability to use the leader key in seq

* fixes leader keycode

* adds chording prototype

* fixes keycode detection

* moves music mode to quantum.c

* disables chording by default

* updates process_action functions to return bool
9 years ago
Jack Humbert 3f02637f4d Backlight Breathing for Planck and Atomic
* Updated personal layouts

* tweaked personal

* Nightly - Audio Cleanup

Refactored the LUTs. Abstracted some of the registers out of audio to
use more functional names. Split audio into audio and audio_pwm. WIP

* nightly - collapsed code

* Added check for note playing to LEDs

* Usability tweaks

* TWEAE

* nightly

added extra kcs to keymap common

* turned on Plank audio

* Added backlight breathing to atomic

* reverted accidental merge

* adds backlight pulse to planck
9 years ago
Jack Humbert 684793360c quantum accommodates more than 16 columns 9 years ago
Erez Zukerman 2ce9644caa Merge pull request #311 from adiabatic/ergodox-zweihander-osx
Add KC_LABK and KC_RABK (< and >)
9 years ago
Nathan Sharfi 08f3142463 Add KC_LABK and KC_RABK (< and >) 9 years ago
Erez Zukerman 9bb368a5fb [Jack & Erez] Defines MOD_HYPR and MOD_MEH 9 years ago
Erez Zukerman f293bf2340 [Jack & Erez] Removes duplicate reference, sorts whitespace 9 years ago
Jack Humbert 41b3e399b1 adds keycode shortcuts for OSL and OSM 9 years ago
Tom Duckering d4520cd3ac Referencing the hex file (#309)
Seems that this is a typo. When I used the hex file it worked so presuming that means it's right ;)
9 years ago
IBNobody 83e1cc241e Clarified audio.c (#302)
* Updated personal layouts

* tweaked personal

* Nightly - Audio Cleanup

Refactored the LUTs. Abstracted some of the registers out of audio to
use more functional names. Split audio into audio and audio_pwm. WIP

* nightly - collapsed code

* Added check for note playing to LEDs
9 years ago
Jack Humbert 0656f2fa10 moves backlight functionality to keyboard files and updates template makefile
previously there were two backlight.c files (bad)
9 years ago
Jack Humbert 66e0323881 removes extra voices, updates .hex files 9 years ago
Jack Humbert e024c11f7a actually resolves conflicts in rgblight.c 9 years ago
Jack Humbert c37d52d213 resolves conflicts in rgblight.c
# Conflicts:
#	quantum/rgblight.c
9 years ago
Jack Humbert bf56838fe9 adds freq LUT for future use 9 years ago
Jack Humbert 140b97a1cd adds delayed vibrato 9 years ago
Jack Humbert e7b6bb641c updates default voice, prunes voices 9 years ago
James ‘Twey’ Kay 7ccfaf750d Add a keymap_extras header for Plover 9 years ago
Eric Tang eb09c450de Fix typo (#276) 9 years ago
Jack Humbert a718c53fe7 adds more voice harmonics 9 years ago
Jack Humbert a8086126fe Merge remote-tracking branch 'origin/master'
# Conflicts:
#	quantum/audio/voices.c
9 years ago
Jack Humbert b1900c8dde adds fifth and fourth down voices 9 years ago
IBNobody 082a0f313d fixed compiler warnings (#273) 9 years ago
Jack Humbert 7b3f212500 adds more voices, fixes macro redefines 9 years ago
Eric Tang 620ac4b260 Update functions used to write to EEPROM 9 years ago
Jack Humbert 9828aba2a1 adds multiple voices and the ability to iterate/deiterate between them 9 years ago
Erez Zukerman a8fd65d86f Merge pull request #265 from sboesebeck/master
ErgodoxLayoutGenerator used
9 years ago
Jack Humbert e89b806b85 converts tabs to spaces 9 years ago
Jack Humbert 73228f5e5d restructures audio, begins voicing 9 years ago
Jack Humbert 2e60054951 fade envelope 9 years ago
Jack Humbert 2e303b40ae start of envelope function 9 years ago
Jack Humbert 7d1a683607 sounds for plover layout 9 years ago
Jack Humbert b0635e58eb delay isn't the problem here 9 years ago
Stephan Bösebeck 13244a259c Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 9 years ago
Jack Humbert de4690593c fixed startup audio with a 500ms delay 9 years ago
Jack Humbert 462601f5e8 breaking changes - restructuring audio.c a little 9 years ago
Stephan Bösebeck 6ff5e10592 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 9 years ago
Jack Humbert fd49dfe5cb vibrato and polyphony paratmeters 9 years ago
Jack Humbert a2f31c886f getting ready for getters and setters 9 years ago
Jack Humbert 78b3a88154 merging in #262 9 years ago
Jack Humbert e49712b559 note sliding - on right now 9 years ago
Stephan Bösebeck 9cc39156f7 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 9 years ago
IBNobody 82ec81660e Merge remote-tracking branch 'refs/remotes/jackhumbert/master' into personal_atomic_planck 9 years ago
IBNobody ef73ab6628 Notes Bugfix 9 years ago
Jack Humbert 89a78f4a11 audio fixes 9 years ago
Jack Humbert 5a15c113d7 Merge branch 'personal_atomic_planck' of github.com:IBNobody/qmk_firmware 9 years ago
IBNobody 5c98ad5960 Added extra songs, LED indicator notes 9 years ago
Jack Humbert d94960be5b Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard 9 years ago
Jack Humbert e0ab1dcf4c merging 9 years ago
Jack Humbert ce463ef424 audio fixes 9 years ago
Stephan Bösebeck 6d40f7c506 added new experimental layout - works with ErgodoxLayoutGenerator 9 years ago
IBNobody 23231fa577 Converted goodbye to notes, fixed eighth dotted note macro 9 years ago
IBNobody 3103ea542f Merge remote-tracking branch 'remotes/jackhumbert/master' into personal_atomic_planck 9 years ago
IBNobody d5b72e7bde Fixed many compiler warnings related to print being disabled 9 years ago
a0-c 90289aa53f __attribute__ ((weak)) added to led_set
__attribute__ ((weak)) added to led_set
9 years ago
IBNobody c940e87235 fixed single note play copy/paste bug 9 years ago
Jack Humbert 319fbe344b Merge branch 'personal_atomic_planck' of github.com:IBNobody/qmk_firmware 9 years ago
IBNobody 29e495be2a Added trimble and tempo adjustments! 9 years ago
IBNobody 943b5b7709 Adding folding to #if, etc 9 years ago
Jack Humbert a67d425f4d planck default layout updates 9 years ago
Jack Humbert e7b9959819 no need for length of play_notes array with macro 9 years ago
IBNobody 45f10b4c4b Fixed how note arrays are used. 9 years ago
Jack Humbert 8bbd064cf5 changes to play_notes, goodbye 9 years ago
Jack Humbert 41cc35425a rests between notes as an argument 9 years ago
Jack Humbert 8f4ce501eb Merge pull request #260 from IBNobody/personal_atomic_planck
Atomic TLC and musical note freqs for audio
9 years ago
IBNobody 4aea806aa8 Adding Musical Notes 9 years ago
Jack Humbert c83aa16f1d fixes audio prescaler to emit correct freq 9 years ago
Jack Humbert ab19ebd08a MAGIC functionality, AG swap in default layout 9 years ago
Jack Humbert 86169833c5 updates to preonic default, music mode integrated 9 years ago
Jack Humbert 142ce47698 added keymap_extras to path 9 years ago
Jack Humbert 0b0ec82427 eeprom reset tool 9 years ago
Jack Humbert 0faa18eab9 audio enable stored in eeprom 9 years ago
IBNobody 8f85117aa9 Added Audio to my Atomic 9 years ago
Jack Humbert ee2ee7f4f0 audio note length fixes 9 years ago
Jack Humbert bb0836c620 the spacessss 9 years ago
Jack Humbert 63462bf8c1 changing up the makefile a bit 9 years ago
IBNobody 2900b48845 Added parenthesis to midi macro. 9 years ago
IBNobody 3755ef5ddb Compiler Warnings / Atomic TLC
Corrected compiler warnings for a number of issues.  Gave Atomic some
TLC.
9 years ago
skullY 97f8f37876 Fixup RGBLIGHT support for clueboard2 9 years ago
Erez Zukerman 9cfc74c35b [Erez & Jack] Makes tri-layer available across Quantum 9 years ago
Jack Humbert 976d0a327b add silent notes 9 years ago
Didier Loiseau aa5eb49edd BÉPO over CSA: GR2A-shifted characters in AltGr layer
- define aliases for all GR2A-shifted characters
- use the available characters in BÉPO over CSA AltGr layer
9 years ago
Didier Loiseau 3a91ddb074 Use CSA_ as prefix for Canadian Multilingual key aliases
CM is already used for Colemak.
9 years ago
Didier Loiseau 911222892e BÉPO over CSA: GR2A characters in AltGr layer
- define aliases for all GR2A characters (unshifted)
- use the available characters in the BÉPO over CSA AltGr layer
9 years ago
Didier Loiseau 7840e69bfa BÉPO over CSA: AltGr layer
- implemented the most useful characters:
  - all French characters + €
  - common programmer characters
- other keys implemented as KC_NO to avoid mistyping a character
  from a lower layer
- AltGr+Shift not supported (yet)
9 years ago
Didier Loiseau a7cef2ca0a Initial BÉPO over CSA with Shift layer
Initial implementation of the BÉPO layout
for use with the Canadian Multilingual Standard layout
(a.k.a. CSA / ACNOR layout) on the OS-side.
- support all bépo characters from the default and shifted layers
9 years ago
Stephan Bösebeck aee8715815 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 9 years ago
Stephan Bösebeck dbd4ab3457 fixed de_osx prefix in keymap include to avoid conflicts 9 years ago
Jack Humbert e7377dc24b Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard 9 years ago
Jack Humbert ac0729787f preonic update 9 years ago
Noah Andrews 95fba250ef Updated several keyboard folders to use new keymap naming scheme 9 years ago
Jack Humbert 8bbc1dcf4f Merge pull request #219 from IBNobody/master
Master
9 years ago
IBNobody 1d13aa933b Minor Tweaks and Documentation
Fixed compiler warning by including bootloader.h in keymap_common.c.

Changed FORCE_NKRO to only be applied if NKRO_ENABLE is defined.

Added extra documentation to the template config.h
9 years ago
Jack Humbert fd9e5d1510 Merge pull request #214 from cdlm/action-hook
Add per-event user hook function
9 years ago
Damien Pollet 2181be029e Add action-preprocessing hook to keyboard template 9 years ago
IBNobody 577971ab07 Magic Key Overrides / Keyboard Lock / Forced NKRO
Added Magic Key Overrides / Magic Key Cleanup / Added Keyboard Lock
option to template / Added forced NKRO option to template (disabled by
default)
9 years ago
IBNobody 3d56ec052e Fixed extra semicolons.
Fixed extra semicolons.
9 years ago
IBNobody 10491ba21f Fixed LED Function Calls
Fixed LED indicator function calls to match how the matrix init function
calls are formatted.
9 years ago
IBNobody ec62d9e85c Merge remote-tracking branch 'refs/remotes/jackhumbert/master'
# Conflicts:
#	quantum/template/template.c
#	quantum/template/template.h
9 years ago
yoyoerx baeffd99da Pull request 190 resolution with 'qmk/master' for merge 9 years ago
IBNobody eba9a7d74d Adding LED function pointers 9 years ago
Jack Humbert 35393fa9dc Merge pull request #194 from DidierLoiseau/bépo-keymap-header
Keymap header for the BÉPO layout
9 years ago
Daniel Kriesten bfc6eca44a fixes an obvious typo to have DE_LCBR produce { 9 years ago
Didier Loiseau 7c33f8493f Keymap header for the BÉPO layout 9 years ago
yoyoerx 641859df84 Addressed void* return warning in all keymaps 9 years ago
Noah Andrews ee1b94045e Remove extraneous comma 9 years ago
plgruener 4ca4322501 update neo keymap 9 years ago
Kévin Letord 4a19cc054d Fix FR_RCBR declaration in keymap_french.h 9 years ago
Keller-Laminar 233af3a41c Include Dvorak underscore and plus keys.
There were previously no Dvorak specific underscore and plus key codes. For a keyboard like the Planck which has layers directly to shifted versions of special character keys you were unable to produce those characters using the Lower layer.
9 years ago
Vincent Pochet 1934e8a270 Add extra keymap for swiss french keyboard 9 years ago
Jack Humbert a6414eb257 Merge pull request #145 from gerbercj/feature/atreus_astar
Add support for Atreus running on A-Star
9 years ago
Chris Gerber 47dcec2945 Add support for Atreus running on A-Star 9 years ago
joar 2f7cda63d0 Norwegian Colemak Ergodox and Norwegian key definitions 9 years ago
Jack Humbert e6a2c77fde README changes 9 years ago
Wojciech Siewierski 65b41e2e59 Use boolean AND instead of bitwise (possible typo)
Fortunately seems harmless.
9 years ago
Erez Zukerman 3c683aa9f2 Fixes CM_SCLN and updates docs for Colemak 9 years ago
Fernando Mendonca c29ad125a7 Fix 2 macros in the Nordic keymap
By testing I found out that, at least on Linux using the Swedish layout,
two macros present on this file were wrong, for the backslash and pipe
keys. Jack helped me find the correct combination for the backslash and
that led me to the right one for pipe.
9 years ago
Jack Humbert 7d6716bede audio on reset 9 years ago
Jack Humbert 0a71166a2d missing file 9 years ago
Yang Liu 2647c7cd84 fix bugs in animation effects 9 years ago
Yang Liu ba9ac457b2 Integrate WS2812 code into quantum core 9 years ago
Jack Humbert 24f2698fba changes to the template 9 years ago
Jack Humbert 5143c59bdf Merge branch 'audio' of https://github.com/jackhumbert/tmk_keyboard into smarkefile 9 years ago
Jack Humbert 544a49329c Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard into smarkefile 9 years ago
Jack Humbert c753bfcc14 Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard into audio 9 years ago
Jack Humbert a820533ab7 keymap.c changes, disable grep stuff 9 years ago
Jack Humbert eb61700912 better integrations 9 years ago
plgruener da09312dd5 complete keymap_german.h (all alphanumerics)
add 'DE_'-prefixed aliases for all alphanumerics, so it becomes
immediatly obvious which layout we are assuming.
9 years ago
Peter Eichinger 48eb980c2a Add defines for CtrlAltGui modifiers 9 years ago
Jack Humbert dfe7004bc5 new keymap folder structure and makefile magic 9 years ago
Jack Humbert 4faddd3449 working 9 years ago
Jack Humbert 6e3c36360e sounds 9 years ago
Stephan Bösebeck e44c30f203 using keymap_german_osx.h more, adding macros for CTRL/CMD-V combination 9 years ago
Jack Humbert 4c100dbbef note seq, start-up beeps, function beeps 9 years ago
Jack Humbert 0f867796de timer 3 9 years ago
Jack Humbert 29de37d5c0 pwm audio 9 years ago
Sébastien Pérochon 48eff6dd89 quantum: Add French keymap for OSX (keymap_french_osx) 9 years ago
Matthias Schmitt 7b7870bae1 Add neo2 keymap and neo2 ergodox layout 9 years ago
Matthias Schmitt 6c15dac7db Add Ctrl-Shift tap modifier 9 years ago
Matthias Schmitt 3dbcad51d1 Add german keymap and german ergodox layout 9 years ago
Jack Humbert 11d6e66979 atomic hex 9 years ago
Erez Zukerman 407f41cd9a [Jack & Erez] Adds standalone versions of Hyper and Meh 9 years ago
Erez Zukerman f5ec585ed8 [Erez & Jack] Adds Meh key (Hyper without Win/Cmd) 9 years ago
Jack Humbert 6485c7d7da nkro info 9 years ago
Jack Humbert eb2795b4d6 atomic up-to-date 9 years ago
Jack Humbert 39915b1748 homebrew instructions 9 years ago
Erez Zukerman 4b0c54324a Adds Hyper key, tweaks ErgoDox EZ default keymap 9 years ago
Jack Humbert 8643e01286 merging 9 years ago
Jack Humbert 1fb8b4ce3a changes 9 years ago
Erez Zukerman d3db8d62f6 More work on ErgoDox EZ default keymap 9 years ago
Erez Zukerman 2739aa8d78 Initial working version of ErgoDox EZ layout using new syntax 9 years ago
Jack Humbert 18da1e6801 layer tap, mod tap 9 years ago
Jack Humbert d9f08e6177 toggle and hold-tap action shortcuts 9 years ago
Jack Humbert 6f3141965e new project script 9 years ago
Erez Zukerman 0c47e8b008 [Jack & Erez] Comments + tiny updates and cleanup 9 years ago
Jack Humbert cc1c32671e fixed makefile, added MO DF shortcuts 9 years ago
Jack Humbert 35a81f5b8b added ergodox 9 years ago
Jack Humbert 46e7fb2d3c quantum separated 9 years ago