Commit Graph
100 Commits
Author SHA1 Message Date
Jack Humbert cefc09ae7d adds option for alt pitch standards 2017-07-24 12:45:34 -04:00
Jack Humbert 6bdf7482b1 update audio/music documentation 2017-07-23 14:59:29 -04:00
Jack Humbert 415d38ba9e adds music mode, music mode songs, music mask 2017-07-23 14:59:29 -04:00
Jack Humbert 9abbbe7089 update audio documentation 2017-07-23 14:59:29 -04:00
Jack Humbert f407f3e8de remove unneccesary headers 2017-07-23 14:59:29 -04:00
Jack Humbert 92ccc9a7b8 use automatic rests with songs (no more rest styles) 2017-07-23 14:59:29 -04:00
Jack Humbert f40ded7894 relocate keymap's useful tools 2017-07-23 14:59:29 -04:00
Jack Humbert fd664fe85b escape song playing in music 2017-07-23 14:59:29 -04:00
Jack Humbert fe113ebad5 start updating audio docs 2017-07-23 14:59:29 -04:00
Jack Humbert 6a3c66776c clean-up planck and preonic keymaps, move audio stuff around 2017-07-23 14:59:29 -04:00
Jack Humbert 8edb67b082 fix line-endings 2017-07-21 19:05:13 -04:00
Jack Humbert 14c5160b1a Update _summary.md 2017-07-17 15:01:33 -04:00
Jack Humbert 000e749853 Rename docs/features/README.md to docs/features.md 2017-07-17 15:01:11 -04:00
Jack Humbert 7c0610b411 Merge pull request #1498 from That-Canadian/minidox
Minidox
2017-07-14 22:04:18 -04:00
Jack Humbert 6ed8ce4f59 Merge pull request #1491 from fredizzimo/msys2
Add support for msys2 build environment
2017-07-13 14:24:26 -04:00
Jack Humbert cc468523df clean up ssd1306 implementation 2017-07-11 14:23:26 -04:00
Jack Humbert 387b07404a update drivers to exclude lets_split include 2017-07-11 13:57:58 -04:00
Jack Humbert 65c10790d4 Update README.md 2017-07-10 11:53:18 -04:00
Jack Humbert 42d5a324eb Start mvoing hardware drivers to /drivers/ (#1433)
* start driver isolation

* update nyquist and orthodox boards

* update atreus62

* move drivers to avr

* update avr conditional
2017-07-10 11:18:47 -04:00
Jack Humbert 8d190d5e25 Merge branch 'master' of https://github.com/qmk/qmk_firmware 2017-07-10 10:35:45 -04:00
Jack Humbert 6221498601 Merge commit '8858438a770c1c982f33b296447ca77176c751f7' 2017-07-09 21:26:54 -04:00
Jack Humbert 8858438a77 Squashed 'lib/lufa/' changes from f2bd51f4e..bbdc9ac40
bbdc9ac40 Merge pull request #1 from fredizzimo/fix_line_endings
75ba27b8d Fix xml file line endings
7a8237259 Merge commit '5a3397d17ec917c7be5d5109e01a3a84a355cb1b'
713c65b5b Merge commit 'cedfbfcb1a9ad9cf93816f1952fc4bf7c55fbb61'
00e20c453 delete old lufa

git-subtree-dir: lib/lufa
git-subtree-split: bbdc9ac40c2ff543bbaf3870d407d0a96c945c1a
2017-07-09 21:26:51 -04:00
Jack Humbert 03706de946 Merge commit '5a3397d17ec917c7be5d5109e01a3a84a355cb1b' 2017-07-07 21:46:08 -04:00
Jack Humbert 5a3397d17e Squashed 'lib/lufa/' changes from a44056fb9..f2bd51f4e
f2bd51f4e fixing line endings

git-subtree-dir: lib/lufa
git-subtree-split: f2bd51f4edba87a259808c92c0424dc36475282b
2017-07-07 21:46:04 -04:00
Jack Humbert ea3df7466a Merge commit 'cedfbfcb1a9ad9cf93816f1952fc4bf7c55fbb61' 2017-07-07 16:40:03 -04:00
Jack Humbert cedfbfcb1a Squashed 'lib/lufa/' changes from 385d40300..a44056fb9
a44056fb9 add .gitattributes

git-subtree-dir: lib/lufa
git-subtree-split: a44056fb9d4784e3a248f460688b35977592cb05
2017-07-07 16:40:01 -04:00
Jack Humbert 0787d70e55 Updates Documentation from #1444 2017-07-07 15:57:18 -04:00
Jack Humbert 9de443cbf1 Merge pull request #1471 from qmk/lufa_lib
Update LUFA and move it to /lib/lufa
2017-07-07 15:33:29 -04:00
Jack Humbert 1c26468ad5 update include 2017-07-07 14:53:47 -04:00
Jack Humbert 7bddacf25f update lets_split lufa include 2017-07-07 13:32:29 -04:00
Jack Humbert 4b37030ad0 update lufa implementation 2017-07-07 12:06:59 -04:00
Jack Humbert 39ece81979 delete old lufa 2017-07-07 11:56:51 -04:00
Jack Humbert 60b30c0363 Squashed 'lib/lufa/' content from commit 385d40300
git-subtree-dir: lib/lufa
git-subtree-split: 385d4030035dbaf41591309dbde47653bd03841b
2017-07-07 11:55:23 -04:00
Jack Humbert 8655d4f494 Merge commit '60b30c036397cb5627fa374bb930794b225daa29' as 'lib/lufa' 2017-07-07 11:55:23 -04:00
Jack Humbert fe47b36065 fix tag increment 2017-07-03 00:23:37 -04:00
Jack Humbert ea134be36a fix up travis script 2017-07-02 23:38:20 -04:00
Jack Humbert b7afa59c97 remove warning 2017-06-30 16:33:49 -04:00
Jack Humbert 753809eed7 adds debouncing to sixkeyboard 2017-06-30 16:33:49 -04:00
Jack Humbert b476d65b9c Update keyboards' rules.mk/Makefiles (#1442)
this may change some of the keyboards' default settings - if you experience anything odd, please check back to this commit
2017-06-30 16:09:52 -04:00
Jack Humbert 3e3c3e2b24 start glossary 2017-06-29 22:12:24 -04:00
Jack Humbert 9f643ba8bf clean-up github page 2017-06-29 21:23:20 -04:00
Jack Humbert 4c7e66c31c add file to summary 2017-06-29 19:37:49 -04:00
Jack Humbert b139633f89 adds how to github 2017-06-29 19:35:33 -04:00
Jack Humbert ad91386497 remove dangling commas 2017-06-29 17:13:42 -04:00
Jack Humbert b75ad215c8 use default base names 2017-06-29 12:25:29 -04:00
Jack Humbert 391eae97e4 testing out new home 2017-06-29 12:13:44 -04:00
Jack Humbert d59734d3b7 restructure summary 2017-06-29 10:35:09 -04:00
Jack Humbert d5244c6cf4 restructure keycode docs 2017-06-29 00:15:07 -04:00
Jack Humbert 40d82906cb adds config options md 2017-06-28 21:20:23 -04:00
Jack Humbert 61ef949576 update some copyright headers 2017-06-28 12:58:58 -04:00
Jack Humbert 56634ca065 cleanup nyquist 2017-06-28 10:42:23 -04:00
Jack Humbert 663d3906ec cleanup orthodox 2017-06-28 10:42:23 -04:00
Jack Humbert f5f7dfa064 cleanup lets_split 2017-06-28 10:42:23 -04:00
Jack Humbert 4ea247e673 create initial code of conduct 2017-06-27 21:36:44 -04:00
Jack Humbert a52836e669 Merge pull request #1445 from qmk/dual_audio
Allow for duophony (C6 and B5) and B5 audio
2017-06-27 16:57:19 -04:00
Jack Humbert 7d28a417c0 don't let timer1 exist without b5 being enabled 2017-06-27 15:28:13 -04:00
Jack Humbert ea7590c894 add new arguements, docs 2017-06-27 14:35:08 -04:00
Jack Humbert 9f5b4e1d7a Merge branch 'master' of https://github.com/qmk/qmk_firmware into dual_audio 2017-06-27 14:21:42 -04:00
Jack Humbert b82604dada no glide 2017-06-27 14:20:53 -04:00
Jack Humbert bfc73e90cf working duopholy 2017-06-27 14:20:44 -04:00
Jack Humbert eabf530a0e b5 audio 2017-06-27 14:20:14 -04:00
Jack Humbert 4ba9438c3f Add eclipse to the _summary 2017-06-27 13:07:50 -04:00
Jack Humbert b2979eba23 Adds parenthesis where they might be needed
Addresses #764
2017-06-27 12:55:18 -04:00
Jack Humbert 61cdc9aaa4 Allow mod swapping for mod tap (MT) (#1202)
* allow mod swapping for mod tap

* quick include

* fix the mod swapping

* make changes consistent with action code

* fix bug

* re-enable no gui, etc

* fix binary comps

* solid logic
2017-06-26 18:54:01 -04:00
Jack Humbert d1fb8d2296 Merge pull request #1431 from rai-suta/master
Bugg fix and add keymap for testing JIS_KEYCODE switch.
2017-06-25 21:31:10 -04:00
Jack Humbert 1a4a66fd01 updates olkb readmes #1362 2017-06-25 12:40:25 -04:00
Jack Humbert 169ede0715 Merge pull request #1427 from blakedietz/master
Add keymaps for ergodox ez, hhkb and jd45 under user blakedietz
2017-06-25 10:29:24 -04:00
Jack Humbert de833659ae Merge pull request #1429 from fredizzimo/fixes_for_emulator
Minor fixes to support the emulator
2017-06-25 10:29:00 -04:00
Jack Humbert 901a92a2fd Update _summary.md 2017-06-24 13:11:25 -04:00
Jack Humbert f175f5df95 Merge pull request #1425 from kynikos/patch-1
Fix typo
2017-06-24 11:39:15 -04:00
Jack Humbert 6c81656e8e Merge pull request #1426 from rai-suta/master
Add JIS_KEYCODE layout for send_string()
2017-06-24 11:38:38 -04:00
Jack Humbert c208a6d4e5 update docs for isp 2017-06-23 23:09:14 -04:00
Jack Humbert b9987d65f9 Merge branch 'master' of https://github.com/qmk/qmk_firmware 2017-06-23 23:07:01 -04:00
Jack Humbert 2c65a17752 add other mcu bootloaders 2017-06-23 23:05:42 -04:00
Jack Humbert dfa6417ae3 Merge pull request #1422 from nstickney/master
update ErgoDox "Familiar" layout
2017-06-23 21:48:17 -04:00
Jack Humbert 918aea5b47 Update _summary.md 2017-06-23 21:29:35 -04:00
Jack Humbert b4f2f44a6f Create isp_flashing_guide.md 2017-06-23 21:29:04 -04:00
Jack Humbert 1524c2cb16 Merge pull request #1418 from npoirey/master
Frenchdev v1
2017-06-23 18:05:33 -04:00
Jack Humbert a1ce43781a Merge pull request #1421 from 333fred/update-layout
Update my layout
2017-06-23 14:43:51 -04:00
Jack Humbert 91f3a73a28 Merge pull request #1419 from Wraul/phantom-improvements
Phantom improvements
2017-06-23 14:43:32 -04:00
Jack Humbert 2b98ec67f3 Update _summary.md 2017-06-22 13:23:08 -04:00
Jack Humbert 7b3c9cc8de Create adding_a_keyboard_to_qmk.md 2017-06-22 13:22:21 -04:00
Jack Humbert f32c68ee65 Update porting_your_keyboard_to_qmk.md 2017-06-22 13:21:43 -04:00
Jack Humbert c21c2cc92b Merge pull request #1416 from geofflane/feature/s65_x_std_grv_esc
Use the new Quantum KC_GESC instead of custom code
2017-06-22 12:38:45 -04:00
Jack Humbert 9d22a1a6d8 add group edge via travis updates 2017-06-21 11:23:33 -04:00
Jack Humbert 23df3016e8 Merge pull request #1405 from cquiroz/oneshot-mods-timeout
Oneshot mods timeout
2017-06-20 11:40:10 -04:00
Jack Humbert 9019d65b3c Merge pull request #1414 from dvdizon/kbd75
KBD75 - Initial KBD75 port from qmkeyboard.cn source files
2017-06-20 09:19:48 -04:00
Jack Humbert 2c171b3e5f Merge pull request #1413 from lasko/master
This is a complete redo of my keymap. It includes several
2017-06-20 09:18:02 -04:00
Jack Humbert 33a271b8e3 Merge pull request #1412 from nall/master
Fixed offset for knight rgb mode
2017-06-20 09:17:36 -04:00
Jack Humbert 3e7bb19612 Merge pull request #1410 from belak/tv44-core
tv44: Add core layout based on the Core 47
2017-06-19 14:05:02 -04:00
Jack Humbert e951317acb Merge pull request #1409 from fredizzimo/full_unit_test
Take first baby steps towards testing the whole QMK
2017-06-19 14:04:19 -04:00
Jack Humbert 621ae42a6c revert edit 2017-06-18 13:28:34 -04:00
Jack Humbert 4217cb5bbc Update key_functions.md 2017-06-18 13:26:20 -04:00
Jack Humbert 517f75d893 Merge pull request #1349 from jpetermans/infinity60
Infinity60 backlight support
2017-06-18 12:38:38 -04:00
Jack Humbert dd73e14c9b Merge pull request #1407 from take-a-CHANCE/master
Adding a planck keymap
2017-06-18 12:35:08 -04:00
Jack Humbert 66e2d6a063 Merge pull request #1406 from jprMesh/atreus52
Atreus52
2017-06-18 12:34:33 -04:00
Jack Humbert f2e1609801 remove hardware files, move arrow pad 2017-06-18 12:33:14 -04:00
Jack Humbert 5682254f71 Merge pull request #1408 from fredizzimo/fix_build_improve_travis
Fix the two failing keymaps and improve the travis build script
2017-06-18 12:13:56 -04:00
Jack Humbert 51a86b85f3 Merge pull request #1361 from fredizzimo/ergodox_infinity_backlight
Add Ergodox Infinity backlight support
2017-06-18 10:15:02 -04:00
Jack Humbert 7feadbd66d Merge pull request #1401 from geofflane/s65_x_fixes3
S65-X Fixes Part 3
2017-06-17 20:14:49 -04:00