diff --git a/keyboards/lotus/config.h b/keyboards/lotus/config.h index 4664b600e8..ecc297760d 100644 --- a/keyboards/lotus/config.h +++ b/keyboards/lotus/config.h @@ -6,6 +6,10 @@ #include +#define MATRIX_COLS 14 +#define MATRIX_ROWS 6 + +// TODO: Adjust this. The GPIO is definitely wrong #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP25 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U @@ -21,9 +25,6 @@ #define WS2812_PIO_USE_PIO1 -#define RGBLIGHT_LED_MAP { 0, 1, 2, 3, 4, 5, \ - 11, 10, 9, 8, 7, 6 } - #define DRIVER_COUNT 1 #define RGB_MATRIX_LED_COUNT 78 diff --git a/keyboards/lotus/info.json b/keyboards/lotus/info.json index 6f00f28184..7bdccb87b8 100644 --- a/keyboards/lotus/info.json +++ b/keyboards/lotus/info.json @@ -1,9 +1,8 @@ { "keyboard_name": "lotus", - "manufacturer": "Framework", + "manufacturer": "Framework Computer", "maintainer": "JohnAZoidberg", "bootloader": "rp2040", - "diode_direction": "COL2ROW", "features": { "bootmagic": false, "mousekey": true, @@ -11,16 +10,11 @@ "console": false, "command": false, "nkro": true, - "rgblight": true, "audio": false }, - "matrix_pins": { - "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": "", + "url": "https://frame.work", "usb": { "device_version": "0.1.0", "pid": "0x0013", @@ -29,32 +23,6 @@ "backlight": { "pin": "GP25" }, - "rgblight": { - "led_count": 12, - "pin": "GP6", - "sleep": true, - "split": true, - "split_count": [6, 6], - "animations": { - "alternating": true, - "breathing": true, - "christmas": true, - "knight": true, - "rainbow_mood": true, - "rainbow_swirl": true, - "rgb_test": false, - "snake": true, - "static_gradient": true, - "twinkle": true - }, - "hue_steps": 8, - "saturation_steps": 8, - "brightness_steps": 8, - "max_brightness": 255 - }, - "split": { - "enabled": false - }, "layout_aliases": { "LAYOUT": "LAYOUT_78_ansi", "LAYOUT_default": "LAYOUT_78_ansi" @@ -62,84 +30,84 @@ "layouts": { "LAYOUT_78_ansi": { "layout": [ - { "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": [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": [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": [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": [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": [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 }, + { "label": "K00", "x": 0, "y": 0 }, + { "label": "K01", "x": 1, "y": 0 }, + { "label": "K02", "x": 2, "y": 0 }, + { "label": "K03", "x": 3, "y": 0 }, + { "label": "K04", "x": 4, "y": 0 }, + { "label": "K05", "x": 5, "y": 0 }, + { "label": "K06", "x": 6, "y": 0 }, + { "label": "K07", "x": 7, "y": 0 }, + { "label": "K08", "x": 8, "y": 0 }, + { "label": "K09", "x": 9, "y": 0 }, + { "label": "K10", "x": 10, "y": 0 }, + { "label": "K11", "x": 11, "y": 0 }, + { "label": "K12", "x": 12, "y": 0 }, + { "label": "K13", "x": 13, "y": 0 }, + { "label": "K14", "x": 14, "y": 0 }, + { "label": "K15", "x": 0, "y": 1 }, + { "label": "K16", "x": 1, "y": 1 }, + { "label": "K17", "x": 2, "y": 1 }, + { "label": "K18", "x": 3, "y": 1 }, + { "label": "K19", "x": 4, "y": 1 }, + { "label": "K20", "x": 5, "y": 1 }, + { "label": "K21", "x": 6, "y": 1 }, + { "label": "K22", "x": 7, "y": 1 }, + { "label": "K23", "x": 8, "y": 1 }, + { "label": "K24", "x": 9, "y": 1 }, + { "label": "K25", "x": 10, "y": 1 }, + { "label": "K26", "x": 11, "y": 1 }, + { "label": "K27", "x": 12, "y": 1 }, + { "label": "K28", "w": 2, "x": 13, "y": 1 }, + { "label": "K29", "w": 1.5, "x": 0, "y": 2 }, + { "label": "K30", "x": 1.5, "y": 2 }, + { "label": "K31", "x": 2.5, "y": 2 }, + { "label": "K32", "x": 3.5, "y": 2 }, + { "label": "K33", "x": 4.5, "y": 2 }, + { "label": "K34", "x": 5.5, "y": 2 }, + { "label": "K35", "x": 6.5, "y": 2 }, + { "label": "K36", "x": 7.5, "y": 2 }, + { "label": "K37", "x": 8.5, "y": 2 }, + { "label": "K38", "x": 9.5, "y": 2 }, + { "label": "K39", "x": 10.5, "y": 2 }, + { "label": "K40", "x": 11.5, "y": 2 }, + { "label": "K41", "x": 12.5, "y": 2 }, + { "label": "K42", "w": 1.5, "x": 13.5, "y": 2 }, + { "label": "K43", "w": 1.75, "x": 0, "y": 3 }, + { "label": "K44", "x": 1.75, "y": 3 }, + { "label": "K45", "x": 2.75, "y": 3 }, + { "label": "K46", "x": 3.75, "y": 3 }, + { "label": "K47", "x": 4.75, "y": 3 }, + { "label": "K48", "x": 5.75, "y": 3 }, + { "label": "K49", "x": 6.75, "y": 3 }, + { "label": "K50", "x": 7.75, "y": 3 }, + { "label": "K51", "x": 8.75, "y": 3 }, + { "label": "K52", "x": 9.75, "y": 3 }, + { "label": "K53", "x": 10.75, "y": 3 }, + { "label": "K54", "x": 11.75, "y": 3 }, + { "label": "K55", "w": 2.25, "x": 12.75, "y": 3 }, + { "label": "K56", "w": 2.25, "x": 0, "y": 4 }, + { "label": "K57", "x": 2.25, "y": 4 }, + { "label": "K58", "x": 3.25, "y": 4 }, + { "label": "K59", "x": 4.25, "y": 4 }, + { "label": "K60", "x": 5.25, "y": 4 }, + { "label": "K61", "x": 6.25, "y": 4 }, + { "label": "K62", "x": 7.25, "y": 4 }, + { "label": "K63", "x": 8.25, "y": 4 }, + { "label": "K64", "x": 9.25, "y": 4 }, + { "label": "K65", "x": 10.25, "y": 4 }, + { "label": "K66", "x": 11.25, "y": 4 }, + { "label": "K67", "w": 1.75, "x": 12.25, "y": 4 }, + { "label": "K68", "x": 14, "y": 4 }, + { "label": "K69", "w": 1.25, "x": 0, "y": 5 }, + { "label": "K70", "w": 1.25, "x": 1.25, "y": 5 }, + { "label": "K71", "w": 1.25, "x": 2.5, "y": 5 }, + { "label": "K72", "w": 6.25, "x": 3.75, "y": 5 }, + { "label": "K73", "x": 10, "y": 5 }, + { "label": "K74", "x": 11, "y": 5 }, + { "label": "K75", "x": 12, "y": 5 }, + { "label": "K76", "x": 13, "y": 5 }, + { "label": "K77", "x": 14, "y": 5 } ] } } diff --git a/keyboards/lotus/keymaps/default/keymap.c b/keyboards/lotus/keymaps/default/keymap.c index 5b0cccb0e0..6af6233aaf 100644 --- a/keyboards/lotus/keymaps/default/keymap.c +++ b/keyboards/lotus/keymaps/default/keymap.c @@ -16,9 +16,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───────┤ * 12 keys │ Shift │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shift │ * ├────┬───┴┬──┴─┬─┴──┬┴───┴───┴───┴───┼───┼───┼───┴┬───┬────┤ - * │ │ │ │ │ │ │ │ │ ↑ │ │ + * │ │ │ │ │ │ │ │ │ ↑│ │ * 11 keys │Ctrl│ FN │GUI │Alt │ │Alt│Ctl│ ← ├───┤ → │ - * │ │ │ │ │ │ │ │ │ ↓ │ │ + * │ │ │ │ │ │ │ │ │↓ │ │ * └────┴────┴────┴────┴────────────────┴───┴───┴────┴───┴────┘ * 78 total */ @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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_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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, - KC_LCTL, MO(1), KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT + KC_LCTL, MO(1), KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT ), /* * Function layer diff --git a/keyboards/lotus/lotus.h b/keyboards/lotus/lotus.h index 0c7e7ed43f..0faf895f3e 100644 --- a/keyboards/lotus/lotus.h +++ b/keyboards/lotus/lotus.h @@ -5,19 +5,19 @@ #include "quantum.h" -#define LAYOUT_split_3x6_4( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L30, L31, L32, L33, R30, R31, R32, R33 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { KC_NO, KC_NO, L30, L31, L32, L33 }, \ - { R05, R04, R03, R02, R01, R00 }, \ - { R15, R14, R13, R12, R11, R10 }, \ - { R25, R24, R23, R22, R21, R20 }, \ - { KC_NO, KC_NO, R33, R32, R31, R30 } \ - } +#define LAYOUT_78_ansi( \ + K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K10, K11, K12, K13, \ + K14, K15, K16, K17, K18, K19, K20, K21, K22, K23, K24, K25, K26, K27, \ + K28, K29, K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K40, K41, \ + K42, K43, K44, K45, K46, K47, K48, K49, K50, K51, K52, K53, K54, \ + K55, K56, K57, K58, K59, K60, K61, K62, K63, K64, K65, K66, \ + K67, K68, K69, K70, K71, K72, K73, K74, K75, K76, K77 \ +) \ +{ \ + { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K10, K11, K12, K13 }, \ + { K14, K15, K16, K17, K18, K19, K20, K21, K22, K23, K24, K25, K26, K27 }, \ + { K28, K29, K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K40, K41 }, \ + { K42, K43, K44, K45, K46, K47, K48, K49, K50, K51, K52, K53, KC_NO, K54 }, \ + { K55, KC_NO, K56, K57, K58, K59, K60, K61, K62, K63, K64, K65, KC_NO, K66 }, \ + { K67, K68, K69, K70, KC_NO, K71, KC_NO, KC_NO, K72, K73, K74, K75, K76, K77 } \ +} diff --git a/keyboards/lotus/mcuconf.h b/keyboards/lotus/mcuconf.h index f3b79dc984..cd174dd342 100644 --- a/keyboards/lotus/mcuconf.h +++ b/keyboards/lotus/mcuconf.h @@ -10,6 +10,10 @@ #undef RP_SIO_USE_UART1 #define RP_SIO_USE_UART1 FALSE +// For RGB backlight +#undef RP_ADC_USE_ADC1 +#define RP_ADC_USE_ADC1 TRUE + // For single-zone backlight #undef RP_PWM_USE_PWM4 #define RP_PWM_USE_PWM4 TRUE diff --git a/keyboards/lotus/rules.mk b/keyboards/lotus/rules.mk index b89b045f60..74ce726c87 100644 --- a/keyboards/lotus/rules.mk +++ b/keyboards/lotus/rules.mk @@ -10,5 +10,8 @@ RGB_MATRIX_ENABLE = no RGB_MATRIX_DRIVER = IS31FL3745 # Custom matrix scanning code via ADC -#CUSTOM_MATRIX = lite -#SRC += matrix.c +CUSTOM_MATRIX = lite +SRC += matrix.c + +# Debugging +#CONSOLE_ENABLE = yes