rootiest/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,779 Commits 1 Branch 0 Tags
1ab78110bd21b32a59eea46558ab4d83c5658cdb
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jack Humbert 098951905d forces all ergodox keymaps to be ez on qmk.fm (were infinity) 2016-08-12 20:45:43 -04:00
Jack Humbert 11d4784d3a Merge pull request #622 from shelaf/master 
My HHKB layout
 2016-08-12 14:43:04 -04:00
Jack Humbert c6ec63eac3 Merge pull request #621 from shelaf/fix 
Fix typo
 2016-08-12 14:42:42 -04:00
Jack Humbert 97cd7afc32 Merge pull request #618 from denolfe/master 
Add denolfe satan keymap
 2016-08-11 21:34:34 -04:00
Jack Humbert a0ed238c12 Merge pull request #617 from iFreilicht/patch-2 
Fix dead link in keycode.txt
 2016-08-11 21:34:09 -04:00
Jack Humbert bad77bf4e9 Merge pull request #614 from iFreilicht/patch-1 
Update TMK_README.md
 2016-08-11 21:33:55 -04:00
Jack Humbert a087a207f1 Merge pull request #608 from finleye/master 
Adds keymap based on Kinesis advantage
 2016-08-11 21:32:32 -04:00
Jack Humbert 55ca218634 Merge pull request #613 from di0ib/master 
Convert hex to bin
 2016-08-08 12:10:49 -04:00
Jack Humbert 1f4277fe6b Merge pull request #612 from kuel/master 
Added file for software implementation of Russian, gave keymap_cyrillic.h a better name.
 2016-08-08 12:09:48 -04:00
Jack Humbert a3167bdc09 Merge pull request #609 from sethbc/fix_clueboard_orphaned_files 
remove orphaned clueboard files
 2016-08-08 12:09:14 -04:00
Jack Humbert 9866c23bff Merge pull request #607 from jeebak/jeebak 
Update Jeebak's keymap, w/ KC_COPY, etc. workaround.
 2016-08-08 12:07:39 -04:00
Jack Humbert 213cb2c243 Merge pull request #605 from kuel/master 
Add keymap_cyrillic.h, lots of cyrillic characters
 2016-08-03 00:11:02 -04:00
Jack Humbert 301e46c529 Merge pull request #599 from Depariel/master 
Fixed compiling errors and updated keymaps for infinity_chibios
 2016-08-03 00:10:41 -04:00
Jack Humbert e62c588921 Merge pull request #561 from 0xdec/patch-1 
Clean up formatting & tiny refactor in rgblight.c
 2016-08-03 00:08:02 -04:00
Jack Humbert 461f973c2b correct file name 2016-08-01 23:46:50 -04:00
Jack Humbert 25f138c0d3 fix mkdir cmd 2016-08-01 22:59:25 -04:00
Jack Humbert f422f442cf automatically forward ergodox ez 2016-08-01 14:51:26 -04:00
Jack Humbert bb249fb239 Merge pull request #597 from Jiehong/feature/basic_keyboard_doc 
feature: add basic doc about how a keyboard works on USB
 2016-08-01 02:25:20 -04:00
Jack Humbert d5baa4773d Merge pull request #596 from fredizzimo/rid_of_quick 
Fix the makefile dependencies and remove quick targets
 2016-08-01 02:24:53 -04:00
Jack Humbert b25dbc484d Merge pull request #594 from jeebak/jeebak 
Jeebak's keymap for planck
 2016-07-31 01:30:31 -04:00
Jack Humbert 7e000ff476 Merge pull request #590 from jeebak/in-like-flint 
Add IN_LIKE_FLINT song
 2016-07-31 01:30:09 -04:00
Jack Humbert 17bd4ac062 Updated my keymap 2016-07-30 14:07:27 -04:00
Jack Humbert 7775f3e4b3 Merge pull request #589 from algernon/h/ergodox_ez-vs-ergodox 
Update some obsolete references
 2016-07-30 02:53:29 -04:00
Jack Humbert 0b7557b60f Merge pull request #587 from fredizzimo/documentation_quick_fix 
Fix the quick aliases documentation section
 2016-07-29 22:33:29 -04:00
