summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2024-03-29 03:23:12 +0000
committerQMK Bot <hello@qmk.fm>2024-03-29 03:23:12 +0000
commit81df9ba4782a7c80bbaf3ab22b4be446c75843e2 (patch)
tree80ccf9f3a8ac9d2061443197434d2704b0d74de8
parent3a22c4a31f8ebeefa86a1152900003b1becf201c (diff)
parente44cbf75562243f68be2a0e5da02bd032df98b3b (diff)
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--keyboards/minimon/bartlesplit/config.h20
-rw-r--r--keyboards/minimon/bartlesplit/info.json114
-rw-r--r--keyboards/minimon/bartlesplit/keymaps/default/keymap.json33
-rw-r--r--keyboards/minimon/bartlesplit/matrix.c148
-rw-r--r--keyboards/minimon/bartlesplit/readme.md31
-rw-r--r--keyboards/minimon/bartlesplit/rules.mk2
-rw-r--r--keyboards/minimon/readme.md1
7 files changed, 349 insertions, 0 deletions
diff --git a/keyboards/minimon/bartlesplit/config.h b/keyboards/minimon/bartlesplit/config.h
new file mode 100644
index 0000000000..e4ca83f5e9
--- /dev/null
+++ b/keyboards/minimon/bartlesplit/config.h
@@ -0,0 +1,20 @@
1/*
2Copyright 2019-2023 e3w2q Kyrremann
3
4This program is free software: you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17
18#pragma once
19
20#define DOUBLE_TAP_SHIFT_TURNS_ON_CAPS_WORD
diff --git a/keyboards/minimon/bartlesplit/info.json b/keyboards/minimon/bartlesplit/info.json
new file mode 100644
index 0000000000..83f93560b6
--- /dev/null
+++ b/keyboards/minimon/bartlesplit/info.json
@@ -0,0 +1,114 @@
1{
2 "keyboard_name": "Bartlesplit",
3 "development_board": "promicro",
4 "diode_direction": "ROW2COL",
5 "features": {
6 "bootmagic": true,
7 "command": false,
8 "console": false,
9 "extrakey": true,
10 "mousekey": true,
11 "nkro": false,
12 "caps_word": true
13 },
14 "matrix_pins": {
15 "cols": ["B3", "B3", "B1", "B1", "F7", "F7", "E6", "E6", "D7", "D7", "C6", "C6"],
16 "rows": ["B5", "B4", "B2", "B6"]
17 },
18 "pin_compatible": "promicro",
19 "url": "https://github.com/Kyrremann/bartlesplit",
20 "usb": {
21 "device_version": "1.0.0",
22 "pid": "0x1306",
23 "vid": "0x4B49"
24 },
25 "community_layouts": ["split_3x6_3", "split_3x5_3"],
26 "layouts": {
27 "LAYOUT_split_3x5_3": {
28 "layout": [
29 {"matrix": [0, 4], "x": 0, "y": 0.5},
30 {"matrix": [0, 3], "x": 1, "y": 0.25},
31 {"matrix": [0, 2], "x": 2, "y": 0},
32 {"matrix": [0, 1], "x": 3, "y": 0.25},
33 {"matrix": [0, 0], "x": 4, "y": 0.25},
34 {"matrix": [0, 6], "x": 6.5, "y": 0.25},
35 {"matrix": [0, 7], "x": 7.5, "y": 0.25},
36 {"matrix": [0, 8], "x": 8.5, "y": 0},
37 {"matrix": [0, 9], "x": 9.5, "y": 0.25},
38 {"matrix": [0, 10], "x": 10.5, "y": 0.5},
39 {"matrix": [1, 4], "x": 0, "y": 1.5},
40 {"matrix": [1, 3], "x": 1, "y": 1.25},
41 {"matrix": [1, 2], "x": 2, "y": 1},
42 {"matrix": [1, 1], "x": 3, "y": 1.25},
43 {"matrix": [1, 0], "x": 4, "y": 1.25},
44 {"matrix": [1, 6], "x": 6.5, "y": 1.25},
45 {"matrix": [1, 7], "x": 7.5, "y": 1.25},
46 {"matrix": [1, 8], "x": 8.5, "y": 1},
47 {"matrix": [1, 9], "x": 9.5, "y": 1.25},
48 {"matrix": [1, 10], "x": 10.5, "y": 1.5},
49 {"matrix": [2, 4], "x": 0, "y": 2.5},
50 {"matrix": [2, 3], "x": 1, "y": 2.25},
51 {"matrix": [2, 2], "x": 2, "y": 2},
52 {"matrix": [2, 1], "x": 3, "y": 2.25},
53 {"matrix": [2, 0], "x": 4, "y": 2.25},
54 {"matrix": [2, 6], "x": 6.5, "y": 2.25},
55 {"matrix": [2, 7], "x": 7.5, "y": 2.25},
56 {"matrix": [2, 8], "x": 8.5, "y": 2},
57 {"matrix": [2, 9], "x": 9.5, "y": 2.25},
58 {"matrix": [2, 10], "x": 10.5, "y": 2.5},
59 {"matrix": [3, 1], "x": 2.5, "y": 3.25},
60 {"matrix": [3, 0], "x": 3.5, "y": 3.25},
61 {"matrix": [3, 3], "x": 4.5, "y": 3.5},
62 {"matrix": [3, 6], "x": 6, "y": 3.5},
63 {"matrix": [3, 7], "x": 7, "y": 3.25},
64 {"matrix": [3, 8], "x": 8, "y": 3.25}
65 ]
66 },
67 "LAYOUT_split_3x6_3": {
68 "layout": [
69 {"matrix": [0, 5], "x": 0, "y": 0.25},
70 {"matrix": [0, 4], "x": 1, "y": 0.125},
71 {"matrix": [0, 3], "x": 2, "y": 0},
72 {"matrix": [0, 2], "x": 3, "y": 0.125},
73 {"matrix": [0, 1], "x": 4, "y": 0.25},
74 {"matrix": [0, 0], "x": 5, "y": 0.25},
75 {"matrix": [0, 6], "x": 7, "y": 0.25},
76 {"matrix": [0, 7], "x": 8, "y": 0.125},
77 {"matrix": [0, 8], "x": 9, "y": 0},
78 {"matrix": [0, 9], "x": 10, "y": 0.125},
79 {"matrix": [0, 10], "x": 11, "y": 0.25},
80 {"matrix": [0, 11], "x": 12, "y": 0.25},
81 {"matrix": [1, 5], "x": 0, "y": 1.25},
82 {"matrix": [1, 4], "x": 1, "y": 1.125},
83 {"matrix": [1, 3], "x": 2, "y": 1},
84 {"matrix": [1, 2], "x": 3, "y": 1.125},
85 {"matrix": [1, 1], "x": 4, "y": 1.25},
86 {"matrix": [1, 0], "x": 5, "y": 1.25},
87 {"matrix": [1, 6], "x": 7, "y": 1.25},
88 {"matrix": [1, 7], "x": 8, "y": 1.125},
89 {"matrix": [1, 8], "x": 9, "y": 1},
90 {"matrix": [1, 9], "x": 10, "y": 1.125},
91 {"matrix": [1, 10], "x": 11, "y": 1.25},
92 {"matrix": [1, 11], "x": 12, "y": 1.25},
93 {"matrix": [2, 5], "x": 0, "y": 2.25},
94 {"matrix": [2, 4], "x": 1, "y": 2.125},
95 {"matrix": [2, 3], "x": 2, "y": 2},
96 {"matrix": [2, 2], "x": 3, "y": 2.125},
97 {"matrix": [2, 1], "x": 4, "y": 2.25},
98 {"matrix": [2, 0], "x": 5, "y": 2.25},
99 {"matrix": [2, 6], "x": 7, "y": 2.25},
100 {"matrix": [2, 7], "x": 8, "y": 2.125},
101 {"matrix": [2, 8], "x": 9, "y": 2},
102 {"matrix": [2, 9], "x": 10, "y": 2.125},
103 {"matrix": [2, 10], "x": 11, "y": 2.25},
104 {"matrix": [2, 11], "x": 12, "y": 2.25},
105 {"matrix": [3, 1], "x": 3.5, "y": 3.25},
106 {"matrix": [3, 0], "x": 4.5, "y": 3.5},
107 {"matrix": [3, 3], "x": 5.5, "y": 3.75},
108 {"matrix": [3, 6], "x": 6.5, "y": 3.75},
109 {"matrix": [3, 7], "x": 7.5, "y": 3.5},
110 {"matrix": [3, 8], "x": 8.5, "y": 3.25}
111 ]
112 }
113 }
114}
diff --git a/keyboards/minimon/bartlesplit/keymaps/default/keymap.json b/keyboards/minimon/bartlesplit/keymaps/default/keymap.json
new file mode 100644
index 0000000000..03a5762839
--- /dev/null
+++ b/keyboards/minimon/bartlesplit/keymaps/default/keymap.json
@@ -0,0 +1,33 @@
1{
2 "version": 1,
3 "notes": "Bartlesplit default keymap",
4 "keyboard": "minimon/bartlesplit",
5 "keymap": "default",
6 "layout": "LAYOUT_split_3x6_3",
7 "layers": [
8 [
9 "KC_TAB", "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_Y", "KC_U", "KC_I", "KC_O", "KC_P", "KC_LBRC",
10 "KC_LCTL", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCLN", "KC_QUOT",
11 "LSFT_T(KC_ESC)", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", "RSFT_T(KC_ESC)",
12 "KC_LALT", "KC_LGUI", "LT(2,KC_SPC)", "KC_ENT", "MO(1)", "KC_BSPC"
13 ],
14 [
15 "KC_NUBS", "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_7", "KC_8", "KC_9", "KC_0", "KC_MINS",
16 "KC_TRNS", "LSFT(KC_1)", "LSFT(KC_2)", "LSFT(KC_3)", "LSFT(KC_4)", "LSFT(KC_5)", "LSFT(KC_6)", "LSFT(KC_7)", "LSFT(KC_8)", "LSFT(KC_9)", "LSFT(KC_0)", "LSFT(KC_MINS)",
17 "KC_TRNS", "KC_GRV", "KC_TRNS", "LSFT(KC_EQL)", "LSFT(KC_RBRC)", "LSFT(KC_BSLS)", "KC_BSLS", "KC_RBRC", "KC_EQL", "KC_TRNS", "KC_TRNS", "KC_TRNS",
18 "KC_RALT", "KC_TRNS", "KC_ESC", "KC_TRNS", "KC_TRNS", "KC_DEL"
19 ],
20 [
21 "KC_ESC", "KC_NO", "KC_F1", "KC_F2", "KC_F3", "KC_F4", "KC_NO", "KC_NO", "KC_UP", "KC_NO", "KC_KB_VOLUME_UP", "KC_MEDIA_PLAY_PAUSE",
22 "KC_TRNS", "KC_NO", "KC_F5", "KC_F6", "KC_F7", "KC_F8", "KC_NO", "KC_LEFT", "KC_DOWN", "KC_RGHT", "KC_KB_VOLUME_DOWN", "KC_NO",
23 "KC_TRNS", "KC_NO", "KC_F9", "KC_F10", "KC_F11", "KC_F12", "KC_LCBR", "RALT(KC_8)", "RALT(KC_9)", "KC_RCBR", "KC_NO", "KC_TRNS",
24 "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "MO(3)", "KC_TRNS"
25 ],
26 [
27 "KC_TAB", "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_Y", "KC_U", "KC_I", "KC_O", "KC_P", "KC_LBRC",
28 "KC_LCTL", "LGUI_T(KC_A)", "LALT_T(KC_S)", "LCTL_T(KC_D)", "LSFT_T(KC_F)", "KC_G", "KC_H", "RSFT_T(KC_J)", "LCTL_T(KC_K)", "LALT_T(KC_L)", "LGUI_T(KC_SCLN)", "KC_QUOT",
29 "LSFT_T(KC_ESC)", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", "RSFT_T(KC_ESC)",
30 "KC_LALT", "KC_LGUI", "LT(2,KC_SPC)", "KC_ENT", "MO(1)", "KC_BSPC"
31 ]
32 ]
33}
diff --git a/keyboards/minimon/bartlesplit/matrix.c b/keyboards/minimon/bartlesplit/matrix.c
new file mode 100644
index 0000000000..351781f520
--- /dev/null
+++ b/keyboards/minimon/bartlesplit/matrix.c
@@ -0,0 +1,148 @@
1/*
2Copyright 2012-2023 Jun Wako <wakojun@gmail.com> Kyrremann <kyrremann@gmail.com>
3This program is free software: you can redistribute it and/or modify
4it under the terms of the GNU General Public License as published by
5the Free Software Foundation, either version 2 of the License, or
6(at your option) any later version.
7This program is distributed in the hope that it will be useful,
8but WITHOUT ANY WARRANTY; without even the implied warranty of
9MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
10GNU General Public License for more details.
11You should have received a copy of the GNU General Public License
12along with this program. If not, see <http://www.gnu.org/licenses/>.
13
14 Copied from here: https://github.com/e3w2q/qmk_firmware/blob/762fe3e0a7cbea768245a75520f06ff5a2f00b9f/keyboards/2x3test/matrix.c
15*/
16
17/*
18 * scan matrix
19 */
20#include <stdint.h>
21#include <stdbool.h>
22#include "wait.h"
23#include "util.h"
24#include "matrix.h"
25#include "quantum.h"
26
27#define ROW_SHIFTER ((uint16_t)1)
28
29static const pin_t row_pins[] = MATRIX_ROW_PINS;
30static const pin_t col_pins[] = MATRIX_COL_PINS;
31
32static void select_row(uint8_t row) {
33 setPinOutput(row_pins[row]);
34 writePinLow(row_pins[row]);
35}
36
37static void unselect_row(uint8_t row) {
38 setPinInputHigh(row_pins[row]);
39}
40
41static void unselect_rows(void) {
42 for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
43 setPinInputHigh(row_pins[x]);
44 }
45}
46
47static void select_col(uint8_t col) {
48 setPinOutput(col_pins[col]);
49 writePinLow(col_pins[col]);
50}
51
52static void unselect_col(uint8_t col) {
53 setPinInputHigh(col_pins[col]);
54}
55
56static void unselect_cols(void) {
57 for (uint8_t x = 0; x < MATRIX_COLS/2; x++) {
58 setPinInputHigh(col_pins[x*2]);
59 }
60}
61
62static void init_pins(void) {
63 unselect_cols();
64 unselect_rows();
65}
66
67static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) {
68 // Store last value of row prior to reading
69 matrix_row_t last_row_value = current_matrix[current_row];
70
71 // Select row and wait for row selection to stabilize
72 select_row(current_row);
73 wait_us(30);
74
75 // For each col...
76 for (uint8_t col_index = 0; col_index < MATRIX_COLS / 2; col_index++) {
77 uint16_t column_index_bitmask = ROW_SHIFTER << ((col_index * 2) + 1);
78 // Check row pin state
79 if (readPin(col_pins[col_index*2])) {
80 // Pin HI, clear col bit
81 current_matrix[current_row] &= ~column_index_bitmask;
82 } else {
83 // Pin LO, set col bit
84 current_matrix[current_row] |= column_index_bitmask;
85 }
86 }
87
88 // Unselect row
89 unselect_row(current_row);
90
91 return (last_row_value != current_matrix[current_row]);
92}
93
94static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) {
95 bool matrix_changed = false;
96
97 // Select col and wait for col selection to stabilize
98 select_col(current_col*2);
99 wait_us(30);
100
101 // For each row...
102 for (uint8_t row_index = 0; row_index < MATRIX_ROWS; row_index++) {
103 // Store last value of row prior to reading
104 matrix_row_t last_row_value = current_matrix[row_index];
105
106 uint16_t column_index_bitmask = ROW_SHIFTER << (current_col * 2);
107 // Check row pin state
108 if (readPin(row_pins[row_index])) {
109 // Pin HI, clear col bit
110 current_matrix[row_index] &= ~column_index_bitmask;
111 } else {
112 // Pin LO, set col bit
113 current_matrix[row_index] |= column_index_bitmask;
114 }
115
116 // Determine if the matrix changed state
117 if ((last_row_value != current_matrix[row_index]) && !(matrix_changed)) {
118 matrix_changed = true;
119 }
120 }
121
122 // Unselect col
123 unselect_col(current_col*2);
124
125 return matrix_changed;
126}
127
128
129void matrix_init_custom(void) {
130 // initialize key pins
131 init_pins();
132}
133
134bool matrix_scan_custom(matrix_row_t current_matrix[]) {
135
136 bool changed = false;
137
138 // Set row, read cols
139 for (uint8_t current_row = 0; current_row < MATRIX_ROWS; current_row++) {
140 changed |= read_cols_on_row(current_matrix, current_row);
141 }
142 // Set col, read rows
143 for (uint8_t current_col = 0; current_col < MATRIX_COLS/2; current_col++) {
144 changed |= read_rows_on_col(current_matrix, current_col);
145 }
146
147 return changed;
148}
diff --git a/keyboards/minimon/bartlesplit/readme.md b/keyboards/minimon/bartlesplit/readme.md
new file mode 100644
index 0000000000..c7109ddf47
--- /dev/null
+++ b/keyboards/minimon/bartlesplit/readme.md
@@ -0,0 +1,31 @@
1# Bartlesplitt
2
3![Bartlesplit with the hub in the 3x6 setup](https://i.imgur.com/IoMpwylh.png)
4
5Bartlesplit is based on [Cheapino](https://github.com/tompi/cheapino) by Tompi.
6The original idea was to build a Cheapino with hot swaps, but it evolved into something more!
7
8At the same time I was working on Bartlesplit, a friend of mine suggested that we try to make a splithub, letting us avoid having the Pro Micro directly on the board.
9This is mostly a design choice, making each split less clutered.
10We have called the hub [The Japanese Connection](https://github.com/Kyrremann/the-japanese-connection) since it's relying on the Japanese duplex matrix.
11
12One of the main feature of the board is the built-in tenting, so you don't need to make a case to get simple tenting.
13
14
15* Keyboard Maintainer: [Kyrre Havik](https://github.com/Kyrremann)
16* Hardware Supported: Rev 1, Pro Micro
17* Hardware Availability: https://github.com/Kyrremann/bartlesplit
18
19Make example for this keyboard (after setting up your build environment):
20
21 make minimon/bartlesplit:default
22
23Flashing example for this keyboard:
24
25 make minimon/bartlesplit:default:flash
26
27See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
28
29## Bootloader
30
31Enter the bootloader in shorting the reset pin on Pro Micro on the hub.
diff --git a/keyboards/minimon/bartlesplit/rules.mk b/keyboards/minimon/bartlesplit/rules.mk
new file mode 100644
index 0000000000..30ce5d293b
--- /dev/null
+++ b/keyboards/minimon/bartlesplit/rules.mk
@@ -0,0 +1,2 @@
1CUSTOM_MATRIX = lite
2SRC += matrix.c
diff --git a/keyboards/minimon/readme.md b/keyboards/minimon/readme.md
index cd020a1110..807e4a7c52 100644
--- a/keyboards/minimon/readme.md
+++ b/keyboards/minimon/readme.md
@@ -7,3 +7,4 @@ Maintained by [Kyrremann](https://github.com/Kyrremann).
7## Keyboards 7## Keyboards
8 8
9* [Index Tab](index_tab/) - 13x6 ortho keyboard 9* [Index Tab](index_tab/) - 13x6 ortho keyboard
10* [Bartlesplit](bartlesplit/) - 42 (36) split board with Pro Micro hub