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

Develop #17

Closed
wants to merge 397 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
397 commits
Select commit Hold shift + click to select a range
d2e5712
Merge branch '9e'
solartempest Nov 29, 2021
2c9db97
Merge branch 'master' of https://github.com/qmk/qmk_firmware into gmm…
solartempest Nov 29, 2021
418c347
Updates after breaking changes. Changed LED timeout and effects defin…
solartempest Nov 29, 2021
53c5cba
Merge branch 'gmmkpro'
solartempest Nov 29, 2021
569bde0
Update keyboards/keychron/q1/rev_0101/rev_0101.c
KeychronMacro Nov 30, 2021
9dc4969
Update config.h
KeychronMacro Nov 30, 2021
0876eda
Update config.h
KeychronMacro Nov 30, 2021
03194af
Update config.h
KeychronMacro Nov 30, 2021
a70e66c
Optimized layer lighting and updated OLED WPM. Much more space effici…
solartempest Dec 1, 2021
de8fdf0
Merge branch 'sofle'
solartempest Dec 1, 2021
d5ad8ab
Optimize layer lighting code for space saving.
solartempest Dec 1, 2021
5830cd3
Merge branch 'ps17'
solartempest Dec 1, 2021
7b85255
OLED-free version for slise.dc
solartempest Dec 1, 2021
65569fa
Added OLED ifdef
solartempest Dec 1, 2021
8ea9cb8
removed duplicated ifdef
Fieoner Dec 2, 2021
df4df51
Add acknowledgements and change NO_PIN.
solartempest Dec 4, 2021
d3e9ae0
Merge branch 'sofle'
solartempest Dec 4, 2021
aec6fe6
Add option for no OLED on master.
solartempest Dec 11, 2021
a872748
Merge branch 'sofle'
solartempest Dec 11, 2021
217337e
Correct splid oled sync when there is only one
solartempest Dec 12, 2021
636068d
Merge branch 'sofle'
solartempest Dec 12, 2021
c982e62
Added destiny 2 skate macro and timer
solartempest Dec 13, 2021
1d0d913
Merge branch 'sofle'
solartempest Dec 13, 2021
3f0da73
Merge branch 'master' of https://github.com/qmk/qmk_firmware
solartempest Dec 13, 2021
7a9b635
Merge branch 'master' of https://github.com/qmk/qmk_firmware into sofle
solartempest Dec 13, 2021
fb3ec91
Merge branch 'qmk:master' into master
lokher Dec 20, 2021
bf5d3b5
Merge pull request #1 from Fieoner/duplicate_line_on_rev_0101
KeychronMacro Dec 20, 2021
07918e0
Merge branch 'qmk:master' into master
lokher Dec 21, 2021
8fd8012
Update keyboards/keychron/q1/rev_0101/rules.mk
KeychronMacro Dec 21, 2021
329963e
Update keyboards/keychron/q2/rev_0110/rules.mk
KeychronMacro Dec 21, 2021
332a2e0
Update keyboards/keychron/q2/rev_0110/rules.mk
KeychronMacro Dec 21, 2021
4383ab0
Update keyboards/keychron/q2/rev_0113/rules.mk
KeychronMacro Dec 21, 2021
036081f
Update keyboards/keychron/q2/rev_0111/rules.mk
KeychronMacro Dec 21, 2021
45ab64f
Update keyboards/keychron/q2/rev_0111/rules.mk
KeychronMacro Dec 21, 2021
4909394
Update keyboards/keychron/q2/rev_0112/rules.mk
KeychronMacro Dec 21, 2021
9ae624d
Update keyboards/keychron/q2/rev_0112/rules.mk
KeychronMacro Dec 21, 2021
40c9bcf
Update keyboards/keychron/q2/rev_0113/rules.mk
KeychronMacro Dec 21, 2021
8f401f4
Merge branch 'qmk:master' into master
KeychronMacro Dec 25, 2021
a8ea9f3
Merge branch 'qmk:master' into master
KeychronMacro Dec 27, 2021
267ec7b
Merge branch 'qmk:master' into master
KeychronMacro Dec 28, 2021
bd69133
Merge branch 'master' of https://github.com/qmk/qmk_firmware
solartempest Jan 2, 2022
13fda03
Merge branch 'master' of https://github.com/qmk/qmk_firmware into sofle
solartempest Jan 2, 2022
0468160
Merge branch 'master' of https://github.com/qmk/qmk_firmware into 9e
solartempest Jan 2, 2022
69fce48
Merge branch 'master' of https://github.com/qmk/qmk_firmware into ps17
solartempest Jan 2, 2022
60cf6e2
Adjust layer colours.
solartempest Jan 2, 2022
9fd923d
Adjust layer colours
solartempest Jan 2, 2022
02f2134
Update layer colours
solartempest Jan 2, 2022
8e11eac
Merge branch 'sofle'
solartempest Jan 2, 2022
c1d5dc3
Merge branch '9e'
solartempest Jan 2, 2022
f201559
Merge branch 'ps17'
solartempest Jan 2, 2022
851d8ea
Merge branch 'qmk:master' into master
KeychronMacro Jan 4, 2022
9d5daa3
Update rev_0101.c
KeychronMacro Jan 4, 2022
1d5ebc6
Update rev_0101.
KeychronMacro Jan 5, 2022
72d8ecb
Merge branch 'qmk:master' into master
KeychronMacro Jan 5, 2022
58327d7
Enable support for edit RGB lighting in VIA.
archite Dec 28, 2021
00fcbbb
Merge branch 'qmk:master' into master
KeychronMacro Jan 7, 2022
3fb43b6
Increase compatibility with stock OLED code
solartempest Jan 8, 2022
eb3f4cb
Merge branch 'sofle'
solartempest Jan 8, 2022
ee46349
Merge branch 'qmk:master' into master
KeychronMacro Jan 8, 2022
8f7af4b
Merge pull request #2 from archite/master
KeychronMacro Jan 8, 2022
057526c
Merge branch 'master' of https://github.com/qmk/qmk_firmware into zod…
solartempest Jan 9, 2022
ee6f48c
General updates.
solartempest Jan 11, 2022
ec06785
Merge branch 'qmk:master' into master
KeychronMacro Jan 12, 2022
0da76d0
Update q1.
KeychronMacro Jan 12, 2022
2ba2791
Merge branch 'master' of https://github.com/Keychron/qmk_firmware
KeychronMacro Jan 12, 2022
b6f08c1
Merge branch 'qmk:master' into master
KeychronMacro Jan 13, 2022
63e75e5
Merge branch 'master' of https://github.com/qmk/qmk_firmware
solartempest Jan 14, 2022
9a9779c
Merge branch 'qmk:master' into master
KeychronMacro Jan 14, 2022
9428120
Merge branch 'qmk:master' into master
KeychronMacro Jan 17, 2022
93fe7a5
Merge branch 'qmk:master' into master
KeychronMacro Jan 18, 2022
87859cc
Merge branch 'qmk:master' into master
KeychronMacro Jan 19, 2022
c47d6b3
Merge branch 'qmk:master' into master
KeychronMacro Jan 20, 2022
4f3811f
Add rgb matrix support for q2 of keychron.
galican Jan 20, 2022
b0c1e83
Update rule.mk.
galican Jan 20, 2022
2eaf1ae
Merge branch 'qmk:master' into master
KeychronMacro Jan 21, 2022
d797b08
Delete comment block which is unwanted.
galican Jan 21, 2022
7f156a1
Merge branch 'qmk:master' into master
KeychronMacro Jan 22, 2022
46b9397
Merge branch 'qmk:master' into master
KeychronMacro Jan 24, 2022
d9bd81b
Merge branch 'qmk:master' into master
KeychronMacro Jan 24, 2022
572e527
Update .gitignore
galican Jan 24, 2022
8ff6614
Merge branch 'qmk:master' into master
KeychronMacro Jan 25, 2022
e097735
Merge branch 'Keychron:master' into master
KeychronMacro Jan 25, 2022
3703fdf
Update .gitignore
galican Jan 25, 2022
bc8923f
Merge branch 'qmk:master' into master
KeychronMacro Jan 26, 2022
a2f7c62
Merge branch 'Keychron:master' into master
KeychronMacro Jan 26, 2022
fa6fa97
Merge branch 'master' of https://github.com/qmk/qmk_firmware into zod…
solartempest Jan 26, 2022
e33c098
Updated build options
solartempest Jan 26, 2022
2481e9d
Merge branch 'qmk:master' into master
KeychronMacro Jan 27, 2022
83889ea
Merge branch 'Keychron:master' into master
KeychronMacro Jan 27, 2022
2c94084
Added pimoroni trackball support
solartempest Jan 27, 2022
9d62243
Merge branch 'qmk:master' into master
KeychronMacro Jan 27, 2022
f7b4443
Merge branch 'Keychron:master' into master
KeychronMacro Jan 27, 2022
e4c6282
Merge branch 'qmk:master' into master
KeychronMacro Jan 28, 2022
b9b6d85
Merge branch 'Keychron:master' into master
KeychronMacro Jan 28, 2022
429f878
Added VIA remapping of rotary encoders and custom functions.
solartempest Jan 28, 2022
c05afb4
Added readme and updated VIA layout.
solartempest Jan 28, 2022
e86dbf9
Merge branch 'zodiark_solar'
solartempest Jan 28, 2022
bf5d9de
Update readme
solartempest Jan 28, 2022
bdab62e
Merge branch 'zodiark_solar'
solartempest Jan 28, 2022
3e62b49
Update readme
solartempest Jan 28, 2022
f5c0a7c
Merge branch 'zodiark_solar'
solartempest Jan 28, 2022
83a19dc
Changed product ID as VIA has issue loading layouts with the original…
solartempest Jan 28, 2022
b751e7d
Merge branch 'zodiark_solar'
solartempest Jan 28, 2022
748104d
Merge branch 'qmk:master' into master
KeychronMacro Jan 29, 2022
18c25b8
Merge branch 'Keychron:master' into master
KeychronMacro Jan 29, 2022
4724d2a
Merge branch 'qmk:master' into master
KeychronMacro Feb 7, 2022
0cf7914
Merge branch 'Keychron:master' into master
KeychronMacro Feb 7, 2022
22333fd
Merge branch 'qmk:master' into master
KeychronMacro Feb 8, 2022
d0c2310
Merge branch 'Keychron:master' into master
KeychronMacro Feb 8, 2022
80bfc5b
Merge branch 'qmk:master' into master
KeychronMacro Feb 9, 2022
b676308
Merge branch 'Keychron:master' into master
KeychronMacro Feb 9, 2022
1c8bce9
Merge branch 'qmk:master' into master
KeychronMacro Feb 10, 2022
3e60989
Merge branch 'Keychron:master' into master
KeychronMacro Feb 10, 2022
17c4cc8
Fix skate macro. Update VIA game layout.
solartempest Feb 10, 2022
1f8c314
Merge branch 'zodiark_solar'
solartempest Feb 10, 2022
3a6f863
Merge branch 'qmk:master' into master
KeychronMacro Feb 11, 2022
194ec84
Merge branch 'Keychron:master' into master
KeychronMacro Feb 11, 2022
ba61002
Merge branch 'qmk:master' into master
KeychronMacro Feb 14, 2022
cfc249d
Merge branch 'Keychron:master' into master
KeychronMacro Feb 14, 2022
773f93b
Merge branch 'qmk:master' into master
KeychronMacro Feb 15, 2022
9b1a6ac
Merge branch 'Keychron:master' into master
KeychronMacro Feb 15, 2022
4f12e64
Merge branch 'qmk:master' into master
KeychronMacro Feb 16, 2022
9b71cc4
Merge branch 'Keychron:master' into master
KeychronMacro Feb 16, 2022
efd1780
Add keyboard rev_0106 and rev_0107 for keychron q1
KeychronMacro Feb 16, 2022
df9bb4e
Merge pull request #19 from lalalademaxiya1/master
KeychronMacro Feb 16, 2022
6b2aa9f
Merge branch 'qmk:master' into master
KeychronMacro Feb 18, 2022
dce8c98
Merge branch 'qmk:master' into master
KeychronMacro Feb 21, 2022
7e8499f
Update keyboards/keychron/q1/rev_0107/config.h
KeychronMacro Feb 21, 2022
4f22b9e
Slight modification
KeychronMacro Feb 21, 2022
ad3e1e6
Merge pull request #20 from lalalademaxiya1/master
KeychronMacro Feb 21, 2022
894adbd
Merge branch 'qmk:master' into master
KeychronMacro Feb 22, 2022
989cec6
Update keyboards/keychron/q1/rev_0107/rules.mk
KeychronMacro Feb 22, 2022
c6d51d5
Update keyboards/keychron/q1/rev_0107/rules.mk
KeychronMacro Feb 22, 2022
3391861
Update keyboards/keychron/q1/rev_0106/rules.mk
KeychronMacro Feb 22, 2022
f9c5669
Update keyboards/keychron/q1/rev_0106/rules.mk
KeychronMacro Feb 22, 2022
3543296
Merge branch 'qmk:master' into master
KeychronMacro Feb 23, 2022
2df5098
Merge branch 'qmk:master' into master
KeychronMacro Feb 26, 2022
6a0eb19
Merge branch 'qmk:master' into master
KeychronMacro Feb 28, 2022
0186837
Create matrix.c
KeychronMacro Feb 28, 2022
72fec4d
Merge pull request #21 from lalalademaxiya1/master
KeychronMacro Feb 28, 2022
85b2728
Merge branch 'qmk:master' into master
KeychronMacro Mar 1, 2022
5c37668
Merge branch 'qmk:master' into master
KeychronMacro Mar 3, 2022
fa59b0f
Merge branch 'qmk:master' into master
KeychronMacro Mar 4, 2022
c8428b7
Merge branch 'qmk:master' into master
KeychronMacro Mar 7, 2022
c9f7c3f
Merge branch 'qmk:master' into master
KeychronMacro Mar 8, 2022
1b88bf4
Merge branch 'qmk:master' into master
KeychronMacro Mar 9, 2022
5407dbc
Merge branch 'qmk:master' into master
KeychronMacro Mar 10, 2022
1ca6e82
Merge branch 'qmk:master' into master
KeychronMacro Mar 11, 2022
4fdf0d6
Merge branch 'qmk:master' into master
KeychronMacro Mar 14, 2022
fe28af2
Merge branch 'qmk:master' into master
KeychronMacro Mar 16, 2022
cde4ad1
Merge branch 'qmk:master' into master
KeychronMacro Mar 17, 2022
797884c
Merge branch 'qmk:master' into master
KeychronMacro Mar 21, 2022
a9356ed
Merge branch 'qmk:master' into master
KeychronMacro Mar 22, 2022
712830d
Merge branch 'qmk:master' into master
KeychronMacro Mar 23, 2022
fafab6a
Merge branch 'qmk:master' into master
KeychronMacro Mar 24, 2022
f286851
Merge branch 'qmk:master' into master
KeychronMacro Mar 26, 2022
02b1ca0
Merge branch 'qmk:master' into master
KeychronMacro Mar 28, 2022
a70a775
Merge branch 'qmk:master' into master
KeychronMacro Mar 30, 2022
98356a4
Merge branch 'qmk:master' into master
KeychronMacro Mar 31, 2022
fc4142a
Merge branch 'qmk:master' into master
KeychronMacro Apr 6, 2022
9480aa8
Add q3
KeychronMacro Apr 6, 2022
a63caee
Update q3
KeychronMacro Apr 6, 2022
d7237cd
Update q3
KeychronMacro Apr 6, 2022
300a99d
Merge pull request #22 from lalalademaxiya1/master
KeychronMacro Apr 6, 2022
db2c836
Merge branch 'qmk:master' into master
KeychronMacro Apr 7, 2022
057f732
Merge branch 'qmk:master' into master
KeychronMacro Apr 8, 2022
e664c23
added q3 rev 0120 left-hand gamer layer
i-am-logger Apr 9, 2022
083b21a
Add keycodes which more closely match Apple's new layout
archite Apr 9, 2022
ee06a5b
Merge branch 'qmk:master' into master
KeychronMacro Apr 11, 2022
7b2c239
Merge pull request #23 from ibootstrapper/master
KeychronMacro Apr 11, 2022
b5578fc
Merge pull request #24 from archite/archite
KeychronMacro Apr 11, 2022
575b45a
Merge branch 'qmk:master' into master
KeychronMacro Apr 12, 2022
493eeb7
Revert "added q3 rev 0120 left-hand gamer layer"
KeychronMacro Apr 12, 2022
056efd9
Merge pull request #27 from Keychron/revert-23-master
KeychronMacro Apr 12, 2022
5c81c65
Revert "Add keycodes which more closely match Apple's new layout"
KeychronMacro Apr 12, 2022
02b8e1f
Merge pull request #28 from Keychron/revert-24-archite
KeychronMacro Apr 12, 2022
279e186
Revert "Add new keyboard q3 for keychron"
KeychronMacro Apr 12, 2022
a79d488
Merge pull request #30 from Keychron/revert-22-master
KeychronMacro Apr 12, 2022
992face
Updated firmware file and various files.
solartempest Apr 13, 2022
30e3688
Removed haptic feedback by default. Functionality still can be enabled.
solartempest Apr 13, 2022
4455037
Merge branch 'sofle'
solartempest Apr 13, 2022
29b3de7
Merge branch 'zodiark_solar'
solartempest Apr 13, 2022
8dda18d
Merge branch 'qmk:master' into master
KeychronMacro Apr 20, 2022
fe3a7b9
Merge branch 'qmk:master' into master
KeychronMacro Apr 22, 2022
e762afa
Merge branch 'qmk:master' into master
KeychronMacro Apr 23, 2022
3667b2a
Merge branch 'qmk:master' into master
KeychronMacro Apr 25, 2022
ae22d61
Merge branch 'qmk:master' into master
KeychronMacro Apr 26, 2022
f9e82d8
Merge branch 'qmk:master' into master
KeychronMacro Apr 27, 2022
49493d1
Merge branch 'qmk:master' into master
KeychronMacro Apr 28, 2022
c8f9c24
Update q2
KeychronMacro Apr 28, 2022
3a51716
Merge branch 'master' of https://github.com/keychron/qmk_firmware int…
KeychronMacro Apr 28, 2022
186fc8a
Resume q2 in master
KeychronMacro Apr 28, 2022
5987078
Update encoder.h
KeychronMacro Apr 28, 2022
eca6b0e
Delete config.h
KeychronMacro Apr 28, 2022
dc2d093
Merge branch 'qmk:master' into master
KeychronMacro Apr 29, 2022
756a7b8
Merge branch 'qmk:master' into master
KeychronMacro May 4, 2022
c1ca77d
Merge branch 'qmk:master' into master
KeychronMacro May 5, 2022
7dc6f0d
Merge branch 'qmk:master' into master
KeychronMacro May 6, 2022
2671444
Merge branch 'qmk:master' into master
KeychronMacro May 11, 2022
bbd24a7
Merge branch 'qmk:master' into master
KeychronMacro Jun 2, 2022
d8e775a
Merge branch 'qmk:master' into master
KeychronMacro Jun 14, 2022
4f9cb1c
Merge branch 'qmk:master' into master
KeychronMacro Jun 15, 2022
6de3040
Merge pull request #1 from solartempest/master
crembz Jun 15, 2022
518b786
Merge pull request #2 from Keychron/master
crembz Jun 15, 2022
94d893f
harvester keymap
crembz Jun 15, 2022
f8ea5bc
Merge pull request #3 from crembz/corne
crembz Jun 15, 2022
217032e
Merge branch 'master' of https://github.com/qmk/qmk_firmware
crembz Jun 28, 2022
f8dc39c
Merge branch 'master' of https://github.com/qmk/qmk_firmware into sofle
crembz Jun 28, 2022
7bd0205
Updates to sofle keymap
crembz Jun 28, 2022
8472625
Merge branch 'master' of https://github.com/qmk/qmk_firmware
crembz Jul 2, 2022
d9785f6
Merge branch 'master' of https://github.com/crembz/qmk_firmware into …
crembz Jul 2, 2022
e2f9c92
cleanup
crembz Jul 2, 2022
7e7e250
Merge branch 'develop' of https://github.com/qmk/qmk_firmware into rp…
crembz Jul 3, 2022
248f900
RP2040 converter
crembz Jul 3, 2022
536c25b
Corne2040dev
crembz Jul 3, 2022
241a51f
Merge branch 'develop' of https://github.com/qmk/qmk_firmware into rp…
crembz Jul 4, 2022
f720801
crkbd rp2040 base
crembz Jul 4, 2022
1a13c6b
Merge branch 'develop' of https://github.com/qmk/qmk_firmware into rp…
crembz Jul 9, 2022
bc53f26
corne miryoku
crembz Jul 9, 2022
eea1a27
Merge branch 'develop' of https://github.com/qmk/qmk_firmware into de…
crembz Jul 11, 2022
a2c9b80
Merge branch 'develop' of https://github.com/qmk/qmk_firmware into sofle
crembz Jul 11, 2022
b16f020
Merge branch 'develop' of https://github.com/qmk/qmk_firmware into sofle
crembz Jul 11, 2022
388e6c5
Merge branch 'sofle' of https://github.com/crembz/qmk_firmware into s…
crembz Jul 12, 2022
ce35702
h
crembz Jul 12, 2022
03f2dad
Merge branch 'sofle' of https://github.com/crembz/qmk_firmware into d…
crembz Jul 12, 2022
172db7c
Merge branch 'rp2040corne' of https://github.com/crembz/qmk_firmware …
crembz Jul 12, 2022
31148f9
Merge branch 'develop' of https://github.com/qmk/qmk_firmware into de…
crembz Jul 12, 2022
28c7783
sofle rp2040 update not working
crembz Jul 12, 2022
0c9c523
sofle updates
crembz Jul 12, 2022
a0ed8b3
asdfasdf
crembz Jul 12, 2022
6a7bec3
.
crembz Jul 13, 2022
7ca779f
Merge branch 'develop' of https://github.com/qmk/qmk_firmware into de…
crembz Jul 13, 2022
13b0463
submodule
crembz Jul 14, 2022
ca66410
Sofle taphold change
crembz Jul 14, 2022
353e791
kyria harvester keymap v1
crembz Jul 17, 2022
4974af0
modified: keyboards/splitkb/kyria/keymaps/harvester/keymap.c
crembz Aug 12, 2022
715f2e7
Merge branch 'develop' of https://github.com/qmk/qmk_firmware into de…
crembz Sep 9, 2022
c31d3e8
Q1
crembz Sep 9, 2022
cefb916
Merge branch 'develop' of https://github.com/qmk/qmk_firmware into de…
crembz Sep 10, 2022
ad87eba
Corne update
crembz Sep 10, 2022
6bcbbf3
Merge branch 'develop' of https://github.com/qmk/qmk_firmware into de…
crembz Sep 15, 2022
e40f3d2
Reviung41Harvester
crembz Sep 17, 2022
8c76272
Reviung
crembz Sep 17, 2022
24b8f14
reviungupdate
crembz Sep 17, 2022
0a3d837
new file: eternal_keypad_via.hex
crembz Oct 21, 2022
aab9641
Merge branch 'develop' of https://github.com/qmk/qmk_firmware into de…
crembz Oct 21, 2022
c4184ea
Sofle update
crembz Oct 21, 2022
deb8b77
Merge branch 'develop' of https://github.com/qmk/qmk_firmware into de…
crembz Nov 12, 2022
337f600
sofle update
crembz Nov 12, 2022
ee91208
Reviung Update
crembz Nov 12, 2022
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
5 changes: 3 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,12 @@
# QMK-specific
api_data/v1
quantum/version.h
*.bin
#*.bin
*.eep
*.hex
#*.hex
*.qmk
*.uf2
.lnk