Jack Humbert 063983639d Merge pull request #503 from fredizzimo/ergodox_subproject 
Add both Ergodox EZ and Infinity Ergodox as sub-projects of Ergodox
 2016-07-29 22:32:27 -04:00
Jack Humbert 7559edc6e6 Merge pull request #578 from 0xdec/master 
0xdec Preonic keymap
 2016-07-28 16:34:34 -04:00
Jack Humbert 9b5edbdce9 Merge pull request #577 from hot-leaf-juice/master 
Pull request to include my keymap if you want it!
 2016-07-28 16:34:16 -04:00
Jack Humbert 16f8426fe2 Merge pull request #573 from algernon/f/make-all-stop-on-error 
tmk_core/rules.mk: Make PRINT_ERROR* stop on error
 2016-07-28 16:32:37 -04:00
Jack Humbert 80667e898a Merge pull request #572 from algernon/f/tap-dance-debug 
tap-dance: Add some debugging support
 2016-07-28 12:28:30 -04:00
Jack Humbert e5ac0e8369 Merge pull request #570 from sethbc/fix_bone2planck_build 
Fix bone2planck build
 2016-07-28 12:27:46 -04:00
Jack Humbert a6d279a343 Merge pull request #569 from sethbc/fix_stanleylai_warnings 
kill warnings filling up travis buildlog
 2016-07-28 12:27:11 -04:00
Jack Humbert 36df9fd3fd Merge pull request #568 from sethbc/fix-colemak-osx-pc-no 
update NO_AMP to NO_AMPR
 2016-07-28 12:26:43 -04:00
Jack Humbert f96a2a74ea Merge pull request #566 from SmackleFunky/master 
Allow toggling out of plover layer
 2016-07-28 12:26:11 -04:00
Jack Humbert 9171ce1d17 Merge pull request #559 from Talljoe/fix-compiler-warning 
Fix compiler warning when PREVENT_STUCK_MODIFIERS is enabled.
 2016-07-28 12:24:42 -04:00
Jack Humbert 8d98f37fbb Merge pull request #564 from mazinbokhari/master 
Move to keyboards
 2016-07-28 12:24:03 -04:00
Jack Humbert b66131eeb5 disable midi by default 2016-07-26 15:59:26 -04:00
Jack Humbert f9aadd17e8 Merge pull request #558 from lindhe/master 
Fix misspelled command in Norwegian helper
 2016-07-25 11:16:54 -04:00
Jack Humbert 8b94e26d7c Fixes midi functionality 2016-07-24 22:07:43 -04:00
Jack Humbert 4aa7d2e206 Merge pull request #554 from robertdale/music-recording-documentation 
Added music recording/playing doc
 2016-07-24 21:58:23 -04:00
Jack Humbert 24bd931962 Merge pull request #552 from robertdale/music-play-fix 
Fixes issue #551 - ensure there's a recording to play before playing
 2016-07-24 21:58:01 -04:00
Jack Humbert 41f15d8c34 Merge pull request #550 from Darthabel/fix_bepo 
Fix some errors in bepo mapping
 2016-07-24 21:57:38 -04:00
Jack Humbert 46f84157ce Merge pull request #549 from locksmithdon/patch-1 
Added LEADER_EXTERNS() call to readme.
 2016-07-24 21:57:15 -04:00
Jack Humbert 670327f1d0 Merge pull request #548 from CommandLineDesign/CMD-Preonic 
CMD keymap for Preonic
 2016-07-24 21:56:50 -04:00
Jack Humbert 384d9cd6bb Merge pull request #546 from sethbc/satan-cleanup 
Satan cleanup
 2016-07-24 21:56:23 -04:00
Jack Humbert 8e1d96983a Merge pull request #543 from VoodaGod/bone2planck 
updated bone2planck
 2016-07-21 21:29:54 -04:00
Jack Humbert 66fed12c98 Merge pull request #541 from milestogo/master 
initial kinisis advantage build
 2016-07-21 21:05:06 -04:00
