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

Iron viking forking it up #802

Open
wants to merge 149 commits into
base: vial
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
149 commits
Select commit Hold shift + click to select a range
9d62ab0
Right trackball working nicely for polydactyl dual track
bullwinkle3000 Aug 29, 2023
fa1e6cd
Merged latest Vial-QMK
bullwinkle3000 Aug 29, 2023
06a831c
Dual polydactyl final
bullwinkle3000 Aug 29, 2023
461e2cf
Shifted 6x7 Trackball working well
bullwinkle3000 Sep 5, 2023
2cea4b1
Adding 4x6_whole_track
bullwinkle3000 Sep 11, 2023
a6e2c46
Adding 4x6_whole_track and 4x6_whole
bullwinkle3000 Sep 11, 2023
ce49d5e
Fixed issue with overlapping DRAGSCROLL_MODE keycode.
bullwinkle3000 Sep 14, 2023
3e22af2
4x6_3_all_dual_track working well.
bullwinkle3000 Sep 16, 2023
5744a3a
6x7 almost done
bullwinkle3000 Oct 3, 2023
2929a7d
Merge branch 'vial-kb:vial' into vial
bullwinkle3000 Oct 3, 2023
0793bbc
Updated 6x7_full_track
bullwinkle3000 Oct 3, 2023
dcece6d
Updated 5x7 track with underglow
bullwinkle3000 Oct 6, 2023
0d5c742
Updated 6x7 with latest config.
bullwinkle3000 Oct 17, 2023
25623f6
Fucking macOS drag and remove...
bullwinkle3000 Oct 17, 2023
e085b5a
3x5_3_track updated and work. Updated key codes to latest all around.
bullwinkle3000 Nov 1, 2023
c5aeb55
Assimilator setup
bullwinkle3000 Nov 5, 2023
0210eb7
Assimilator edits
bullwinkle3000 Nov 6, 2023
90b37bc
Adjusting thumb keys
bullwinkle3000 Nov 6, 2023
a7c2f3a
Working
bullwinkle3000 Nov 7, 2023
7ec7bb2
4x6_track good
bullwinkle3000 Nov 9, 2023
2aaf335
Automouse layer on pointing device motion only. Ignores dragscroll d…
bullwinkle3000 Nov 11, 2023
4a4f885
Added RGB control keys to 4x6
bullwinkle3000 Nov 11, 2023
6b446f8
Done with squarespace_00109
bullwinkle3000 Nov 15, 2023
587e483
Merge branch 'vial-kb:vial' into vial
bullwinkle3000 Nov 16, 2023
0e789f7
5x6 in good place
bullwinkle3000 Nov 18, 2023
f308462
Final 00141
bullwinkle3000 Nov 18, 2023
b031173
Initial 5x7 full track
bullwinkle3000 Nov 19, 2023
44baf5a
5x7 done.
bullwinkle3000 Nov 20, 2023
11ac902
Adjust the lower key
bullwinkle3000 Nov 21, 2023
e273d94
Adding 5x6_full_wyld_track
bullwinkle3000 Nov 25, 2023
a5f502f
5x6_full_wyld_track working well
bullwinkle3000 Nov 25, 2023
a84590c
Moved QK_BOOT keys on 5x6_full_wyld_track
bullwinkle3000 Nov 25, 2023
f4692f0
Finalizing updated 5x6_track and 5x6_full_track
bullwinkle3000 Nov 29, 2023
f99b467
Finished updated 5x6_track and 5x6_full_track
bullwinkle3000 Nov 30, 2023
96f547f
Last tweak to 5x6_track keymap
bullwinkle3000 Nov 30, 2023
19fc529
3x5_3_track updated and ready
bullwinkle3000 Dec 2, 2023
6aa1e4f
5x6 Updated with dual oleds and encoders
bullwinkle3000 Dec 5, 2023
57d0500
accidental deletion
bullwinkle3000 Dec 6, 2023
0c8c13d
Ballpark of RGB setup
bullwinkle3000 Dec 8, 2023
571ecca
Added 5x7 full dual track and beginning of 5x6 full dual track.
bullwinkle3000 Dec 13, 2023
8df265f
Added 4x6_3_dual_track
bullwinkle3000 Dec 15, 2023
6a703e7
4x6_3_dual_track working nicely
bullwinkle3000 Dec 16, 2023
ee90384
4x6_3_dual_track working nicely
bullwinkle3000 Dec 18, 2023
cd557bd
4x6 skree tail setup
bullwinkle3000 Dec 18, 2023
c8d6699
4x6 skree tail in progress
bullwinkle3000 Dec 18, 2023
b1de21f
Fixed 4x6_3_all_track.h
bullwinkle3000 Dec 18, 2023
8053a99
rgb matrix defined, keymap fixed.
bullwinkle3000 Dec 18, 2023
6d8099c
Fixed wrong data pin.
bullwinkle3000 Dec 18, 2023
f36697b
Tweaked Skree build for thumbs issue.
bullwinkle3000 Dec 20, 2023
1abcbf3
4x5_3_track finished for etsy_2817214262
bullwinkle3000 Dec 20, 2023
460d842
4x5_3_track finished for etsy_2817214262
bullwinkle3000 Dec 21, 2023
7e21e07
Added 3x6_dual_track
bullwinkle3000 Dec 21, 2023
c493888
Finished 3x6_dual_track
bullwinkle3000 Dec 24, 2023
aaddc81
Finished 5x6
bullwinkle3000 Dec 28, 2023
0da39e9
Added 4x6_mini_track
bullwinkle3000 Jan 3, 2024
9e9669d
Finished 4x6_mini_track
bullwinkle3000 Jan 4, 2024
6a91508
fixed typo
bullwinkle3000 Jan 8, 2024
e90bbfe
Slight fixes to bad keys and configs
bullwinkle3000 Jan 12, 2024
0d00c02
RGB wasn't happy
bullwinkle3000 Jan 18, 2024
96efe88
MUTE/HOME swap
bullwinkle3000 Jan 19, 2024
595f807
Added 5x7_full_ug
bullwinkle3000 Jan 23, 2024
ae544b2
Firmware all working
bullwinkle3000 Jan 27, 2024
5f9e617
Merge branch 'vial-kb:vial' into vial
bullwinkle3000 Jan 27, 2024
acf663b
Updating 4x6_whole_track and 5x7_full_ug finished
bullwinkle3000 Jan 29, 2024
b5b9b42
5x6 default track adjustments
bullwinkle3000 Feb 3, 2024
93b0925
Finished longtime wyld 5x6
bullwinkle3000 Feb 5, 2024
1145694
Ensure WYLD_AUTO_MS_TOG key is on layout
bullwinkle3000 Feb 5, 2024
97336af
Ensure WYLD_AUTO_MS_TOG key is on layout
bullwinkle3000 Feb 6, 2024
7deac1c
4x6 mini finished
bullwinkle3000 Feb 10, 2024
0792acd
4x6 mini #2 finished
bullwinkle3000 Feb 14, 2024
2f12216
Tweak to lift off distance
bullwinkle3000 Feb 14, 2024
a5d9958
Adding 4x5_all_track
bullwinkle3000 Feb 15, 2024
f8bdb63
4x5_all_track in good place.
bullwinkle3000 Feb 16, 2024
5abeea7
First pass at 6x7_wyld_track
bullwinkle3000 Feb 18, 2024
ef2b368
OLED with trackball will display DPI and pointing device mode.
bullwinkle3000 Feb 19, 2024
8c91948
Updated OLED reference
bullwinkle3000 Feb 19, 2024
cde8067
Finished 6x7_wyld_track
bullwinkle3000 Feb 21, 2024
caed2e7
Ensure exclusive adjustment of dragscroll or sniping
bullwinkle3000 Feb 26, 2024
5d5cfd6
flase isn't false is it?
bullwinkle3000 Feb 26, 2024
91947b4
Only turn off drag/snip when enabling snip/drag
candrews Feb 26, 2024
540b878
Merge pull request #4 from candrews/patch-1
bullwinkle3000 Feb 26, 2024
b118ead
Updated 5x6_5_full with fixed UART pins
bullwinkle3000 Feb 26, 2024
9550bdf
Updated 5x6_track done
bullwinkle3000 Feb 29, 2024
3e03e13
OLEDs won't display below line 9
bullwinkle3000 Mar 1, 2024
6e3025c
6x7 track with per-key done
bullwinkle3000 Mar 5, 2024
ccf872b
custom 5x6 in good place
bullwinkle3000 Mar 19, 2024
7af3158
Encoder pins
bullwinkle3000 Mar 22, 2024
426b521
5x7 track updated
bullwinkle3000 Apr 1, 2024
eb45715
5x6_track done
bullwinkle3000 Apr 11, 2024
19fc051
Updates to 4x6_3_all_track.
bullwinkle3000 Apr 16, 2024
e0f0343
Finished dual 5x6_3_track
bullwinkle3000 Apr 22, 2024
4a28589
Updated skree 5x6_track
bullwinkle3000 Apr 29, 2024
d3b1bd2
Debugging config
bullwinkle3000 May 2, 2024
0b89b7a
Order done
bullwinkle3000 May 4, 2024
9c828c5
reversed encoder pins
bullwinkle3000 May 4, 2024
e5ff2eb
rewmove config_common.h
bullwinkle3000 May 30, 2024
6935293
dual wyld 3x5 track mostly in place
bullwinkle3000 Jun 1, 2024
19d201a
Working so far.
nethermead Jun 1, 2024
dd07685
3x5 dual track done
nethermead Jun 4, 2024
f2d4508
4x6_mini_track done
nethermead Jun 21, 2024
a5da266
remove logging in trackball motion
nethermead Jun 21, 2024
c825747
missing dpi keys
bullwinkle3000 Jun 21, 2024
43e838b
4x5_all_track done
nethermead Jun 21, 2024
4412bd6
Refuses to compile on mac...?
bullwinkle3000 Jul 2, 2024
a7f8e2a
4x5_all_track fix
nethermead Jul 2, 2024
93a4dc9
Fixes to info.json
bullwinkle3000 Jul 2, 2024
0d5f994
Fixes to info.json
bullwinkle3000 Jul 2, 2024
883d7c6
Done
nethermead Jul 3, 2024
9a3b749
Reworked keymap a bit for 3x5
bullwinkle3000 Jul 5, 2024
97d46b4
added kc_esc
bullwinkle3000 Jul 5, 2024
6ed53e9
Adjusting
nethermead Jul 7, 2024
9ccf94c
Updated vial setup
bullwinkle3000 Jul 7, 2024
c70f5f0
Updated vial setup
bullwinkle3000 Jul 7, 2024
fda9da2
Adding 7th column for cluster offset
nethermead Jul 7, 2024
7ba5c25
Offset key ids in matrix
bullwinkle3000 Jul 7, 2024
9183175
Adding 7th column for cluster offset
nethermead Jul 7, 2024
83c4501
another adjustment
bullwinkle3000 Jul 7, 2024
e95793d
Last key swap
bullwinkle3000 Jul 7, 2024
a1a38c5
Ensure mouse control and automouse bits enabled
bullwinkle3000 Jul 8, 2024
e5d4fab
R64 and R63 backward
bullwinkle3000 Jul 8, 2024
98df294
4x7_whole_track added
bullwinkle3000 Jul 14, 2024
9a0b486
Encoders
bullwinkle3000 Jul 14, 2024
1468c14
Added 3x5_mini_track and adjusted 4x7
bullwinkle3000 Jul 16, 2024
5fe017e
3_5_mini_3_track in good place
bullwinkle3000 Jul 17, 2024
529d38f
3_5_mini_3_track finalizing
bullwinkle3000 Jul 18, 2024
847ffd8
RGB 95% done
bullwinkle3000 Jul 19, 2024
158fe7a
Missed QK_BOOT
bullwinkle3000 Jul 20, 2024
933cd3a
Set dpi defaults to 100 for sniping and drag scroll.
bullwinkle3000 Jul 20, 2024
07d14b0
underglow on 4x5_all_track
bullwinkle3000 Jul 21, 2024
124cde0
Firmware good
bullwinkle3000 Jul 23, 2024
bf75415
Firmware good
bullwinkle3000 Jul 23, 2024
c9715e1
3x5_carbonfet good
bullwinkle3000 Aug 10, 2024
2292795
3x5_carbonfet good
bullwinkle3000 Sep 8, 2024
0d14803
3x5_carbonfet good
bullwinkle3000 Sep 8, 2024
8126ad0
first pass
bullwinkle3000 Sep 8, 2024
496b2e0
6x7 in good place
bullwinkle3000 Sep 9, 2024
04e1a65
4x6 3159456208 looking good
bullwinkle3000 Sep 9, 2024
f29db8a
4x6 3159456208 looking good
bullwinkle3000 Sep 9, 2024
c3d73dc
4x6 3159456208 looking good
bullwinkle3000 Sep 12, 2024
216b99d
6x7 3171918812 looking good
bullwinkle3000 Sep 12, 2024
0551c69
6x7 3171918812 looking good
bullwinkle3000 Sep 13, 2024
54c0630
6x7 3171918812 done
bullwinkle3000 Sep 13, 2024
c598f8c
adding assimilator setup and updating rgb/kle data.
bullwinkle3000 Sep 25, 2024
4160c16
bits all working
bullwinkle3000 Sep 25, 2024
1702ff5
trimming down to exact rows and columns
bullwinkle3000 Sep 25, 2024
b4bd0d1
Close
bullwinkle3000 Sep 25, 2024
811aabe
testing altered layout
bullwinkle3000 Oct 4, 2024
78de9db
Done with assimilator setup
bullwinkle3000 Oct 12, 2024
d122664
Corrected some files and downgraded avr gcc
iron-viking Oct 13, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
37 changes: 37 additions & 0 deletions -/build_full_test.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# Copyright 2017 Fred Sundvik
#
# 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/>.

