Skip to content

Commit 90ce2e0

Browse files
JohnAZoidbergJohnAZoidberg
committed
lotus: Fix build
GPIOs are all wrong! Signed-off-by: Daniel Schaefer <[email protected]>
1 parent 9ab3f3a commit 90ce2e0

File tree

4 files changed

+144
-125
lines changed

4 files changed

+144
-125
lines changed

‎keyboards/lotus/info.json‎

Lines changed: 91 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"keyboard_name": "Framework Lotus",
2+
"keyboard_name": "lotus",
33
"manufacturer": "Framework",
4-
"maintainer": "Daniel Schaefer",
4+
"maintainer": "JohnAZoidberg",
55
"bootloader": "rp2040",
66
"diode_direction": "COL2ROW",
77
"features": {
@@ -15,11 +15,12 @@
1515
"audio": false
1616
},
1717
"matrix_pins": {
18-
"cols": ["GP21", "GP20", "GP19", "GP18", "GP17", "GP16"],
19-
"rows": ["GP12", "GP13", "GP14", "GP15"]
18+
"cols": ["GP30", "GP29", "GP28", "GP27", "GP26", "GP25", "GP24", "GP23", "GP22", "GP21", "GP20", "GP19", "GP18", "GP17", "GP16", "GP15"],
19+
"rows": ["GP9", "GP10", "GP11", "GP12", "GP13", "GP14"]
2020
},
2121
"debounce": 5,
2222
"processor": "RP2040",
23+
"url": "",
2324
"usb": {
2425
"device_version": "0.1.0",
2526
"pid": "0x0013",
@@ -52,64 +53,93 @@
5253
"enabled": false
5354
},
5455
"layouts": {
55-
"LAYOUT_ANSI": {
56+
"LAYOUT_75_ansi": {
5657
"layout": [
57-
],
58-
},
59-
"LAYOUT_ISO": {
60-
"layout": [
61-
],
62-
},
63-
"LAYOUT_JIS": {
64-
"layout": [
65-
],
66-
},
67-
"LAYOUT_split_3x6_4": {
68-
"layout": [
69-
{"label":"L00", "x":0, "y":1.5},
70-
{"label":"L01", "x":1, "y":1.25},
71-
{"label":"L02", "x":2, "y":0.5},
72-
{"label":"L03", "x":3, "y":0},
73-
{"label":"L04", "x":4, "y":0.25},
74-
{"label":"L05", "x":5, "y":0.5},
75-
{"label":"R00", "x":8.75, "y":0.5},
76-
{"label":"R01", "x":9.75, "y":0.25},
77-
{"label":"R02", "x":10.75, "y":0},
78-
{"label":"R03", "x":11.75, "y":0.5},
79-
{"label":"R04", "x":12.75, "y":1.25},
80-
{"label":"R05", "x":13.75, "y":1.5},
81-
{"label":"L10", "x":0, "y":2.5},
82-
{"label":"L11", "x":1, "y":2.25},
83-
{"label":"L12", "x":2, "y":1.5},
84-
{"label":"L13", "x":3, "y":1},
85-
{"label":"L14", "x":4, "y":1.25},
86-
{"label":"L15", "x":5, "y":1.5},
87-
{"label":"R10", "x":8.75, "y":1.5},
88-
{"label":"R11", "x":9.75, "y":1.25},
89-
{"label":"R12", "x":10.75, "y":1},
90-
{"label":"R13", "x":11.75, "y":1.5},
91-
{"label":"R14", "x":12.75, "y":2.25},
92-
{"label":"R15", "x":13.75, "y":2.5},
93-
{"label":"L20", "x":0, "y":3.5},
94-
{"label":"L21", "x":1, "y":3.25},
95-
{"label":"L22", "x":2, "y":2.5},
96-
{"label":"L23", "x":3, "y":2},
97-
{"label":"L24", "x":4, "y":2.25},
98-
{"label":"L25", "x":5, "y":2.5},
99-
{"label":"R20", "x":8.75, "y":2.5},
100-
{"label":"R21", "x":9.75, "y":2.25},
101-
{"label":"R22", "x":10.75, "y":2},
102-
{"label":"R23", "x":11.75, "y":2.5},
103-
{"label":"R24", "x":12.75, "y":3.25},
104-
{"label":"R25", "x":13.75, "y":3.5},
105-
{"label":"L30", "x":3, "y":4},
106-
{"label":"L31", "x":4, "y":3.75},
107-
{"label":"L32", "x":5, "y":3.75},
108-
{"label":"L33", "x":6, "y":4},
109-
{"label":"R30", "x":7.75, "y":4},
110-
{"label":"R31", "x":8.75, "y":3.75},
111-
{"label":"R32", "x":9.75, "y":3.75},
112-
{"label":"R33", "x":10.75, "y":4}]
58+
{ "matrix": [0, 0], "x": 0, "y": 0 },
59+
{ "matrix": [0, 1], "x": 1, "y": 0 },
60+
{ "matrix": [0, 2], "x": 2, "y": 0 },
61+
{ "matrix": [0, 3], "x": 3, "y": 0 },
62+
{ "matrix": [0, 4], "x": 4, "y": 0 },
63+
{ "matrix": [0, 5], "x": 5, "y": 0 },
64+
{ "matrix": [0, 6], "x": 6, "y": 0 },
65+
{ "matrix": [0, 7], "x": 7, "y": 0 },
66+
{ "matrix": [0, 8], "x": 8, "y": 0 },
67+
{ "matrix": [0, 9], "x": 9, "y": 0 },
68+
{ "matrix": [0, 10], "x": 10, "y": 0 },
69+
{ "matrix": [0, 11], "x": 11, "y": 0 },
70+
{ "matrix": [0, 12], "x": 12, "y": 0 },
71+
{ "matrix": [0, 13], "x": 13, "y": 0 },
72+
{ "matrix": [0, 14], "x": 14, "y": 0 },
73+
{ "matrix": [0, 15], "x": 15, "y": 0 },
74+
{ "matrix": [1, 0], "x": 0, "y": 1 },
75+
{ "matrix": [1, 1], "x": 1, "y": 1 },
76+
{ "matrix": [1, 2], "x": 2, "y": 1 },
77+
{ "matrix": [1, 3], "x": 3, "y": 1 },
78+
{ "matrix": [1, 4], "x": 4, "y": 1 },
79+
{ "matrix": [1, 5], "x": 5, "y": 1 },
80+
{ "matrix": [1, 6], "x": 6, "y": 1 },
81+
{ "matrix": [1, 7], "x": 7, "y": 1 },
82+
{ "matrix": [1, 8], "x": 8, "y": 1 },
83+
{ "matrix": [1, 9], "x": 9, "y": 1 },
84+
{ "matrix": [1, 10], "x": 10, "y": 1 },
85+
{ "matrix": [1, 11], "x": 11, "y": 1 },
86+
{ "matrix": [1, 12], "x": 12, "y": 1 },
87+
{ "matrix": [1, 13], "w": 2, "x": 13, "y": 1 },
88+
{ "matrix": [1, 15], "x": 15, "y": 1 },
89+
{ "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2 },
90+
{ "matrix": [2, 1], "x": 1.5, "y": 2 },
91+
{ "matrix": [2, 2], "x": 2.5, "y": 2 },
92+
{ "matrix": [2, 3], "x": 3.5, "y": 2 },
93+
{ "matrix": [2, 4], "x": 4.5, "y": 2 },
94+
{ "matrix": [2, 5], "x": 5.5, "y": 2 },
95+
{ "matrix": [2, 6], "x": 6.5, "y": 2 },
96+
{ "matrix": [2, 7], "x": 7.5, "y": 2 },
97+
{ "matrix": [2, 8], "x": 8.5, "y": 2 },
98+
{ "matrix": [2, 9], "x": 9.5, "y": 2 },
99+
{ "matrix": [2, 10], "x": 10.5, "y": 2 },
100+
{ "matrix": [2, 11], "x": 11.5, "y": 2 },
101+
{ "matrix": [2, 12], "x": 12.5, "y": 2 },
102+
{ "matrix": [2, 13], "w": 1.5, "x": 13.5, "y": 2 },
103+
{ "matrix": [2, 15], "x": 15, "y": 2 },
104+
{ "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3 },
105+
{ "matrix": [3, 1], "x": 1.75, "y": 3 },
106+
{ "matrix": [3, 2], "x": 2.75, "y": 3 },
107+
{ "matrix": [3, 3], "x": 3.75, "y": 3 },
108+
{ "matrix": [3, 4], "x": 4.75, "y": 3 },
109+
{ "matrix": [3, 5], "x": 5.75, "y": 3 },
110+
{ "matrix": [3, 6], "x": 6.75, "y": 3 },
111+
{ "matrix": [3, 7], "x": 7.75, "y": 3 },
112+
{ "matrix": [3, 8], "x": 8.75, "y": 3 },
113+
{ "matrix": [3, 9], "x": 9.75, "y": 3 },
114+
{ "matrix": [3, 10], "x": 10.75, "y": 3 },
115+
{ "matrix": [3, 11], "x": 11.75, "y": 3 },
116+
{ "matrix": [3, 12], "w": 2.25, "x": 12.75, "y": 3 },
117+
{ "matrix": [3, 15], "x": 15, "y": 3 },
118+
{ "matrix": [4, 0], "w": 2.25, "x": 0, "y": 4 },
119+
{ "matrix": [4, 2], "x": 2.25, "y": 4 },
120+
{ "matrix": [4, 3], "x": 3.25, "y": 4 },
121+
{ "matrix": [4, 4], "x": 4.25, "y": 4 },
122+
{ "matrix": [4, 5], "x": 5.25, "y": 4 },
123+
{ "matrix": [4, 6], "x": 6.25, "y": 4 },
124+
{ "matrix": [4, 7], "x": 7.25, "y": 4 },
125+
{ "matrix": [4, 8], "x": 8.25, "y": 4 },
126+
{ "matrix": [4, 9], "x": 9.25, "y": 4 },
127+
{ "matrix": [4, 10], "x": 10.25, "y": 4 },
128+
{ "matrix": [4, 11], "x": 11.25, "y": 4 },
129+
{ "matrix": [4, 12], "w": 1.75, "x": 12.25, "y": 4 },
130+
{ "matrix": [4, 14], "x": 14, "y": 4 },
131+
{ "matrix": [4, 15], "x": 15, "y": 4 },
132+
{ "matrix": [5, 0], "w": 1.25, "x": 0, "y": 5 },
133+
{ "matrix": [5, 1], "w": 1.25, "x": 1.25, "y": 5 },
134+
{ "matrix": [5, 2], "w": 1.25, "x": 2.5, "y": 5 },
135+
{ "matrix": [5, 3], "w": 6.25, "x": 3.75, "y": 5 },
136+
{ "matrix": [5, 10], "x": 10, "y": 5 },
137+
{ "matrix": [5, 11], "x": 11, "y": 5 },
138+
{ "matrix": [5, 12], "x": 12, "y": 5 },
139+
{ "matrix": [5, 13], "x": 13, "y": 5 },
140+
{ "matrix": [5, 14], "x": 14, "y": 5 },
141+
{ "matrix": [5, 15], "x": 15, "y": 5 }
142+
]
113143
}
114144
}
115145
}

‎keyboards/lotus/keymaps/default/keymap.c‎

Lines changed: 23 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,30 @@
1-
// Copyright 2022 Yoichiro Tanaka (@yoichiro)
21
// Copyright 2022 Framework Computer
32
// SPDX-License-Identifier: GPL-2.0-or-later
43

54
#include QMK_KEYBOARD_H
65

7-
enum layer_number {
8-
_QWERTY = 0,
9-
_LOWER,
10-
_RAISE,
11-
_ADJUST,
12-
};
13-
14-
#define LOWER MO(_LOWER)
15-
#define RAISE MO(_RAISE)
16-
176
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
18-
19-
[_QWERTY] = LAYOUT_split_3x6_4(
20-
//+--------+--------+--------+--------+--------+--------+ +--------+--------+--------+--------+--------+--------+
21-
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
22-
//+--------+--------+--------+--------+--------+--------+ +--------+--------+--------+--------+--------+--------+
23-
KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
24-
//+--------+--------+--------+--------+--------+--------+ +--------+--------+--------+--------+--------+--------+
25-
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
26-
//+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
27-
KC_LGUI, KC_LALT, LOWER, KC_SPC, KC_ENT, RAISE, KC_RALT, KC_RGUI
28-
//+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
29-
),
30-
31-
[_LOWER] = LAYOUT_split_3x6_4(
32-
//+--------+--------+--------+--------+--------+--------+ +--------+--------+--------+--------+--------+--------+
33-
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
34-
//+--------+--------+--------+--------+--------+--------+ +--------+--------+--------+--------+--------+--------+
35-
KC_LCTL, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT,_______, _______,
36-
//+--------+--------+--------+--------+--------+--------+ +--------+--------+--------+--------+--------+--------+
37-
KC_LSFT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
38-
//+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
39-
KC_LGUI, KC_LALT, LOWER, KC_SPC, KC_ENT, RAISE, KC_RALT, KC_RGUI
40-
//+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
41-
),
42-
43-
[_RAISE] = LAYOUT_split_3x6_4(
44-
//+--------+--------+--------+--------+--------+--------+ +--------+--------+--------+--------+--------+--------+
45-
KC_ESC, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
46-
//+--------+--------+--------+--------+--------+--------+ +--------+--------+--------+--------+--------+--------+
47-
KC_LCTL, _______, _______, _______, _______, _______, KC_MINS, KC_EQL, KC_LCBR, KC_RCBR, KC_PIPE, KC_GRV,
48-
//+--------+--------+--------+--------+--------+--------+ +--------+--------+--------+--------+--------+--------+
49-
KC_LSFT, KC_TILD, _______, _______, _______, _______, KC_UNDS, KC_PLUS, KC_LBRC, KC_RBRC, KC_BSLS, KC_TILD,
50-
//+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
51-
KC_LGUI, KC_LALT, LOWER, KC_SPC, KC_ENT, RAISE, KC_RALT, KC_RGUI
52-
//+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
53-
),
54-
55-
[_ADJUST] = LAYOUT_split_3x6_4(
56-
//+--------+--------+--------+--------+--------+--------+ +--------+--------+--------+--------+--------+--------+
57-
QK_BOOT, _______, _______, _______, _______, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6,
58-
//+--------+--------+--------+--------+--------+--------+ +--------+--------+--------+--------+--------+--------+
59-
RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
60-
//+--------+--------+--------+--------+--------+--------+ +--------+--------+--------+--------+--------+--------+
61-
RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______,
62-
//+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
63-
KC_LGUI, KC_LALT, LOWER, KC_SPC, KC_ENT, RAISE, KC_RALT, KC_RGUI
64-
//+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
65-
)
7+
/*
8+
* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
9+
* │Esc│F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│PSc│Pse│Del│
10+
* ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴───┼───┤
11+
* │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│Hom│
12+
* ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
13+
* │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │ \ │PgU│
14+
* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
15+
* │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ Enter │PgD│
16+
* ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
17+
* │ Shift │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shift│ ↑ │End│
18+
* ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
19+
* │Ctrl│GUI │Alt │ │Alt│GUI│Ctl│ ← │ ↓ │ → │
20+
* └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
21+
*/
22+
[0] = LAYOUT_75_ansi(
23+
KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_PAUS, KC_DEL,
24+
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME,
25+
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
26+
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN,
27+
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END,
28+
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
29+
)
6630
};
67-
68-
layer_state_t layer_state_set_user(layer_state_t state) {
69-
return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
70-
}

