Commit Graph

2407 Commits (bce6e52391da7c5f620c96a91857940f0dee19df)
 

Author SHA1 Message Date
climbalima bce6e52391 fixed conflict
8 years ago
climbalima dd22c787b8 fixed extra paste
8 years ago
climbalima ec0db2933c Merge branch 'master' of https://github.com/climbalima/qmk_firmware
8 years ago
climbalima b5cecb4cc9 Added both revisions into one folder
8 years ago
climbalima 79f82d3d80 returned to o
8 years ago
climbalima 6e27f6fbde Changes to be committed:
8 years ago
Jack Humbert 21e443101f Merge pull request #484 from jackhumbert/lets-split-support
8 years ago
Jack Humbert a4bf46f9b1 default keymap, reset sorted out for now, added serial to makefile
8 years ago
Jack Humbert c88207884b Merge branch 'master' into lets-split-support
8 years ago
Jack Humbert 5baaf871bb Merge pull request #488 from fredizzimo/add_visualizer
8 years ago
Fred Sundvik 6c29655790 Merge commit '73d890a2c9c34b905cd5e74e7146fdd4578dcb96' into add_visualizer
8 years ago
Fred Sundvik f727801bc6 Delete .gitmodules from visualizer
8 years ago
Fred Sundvik 9f33a5593c Add 'quantum/visualizer/' from commit 'bde869aa7ec8601459bc63b9636081d21108d1be'
8 years ago
Jack Humbert 19f480992c Merge pull request #487 from fredizzimo/serial_link_ergodox
8 years ago
Fred Sundvik e5726b017a Add setting of the master side to the makefile
8 years ago
Fred Sundvik 4b45deb652 Enable serial_link support for ChibiOS
8 years ago
Fred Sundvik a7e3e4e652 Add serial_link compilation to Infinity Ergodox
8 years ago
Jack Humbert eb6e17be6f adds eep, removes usbconfig.h
8 years ago
Jack Humbert c6d671e54c Merge pull request #482 from fredizzimo/serial_link
8 years ago
Fred Sundvik d5e7603d55 Remove extra serial_link subdirectory
8 years ago
Fred Sundvik c5bf090d16 Remove CGreen make files
8 years ago
Fred Sundvik 3ac52b2e76 Remove serial_link .gitignore and .gitmodules
8 years ago
Jack Humbert 3577e26fd9 fix/annotate wait_us lines
8 years ago
Jack Humbert cb410729e6 remove uno_slave for now, even though it's freakin cool
8 years ago
Jack Humbert dd2522ba8b add options to config.h
8 years ago
Jack Humbert 22ad6459b1 Merge branch 'master' into lets-split-support
8 years ago
Jack Humbert ce01f88c43 images, docks, clean-up [skip ci]
8 years ago
Jack Humbert d707738616 i2c working
8 years ago
Jack Humbert 96f44e1202 one half working
8 years ago
Fred Sundvik 639cdd363e Add 'quantum/serial_link/' from commit 'a20d513e3cdacbf6e0e70a80402497ad10166434'
8 years ago
Jack Humbert 7d28d6a7bc Merge pull request #480 from fredizzimo/add_infinity_ergodox
8 years ago
Fred Sundvik f9a6e34c28 Add dfu-util command for programming
8 years ago
Jack Humbert 421ff74e0c Merge pull request #471 from Chipairon/patch-1
8 years ago
Jack Humbert 99846b10e8 Merge pull request #478 from fredizzimo/chibios_subprojects
8 years ago
Fred Sundvik b4cd0cfd15 Infinity Ergodox - Add matrix.c and led.c
8 years ago
Fred Sundvik 74847a84f8 First version of Infinity Ergodox
8 years ago
Fred Sundvik cf6cd15920 Fix typo in teensy_lc_onkey.h
8 years ago
Fred Sundvik 6e4f2e18e6 Don't include common_config.h for ChibiOS test
8 years ago
Fred Sundvik 0a040a89e8 Move ChibiOS test board and ld
8 years ago
Fred Sundvik b11657d1c8 Suprojects for ChibiOS testing
8 years ago
Jack Humbert 94d3159d9d correct break/return order for planck and preonic defaults
8 years ago
Jack Humbert 9e01b219f3 Fixes typos in keycode.txt
8 years ago
Jack Humbert 86a7b060ef Adds wait to i2c (debounce)
8 years ago
Jack Humbert eafaba6b53 Improves debounce
8 years ago
Pavlos Vinieratos df25033fc6 fix typos
8 years ago
Jack Humbert 8e88d55bfd reverts #343 for the most part (#474)
8 years ago
Jack Humbert 21ee3eb569 Merge pull request #472 from Wigguno/master
9 years ago
Richard f4febd2cf7 Fix other KC60 Keymap Makefiles so they compile properly
9 years ago
Richard 54209dc672 Add my keymap to KC60
9 years ago
Rubén Díaz-Jorge 132c047469 Fix for '~' in spanish layout
9 years ago