$(TEST)_INC := \
tests/test_common/common_config.h

$(TEST)_SRC := \
$(QUANTUM_SRC) \
$(SRC) \
$(QUANTUM_PATH)/keymap_introspection.c \
tests/test_common/matrix.c \
tests/test_common/test_driver.cpp \
tests/test_common/keyboard_report_util.cpp \
tests/test_common/keycode_util.cpp \
tests/test_common/keycode_table.cpp \
tests/test_common/test_fixture.cpp \
tests/test_common/test_keymap_key.cpp \
tests/test_common/test_logger.cpp \
$(patsubst $(ROOTDIR)/%,%,$(wildcard $(TEST_PATH)/*.cpp))

$(TEST)_DEFS := $(OPT_DEFS) "-DKEYMAP_C=\"keymap.c\""

$(TEST)_CONFIG := $(TEST_PATH)/config.h

VPATH += $(TOP_DIR)/tests/test_common
17 changes: 17 additions & 0 deletions -/build_json.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Look for a json keymap file
ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_5)/keymap.json)","")
KEYMAP_JSON := $(MAIN_KEYMAP_PATH_5)/keymap.json
KEYMAP_PATH := $(MAIN_KEYMAP_PATH_5)
else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_4)/keymap.json)","")
KEYMAP_JSON := $(MAIN_KEYMAP_PATH_4)/keymap.json
KEYMAP_PATH := $(MAIN_KEYMAP_PATH_4)
else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_3)/keymap.json)","")
KEYMAP_JSON := $(MAIN_KEYMAP_PATH_3)/keymap.json
KEYMAP_PATH := $(MAIN_KEYMAP_PATH_3)
else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_2)/keymap.json)","")
KEYMAP_JSON := $(MAIN_KEYMAP_PATH_2)/keymap.json
KEYMAP_PATH := $(MAIN_KEYMAP_PATH_2)
else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_1)/keymap.json)","")
KEYMAP_JSON := $(MAIN_KEYMAP_PATH_1)/keymap.json
KEYMAP_PATH := $(MAIN_KEYMAP_PATH_1)
endif
Loading