1
0
Fork 0
Commit graph

150 commits

Author SHA1 Message Date
Erez Zukerman
2ce9644caa Merge pull request #311 from adiabatic/ergodox-zweihander-osx
Add KC_LABK and KC_RABK (< and >)
2016-05-06 18:28:43 -04:00
Nathan Sharfi
08f3142463 Add KC_LABK and KC_RABK (< and >) 2016-05-06 05:40:02 -07:00
Erez Zukerman
9bb368a5fb [Jack & Erez] Defines MOD_HYPR and MOD_MEH 2016-05-05 22:44:24 -04:00
Erez Zukerman
f293bf2340 [Jack & Erez] Removes duplicate reference, sorts whitespace 2016-05-05 22:19:29 -04:00
Jack Humbert
41b3e399b1 adds keycode shortcuts for OSL and OSM 2016-05-05 21:50:51 -04:00
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 ;)
2016-05-05 18:27:28 -04:00
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
2016-05-03 13:56:40 -04:00
Jack Humbert
0656f2fa10 moves backlight functionality to keyboard files and updates template makefile
previously there were two backlight.c files (bad)
2016-04-29 22:19:40 -04:00
Jack Humbert
66e0323881 removes extra voices, updates .hex files 2016-04-29 12:42:55 -04:00
Jack Humbert
e024c11f7a actually resolves conflicts in rgblight.c 2016-04-26 13:50:04 -04:00
Jack Humbert
c37d52d213 resolves conflicts in rgblight.c
# Conflicts:
#	quantum/rgblight.c
2016-04-26 13:48:36 -04:00
Jack Humbert
bf56838fe9 adds freq LUT for future use 2016-04-26 01:17:00 -04:00
Jack Humbert
140b97a1cd adds delayed vibrato 2016-04-26 01:16:47 -04:00
Jack Humbert
e7b6bb641c updates default voice, prunes voices 2016-04-25 00:59:47 -04:00
James ‘Twey’ Kay
7ccfaf750d Add a keymap_extras header for Plover 2016-04-23 18:49:10 +01:00
Eric Tang
eb09c450de Fix typo (#276) 2016-04-22 16:44:50 -04:00
Jack Humbert
a718c53fe7 adds more voice harmonics 2016-04-22 11:58:29 -04:00
Jack Humbert
a8086126fe Merge remote-tracking branch 'origin/master'
# Conflicts:
#	quantum/audio/voices.c
2016-04-22 01:04:13 -04:00
Jack Humbert
b1900c8dde adds fifth and fourth down voices 2016-04-22 01:02:50 -04:00
IBNobody
082a0f313d fixed compiler warnings (#273) 2016-04-22 01:01:38 -04:00
Jack Humbert
7b3f212500 adds more voices, fixes macro redefines 2016-04-21 23:10:49 -04:00
Eric Tang
620ac4b260 Update functions used to write to EEPROM 2016-04-21 20:07:03 -07:00
Jack Humbert
9828aba2a1 adds multiple voices and the ability to iterate/deiterate between them 2016-04-21 18:14:25 -04:00
Erez Zukerman
a8fd65d86f Merge pull request #265 from sboesebeck/master
ErgodoxLayoutGenerator used
2016-04-21 08:10:39 +03:00
Jack Humbert
e89b806b85 converts tabs to spaces 2016-04-21 00:40:00 -04:00
Jack Humbert
73228f5e5d restructures audio, begins voicing 2016-04-21 00:37:45 -04:00
Jack Humbert
2e60054951 fade envelope 2016-04-20 23:16:39 -04:00
Jack Humbert
2e303b40ae start of envelope function 2016-04-20 22:29:01 -04:00
Jack Humbert
7d1a683607 sounds for plover layout 2016-04-20 22:28:47 -04:00
Jack Humbert
b0635e58eb delay isn't the problem here 2016-04-20 18:39:36 -04:00
Stephan Bösebeck
13244a259c Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-04-20 11:15:59 +02:00
Jack Humbert
de4690593c fixed startup audio with a 500ms delay 2016-04-20 01:08:17 -04:00
Jack Humbert
462601f5e8 breaking changes - restructuring audio.c a little 2016-04-19 21:25:48 -04:00
Stephan Bösebeck
6ff5e10592 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-04-19 23:07:11 +02:00
Jack Humbert
fd49dfe5cb vibrato and polyphony paratmeters 2016-04-19 17:00:45 -04:00
Jack Humbert
a2f31c886f getting ready for getters and setters 2016-04-19 12:58:13 -04:00
Jack Humbert
78b3a88154 merging in #262 2016-04-18 21:04:29 -04:00
Jack Humbert
e49712b559 note sliding - on right now 2016-04-18 21:01:48 -04:00
Stephan Bösebeck
9cc39156f7 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-04-18 08:03:22 +02:00
IBNobody
82ec81660e Merge remote-tracking branch 'refs/remotes/jackhumbert/master' into personal_atomic_planck 2016-04-17 23:16:36 -05:00
IBNobody
ef73ab6628 Notes Bugfix 2016-04-17 22:08:05 -05:00
Jack Humbert
89a78f4a11 audio fixes 2016-04-17 21:26:06 -04:00
Jack Humbert
5a15c113d7 Merge branch 'personal_atomic_planck' of github.com:IBNobody/qmk_firmware 2016-04-17 21:15:50 -04:00
IBNobody
5c98ad5960 Added extra songs, LED indicator notes 2016-04-17 20:14:37 -05:00
Jack Humbert
d94960be5b Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard 2016-04-17 18:19:46 -04:00
Jack Humbert
e0ab1dcf4c merging 2016-04-17 18:15:35 -04:00
Jack Humbert
ce463ef424 audio fixes 2016-04-17 18:14:42 -04:00
Stephan Bösebeck
6d40f7c506 added new experimental layout - works with ErgodoxLayoutGenerator 2016-04-17 22:19:47 +02:00
IBNobody
23231fa577 Converted goodbye to notes, fixed eighth dotted note macro 2016-04-17 14:16:03 -05:00
IBNobody
3103ea542f Merge remote-tracking branch 'remotes/jackhumbert/master' into personal_atomic_planck 2016-04-17 12:55:19 -05:00