Merge remote-tracking branch 'upstream/master' into develop

4 files changed, 192 insertions, 0 deletions

diff --git a/layouts/community/split_3x5_3/bbaserdem/config.h b/layouts/community/split_3x5_3/bbaserdem/config.h
new file mode 100644
index 0000000000..6bb3515b9e
--- /dev/null
+++ b/layouts/community/split_3x5_3/bbaserdem/config.h
@@ -0,0 +1,35 @@
+
+/* Copyright 2021 Batuhan Başerdem
+ * <baserdem.batuhan@gmail.com> @bbaserdem
+ *
+ * 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
+
+// Split definition; use the following to flash;
+//  pro-micro:      avrdude-split-left/right
+//  elite-c:        dfu-split-left/right
+#define EE_HANDS
+
+#ifdef KEYBOARD_crkbd_rev1
+    // Corne overrides
+#   ifdef RGBLED_NUM
+#   undef RGBLED_NUM
+#   endif
+#   ifdef DRIVER_LED_TOTAL
+#   undef DRIVER_LED_TOTAL
+#   endif
+#   define RGBLED_NUM 48
+#   define DRIVER_LED_TOTAL RGBLED_NUM
+#endif // KEYBOARD_crkbd_rev1
diff --git a/layouts/community/split_3x5_3/bbaserdem/keymap.c b/layouts/community/split_3x5_3/bbaserdem/keymap.c
new file mode 100644
index 0000000000..f39a81082e
--- /dev/null
+++ b/layouts/community/split_3x5_3/bbaserdem/keymap.c
@@ -0,0 +1,117 @@
+/* Copyright 2021 Batuhan Başerdem
+ * <baserdem.batuhan@gmail.com> @bbaserdem
+ *
+ * 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/>.
+ */
+
+#include QMK_KEYBOARD_H
+#include "bbaserdem.h"
+
+/* D layout
+ * ┌───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┐
+ * │' "│, <│. >│ P │ Y │         │ F │ G │ C │ R │ L │
+ * ├───┼───┼───┼───┼───┤         ├───┼───┼───┼───┼───┤
+ * │ A │ O │ E │ U │ I │         │ D │ H │ T │ N │ S │
+ * ├───┼───┼───┼───┼───┤         ├───┼───┼───┼───┼───┤
+ * │; :│ Q │ J │ K │ X │         │ B │ M │ W │ V │ Z │
+ * └───┴───┴───┼───┼───┼───┐ ┌───┼───┼───┼───┴───┴───┘
+ *             │Del│Tab│Spc│ │Ent│Esc│Bsp│
+ *             └───┴───┴───┘ └───┴───┴───┘
+ */
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT_split_3x5_3_wrapper(
+        _BL1_5_,_BR1_5_,
+        _BL2_5_,_BR2_5_,
+        _BL3_5_,_BR3_5_,
+        _BL4_3_,_BR4_3_
+    ),
+    [_CHAR] = LAYOUT_split_3x5_3_wrapper(
+        _CL1_5_,_CR1_5_,
+        _CL2_5_,_CR2_5_,
+        _CL3_5_,_CR3_5_,
+        _CL4_3_,_CR4_3_
+    ),
+    [_GAME] = LAYOUT_split_3x5_3_wrapper(
+        _GA1_5_,___5___,
+        _GA2_5_,___5___,
+        _GA3_5_,___5___,
+        _GA4_3_,___3___
+    ),
+    [_MEDI] = LAYOUT_split_3x5_3_wrapper(
+        ___5___,_ME1_5_,
+        ___5___,_ME2_5_,
+        ___5___,_ME3_5_,
+        ___3___,_ME4_3_
+    ),
+    [_NAVI] = LAYOUT_split_3x5_3_wrapper(
+        ___5___,_NA1_5_,
+        ___5___,_NA2_5_,
+        ___5___,_NA3_5_,
+        ___3___,_NA4_3_
+    ),
+    [_SYMB] = LAYOUT_split_3x5_3_wrapper(
+        ___5___,_SY1_5_,
+        ___5___,_SY2_5_,
+        ___5___,_SY3_5_,
+        ___3___,_SY4_3_
+    ),
+    [_NUMB] = LAYOUT_split_3x5_3_wrapper(
+        _NU1_5_,___5___,
+        _NU2_5_,___5___,
+        _NU3_5_,___5___,
+        _NU4_3_,___3___
+    ),
+    [_FUNC] = LAYOUT_split_3x5_3_wrapper(
+        _FU1_5_,___5___,
+        _FU2_5_,___5___,
+        _FU3_5_,___5___,
+        _FU4_3_,___3___
+    ),
+    [_MOUS] = LAYOUT_split_3x5_3_wrapper(
+        _MO1_5_,___5___,
+        _MO2_5_,___5___,
+        _MO3_5_,___5___,
+        _MO4_3_,___3___
+    ),
+    [_MUSI] = LAYOUT_split_3x5_3_wrapper(
+            _MU_10_,
+            _MU_10_,
+            _MU_10_,
+        _MUL_3_,_MUR_3_
+    )
+};
+
+// RGB Matrix configuration
+#ifdef RGB_MATRIX_ENABLE
+
+// crkbd
+#ifdef KEYBOARD_crkbd_rev1
+/* This is left-right for crkbd indicator light
+ * ┌──┬──┬──┬──┬──┐      ┌──┬──┬──┬──┬──┐
+ * │23│18│17│10│09│      │33│34│41│42│47│
+ * ├02┼──┼01┼──┼00┤      ├24┼──┼25┼──┼26┤
+ * │22│19│16│11│08│      │32│35│40│43│46│
+ * ├03┼──┼04┼──┼05┤      ├29┼──┼28┼──┼27┤
+ * │21│20│15│12│07│      │31│36│39│44│45│
+ * └──┴──┴──┼──┼──┼──┐┌──┼──┼──┼──┴──┴──┘
+ *          │14│13│06││30│37│38│
+ *          └──┴──┴──┘└──┴──┴──┘
+ */
+
+// End of differentiations
+#endif // KEYBOARD_crkbd_rev1
+
+// End of code for the RGB_MATRIX setup
+#endif // RGB_MATRIX_ENABLE
diff --git a/layouts/community/split_3x5_3/bbaserdem/readme.md b/layouts/community/split_3x5_3/bbaserdem/readme.md
new file mode 100644
index 0000000000..30cacd85ea
--- /dev/null
+++ b/layouts/community/split_3x5_3/bbaserdem/readme.md
@@ -0,0 +1,18 @@
+This folder contains my [split\_3x5\_3](../../../default/split_3x5_3) board layouts
+Check out the [user readme](../../../../users/bbaserdem/readme.md) for more info.
+
+# Crkbd
+
+Using a no 6th column crkbd (rev 2.1 choc) as a mobile keyboard.
+
+This version uses ProMicro as controllers; can't have OLED and RGB at the same time.
+
+## Build
+
+QMK cli commands no longer works with Archlinux (2021 Sep.) on my PC for flashing promicro.
+In the past; I used to flash Pro Micro explicitly using the following line, for referance.
+
+```
+sudo avrdude -p atmgea34u4 -P "$(ls /dev/ttyACM*)" -c avr109 -D -U flash:w:<hexfile>.hex
+```
+
diff --git a/layouts/community/split_3x5_3/bbaserdem/rules.mk b/layouts/community/split_3x5_3/bbaserdem/rules.mk
new file mode 100644
index 0000000000..047629b401
--- /dev/null
+++ b/layouts/community/split_3x5_3/bbaserdem/rules.mk
@@ -0,0 +1,22 @@
+# Copyright 2021 Batuhan Başerdem
+# <baserdem.batuhan@gmail.com> @bbaserdem
+#
+# 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/>.
+
+# Corne keyboard
+ifneq (,$(findstring crkbd/rev1,$(KEYBOARD)))
+    RGBLIGHT_ENABLE = no
+    RGB_MATRIX_ENABLE = yes
+    OLED_ENABLE = no
+endif