gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2024-11-23 20:03:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,272 Commits 62 Branches 1,610 Tags 1.3 GiB
d707738616
Commit Graph

197 Commits

Author SHA1 Message Date
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
IBNobody
d5b72e7bde Fixed many compiler warnings related to print being disabled 2016-04-17 12:54:32 -05:00
a0-c
90289aa53f __attribute__ ((weak)) added to led_set 
__attribute__ ((weak)) added to led_set
 2016-04-17 06:51:39 -10:00
IBNobody
c940e87235 fixed single note play copy/paste bug 2016-04-17 10:41:07 -05:00
Jack Humbert
319fbe344b Merge branch 'personal_atomic_planck' of github.com:IBNobody/qmk_firmware 2016-04-17 10:56:12 -04:00
IBNobody
29e495be2a Added trimble and tempo adjustments! 2016-04-17 02:52:38 -05:00
IBNobody
943b5b7709 Adding folding to #if, etc 2016-04-17 00:24:58 -05:00
Jack Humbert
a67d425f4d planck default layout updates 2016-04-17 01:00:39 -04:00
Jack Humbert
e7b9959819 no need for length of play_notes array with macro 2016-04-16 23:15:40 -04:00
IBNobody
45f10b4c4b Fixed how note arrays are used. 2016-04-16 22:10:18 -05:00
Jack Humbert
8bbd064cf5 changes to play_notes, goodbye 2016-04-16 23:07:50 -04:00
Jack Humbert
41cc35425a rests between notes as an argument 2016-04-16 21:31:40 -04:00
Jack Humbert
8f4ce501eb Merge pull request #260 from IBNobody/personal_atomic_planck 
Atomic TLC and musical note freqs for audio
 2016-04-16 21:02:17 -04:00
IBNobody
4aea806aa8 Adding Musical Notes 2016-04-16 19:31:32 -05:00
Jack Humbert
c83aa16f1d fixes audio prescaler to emit correct freq 2016-04-16 20:26:02 -04:00
Jack Humbert
ab19ebd08a MAGIC functionality, AG swap in default layout 2016-04-16 18:51:58 -04:00
Jack Humbert
86169833c5 updates to preonic default, music mode integrated 2016-04-16 15:47:17 -04:00
Jack Humbert
142ce47698 added keymap_extras to path 2016-04-16 01:23:08 -04:00
Jack Humbert
0b0ec82427 eeprom reset tool 2016-04-16 00:01:22 -04:00
Jack Humbert
0faa18eab9 audio enable stored in eeprom 2016-04-15 23:38:21 -04:00
IBNobody
8f85117aa9 Added Audio to my Atomic 2016-04-15 14:42:50 -05:00
Jack Humbert
ee2ee7f4f0 audio note length fixes 2016-04-15 13:44:07 -04:00
Jack Humbert
bb0836c620 the spacessss 2016-04-15 00:26:22 -04:00
Jack Humbert
63462bf8c1 changing up the makefile a bit 2016-04-14 20:42:14 -04:00
IBNobody
2900b48845 Added parenthesis to midi macro. 2016-04-13 22:04:44 -05:00
IBNobody
3755ef5ddb Compiler Warnings / Atomic TLC 
Corrected compiler warnings for a number of issues.  Gave Atomic some
TLC.
 2016-04-13 20:57:51 -05:00
skullY
97f8f37876 Fixup RGBLIGHT support for clueboard2 2016-04-10 21:16:49 -07:00
Erez Zukerman
9cfc74c35b [Erez & Jack] Makes tri-layer available across Quantum 2016-04-07 15:21:06 +03:00
Jack Humbert
976d0a327b add silent notes 2016-04-05 09:21:44 -04:00
Stephan Bösebeck
aee8715815 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-04-01 23:54:16 +02:00
Stephan Bösebeck
dbd4ab3457 fixed de_osx prefix in keymap include to avoid conflicts 2016-03-31 23:15:59 +02:00
Jack Humbert
e7377dc24b Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard 2016-03-30 00:45:48 -04:00
Jack Humbert
ac0729787f preonic update 2016-03-30 00:43:07 -04:00
Noah Andrews
95fba250ef Updated several keyboard folders to use new keymap naming scheme 2016-03-29 21:53:36 -04:00
Jack Humbert
8bbc1dcf4f Merge pull request #219 from IBNobody/master 
Master
 2016-03-28 23:17:16 -04:00
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
 2016-03-28 19:45:20 -05:00
Jack Humbert
fd9e5d1510 Merge pull request #214 from cdlm/action-hook 
Add per-event user hook function
 2016-03-28 11:55:19 -04:00
Damien Pollet
2181be029e Add action-preprocessing hook to keyboard template 2016-03-28 16:49:46 +02:00
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)
 2016-03-28 00:03:21 -05:00
IBNobody
3d56ec052e Fixed extra semicolons. 
Fixed extra semicolons.
 2016-03-22 21:06:22 -05:00
IBNobody
10491ba21f Fixed LED Function Calls 
Fixed LED indicator function calls to match how the matrix init function
calls are formatted.
 2016-03-22 20:58:44 -05:00
IBNobody
ec62d9e85c Merge remote-tracking branch 'refs/remotes/jackhumbert/master' 
# Conflicts:
#	quantum/template/template.c
#	quantum/template/template.h
 2016-03-22 20:39:05 -05:00
yoyoerx
baeffd99da Pull request 190 resolution with 'qmk/master' for merge 2016-03-21 17:18:53 -04:00
IBNobody
eba9a7d74d Adding LED function pointers 2016-03-15 23:52:51 -05:00
Jack Humbert
35393fa9dc Merge pull request #194 from DidierLoiseau/bépo-keymap-header 
Keymap header for the BÉPO layout
 2016-03-14 13:42:47 -04:00
Daniel Kriesten
bfc6eca44a fixes an obvious typo to have DE_LCBR produce { 2016-03-14 13:35:34 +01:00
Didier Loiseau
7c33f8493f Keymap header for the BÉPO layout 2016-03-13 23:22:21 +01:00
yoyoerx
641859df84 Addressed void* return warning in all keymaps 2016-03-10 11:28:34 -05:00
Noah Andrews
ee1b94045e Remove extraneous comma 2016-03-04 10:53:58 -05:00
plgruener
4ca4322501 update neo keymap 2016-03-03 10:25:23 +01:00
Kévin Letord
4a19cc054d Fix FR_RCBR declaration in keymap_french.h 2016-02-27 15:22:54 +01:00
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.
 2016-02-22 13:06:26 -05:00
Vincent Pochet
1934e8a270 Add extra keymap for swiss french keyboard 2016-02-20 14:01:28 +01:00
Jack Humbert
a6414eb257 Merge pull request #145 from gerbercj/feature/atreus_astar 
Add support for Atreus running on A-Star
 2016-02-17 21:18:13 -05:00