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.

Sign up for GitHub

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

[Keyboard] New Keyboard - Sugar Glider #19933

Merged
merged 42 commits into from
Mar 15, 2023
Merged

[Keyboard] New Keyboard - Sugar Glider #19933

Changes from 1 commit
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
cd22c5c
Initial config for matrix.c and keymap in sugar.h
kylemccreery Jun 28, 2022
ce0bb33
Merge branch 'master' of github.com:qmk/qmk_firmware into sugar
kylemccreery Jul 1, 2022
441a850
Initial matrix working with base firmware, no functionality outside o…
kylemccreery Jul 2, 2022
f77763a
Merge branch 'master' of github.com:qmk/qmk_firmware into sugar
kylemccreery Jul 2, 2022
4018ca7
keeping puckbuddy here until finished the sugarglider code
kylemccreery Jul 5, 2022
d2a085c
working on config options
kylemccreery Jul 6, 2022
d8de9af
Removing conflict old puckbuddy files
kylemccreery Aug 23, 2022
3bf9613
Merge branch 'master' of github.com:qmk/qmk_firmware into sugar
kylemccreery Aug 23, 2022
296b610
Merge branch 'master' of github.com:qmk/qmk_firmware into sugar
kylemccreery Aug 30, 2022
85229ce
Merge branch 'master' of github.com:qmk/qmk_firmware into sugar
kylemccreery Oct 17, 2022
4a24252
Merge branch 'sugar' of github.com:kylemccreery/qmk_firmware into sugar
kylemccreery Oct 17, 2022
09f9cfe
cleaning up
kylemccreery Oct 31, 2022
50494e1
Merge branch 'sugar' of github.com:kylemccreery/qmk_firmware into sugar
kylemccreery Oct 31, 2022
2bbf823
Merge branch 'master' of github.com:qmk/qmk_firmware into sugar
kylemccreery Jan 5, 2023
4691c30
Merge branch 'master' of github.com:qmk/qmk_firmware into sugar
kylemccreery Feb 15, 2023
7305002
prepping for actual push
kylemccreery Feb 15, 2023
4ec0c19
Merge branch 'master' of github.com:qmk/qmk_firmware into sugar
kylemccreery Feb 22, 2023
dceb9e8
prepping for final pr
kylemccreery Feb 22, 2023
363f8f3
more prep for pr
kylemccreery Feb 23, 2023
08aaf9e
updated license date to prep for pr
kylemccreery Feb 23, 2023
fe4fe97
wip pr prep
kylemccreery Feb 23, 2023
c3f5091
Merge branch 'master' of github.com:qmk/qmk_firmware into sugar
kylemccreery Feb 24, 2023
dbfe138
Merge branch 'sugar' of github.com:kylemccreery/qmk_firmware into sugar
kylemccreery Feb 24, 2023
2f820e2
Preparing to rewrite values from config into info.json so saving off …
kylemccreery Feb 24, 2023
ea28dab
z
kylemccreery Feb 24, 2023
9d5ed3e
Moved wide oled check to post rules.
kylemccreery Feb 24, 2023
6819df1
Update post_rules.mk
kylemccreery Feb 24, 2023
c1805d7
Apply suggestions from code review
kylemccreery Feb 25, 2023
973a3d1
Delete STM32F401xE.ld
kylemccreery Feb 25, 2023
b5976e4
More changes suggested by drashna.
kylemccreery Feb 25, 2023
143d1bf
Merge branch 'master' of github.com:qmk/qmk_firmware into sugar
kylemccreery Feb 28, 2023
4ef9558
made changes to formatting to work with breaking merge
kylemccreery Feb 28, 2023
87dcbea
Merge branch 'master' of github.com:qmk/qmk_firmware into sugar
kylemccreery Mar 1, 2023
ad2ddb4
updating steno keymap defaults
kylemccreery Mar 3, 2023
2df6ebe
Update keyboards/mechwild/sugarglider/sugarglider.h
kylemccreery Mar 8, 2023
0718128
Merge branch 'master' of github.com:qmk/qmk_firmware into sugar
kylemccreery Mar 8, 2023
5cae8a5
Suggestions taken into account from code review.
kylemccreery Mar 8, 2023
98aaa17
Merge branch 'master' of github.com:qmk/qmk_firmware into sugar
kylemccreery Mar 10, 2023
69e4be0
The encoders are barely usable because of the i2c delay without addin…
kylemccreery Mar 10, 2023
01c9688
Forgot to include encoder.h for the encoder scan rate fix.
kylemccreery Mar 10, 2023
f1935a7
Apply suggestions from code review
kylemccreery Mar 11, 2023
497eee4
Merge branch 'master' of github.com:qmk/qmk_firmware into sugar
kylemccreery Mar 11, 2023
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 branch 'master' of github.com:qmk/qmk_firmware into sugar
  • Loading branch information
@kylemccreery
kylemccreery committed Mar 10, 2023
commit 98aaa17cc5a43bb4126540c534f72550be32f81f

This merge commit was added into this branch cleanly.

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