aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-10-22 13:32:51 +0000
committerQMK Bot <hello@qmk.fm>2021-10-22 13:32:51 +0000
commitbd3e42c4a83b9efb7e7b40cd3b2325bddd3cdd53 (patch)
tree74cc4dcf2dc4ec3273d7074baadc8e7c994b6ef4
parent0093d3d761e60a31bb2a15a5859dbd0c08ef9999 (diff)
parent3979137995e32491ddebc48eab991a4dfdccc02f (diff)
downloadqmk_firmware-bd3e42c4a83b9efb7e7b40cd3b2325bddd3cdd53.tar.gz
qmk_firmware-bd3e42c4a83b9efb7e7b40cd3b2325bddd3cdd53.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat
-rw-r--r--keyboards/pteron36/info.json88
-rw-r--r--keyboards/pteron36/keymaps/default/keymap.c13
-rw-r--r--keyboards/pteron36/keymaps/via/keymap.c95
-rw-r--r--keyboards/pteron36/readme.md5
-rw-r--r--keyboards/pteron36/rules.mk2
5 files changed, 144 insertions, 59 deletions
diff --git a/keyboards/pteron36/info.json b/keyboards/pteron36/info.json
index b493879bf..e191dc616 100644
--- a/keyboards/pteron36/info.json
+++ b/keyboards/pteron36/info.json
@@ -1,13 +1,95 @@
1{ 1{
2 "keyboard_name": "Pteron36", 2 "keyboard_name": "Pteron36",
3 "url": "", 3 "url": "",
4 "maintainer": "Harshit Goel", 4 "maintainer": "harshitgoel96",
5 "layouts": { 5 "layouts": {
6 "LAYOUT_split_3x5_3": { 6 "LAYOUT_split_3x5_3": {
7 "layout": [{"x":2, "y":0}, {"x":12.5, "y":0}, {"x":1, "y":0.5}, {"x":3, "y":0.5}, {"x":11.5, "y":0.5}, {"x":13.5, "y":0.5}, {"x":4, "y":0.75}, {"x":10.5, "y":0.75}, {"x":0, "y":1}, {"x":2, "y":1}, {"x":12.5, "y":1}, {"x":14.5, "y":1}, {"x":1, "y":1.5}, {"x":3, "y":1.5}, {"x":11.5, "y":1.5}, {"x":13.5, "y":1.5}, {"x":4, "y":1.75}, {"x":10.5, "y":1.75}, {"x":0, "y":2}, {"x":2, "y":2}, {"x":12.5, "y":2}, {"x":14.5, "y":2}, {"x":1, "y":2.5}, {"x":3, "y":2.5}, {"x":11.5, "y":2.5}, {"x":13.5, "y":2.5}, {"x":4, "y":2.75}, {"x":10.5, "y":2.75}, {"x":0, "y":3}, {"x":14.5, "y":3}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":6, "y":4}, {"x":8.5, "y":4}, {"x":9.5, "y":4}, {"x":10.5, "y":4}] 7 "layout": [
8 {"x":0, "y":1},
9 {"x":1, "y":0.5},
10 {"x":2, "y":0},
11 {"x":3, "y":0.5},
12 {"x":4, "y":0.75},
13 {"x":10, "y":0.75},
14 {"x":11, "y":0.5},
15 {"x":12, "y":0},
16 {"x":13, "y":0.5},
17 {"x":14, "y":1},
18
19 {"x":0, "y":2},
20 {"x":1, "y":1.5},
21 {"x":2, "y":1},
22 {"x":3, "y":1.5},
23 {"x":4, "y":1.75},
24 {"x":10, "y":1.75},
25 {"x":11, "y":1.5},
26 {"x":12, "y":1},
27 {"x":13, "y":1.5},
28 {"x":14, "y":2},
29
30 {"x":0, "y":3},
31 {"x":1, "y":2.5},
32 {"x":2, "y":2},
33 {"x":3, "y":2.5},
34 {"x":4, "y":2.75},
35 {"x":10, "y":2.75},
36 {"x":11, "y":2.5},
37 {"x":12, "y":2},
38 {"x":13, "y":2.5},
39 {"x":14, "y":3},
40
41 {"x":4, "y":4},
42 {"x":5, "y":4},
43 {"x":6, "y":4},
44 {"x":8, "y":4},
45 {"x":9, "y":4},
46 {"x":10, "y":4}
47 ]
8 }, 48 },
9 "LAYOUT_split_3x5_3_encoder": { 49 "LAYOUT_split_3x5_3_encoder": {
10 "layout": [{"x":2, "y":0}, {"x":12.5, "y":0}, {"x":1, "y":0.5}, {"x":3, "y":0.5}, {"x":11.5, "y":0.5}, {"x":13.5, "y":0.5}, {"x":4, "y":0.75}, {"x":10.5, "y":0.75}, {"x":0, "y":1}, {"x":2, "y":1}, {"x":12.5, "y":1}, {"x":14.5, "y":1}, {"x":1, "y":1.5}, {"x":3, "y":1.5}, {"x":11.5, "y":1.5}, {"x":13.5, "y":1.5}, {"x":4, "y":1.75}, {"x":10.5, "y":1.75}, {"x":0, "y":2}, {"x":2, "y":2}, {"x":12.5, "y":2}, {"x":14.5, "y":2}, {"x":1, "y":2.5}, {"x":3, "y":2.5}, {"x":11.5, "y":2.5}, {"x":13.5, "y":2.5}, {"x":4, "y":2.75}, {"label":"enc1", "x":5.5, "y":2.75}, {"label":"enc2", "x":9, "y":2.75}, {"x":10.5, "y":2.75}, {"x":0, "y":3}, {"x":14.5, "y":3}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":6, "y":4}, {"x":8.5, "y":4}, {"x":9.5, "y":4}, {"x":10.5, "y":4}] 50 "layout": [
51 {"x":0, "y":1},
52 {"x":1, "y":0.5},
53 {"x":2, "y":0},
54 {"x":3, "y":0.5},
55 {"x":4, "y":0.75},
56 {"x":10, "y":0.75},
57 {"x":11, "y":0.5},
58 {"x":12, "y":0},
59 {"x":13, "y":0.5},
60 {"x":14, "y":1},
61
62 {"x":0, "y":2},
63 {"x":1, "y":1.5},
64 {"x":2, "y":1},
65 {"x":3, "y":1.5},
66 {"x":4, "y":1.75},
67 {"x":10, "y":1.75},
68 {"x":11, "y":1.5},
69 {"x":12, "y":1},
70 {"x":13, "y":1.5},
71 {"x":14, "y":2},
72
73 {"x":0, "y":3},
74 {"x":1, "y":2.5},
75 {"x":2, "y":2},
76 {"x":3, "y":2.5},
77 {"x":4, "y":2.75},
78 {"label":"enc1", "x":5.5, "y":2.75},
79 {"label":"enc2", "x":8.5, "y":2.75},
80 {"x":10, "y":2.75},
81 {"x":11, "y":2.5},
82 {"x":12, "y":2},
83 {"x":13, "y":2.5},
84 {"x":14, "y":3},
85
86 {"x":4, "y":4},
87 {"x":5, "y":4},
88 {"x":6, "y":4},
89 {"x":8, "y":4},
90 {"x":9, "y":4},
91 {"x":10, "y":4}
92 ]
11 } 93 }
12 } 94 }
13} 95}
diff --git a/keyboards/pteron36/keymaps/default/keymap.c b/keyboards/pteron36/keymaps/default/keymap.c
index 0cc0e2b47..14b4e5979 100644
--- a/keyboards/pteron36/keymaps/default/keymap.c
+++ b/keyboards/pteron36/keymaps/default/keymap.c
@@ -27,9 +27,10 @@ enum custom_keycodes {
27 27
28const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 28const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
29 29
30 [_QWERTY] = LAYOUT_split_3x5_3_encoder( 30 [_QWERTY] = LAYOUT_split_3x5_3_encoder(
31 KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, 31 KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
32 KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, 32 KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,
33 KC_Z, KC_X, KC_C, KC_V, KC_B,KC_LBRACKET, KC_RBRACKET, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, 33 KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LBRC, KC_RBRC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,
34 KC_LGUI, KC_BSPC, KC_SPC, KC_SPC, KC_ENT, KC_RALT 34 KC_LGUI, KC_BSPC, KC_SPC, KC_SPC, KC_ENT, KC_RALT
35 )}; 35 )
36};
diff --git a/keyboards/pteron36/keymaps/via/keymap.c b/keyboards/pteron36/keymaps/via/keymap.c
index 9e467dcde..ce96ea6c5 100644
--- a/keyboards/pteron36/keymaps/via/keymap.c
+++ b/keyboards/pteron36/keymaps/via/keymap.c
@@ -33,53 +33,54 @@ enum layer_names {
33 33
34const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 34const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
35 35
36 [_QWERTY] = LAYOUT_split_3x5_3_encoder( 36 [_QWERTY] = LAYOUT_split_3x5_3_encoder(
37 KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, 37 KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
38 KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, 38 KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,
39 KC_Z, KC_X, KC_C, KC_V, KC_B,KC_LBRACKET, KC_RBRACKET, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, 39 KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LBRC, KC_RBRC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,
40 KC_LGUI, KC_BSPC, KC_SPC, KC_SPC, KC_ENT, KC_RALT 40 KC_LGUI, KC_BSPC, KC_SPC, KC_SPC, KC_ENT, KC_RALT
41 ), 41 ),
42 42
43 [_SYMB] = LAYOUT_split_3x5_3_encoder( 43 [_SYMB] = LAYOUT_split_3x5_3_encoder(
44 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 44 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
45 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 45 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
46 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 46 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
47 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS 47 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
48 ), 48 ),
49 49
50 [_NAV] = LAYOUT_split_3x5_3_encoder( 50 [_NAV] = LAYOUT_split_3x5_3_encoder(
51 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 51 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
52 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 52 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
53 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 53 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
54 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS 54 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
55 ), 55 ),
56 56
57 [_ADJUST] = LAYOUT_split_3x5_3_encoder( 57 [_ADJUST] = LAYOUT_split_3x5_3_encoder(
58 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 58 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
59 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 59 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
60 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 60 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
61 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS 61 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
62 ), 62 ),
63 [_MOUSE] = LAYOUT_split_3x5_3_encoder( 63
64 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 64 [_MOUSE] = LAYOUT_split_3x5_3_encoder(
65 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 65 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
66 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 66 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
67 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS 67 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
68 ), 68 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
69 69 ),
70 [_NUMB] = LAYOUT_split_3x5_3_encoder( 70
71 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 71 [_NUMB] = LAYOUT_split_3x5_3_encoder(
72 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 72 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
73 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 73 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
74 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS 74 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
75 ), 75 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
76 76 ),
77 [_FNR] = LAYOUT_split_3x5_3_encoder( 77
78 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 78 [_FNR] = LAYOUT_split_3x5_3_encoder(
79 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 79 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
80 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 80 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
81 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS 81 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
82 ) 82 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
83 )
83 84
84}; 85};
85 86
diff --git a/keyboards/pteron36/readme.md b/keyboards/pteron36/readme.md
index a68c7a55b..0e430db24 100644
--- a/keyboards/pteron36/readme.md
+++ b/keyboards/pteron36/readme.md
@@ -2,11 +2,12 @@
2 2
3![Pteron36](https://i.imgur.com/PuXPWYfh.jpg) 3![Pteron36](https://i.imgur.com/PuXPWYfh.jpg)
4 4
5A 36 key keyboard with a bit more natural thumb cluster. 5A 36-key keyboard with a bit more natural thumb cluster.
6 6
7* Keyboard Maintainer: [Harshit Goel](https://github.com/harshitgoel96) 7* Keyboard Maintainer: [Harshit Goel](https://github.com/harshitgoel96)
8* Hardware Supported: Pteron36 using promicro. 8* Hardware Supported: Pteron36 using promicro.
9* Hardware Availability: Hardware is opensource, you can simply send the gerber to a PCB manufacturere and them made. File are availalbe in [pteron36 repository](https://github.com/harshitgoel96/pteron36-split-keyboard/releases/tag/v1.2.0) 9* Hardware Availability: Files are available in the [pteron36 repository](https://github.com/harshitgoel96/pteron36-split-keyboard/releases/tag/v1.2.0)
10 * The hardware is open source; you can simply send the Gerber to a PCB manufacturer and have them made.
10 11
11Make example for this keyboard (after setting up your build environment): 12Make example for this keyboard (after setting up your build environment):
12 13
diff --git a/keyboards/pteron36/rules.mk b/keyboards/pteron36/rules.mk
index 278246b37..a12be2635 100644
--- a/keyboards/pteron36/rules.mk
+++ b/keyboards/pteron36/rules.mk
@@ -7,7 +7,7 @@ BOOTLOADER = caterina
7# Build Options 7# Build Options
8# change yes to no to disable 8# change yes to no to disable
9# 9#
10BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite 10BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
11MOUSEKEY_ENABLE = yes # Mouse keys 11MOUSEKEY_ENABLE = yes # Mouse keys
12EXTRAKEY_ENABLE = yes # Audio control and System control 12EXTRAKEY_ENABLE = yes # Audio control and System control
13CONSOLE_ENABLE = no # Console for debug 13CONSOLE_ENABLE = no # Console for debug
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-04 10:01:06 +0000