Josh Colbeck
|
ac978a50a2
|
Merge branch 'master' of https://github.com/Skrymir/qmk_firmware
|
2016-07-06 23:38:58 -05: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 |
|
Joshua Colbeck
|
e0e1c119f0
|
Merge pull request #1 from Skrymir/patch-1
add ergodox layout
|
2016-07-06 20:29:29 -05:00 |
|
Josh Colbeck
|
5ed673d82d
|
Changed layer switching to momentary
corrected macro
|
2016-07-06 20:24:57 -05: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 |
|
Fred Sundvik
|
6c29655790
|
Merge commit '73d890a2c9c34b905cd5e74e7146fdd4578dcb96' into add_visualizer
|
2016-07-06 20:30:58 +03:00 |
|
Fred Sundvik
|
f727801bc6
|
Delete .gitmodules from visualizer
|
2016-07-06 20:17:16 +03:00 |
|
Fred Sundvik
|
9f33a5593c
|
Add 'quantum/visualizer/' from commit 'bde869aa7ec8601459bc63b9636081d21108d1be'
git-subtree-dir: quantum/visualizer
git-subtree-mainline: 19f480992c015aec0a15dca43e740bad8b7834e6
git-subtree-split: bde869aa7ec8601459bc63b9636081d21108d1be
|
2016-07-06 20:15:45 +03: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 |
|
Fred Sundvik
|
e5726b017a
|
Add setting of the master side to the makefile
|
2016-07-06 16:06:53 +03:00 |
|
Fred Sundvik
|
4b45deb652
|
Enable serial_link support for ChibiOS
|
2016-07-06 16:06:53 +03:00 |
|
Fred Sundvik
|
a7e3e4e652
|
Add serial_link compilation to Infinity Ergodox
|
2016-07-06 16:06:53 +03: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 |
|
Fred Sundvik
|
d5e7603d55
|
Remove extra serial_link subdirectory
|
2016-07-06 13:26:20 +03:00 |
|
Fred Sundvik
|
c5bf090d16
|
Remove CGreen make files
|
2016-07-06 13:10:30 +03:00 |
|
Fred Sundvik
|
3ac52b2e76
|
Remove serial_link .gitignore and .gitmodules
|
2016-07-06 13:09:51 +03: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 |
|
Fred Sundvik
|
639cdd363e
|
Add 'quantum/serial_link/' from commit 'a20d513e3cdacbf6e0e70a80402497ad10166434'
git-subtree-dir: quantum/serial_link
git-subtree-mainline: 7d28d6a7bc81578bb5a83f1d55810ee3d1458e96
git-subtree-split: a20d513e3cdacbf6e0e70a80402497ad10166434
|
2016-07-05 23:27:47 +03:00 |
|
Jack Humbert
|
7d28d6a7bc
|
Merge pull request #480 from fredizzimo/add_infinity_ergodox
Add infinity ergodox
|
2016-07-05 13:12:01 -04:00 |
|
Fred Sundvik
|
f9a6e34c28
|
Add dfu-util command for programming
Also add .bin generation, which is needed for dfu-util.
|
2016-07-05 19:28:17 +03: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 |
|
Fred Sundvik
|
b4cd0cfd15
|
Infinity Ergodox - Add matrix.c and led.c
|
2016-07-05 16:50:30 +03:00 |
|
Fred Sundvik
|
74847a84f8
|
First version of Infinity Ergodox
Mostly just adding the files from the fredizzimo repository. Still
needs some fixing until it works
|
2016-07-05 16:45:29 +03:00 |
|
Fred Sundvik
|
cf6cd15920
|
Fix typo in teensy_lc_onkey.h
|
2016-07-05 15:54:59 +03:00 |
|
Fred Sundvik
|
6e4f2e18e6
|
Don't include common_config.h for ChibiOS test
|
2016-07-05 15:53:40 +03:00 |
|
Fred Sundvik
|
0a040a89e8
|
Move ChibiOS test board and ld
Move the ChibiOS test subproject board and ld files to the kebyoard
folder, so that the build system can find them
|
2016-07-05 15:34:35 +03:00 |
|
Fred Sundvik
|
b11657d1c8
|
Suprojects for ChibiOS testing
|
2016-07-05 14:56:34 +03:00 |
|
Josh Colbeck
|
74d848c942
|
Merge remote-tracking branch 'jackhumbert/master' into patch-1
|
2016-07-04 22:44:26 -05:00 |
|
Jack Humbert
|
94d3159d9d
|
correct break/return order for planck and preonic defaults
|
2016-07-04 22:06:22 -04:00 |
|
Josh Colbeck
|
a5fb2b58a5
|
Merge remote-tracking branch 'jackhumbert/master' into patch-1
|
2016-07-04 15:41:58 -05:00 |
|
Josh Colbeck
|
497b92c3bd
|
Added macro and readme
macros to for often used eclipse shortcuts
|
2016-07-04 15:22:13 -05:00 |
|
Josh Colbeck
|
1650adf29a
|
Added new keymap
|
2016-07-04 12:00:06 -05: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 |
|
Pavlos Vinieratos
|
df25033fc6
|
fix typos
|
2016-07-04 17:55:32 +02:00 |
|
Jack Humbert
|
8e88d55bfd
|
reverts #343 for the most part (#474)
|
2016-07-04 11:45:58 -04:00 |
|
Josh Colbeck
|
62a92a71d0
|
Revert "Changed layout of left hand main layer"
This reverts commit 8149924399cf3d31d80444a10477a29f53a4990e.
|
2016-07-03 21:50:04 -05:00 |
|
Joshua Colbeck
|
8149924399
|
Changed layout of left hand main layer
|
2016-07-03 12:24:44 -05:00 |
|
Jack Humbert
|
21ee3eb569
|
Merge pull request #472 from Wigguno/master
|
2016-07-02 22:19:33 -04:00 |
|