Skip to content

Commit

Permalink
Merge branch 'vial' of github.com:vial-kb/vial-qmk into rigid-flex-ma…
Browse files Browse the repository at this point in the history
…trix
  • Loading branch information
RealET committed Oct 3, 2023
2 parents 29cdc74 + bb182ad commit 24a8daf
Show file tree
Hide file tree
Showing 6,341 changed files with 122,407 additions and 52,334 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
27 changes: 23 additions & 4 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,29 @@
<!---
For keyboard addition or changes, Vial will accept keyboards that implement "default" and "via" keymaps.
For Vial-enabled keymaps please ensure that VIAL_INSECURE is not set.
User keymaps (i.e. https://github.com/vial-kb/vial-qmk/tree/vial/users) will not be accepted at the moment.
If you are submitting a Vial-enabled keymap for a keyboard in QMK:
For other core changes, please explain what you are changing and why.
- Keymaps will not be accepted with VIAL_INSECURE=yes.
- Avoid changing keyboard-level code if possible. (ex: switching the encoder pins in info.json)
- Please name your keymap "vial". Personal keymaps are not accepted at this time.
- If your Vial keymap only works for a specific keyboard revision, place it under that revision's folder. (ex: keyboards/planck/rev6_drop/keymaps/vial and keyboards/planck/ez/glow/keymaps/vial)
If you are submitting a new keyboard with keymaps:
- If you are also submitting this keyboard to QMK, please try to submit mostly the same code to both repos if possible.
- If you are not submitting this keyboard to QMK, only include "default" and "vial" keymaps. VIA firmware can no longer be built by this repository.
------
For all keyboard and keymap submissions:
As the submitter, you are ultimately responsible for maintaining the keyboards/keymaps you submit.
Vial contributors will try to fix compilation issues as updates are made, but are not always familiar with and often can't test specific keymaps/keyboards.
Vial is decentralized, so inclusion in the vial-qmk repository is optional. Unmaintained keymaps/keyboards which are broken and cannot be fixed without extensive rework or strong familiarity with the hardware may be removed from this repository, with or without warning.
------
For core changes, please explain what you are changing and why.
Before submitting a PR, delete the entirety of this comment and document your changes.
-->
74 changes: 0 additions & 74 deletions .github/workflows/ci_builds.yml

This file was deleted.

36 changes: 0 additions & 36 deletions .github/workflows/regen.yml

This file was deleted.

46 changes: 0 additions & 46 deletions .github/workflows/regen_push.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ secrets.tar
# Python things
__pycache__
.python-version
.venv/
.venv

# Prerequisites for updating ChibiOS
/util/fmpp*
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ define PARSE_TEST
ifeq ($$(TEST_NAME),all)
MATCHED_TESTS := $$(TEST_LIST)
else
MATCHED_TESTS := $$(foreach TEST, $$(TEST_LIST),$$(if $$(findstring $$(TEST_NAME), $$(notdir $$(TEST))), $$(TEST),))
MATCHED_TESTS := $$(foreach TEST, $$(TEST_LIST),$$(if $$(findstring x$$(TEST_NAME)x, x$$(notdir $$(TEST))x), $$(TEST),))
endif
$$(foreach TEST,$$(MATCHED_TESTS),$$(eval $$(call BUILD_TEST,$$(TEST),$$(TEST_TARGET))))
endef
Expand Down
3 changes: 1 addition & 2 deletions builddefs/build_full_test.mk
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ $(TEST)_INC := \
tests/test_common/common_config.h

$(TEST)_SRC := \
$(TMK_COMMON_SRC) \
$(QUANTUM_SRC) \
$(SRC) \
$(QUANTUM_PATH)/keymap_introspection.c \
Expand All @@ -31,7 +30,7 @@ $(TEST)_SRC := \
tests/test_common/test_logger.cpp \
$(patsubst $(ROOTDIR)/%,%,$(wildcard $(TEST_PATH)/*.cpp))

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

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

Expand Down
Loading

0 comments on commit 24a8daf

Please sign in to comment.