# Old-style QMK Makefiles
/keyboards/**/Makefile
Expand Down
1,185 changes: 1,185 additions & 0 deletions eternal_keypad_via.hex

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions keyboards/aleblazer/zodiark/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

#include "config_common.h"

/* USB Device descriptor parameter */
#define VENDOR_ID 0xF901
//#define PRODUCT_ID 0xF902
#define DEVICE_VER 0x0001
#define MANUFACTURER Aleblazer
#define PRODUCT Zodiark

#define SOFT_SERIAL_PIN D3
#define SELECT_SOFT_SERIAL_SPEED 1

Expand Down

Large diffs are not rendered by default.

80 changes: 80 additions & 0 deletions keyboards/aleblazer/zodiark/keymaps/solartempest/config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
/*
Copyright 2021 Spencer Deven <splitlogicdesign@gmail.com>
Copyright 2021 solartempest

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once

#define MASTER_LEFT

#undef PRODUCT_ID
#define PRODUCT_ID 0xFF02 //Original was 0xF902. If the same ID is used, VIA will fail to reload saved layouts.

#undef MATRIX_ROWS
#undef MATRIX_COLS
#undef MATRIX_ROW_PINS
#undef MATRIX_COL_PINS
#undef ENCODER_RESOLUTION
#define MATRIX_ROWS 10
#define MATRIX_COLS 8 //Added extra column for rotary encoder VIA mapping.
#define MATRIX_ROW_PINS { C6, D7, E6, B4, F4 }
#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6, NO_PIN } //A virtual pin is needed for the encoder key matrix in via.
#define ENCODER_RESOLUTION 4 //Reduce encoder double-input issue.

#undef DEBOUNCE
#define DEBOUNCE 6 //Default is 5

// Tapping settings
#define TAP_CODE_DELAY 10
#define TAPPING_TOGGLE 2 //Tap TT twice to toggle layer
#define TAPPING_TERM 160 //Tapping duration in ms

// Disabled to save space
#define NO_ACTION_MACRO
#define NO_ACTION_FUNCTION
#define NO_ACTION_ONESHOT //Save 244 bytes (-244).
#define NO_RESET //Save 40 bytes (-40).
#define LAYER_STATE_8BIT //For less than 8 bits worth of layers.
#undef LOCKING_SUPPORT_ENABLE //For MX lock keys only.
#undef LOCKING_RESYNC_ENABLE //For MX lock keys only.

#ifdef OLED_ENABLE
#define OLED_DISPLAY_128X64
#define OLED_TIMEOUT 80000 //80000 = 80secs, 120000 = 2mins in ms.
#define SPLIT_OLED_ENABLE //Synx on/off OLED state between halves (+100).
#define OLED_LOGO //Enable to print snakey custom logo on slave side (+108).
#endif

#ifdef RGBLIGHT_ENABLE
#undef RGBLIGHT_ANIMATIONS // Very memory intensive (+2604)
#define RGBLIGHT_EFFECT_STATIC_GRADIENT //Preferred RGB effect (+262)
//#define RGBLIGHT_EFFECT_BREATHING //Testing
//#define RGBLIGHT_EFFECT_SNAKE //For testing LED order
#define RGBLIGHT_SLEEP //Turn off LEDs when computer sleeping (+72)
#endif

// Pimoroni trackball settings
#ifdef POINTING_DEVICE_ENABLE
//#define PIMORONI_TRACKBALL_INTERVAL_MS 6 //Default is 8ms
#define POINTING_DEVICE_ROTATION_90
#define PIMORONI_TRACKBALL_INVERT_Y
#define PIMORONI_TRACKBALL_INVERT_X
#endif

#ifdef VIA_ENABLE
#define DYNAMIC_KEYMAP_LAYER_COUNT 5
#endif

#define D2SKATE_MACRO_ENABLE //Enable Destiny 2 hunter skate macro (+224)
48 changes: 48 additions & 0 deletions keyboards/aleblazer/zodiark/keymaps/solartempest/encoder.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
/* Copyright
* 2021 solartempest
* 2021 QMK
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/


#ifdef ENCODER_ENABLE
static uint8_t encoder_state[2] = {0};
static keypos_t encoder_ccw[2] = {{7, 4}, {7, 9}}; //Use these keymap positions to specify the encoder functions on rotate.
static keypos_t encoder_cw[2] = {{7, 3}, {7, 8}};

void encoder_action_unregister(void) {
for (int index = 0; index < 2; ++index) {
if (encoder_state[index]) {
keyevent_t encoder_event = (keyevent_t){.key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index], .pressed = false, .time = (timer_read() | 1)};
encoder_state[index] = 0;
action_exec(encoder_event);
}
}
}

void encoder_action_register(uint8_t index, bool clockwise) {
keyevent_t encoder_event = (keyevent_t){.key = clockwise ? encoder_cw[index] : encoder_ccw[index], .pressed = true, .time = (timer_read() | 1)};
encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
action_exec(encoder_event);
}

//void matrix_scan_user(void) { encoder_action_unregister(); } //Included in keymap.c instead

bool encoder_update_user(uint8_t index, bool clockwise) {
encoder_action_register(index, clockwise);
return false;
};
#endif

Loading