Jack Humbert 5249b4451c Merge pull request #540 from replicaJunction/feature-atreus-keymapFunction 
Adjusted Atreus KEYMAP() function.
 2016-07-21 21:04:45 -04:00
Jack Humbert fb0bba5981 Merge pull request #538 from robertdale/preonic-map-correction 
Preonic: Corrected the ascii layout to match the coded layout
 2016-07-21 21:03:56 -04:00
Jack Humbert d5d2eb8b5a Merge pull request #536 from pvinis/debug-doc 
add some debugging doc, after i found out how to print debug messages
 2016-07-21 21:02:37 -04:00
Jack Humbert 6f9f9baff4 Merge pull request #530 from sethbc/master 
Misc. fixes from sethbc
 2016-07-21 21:01:35 -04:00
Jack Humbert 26546f995f Merge pull request #529 from CommandLineDesign/CMD60-newKeymap 
Added CMD60 keymap
 2016-07-21 20:59:02 -04:00
Jack Humbert 2bed835a33 Merge pull request #525 from edasque/master 
Added Docker as a simple way to build firmwares
 2016-07-21 20:58:39 -04:00
Jack Humbert fc9f128648 Merge pull request #522 from exiva/extrakey-macfix 
Fix OS X Recognizing keyboard as Mouse/Tablet
 2016-07-21 20:57:54 -04:00
Jack Humbert fc4ab870f5 Merge pull request #521 from exiva/makefile-wait 
Make DFU wait for bootloader
 2016-07-21 20:57:32 -04:00
Jack Humbert 940358ed4f Merge pull request #518 from jakllsch/upstream 
keymap_extras changes
 2016-07-21 20:56:54 -04:00
Jack Humbert 62a6d3a6f5 Merge pull request #516 from pvinis/tap-dance-anyway 
Tap dance anyway
 2016-07-21 20:56:24 -04:00
Jack Humbert 9ecf9073b9 Merge pull request #489 from Skrymir/master 
New ergodox-ez layout
 2016-07-14 10:59:23 -04:00
Jack Humbert 8bbbbcddf9 Merge pull request #515 from pvinis/reset-function 
extract reset keyboard into a function
 2016-07-14 10:53:51 -04:00
Jack Humbert a998a48673 Merge pull request #477 from Smilliam/master 
Canceling Space Cadet state with opposite shift key
 2016-07-11 09:14:43 -04:00
Jack Humbert 076de6fa75 Merge pull request #506 from stanleylai/master 
Added my custom keymap for Satan
 2016-07-11 09:14:11 -04:00
Jack Humbert 4081fc4d8f Merge pull request #505 from fredizzimo/documentation_fix 
Remove out of place documentation, caused by ChibiOS merge
 2016-07-10 14:02:10 -04:00
Jack Humbert b0300d8d8f Merge pull request #502 from robotmaxtron/master 
Adding robotmaxtron's GH60 Keymap
 2016-07-09 20:55:58 -04:00
Jack Humbert 9dc6dfbf96 Merge pull request #500 from TerryMathews/master 
Establish Poker clone keymap for Satan
 2016-07-09 19:19:05 -04:00
Jack Humbert 4139841e9d Merge pull request #498 from fredizzimo/fix_make_dependencies 
Fix make dependencies
 2016-07-08 16:44:18 -04:00
Jack Humbert 8610481c37 Merge pull request #496 from fredizzimo/makefile_optimization 
Makefile optimization
 2016-07-08 12:01:32 -04:00
Jack Humbert b6e47f7a5f Merge pull request #494 from robbiegill/master 
Port support for hhkb-jp from tmk
 2016-07-08 08:35:24 -04:00
Jack Humbert a9979c6f42 Merge pull request #493 from TerryMathews/master 
Create keycodes for RGB control functions
 2016-07-08 08:34:27 -04:00
Jack Humbert e8719e10c4 Merge pull request #491 from fredizzimo/keycode_fixes 
Some fixes for keycode processing
 2016-07-07 13:57:39 -04:00