‎keyboards/lotus/readme.md‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,32 @@ Enter the bootloader in 3 ways:
4040
- [ ] Keyboard with per-key RGB
4141
- [ ] Numpad with 1-zone backlight
4242
- [ ] Numpad with per-key RGB
43+
44+
# Notes
45+
46+
- GPIO
47+
- Keyboard Column driver pins
48+
- GPIO8 (Column 0)
49+
- GPIO9
50+
- GPIO10
51+
- GPIO11
52+
- GPIO12
53+
- GPIO13
54+
- GPIO14
55+
- GPIO15
56+
- GPIO16
57+
- GPIO17
58+
- GPIO18
59+
- GPIO19
60+
- GPIO20
61+
- GPIO21
62+
- GPIO22
63+
- GPIO23 (Column 14)
64+
- SGM48751
65+
- GPIO1 - Analog Mux Control
66+
- GPIO2 - Analog Mux Control
67+
- GPIO3 - Analog Mux Control
68+
- GPIO4 - Enable
69+
- RGB Backlight
70+
- GPIO26 - I2C SDA
71+
- GPIO27 - I2C SCL

‎keyboards/lotus/rules.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
WS2812_DRIVER = vendor
22
SERIAL_DRIVER = vendor
3-
RGB_MATRIX_ENABLE = yes
3+
#RGB_MATRIX_ENABLE = false
44
RGB_MATRIX_DRIVER = IS31FL3745

0 commit comments

Comments
 (0)