Merge branch 'master' into meteor

1 files changed, 41 insertions, 0 deletions

diff --git a/keyboards/torn/torn.h b/keyboards/torn/torn.h
new file mode 100644
index 000000000..c25b5c2a0
--- /dev/null
+++ b/keyboards/torn/torn.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2020 Richard Titmuss <richard.titmuss@gmail.com>
+ *
+ * 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/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define ___ KC_NO
+
+// clang-format off
+#define LAYOUT_split_3x6_4( \
+	k00, k01, k02, k03, k04, k05,   k06, k07, k08, k09, k0a, k0b, \
+	k10, k11, k12, k13, k14, k15,   k16, k17, k18, k19, k1a, k1b, \
+	k20, k21, k22, k23, k24, k25,   k26, k27, k28, k29, k2a, k2b, \
+	          k32, k33, k34, k35,   k36, k37, k38, k39 \
+) { \
+	{ k00, k01, k02, k03, k04, k05,   k06, k07, k08, k09, k0a, k0b }, \
+	{ k10, k11, k12, k13, k14, k15,   k16, k17, k18, k19, k1a, k1b }, \
+	{ k20, k21, k22, k23, k24, k25,   k26, k27, k28, k29, k2a, k2b }, \
+	{ ___, ___, k32, k33, k34, k35,   k36, k37, k38, k39, ___, ___ } \
+}
+// clang-format on
+
+void torn_set_led(uint8_t led, bool on);
+
+void secondary_encoder_read(void);
+void secondary_encoder_init(void);