Jack Humbert c1dfb636ef fixes quantum template (actually) 2016-07-07 12:22:10 -04:00
Jack Humbert 57e08eb8ba updates rgblight implementation, makes non-timer stuff compatible with audio 2016-07-07 11:33:34 -04:00
Jack Humbert ad43d450ca Merge pull request #490 from fredizzimo/integrate_visualizer 
Integrate visualizer for ChibiOS and Infinity Ergodox
 2016-07-07 09:59:33 -04:00
Jack Humbert 589df84d6c corrects quantum template 2016-07-07 09:58:44 -04:00
Jack Humbert 21e443101f Merge pull request #484 from jackhumbert/lets-split-support 
Add Let's Split support
 2016-07-06 23:44:22 -04:00
Jack Humbert a4bf46f9b1 default keymap, reset sorted out for now, added serial to makefile 2016-07-06 22:48:19 -04:00
Jack Humbert c88207884b Merge branch 'master' into lets-split-support 2016-07-06 18:05:50 -04:00
Jack Humbert 5baaf871bb Merge pull request #488 from fredizzimo/add_visualizer 
Add visualizer library
 2016-07-06 15:02:51 -04:00
Jack Humbert 19f480992c Merge pull request #487 from fredizzimo/serial_link_ergodox 
Integrate serial link support for ChibiOS and Infinity Ergodox
 2016-07-06 09:48:58 -04:00
Jack Humbert eb6e17be6f adds eep, removes usbconfig.h 2016-07-06 09:04:04 -04:00
Jack Humbert c6d671e54c Merge pull request #482 from fredizzimo/serial_link 
Add serial link library
 2016-07-06 08:56:57 -04:00
Jack Humbert 3577e26fd9 fix/annotate wait_us lines 2016-07-06 00:24:31 -04:00
Jack Humbert cb410729e6 remove uno_slave for now, even though it's freakin cool 2016-07-05 23:56:42 -04:00
Jack Humbert dd2522ba8b add options to config.h 2016-07-05 23:52:18 -04:00
Jack Humbert 22ad6459b1 Merge branch 'master' into lets-split-support 2016-07-05 23:40:58 -04:00
Jack Humbert ce01f88c43 images, docks, clean-up [skip ci] 2016-07-05 23:40:54 -04:00
Jack Humbert d707738616 i2c working 2016-07-05 23:27:10 -04:00
Jack Humbert 96f44e1202 one half working 2016-07-05 18:36:02 -04:00
Jack Humbert 7d28d6a7bc Merge pull request #480 from fredizzimo/add_infinity_ergodox 
Add infinity ergodox
 2016-07-05 13:12:01 -04:00
Jack Humbert 421ff74e0c Merge pull request #471 from Chipairon/patch-1 
Fix for '~' in spanish layout
 2016-07-05 11:05:14 -04:00
Jack Humbert 99846b10e8 Merge pull request #478 from fredizzimo/chibios_subprojects 
Suprojects for ChibiOS testing
 2016-07-05 11:04:54 -04:00
Jack Humbert 94d3159d9d correct break/return order for planck and preonic defaults 2016-07-04 22:06:22 -04:00
Jack Humbert 9e01b219f3 Fixes typos in keycode.txt 2016-07-04 12:19:01 -04:00
Jack Humbert 86a7b060ef Adds wait to i2c (debounce) 2016-07-04 12:13:41 -04:00
Jack Humbert eafaba6b53 Improves debounce 2016-07-04 12:01:10 -04:00
Jack Humbert 8e88d55bfd reverts #343 for the most part (#474) 2016-07-04 11:45:58 -04:00
Jack Humbert 21ee3eb569 Merge pull request #472 from Wigguno/master 2016-07-02 22:19:33 -04:00
Jack Humbert a8b55f8c85 Test all subprojects with travis (#464) 
* tests all subprojects

* too many paren
 2016-06-30 09:51:45 -04:00
Jack Humbert 2d80eee6b8 test handwired boards 2016-06-29 21:21:02 -04:00
Jack Humbert ba6fb23f07 adds handwire and onekey example 2016-06-29 20:21:05 -04:00
Jack Humbert 7db2ec1509 updates planck experimental, width of color output 2016-06-29 18:47:53 -04:00
Jack Humbert 8125cdb88c gets rid of rand warning [skip ci] 2016-06-29 18:36:52 -04:00