Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Moves features to their own files (process_*), adds tap dance feature #460

Merged
merged 79 commits into from
Jun 29, 2016
Merged
Changes from 1 commit
Commits
Show all changes
79 commits
Select commit Hold shift + click to select a range
6d3b8c5
non-working commit
jackhumbert Jun 12, 2016
819a448
working
jackhumbert Jun 12, 2016
2ebdeff
Merge branch 'master' into subprojects
jackhumbert Jun 13, 2016
e8645ac
subprojects implemented for planck
jackhumbert Jun 13, 2016
ccdb60d
pass a subproject variable through to c
jackhumbert Jun 13, 2016
305d3c7
consolidates clueboard revisions
jackhumbert Jun 13, 2016
7547fb3
Merge branch 'master' into subprojects
jackhumbert Jun 18, 2016
dbfa563
thanks for letting me know about conflicts..
jackhumbert Jun 18, 2016
ebc4c40
turn off audio for yang's
jackhumbert Jun 18, 2016
f5ea5c1
corrects starting paths for subprojects
jackhumbert Jun 18, 2016
49310b2
messing around with travis
jackhumbert Jun 18, 2016
c296a46
semicolon
jackhumbert Jun 18, 2016
4eb7c7b
travis script
jackhumbert Jun 18, 2016
dffa7af
travis script
jackhumbert Jun 18, 2016
41bfd58
script for travis
jackhumbert Jun 19, 2016
46ed5d5
correct directory (probably), amend files to commit
Jun 19, 2016
1d9c2c5
remove origin before adding
jackhumbert Jun 19, 2016
0a27c36
git pull, correct syntax
jackhumbert Jun 19, 2016
efc298c
git checkout
jackhumbert Jun 19, 2016
a2053bf
git pull origin branch
jackhumbert Jun 19, 2016
7f6bd83
where are we?
jackhumbert Jun 19, 2016
93ae041
where are we?
jackhumbert Jun 19, 2016
82335e4
Merge branch 'subprojects' of https://github.com/jackhumbert/qmk_firm…
jackhumbert Jun 19, 2016
f985bc4
merging
jackhumbert Jun 19, 2016
f43c640
force things to happen
jackhumbert Jun 19, 2016
193a88c
adds commit message, adds add
jackhumbert Jun 19, 2016
6b43b75
rebase, no commit message
jackhumbert Jun 19, 2016
7d0b93d
rebase branch
jackhumbert Jun 19, 2016
dc3c408
idk!
jackhumbert Jun 19, 2016
8446f33
try just pull
jackhumbert Jun 19, 2016
f67ad15
fetch - merge
jackhumbert Jun 19, 2016
983df60
specify repo branch
jackhumbert Jun 19, 2016
f9c444e
checkout
jackhumbert Jun 19, 2016
8ee6d21
goddammit
jackhumbert Jun 19, 2016
60eeba6
merge? idk
jackhumbert Jun 19, 2016
289062f
pls
jackhumbert Jun 19, 2016
a0f304f
after all
jackhumbert Jun 19, 2016
5108de7
don't split up keyboards
jackhumbert Jun 19, 2016
f11b0a6
syntax
jackhumbert Jun 19, 2016
6967a92
Merge branch 'master' into subprojects
jackhumbert Jun 19, 2016
da4b601
adds quick for all-keyboards
jackhumbert Jun 19, 2016
2f64142
trying out new script
jackhumbert Jun 19, 2016
4111800
script update
jackhumbert Jun 19, 2016
63a0830
lowercase
jackhumbert Jun 19, 2016
0dc5297
all keyboards
jackhumbert Jun 19, 2016
f07209d
stop replacing compiled.hex automatically
jackhumbert Jun 19, 2016
a3721f4
adds if statement
jackhumbert Jun 19, 2016
9a29c05
skip automated build branches
jackhumbert Jun 19, 2016
4f05f28
forces push to automated build branch
jackhumbert Jun 19, 2016
b970f88
throw an add in there
jackhumbert Jun 19, 2016
d0bcfe5
upstream?
jackhumbert Jun 19, 2016
b9a30b0
adds AUTOGEN
jackhumbert Jun 19, 2016
5f45d48
ignore all .hex files again
jackhumbert Jun 21, 2016
ac4e73a
testing out new repo
jackhumbert Jun 22, 2016
25a3f7e
global ident
jackhumbert Jun 22, 2016
7e2585b
generate script, keyboard_keymap.hex
jackhumbert Jun 22, 2016
7177b26
skip generation for now, print pandoc info, submodule update
jackhumbert Jun 23, 2016
354bd13
try trusty
jackhumbert Jun 23, 2016
720531e
and sudo
jackhumbert Jun 23, 2016
0480576
try generate
jackhumbert Jun 23, 2016
7c76295
merging master
jackhumbert Jun 23, 2016
dde8870
updates subprojects to keyboards
jackhumbert Jun 23, 2016
bb99887
no idea
jackhumbert Jun 23, 2016
6d264f8
updates to keyboards
jackhumbert Jun 23, 2016
76e182e
merge in backlight stuff
jackhumbert Jun 24, 2016
426f3fe
cleans up clueboard stuff
jackhumbert Jun 24, 2016
8e23578
setup to use local readme
jackhumbert Jun 24, 2016
c50a1b8
updates cluepad, planck experimental
jackhumbert Jun 24, 2016
86c037a
remove extra led.c [ci skip]
jackhumbert Jun 24, 2016
e382e6f
Merge branch 'master' into subprojects
jackhumbert Jun 24, 2016
e2d095f
audio and midi moved over to separate files
jackhumbert Jun 25, 2016
287c8d1
chording, leader, unicode separated
jackhumbert Jun 25, 2016
5677ee2
consolidate each [skip ci]
jackhumbert Jun 25, 2016
887e4d8
correct include
jackhumbert Jun 25, 2016
5a17c77
quantum: Add a tap dance feature (#451)
algernon Jun 28, 2016
8665abf
Merge branch 'master' into quantum-keypress-process
jackhumbert Jun 29, 2016
8260c08
Merge branch 'master' into quantum-keypress-process
jackhumbert Jun 29, 2016
c21343c
Merge branch 'master' into quantum-keypress-process
jackhumbert Jun 29, 2016
27c5490
update build script
jackhumbert Jun 29, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
semicolon
  • Loading branch information
jackhumbert committed Jun 18, 2016
commit c296a468a9f5e4a486e1803e17e92e8dc87aaaf7
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,5 @@ addons:
- dfu-programmer

after_success:
git commit -am "Updates compiled.hex files"
git commit -am "Updates compiled.hex files";
git push