From 90ce2e08119bae76bdb190bccc5464b159ed0ed9 Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Tue, 20 Dec 2022 11:27:41 +0800 Subject: [PATCH] lotus: Fix build GPIOs are all wrong! Signed-off-by: Daniel Schaefer --- keyboards/lotus/info.json | 152 ++++++++++++++--------- keyboards/lotus/keymaps/default/keymap.c | 86 ++++--------- keyboards/lotus/readme.md | 29 +++++ keyboards/lotus/rules.mk | 2 +- 4 files changed, 144 insertions(+), 125 deletions(-) diff --git a/keyboards/lotus/info.json b/keyboards/lotus/info.json index e0cda5cf79..63c5ede481 100644 --- a/keyboards/lotus/info.json +++ b/keyboards/lotus/info.json @@ -1,7 +1,7 @@ { - "keyboard_name": "Framework Lotus", + "keyboard_name": "lotus", "manufacturer": "Framework", - "maintainer": "Daniel Schaefer", + "maintainer": "JohnAZoidberg", "bootloader": "rp2040", "diode_direction": "COL2ROW", "features": { @@ -15,11 +15,12 @@ "audio": false }, "matrix_pins": { - "cols": ["GP21", "GP20", "GP19", "GP18", "GP17", "GP16"], - "rows": ["GP12", "GP13", "GP14", "GP15"] + "cols": ["GP30", "GP29", "GP28", "GP27", "GP26", "GP25", "GP24", "GP23", "GP22", "GP21", "GP20", "GP19", "GP18", "GP17", "GP16", "GP15"], + "rows": ["GP9", "GP10", "GP11", "GP12", "GP13", "GP14"] }, "debounce": 5, "processor": "RP2040", + "url": "", "usb": { "device_version": "0.1.0", "pid": "0x0013", @@ -52,64 +53,93 @@ "enabled": false }, "layouts": { - "LAYOUT_ANSI": { + "LAYOUT_75_ansi": { "layout": [ - ], - }, - "LAYOUT_ISO": { - "layout": [ - ], - }, - "LAYOUT_JIS": { - "layout": [ - ], - }, - "LAYOUT_split_3x6_4": { - "layout": [ - {"label":"L00", "x":0, "y":1.5}, - {"label":"L01", "x":1, "y":1.25}, - {"label":"L02", "x":2, "y":0.5}, - {"label":"L03", "x":3, "y":0}, - {"label":"L04", "x":4, "y":0.25}, - {"label":"L05", "x":5, "y":0.5}, - {"label":"R00", "x":8.75, "y":0.5}, - {"label":"R01", "x":9.75, "y":0.25}, - {"label":"R02", "x":10.75, "y":0}, - {"label":"R03", "x":11.75, "y":0.5}, - {"label":"R04", "x":12.75, "y":1.25}, - {"label":"R05", "x":13.75, "y":1.5}, - {"label":"L10", "x":0, "y":2.5}, - {"label":"L11", "x":1, "y":2.25}, - {"label":"L12", "x":2, "y":1.5}, - {"label":"L13", "x":3, "y":1}, - {"label":"L14", "x":4, "y":1.25}, - {"label":"L15", "x":5, "y":1.5}, - {"label":"R10", "x":8.75, "y":1.5}, - {"label":"R11", "x":9.75, "y":1.25}, - {"label":"R12", "x":10.75, "y":1}, - {"label":"R13", "x":11.75, "y":1.5}, - {"label":"R14", "x":12.75, "y":2.25}, - {"label":"R15", "x":13.75, "y":2.5}, - {"label":"L20", "x":0, "y":3.5}, - {"label":"L21", "x":1, "y":3.25}, - {"label":"L22", "x":2, "y":2.5}, - {"label":"L23", "x":3, "y":2}, - {"label":"L24", "x":4, "y":2.25}, - {"label":"L25", "x":5, "y":2.5}, - {"label":"R20", "x":8.75, "y":2.5}, - {"label":"R21", "x":9.75, "y":2.25}, - {"label":"R22", "x":10.75, "y":2}, - {"label":"R23", "x":11.75, "y":2.5}, - {"label":"R24", "x":12.75, "y":3.25}, - {"label":"R25", "x":13.75, "y":3.5}, - {"label":"L30", "x":3, "y":4}, - {"label":"L31", "x":4, "y":3.75}, - {"label":"L32", "x":5, "y":3.75}, - {"label":"L33", "x":6, "y":4}, - {"label":"R30", "x":7.75, "y":4}, - {"label":"R31", "x":8.75, "y":3.75}, - {"label":"R32", "x":9.75, "y":3.75}, - {"label":"R33", "x":10.75, "y":4}] + { "matrix": [0, 0], "x": 0, "y": 0 }, + { "matrix": [0, 1], "x": 1, "y": 0 }, + { "matrix": [0, 2], "x": 2, "y": 0 }, + { "matrix": [0, 3], "x": 3, "y": 0 }, + { "matrix": [0, 4], "x": 4, "y": 0 }, + { "matrix": [0, 5], "x": 5, "y": 0 }, + { "matrix": [0, 6], "x": 6, "y": 0 }, + { "matrix": [0, 7], "x": 7, "y": 0 }, + { "matrix": [0, 8], "x": 8, "y": 0 }, + { "matrix": [0, 9], "x": 9, "y": 0 }, + { "matrix": [0, 10], "x": 10, "y": 0 }, + { "matrix": [0, 11], "x": 11, "y": 0 }, + { "matrix": [0, 12], "x": 12, "y": 0 }, + { "matrix": [0, 13], "x": 13, "y": 0 }, + { "matrix": [0, 14], "x": 14, "y": 0 }, + { "matrix": [0, 15], "x": 15, "y": 0 }, + { "matrix": [1, 0], "x": 0, "y": 1 }, + { "matrix": [1, 1], "x": 1, "y": 1 }, + { "matrix": [1, 2], "x": 2, "y": 1 }, + { "matrix": [1, 3], "x": 3, "y": 1 }, + { "matrix": [1, 4], "x": 4, "y": 1 }, + { "matrix": [1, 5], "x": 5, "y": 1 }, + { "matrix": [1, 6], "x": 6, "y": 1 }, + { "matrix": [1, 7], "x": 7, "y": 1 }, + { "matrix": [1, 8], "x": 8, "y": 1 }, + { "matrix": [1, 9], "x": 9, "y": 1 }, + { "matrix": [1, 10], "x": 10, "y": 1 }, + { "matrix": [1, 11], "x": 11, "y": 1 }, + { "matrix": [1, 12], "x": 12, "y": 1 }, + { "matrix": [1, 13], "w": 2, "x": 13, "y": 1 }, + { "matrix": [1, 15], "x": 15, "y": 1 }, + { "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2 }, + { "matrix": [2, 1], "x": 1.5, "y": 2 }, + { "matrix": [2, 2], "x": 2.5, "y": 2 }, + { "matrix": [2, 3], "x": 3.5, "y": 2 }, + { "matrix": [2, 4], "x": 4.5, "y": 2 }, + { "matrix": [2, 5], "x": 5.5, "y": 2 }, + { "matrix": [2, 6], "x": 6.5, "y": 2 }, + { "matrix": [2, 7], "x": 7.5, "y": 2 }, + { "matrix": [2, 8], "x": 8.5, "y": 2 }, + { "matrix": [2, 9], "x": 9.5, "y": 2 }, + { "matrix": [2, 10], "x": 10.5, "y": 2 }, + { "matrix": [2, 11], "x": 11.5, "y": 2 }, + { "matrix": [2, 12], "x": 12.5, "y": 2 }, + { "matrix": [2, 13], "w": 1.5, "x": 13.5, "y": 2 }, + { "matrix": [2, 15], "x": 15, "y": 2 }, + { "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3 }, + { "matrix": [3, 1], "x": 1.75, "y": 3 }, + { "matrix": [3, 2], "x": 2.75, "y": 3 }, + { "matrix": [3, 3], "x": 3.75, "y": 3 }, + { "matrix": [3, 4], "x": 4.75, "y": 3 }, + { "matrix": [3, 5], "x": 5.75, "y": 3 }, + { "matrix": [3, 6], "x": 6.75, "y": 3 }, + { "matrix": [3, 7], "x": 7.75, "y": 3 }, + { "matrix": [3, 8], "x": 8.75, "y": 3 }, + { "matrix": [3, 9], "x": 9.75, "y": 3 }, + { "matrix": [3, 10], "x": 10.75, "y": 3 }, + { "matrix": [3, 11], "x": 11.75, "y": 3 }, + { "matrix": [3, 12], "w": 2.25, "x": 12.75, "y": 3 }, + { "matrix": [3, 15], "x": 15, "y": 3 }, + { "matrix": [4, 0], "w": 2.25, "x": 0, "y": 4 }, + { "matrix": [4, 2], "x": 2.25, "y": 4 }, + { "matrix": [4, 3], "x": 3.25, "y": 4 }, + { "matrix": [4, 4], "x": 4.25, "y": 4 }, + { "matrix": [4, 5], "x": 5.25, "y": 4 }, + { "matrix": [4, 6], "x": 6.25, "y": 4 }, + { "matrix": [4, 7], "x": 7.25, "y": 4 }, + { "matrix": [4, 8], "x": 8.25, "y": 4 }, + { "matrix": [4, 9], "x": 9.25, "y": 4 }, + { "matrix": [4, 10], "x": 10.25, "y": 4 }, + { "matrix": [4, 11], "x": 11.25, "y": 4 }, + { "matrix": [4, 12], "w": 1.75, "x": 12.25, "y": 4 }, + { "matrix": [4, 14], "x": 14, "y": 4 }, + { "matrix": [4, 15], "x": 15, "y": 4 }, + { "matrix": [5, 0], "w": 1.25, "x": 0, "y": 5 }, + { "matrix": [5, 1], "w": 1.25, "x": 1.25, "y": 5 }, + { "matrix": [5, 2], "w": 1.25, "x": 2.5, "y": 5 }, + { "matrix": [5, 3], "w": 6.25, "x": 3.75, "y": 5 }, + { "matrix": [5, 10], "x": 10, "y": 5 }, + { "matrix": [5, 11], "x": 11, "y": 5 }, + { "matrix": [5, 12], "x": 12, "y": 5 }, + { "matrix": [5, 13], "x": 13, "y": 5 }, + { "matrix": [5, 14], "x": 14, "y": 5 }, + { "matrix": [5, 15], "x": 15, "y": 5 } + ] } } } diff --git a/keyboards/lotus/keymaps/default/keymap.c b/keyboards/lotus/keymaps/default/keymap.c index d47fa03505..26c35facc5 100644 --- a/keyboards/lotus/keymaps/default/keymap.c +++ b/keyboards/lotus/keymaps/default/keymap.c @@ -1,70 +1,30 @@ -// Copyright 2022 Yoichiro Tanaka (@yoichiro) // Copyright 2022 Framework Computer // SPDX-License-Identifier: GPL-2.0-or-later #include QMK_KEYBOARD_H -enum layer_number { - _QWERTY = 0, - _LOWER, - _RAISE, - _ADJUST, -}; - -#define LOWER MO(_LOWER) -#define RAISE MO(_RAISE) - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - [_QWERTY] = LAYOUT_split_3x6_4( -//+--------+--------+--------+--------+--------+--------+ +--------+--------+--------+--------+--------+--------+ - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, -//+--------+--------+--------+--------+--------+--------+ +--------+--------+--------+--------+--------+--------+ - KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, -//+--------+--------+--------+--------+--------+--------+ +--------+--------+--------+--------+--------+--------+ - 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_LGUI, KC_LALT, LOWER, KC_SPC, KC_ENT, RAISE, KC_RALT, KC_RGUI -//+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ - ), - - [_LOWER] = LAYOUT_split_3x6_4( -//+--------+--------+--------+--------+--------+--------+ +--------+--------+--------+--------+--------+--------+ - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, -//+--------+--------+--------+--------+--------+--------+ +--------+--------+--------+--------+--------+--------+ - KC_LCTL, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT,_______, _______, -//+--------+--------+--------+--------+--------+--------+ +--------+--------+--------+--------+--------+--------+ - KC_LSFT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, -//+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ - KC_LGUI, KC_LALT, LOWER, KC_SPC, KC_ENT, RAISE, KC_RALT, KC_RGUI -//+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ - ), - - [_RAISE] = LAYOUT_split_3x6_4( -//+--------+--------+--------+--------+--------+--------+ +--------+--------+--------+--------+--------+--------+ - KC_ESC, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, -//+--------+--------+--------+--------+--------+--------+ +--------+--------+--------+--------+--------+--------+ - KC_LCTL, _______, _______, _______, _______, _______, KC_MINS, KC_EQL, KC_LCBR, KC_RCBR, KC_PIPE, KC_GRV, -//+--------+--------+--------+--------+--------+--------+ +--------+--------+--------+--------+--------+--------+ - KC_LSFT, KC_TILD, _______, _______, _______, _______, KC_UNDS, KC_PLUS, KC_LBRC, KC_RBRC, KC_BSLS, KC_TILD, -//+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ - KC_LGUI, KC_LALT, LOWER, KC_SPC, KC_ENT, RAISE, KC_RALT, KC_RGUI -//+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ - ), - - [_ADJUST] = LAYOUT_split_3x6_4( -//+--------+--------+--------+--------+--------+--------+ +--------+--------+--------+--------+--------+--------+ - QK_BOOT, _______, _______, _______, _______, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, -//+--------+--------+--------+--------+--------+--------+ +--------+--------+--------+--------+--------+--------+ - RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, -//+--------+--------+--------+--------+--------+--------+ +--------+--------+--------+--------+--------+--------+ - RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, -//+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ - KC_LGUI, KC_LALT, LOWER, KC_SPC, KC_ENT, RAISE, KC_RALT, KC_RGUI -//+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ - ) + /* + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │Esc│F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│PSc│Pse│Del│ + * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴───┼───┤ + * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│Hom│ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ + * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │ \ │PgU│ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ + * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ Enter │PgD│ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ + * │ Shift │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shift│ ↑ │End│ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤ + * │Ctrl│GUI │Alt │ │Alt│GUI│Ctl│ ← │ ↓ │ → │ + * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘ + */ + [0] = LAYOUT_75_ansi( + 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, + 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, + 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, + 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, + 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, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ) }; - -layer_state_t layer_state_set_user(layer_state_t state) { - return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); -} diff --git a/keyboards/lotus/readme.md b/keyboards/lotus/readme.md index cd4cb0acfa..98ef02ca04 100644 --- a/keyboards/lotus/readme.md +++ b/keyboards/lotus/readme.md @@ -40,3 +40,32 @@ Enter the bootloader in 3 ways: - [ ] Keyboard with per-key RGB - [ ] Numpad with 1-zone backlight - [ ] Numpad with per-key RGB + +# Notes + +- GPIO + - Keyboard Column driver pins + - GPIO8 (Column 0) + - GPIO9 + - GPIO10 + - GPIO11 + - GPIO12 + - GPIO13 + - GPIO14 + - GPIO15 + - GPIO16 + - GPIO17 + - GPIO18 + - GPIO19 + - GPIO20 + - GPIO21 + - GPIO22 + - GPIO23 (Column 14) + - SGM48751 + - GPIO1 - Analog Mux Control + - GPIO2 - Analog Mux Control + - GPIO3 - Analog Mux Control + - GPIO4 - Enable + - RGB Backlight + - GPIO26 - I2C SDA + - GPIO27 - I2C SCL \ No newline at end of file diff --git a/keyboards/lotus/rules.mk b/keyboards/lotus/rules.mk index d8452839f1..f468bb2a6c 100644 --- a/keyboards/lotus/rules.mk +++ b/keyboards/lotus/rules.mk @@ -1,4 +1,4 @@ WS2812_DRIVER = vendor SERIAL_DRIVER = vendor -RGB_MATRIX_ENABLE = yes +#RGB_MATRIX_ENABLE = false RGB_MATRIX_DRIVER = IS31FL3745