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

Rgb matrix fixes, I2C library can now retry if it has failed #2943

Merged
merged 24 commits into from
May 14, 2018
Merged
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
5665888
Merge remote-tracking branch 'qmk/master'
May 26, 2017
d50dd9c
Merge remote-tracking branch 'qmk/master'
May 28, 2017
f8538fd
Added Modular keyboards L,R and NUM
May 28, 2017
995a068
Merge remote-tracking branch 'qmk/master'
May 28, 2017
a23f7dc
Merge remote-tracking branch 'qmk/master'
May 28, 2017
72d78c5
Merge remote-tracking branch 'qmk/master'
May 29, 2017
f41a3b0
Merge remote-tracking branch 'qmk/master'
Jun 8, 2017
7f76f3e
Merge branch 'master' of git://github.com/qmk/qmk_firmware
Nov 11, 2017
f699a1c
Merge remote-tracking branch 'upstream/master'
yiancar Dec 31, 2017
4fcd685
Merge remote-tracking branch 'upstream/master'
yiancar Jan 31, 2018
61c30a5
Remove modular from master
yiancar Feb 1, 2018
62e0d82
Merge remote-tracking branch 'upstream/master'
yiancar Feb 2, 2018
c6796ae
Merge remote-tracking branch 'upstream/master'
yiancar Feb 3, 2018
9e28d84
Merge remote-tracking branch 'upstream/master'
yiancar Feb 10, 2018
b70e228
Merge remote-tracking branch 'upstream/master'
yiancar Feb 10, 2018
d97597a
Merge remote-tracking branch 'upstream/master'
yiancar May 8, 2018
78e9291
Merge remote-tracking branch 'upstream/master'
yiancar May 9, 2018
808d2e7
General fixes for RGB_matrix
yiancar May 10, 2018
cb159e3
Documentation update for RGBmatrix
yiancar May 10, 2018
6299a5e
More doc updates
yiancar May 10, 2018
f5b141d
I2C library can now retry if it has failed
yiancar May 12, 2018
5383155
RGB Matrix, use alternative I2C library
yiancar May 12, 2018
50773f1
Update rgb_matrix.c
yiancar May 13, 2018
536bdf5
RGB matrix cleanup
yiancar May 13, 2018
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
Merge remote-tracking branch 'qmk/master'
  • Loading branch information
yiancar committed Jun 8, 2017
commit f41a3b06fee8bac60ea42977b77d361b0251c602

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.