Merge branch 'chameleon' of https://github.com/TweetyDaBird/vial-qmk …

…into chameleon # Conflicts: # keyboards/tweetydabird/chameleon/keymaps/vial/rules.mk
TweetyDaBird · Mar 1, 2024 · 831418f · 831418f
2 parents 3b25b33 + a9f60c4
commit 831418f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/keyboards/tweetydabird/chameleon/config.h b/keyboards/tweetydabird/chameleon/config.h
@@ -3,4 +3,4 @@
 
 #pragma once
 
-#define WS2812_PIO_USE_PIO1 // Force the usage of PIO1 peripheral, by default the WS2812 implementation uses the PIO0 peripheral
+#define WS2812_PIO_USE_PIO1 // Force the usage of PIO1 peripheral, by default the WS2812 implementation uses the PIO0 peripheral
diff --git a/users/art/art_user_config.h.example b/users/art/art_user_config.h.example
@@ -0,0 +1,7 @@
+// Copyright 2022 Artjoms Rizihs (@artjomsR)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#define SPLIT75_SETUP_FOR_PUBLIC_USE_BY_DEFAULT true
+#define WORKMAN_TO_QWERTY_HW_MAPPING false
+
+#define lang_switch_combo SS_LGUI(SS_TAP(X_Z))
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,4 +3,4 @@

		#pragma once

		#define WS2812_PIO_USE_PIO1 // Force the usage of PIO1 peripheral, by default the WS2812 implementation uses the PIO0 peripheral
		#define WS2812_PIO_USE_PIO1 // Force the usage of PIO1 peripheral, by default the WS2812 implementation uses the PIO0 peripheral