From 297a58218aadb0036835b159598e1ffcbd5dce86 Mon Sep 17 00:00:00 2001 From: leviport Date: Wed, 28 Jun 2023 17:23:47 -0600 Subject: [PATCH 1/4] Add Levi's launch_3 layout & correct RESET comments --- .../system76/launch_1/keymaps/levi/keymap.c | 4 +- .../system76/launch_2/keymaps/levi/keymap.c | 4 +- .../system76/launch_3/keymaps/levi/keymap.c | 133 ++++++++++++++++++ .../launch_heavy_1/keymaps/levi/keymap.c | 4 +- .../launch_heavy_3/keymaps/levi/keymap.c | 4 +- 5 files changed, 141 insertions(+), 8 deletions(-) create mode 100644 keyboards/system76/launch_3/keymaps/levi/keymap.c diff --git a/keyboards/system76/launch_1/keymaps/levi/keymap.c b/keyboards/system76/launch_1/keymaps/levi/keymap.c index 574079c0740e..590475638881 100644 --- a/keyboards/system76/launch_1/keymaps/levi/keymap.c +++ b/keyboards/system76/launch_1/keymaps/levi/keymap.c @@ -67,7 +67,7 @@ ________________________________________________________________________________ /* Layer 2, function layer __________________________________________________________________________________________________________________________________ ________ | | | | | | | | | | | | | | || | -| RESET | | | | | | | | | | | | | || Dvorak | +| QK_BOOT| | | | | | | | | | | | | || Dvorak | |________|________|________|________|________|________|________|________|________|________|________|________|________|____________||________| | | | | | | | | | | | | | | || | | | | | | | | | | | | | | | || Qwerty | @@ -85,7 +85,7 @@ ________________________________________________________________________________ | | | | | Backspace | | | | | | HOME | PGDN | END | |____________|________|_______|________|_________________|_________________|________|________|_____________| |________|________|________| -* 'RESET' resets the controller and puts the board into firmware flashing mode. If this key is hit accidentally, just unplug the board +* 'QK_BOOT' resets the controller and puts the board into firmware flashing mode. If this key is hit accidentally, just unplug the board * and plug it back in. */ diff --git a/keyboards/system76/launch_2/keymaps/levi/keymap.c b/keyboards/system76/launch_2/keymaps/levi/keymap.c index ec717e13dc66..f1db7f0b0cc7 100644 --- a/keyboards/system76/launch_2/keymaps/levi/keymap.c +++ b/keyboards/system76/launch_2/keymaps/levi/keymap.c @@ -70,7 +70,7 @@ ________________________________________________________________________________ /* Layer 2, function layer __________________________________________________________________________________________________________________________________ ________ | | | | | | | | | | | | | | || | -| RESET | | | Insert | | | | | | | | | | || Dvorak | +| QK_BOOT| | | Insert | | | | | | | | | | || Dvorak | |________|________|________|________|________|________|________|________|________|________|________|________|________|____________||________| | | | | | | | | | | | LED | LED | LED | || | | | | | | | | | | | | TOGGLE | DOWN | UP | || Qwerty | @@ -88,7 +88,7 @@ ________________________________________________________________________________ | | | | | Backspace | | | | | | HOME | PGDN | END | |____________|________|_______|________|_________________|_________________|________|________|_____________| |________|________|________| -* 'RESET' resets the controller and puts the board into firmware flashing mode. If this key is hit accidentally, just unplug the board +* 'QK_BOOT' resets the controller and puts the board into firmware flashing mode. If this key is hit accidentally, just unplug the board * and plug it back in. */ diff --git a/keyboards/system76/launch_3/keymaps/levi/keymap.c b/keyboards/system76/launch_3/keymaps/levi/keymap.c new file mode 100644 index 000000000000..f1db7f0b0cc7 --- /dev/null +++ b/keyboards/system76/launch_3/keymaps/levi/keymap.c @@ -0,0 +1,133 @@ +#include QMK_KEYBOARD_H + +static bool lctl_pressed, rctl_pressed, esc_pressed; +void system76_ec_unlock(void); + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + /* Layer 0, Dvorak layer +__________________________________________________________________________________________________________________________________ ________ +| | | | | | | | | | | | | | || | +| ESC | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | DELETE || HOME | +|________|________|________|________|________|________|________|________|________|________|________|________|________|____________||________| +| | | | | | | | | | | | [ | ] | || | +| ~` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | { | } | BACKSPACE || PGUP | +|________|________|________|________|________|________|________|________|________|________|________|________|________|____________||________| +| | ' | , | . | | | | | | | | / | = | || | +| TAB | " | < | > | P | Y | F | G | C | R | L | ? | + | | \ || PGDN | +|____________|________|________|________|________|________|________|________|________|________|________|________|________|________||________| + | | | | | | | | | | | | - | | | | + | CTRL | A | O | E | U | I | D | H | T | N | S | _ | ENTER | | END | + |____________|________|________|________|________|________|________|________|________|________|________|________|____________|___|________| + | | : | | | | | | | | | | | | + | SHIFT | ; | Q | J | K | X | B | M | W | V | Z | SHIFT | UP | + |________________|________|________|________|________|________|________|________|________|________|________|____________|________|_________ + | | | | | | | | | | | | | | + | FN | CTRL | LALT | LGUI | SPACE | FN | RCTRL | RALT | FN | | LEFT | DOWN | RIGHT | + |____________|________|_______|________|_________________|_________________|________|________|_____________| |________|________|________| +*/ + + [0] = LAYOUT( + 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_DEL, KC_HOME, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, KC_RBRC, KC_BSPC, KC_PGUP, + KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, KC_EQL, KC_BSLS, KC_PGDN, + KC_LCTL, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, KC_ENT, KC_END, + KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT, KC_UP, + MO(2), KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, MO(2), KC_RCTL, KC_RALT, MO(2), KC_LEFT, KC_DOWN, KC_RIGHT + ), + +/* Layer 1, QWERTY layer +__________________________________________________________________________________________________________________________________ ________ +| | | | | | | | | | | | | | || | +| ESC | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | DELETE || HOME | +|________|________|________|________|________|________|________|________|________|________|________|________|________|____________||________| +| | | | | | | | | | | | | | || | +| ~` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | _ - | = + | BACKSPACE || PGUP | +|________|________|________|________|________|________|________|________|________|________|________|________|________|____________||________| +| | | | | | | | | | | | [ | ] | || | +| TAB | Q | W | E | R | T | Y | U | I | O | P | { | } | | \ || PGDN | +|____________|________|________|________|________|________|________|________|________|________|________|________|________|________||________| + | | | | | | | | | | | ; | ' | | | | + | CTRL | A | S | D | F | G | H | J | K | L | : | " | ENTER | | END | + |____________|________|________|________|________|________|________|________|________|________|________|________|____________|___|________| + | | | | | | | | | , | . | / | | | + | SHIFT | Z | X | C | V | B | N | M | < | > | ? | SHIFT | UP | + |________________|________|________|________|________|________|________|________|________|________|________|____________|________|_________ + | | | | | | | | | | | | | | + | FN | CTRL | LALT | LGUI | SPACE | FN | RCTRL | RALT | FN | | LEFT | DOWN | RIGHT | + |____________|________|_______|________|_________________|_________________|________|________|_____________| |________|________|________| +*/ + + [1] = LAYOUT( + 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_DEL, KC_HOME, + 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_PGUP, + 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_PGDN, + 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_ENT, KC_END, + 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, + MO(2), KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, MO(2), KC_RCTL, KC_RALT, MO(2), KC_LEFT, KC_DOWN, KC_RIGHT + ), + + /* Layer 2, function layer +__________________________________________________________________________________________________________________________________ ________ +| | | | | | | | | | | | | | || | +| QK_BOOT| | | Insert | | | | | | | | | | || Dvorak | +|________|________|________|________|________|________|________|________|________|________|________|________|________|____________||________| +| | | | | | | | | | | LED | LED | LED | || | +| | | | | | | | | | | TOGGLE | DOWN | UP | || Qwerty | +|________|________|________|________|________|________|________|________|________|________|________|________|________|____________||________| +| | | | | | | | | | | | | | || | +| | Home | Up | End | PgUp | | PgUp | Home | Up | End | | | | PrtScr || | +|____________|________|________|________|________|________|________|________|________|________|________|________|________|________||________| + | | | | | | | | | | | | | | | | + | | Left | Down | Right | PgDn | | PgDn | Left | Down | Right | | | | | | + |____________|________|________|________|________|________|________|________|________|________|________|________|____________|___|________| + | | | | | | | | | | | | | | + | |PlayPaus| Prev | Next | VolDn | VolUp | VolMute| | | | | | PGUP | + |________________|________|________|________|________|________|________|________|________|________|________|____________|________|_________ + | | | | | | | | | | | | | | + | | | | | Backspace | | | | | | HOME | PGDN | END | + |____________|________|_______|________|_________________|_________________|________|________|_____________| |________|________|________| + +* 'QK_BOOT' resets the controller and puts the board into firmware flashing mode. If this key is hit accidentally, just unplug the board +* and plug it back in. +*/ + + [2] = LAYOUT( + QK_BOOT, KC_TRNS, KC_TRNS, KC_INS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, TO(0), + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_VAD, RGB_VAI, KC_TRNS, TO(1), + KC_TRNS, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_TRNS, KC_PGUP, KC_HOME, KC_UP, KC_END, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, + KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_TRNS, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_MPLY, KC_MPRV, KC_MNXT, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END + ), + + [3] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), +}; + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case KC_LCTL: + lctl_pressed = record->event.pressed; + break; + case KC_RCTL: + rctl_pressed = record->event.pressed; + break; + case KC_ESC: + esc_pressed = record ->event.pressed; + break; + }; + return true; +} + +void matrix_scan_user(void) { + if (lctl_pressed && rctl_pressed && esc_pressed) { + system76_ec_unlock(); + } +} diff --git a/keyboards/system76/launch_heavy_1/keymaps/levi/keymap.c b/keyboards/system76/launch_heavy_1/keymaps/levi/keymap.c index e5f983ce0082..ce9beefa417f 100644 --- a/keyboards/system76/launch_heavy_1/keymaps/levi/keymap.c +++ b/keyboards/system76/launch_heavy_1/keymaps/levi/keymap.c @@ -67,7 +67,7 @@ ________________________________________________________________________________ /* Layer 2, function layer __________________________________________________________________________________________________________________________________ ________ ___________________________________ | | | | | | | | | | | | | | || DVORAK || | | | | -| RESET | | | | | | | | | | | | | || || | | | | +| QK_BOOT| | | | | | | | | | | | | || || | | | | |________|________|________|________|________|________|________|________|________|________|________|________|________|____________||________||________|________|________|________| | | | | | | | | | | | LED | LED | LED | || QWERTY || | | | | | | | | | | | | | | | TOGGLE | DOWN | UP | || || | | | | @@ -84,7 +84,7 @@ ________________________________________________________________________________ | | | | | | | | | | | | | || | | | | | | | | | | | | | | HOME | PGDN | END || | | | |____________|________|_______|________|_________________|_________________|________|________|_____________| |________|________|________||_________________|________|________| - * 'RESET' resets the controller and puts the board into firmware flashing mode. If this key is hit accidentally, just unplug the board + * 'QK_BOOT' resets the controller and puts the board into firmware flashing mode. If this key is hit accidentally, just unplug the board * and plug it back in. */ diff --git a/keyboards/system76/launch_heavy_3/keymaps/levi/keymap.c b/keyboards/system76/launch_heavy_3/keymaps/levi/keymap.c index e5f983ce0082..ce9beefa417f 100644 --- a/keyboards/system76/launch_heavy_3/keymaps/levi/keymap.c +++ b/keyboards/system76/launch_heavy_3/keymaps/levi/keymap.c @@ -67,7 +67,7 @@ ________________________________________________________________________________ /* Layer 2, function layer __________________________________________________________________________________________________________________________________ ________ ___________________________________ | | | | | | | | | | | | | | || DVORAK || | | | | -| RESET | | | | | | | | | | | | | || || | | | | +| QK_BOOT| | | | | | | | | | | | | || || | | | | |________|________|________|________|________|________|________|________|________|________|________|________|________|____________||________||________|________|________|________| | | | | | | | | | | | LED | LED | LED | || QWERTY || | | | | | | | | | | | | | | | TOGGLE | DOWN | UP | || || | | | | @@ -84,7 +84,7 @@ ________________________________________________________________________________ | | | | | | | | | | | | | || | | | | | | | | | | | | | | HOME | PGDN | END || | | | |____________|________|_______|________|_________________|_________________|________|________|_____________| |________|________|________||_________________|________|________| - * 'RESET' resets the controller and puts the board into firmware flashing mode. If this key is hit accidentally, just unplug the board + * 'QK_BOOT' resets the controller and puts the board into firmware flashing mode. If this key is hit accidentally, just unplug the board * and plug it back in. */ From 95ec5671332ae0590754642583cc1975034fd457 Mon Sep 17 00:00:00 2001 From: Ian Douglas Scott Date: Wed, 2 Aug 2023 12:36:57 -0700 Subject: [PATCH 2/4] launch_heavy_3: Fix LED mapping Same change as https://github.com/system76/qmk_firmware/pull/44. --- keyboards/system76/launch_heavy_3/launch_heavy_3.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/system76/launch_heavy_3/launch_heavy_3.c b/keyboards/system76/launch_heavy_3/launch_heavy_3.c index 80d13f9be6ae..d2034db5ff0f 100644 --- a/keyboards/system76/launch_heavy_3/launch_heavy_3.c +++ b/keyboards/system76/launch_heavy_3/launch_heavy_3.c @@ -48,9 +48,9 @@ led_config_t g_led_config = { { { 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82}, { 68, 67, 66, 65, 64, 63, 62, 61, 60, 59, 58, 57, 56, 55}, { 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52}, - { 38, 37, 36, 35, 34, 33, 32, 31, 30, 29, 28, 27, 26, 25}, - { 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 87}, - { 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 86, 85}, + { 38, 37, 36, 35, 34, 33, 32, 31, 30, 29, 28, 27, 26, 83}, + { 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 54}, + { 13, 14, 15, 16, 17, 25, 18, 19, 20, 21, 22, 23, 24, 53}, { __, __, __,104,103,102, __, __, __, __, __, __,101, __}, { __, __, __, 97, 98, 99, __, __, __, __, __, __,100, __}, { __, __, __, 96, 95, 94, __, __, __, __, __, __, 93, __}, From ec45bc6024c281bce6dab148f0c3f2ab498cd67d Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Fri, 25 Aug 2023 11:03:42 -0600 Subject: [PATCH 3/4] Fixes for updated QMK --- keyboards/system76/launch_2/config.h | 2 +- keyboards/system76/launch_3/config.h | 4 ++-- keyboards/system76/launch_heavy_1/config.h | 2 +- keyboards/system76/launch_heavy_1/post_rules.mk | 12 ------------ keyboards/system76/launch_heavy_3/config.h | 4 ++-- keyboards/system76/launch_lite_1/config.h | 2 +- keyboards/system76/launch_lite_1/post_rules.mk | 12 ------------ keyboards/system76/launch_test/config.h | 2 +- keyboards/system76/virgo_keyboard_test_1/config.h | 2 +- 9 files changed, 9 insertions(+), 33 deletions(-) delete mode 100644 keyboards/system76/launch_heavy_1/post_rules.mk delete mode 100644 keyboards/system76/launch_lite_1/post_rules.mk diff --git a/keyboards/system76/launch_2/config.h b/keyboards/system76/launch_2/config.h index bf3760b8d863..4d37518e2284 100644 --- a/keyboards/system76/launch_2/config.h +++ b/keyboards/system76/launch_2/config.h @@ -34,7 +34,7 @@ #define DIODE_DIRECTION COL2ROW #ifdef RGB_MATRIX_ENABLE -# define RGB_DI_PIN F7 +# define WS2812_DI_PIN F7 # define RGB_MATRIX_LED_COUNT 84 # define RGB_MATRIX_KEYPRESSES // Reacts to keypresses // # define RGB_MATRIX_KEYRELEASES // Reacts to keyreleases (instead of keypresses) diff --git a/keyboards/system76/launch_3/config.h b/keyboards/system76/launch_3/config.h index 2a678c3796b4..38760b4d073b 100644 --- a/keyboards/system76/launch_3/config.h +++ b/keyboards/system76/launch_3/config.h @@ -34,7 +34,7 @@ #define DIODE_DIRECTION COL2ROW #ifdef RGB_MATRIX_ENABLE -# define RGB_DI_PIN GP5 +# define WS2812_DI_PIN GP5 # define RGB_MATRIX_LED_COUNT 84 # define RGB_MATRIX_KEYPRESSES // Reacts to keypresses // # define RGB_MATRIX_KEYRELEASES // Reacts to keyreleases (instead of keypresses) @@ -70,7 +70,7 @@ #define LOCKING_RESYNC_ENABLE // I2C { -#define I2C_DRIVER I2CD2 +#define I2C_DRIVER I2CD1 #define I2C1_CLOCK_SPEED 100000UL // Run I2C bus at 100 kHz #define I2C1_SCL_PIN GP27 #define I2C1_SDA_PIN GP26 diff --git a/keyboards/system76/launch_heavy_1/config.h b/keyboards/system76/launch_heavy_1/config.h index f3c448e867b6..0c11d3d37956 100644 --- a/keyboards/system76/launch_heavy_1/config.h +++ b/keyboards/system76/launch_heavy_1/config.h @@ -34,7 +34,7 @@ #define DIODE_DIRECTION COL2ROW #ifdef RGB_MATRIX_ENABLE -# define RGB_DI_PIN F7 +# define WS2812_DI_PIN F7 # define RGB_MATRIX_LED_COUNT 105 # define RGB_MATRIX_KEYPRESSES // Reacts to keypresses // # define RGB_MATRIX_KEYRELEASES // Reacts to keyreleases (instead of keypresses) diff --git a/keyboards/system76/launch_heavy_1/post_rules.mk b/keyboards/system76/launch_heavy_1/post_rules.mk deleted file mode 100644 index 3751a8b8c31b..000000000000 --- a/keyboards/system76/launch_heavy_1/post_rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# System76 EC -# remove the RESET HID command -VALID_SYSTEM76_EC_TYPES := yes -SYSTEM76_EC_ENABLE ?= no -ifneq ($(strip $(SYSTEM76_EC_ENABLE)),no) - ifeq ($(filter $(SYSTEM76_EC_ENABLE),$(VALID_SYSTEM76_EC_TYPES)),) - $(error SYSTEM76_EC_EN="$(strip $(SYSTEM76_EC_ENABLE))" is not a valid type for the System76 EC option) - endif - ifneq ($(strip $(SYSTEM76_EC_ENABLE)),no) - OPT_DEFS += -DSYSTEM76_EC - endif -endif diff --git a/keyboards/system76/launch_heavy_3/config.h b/keyboards/system76/launch_heavy_3/config.h index 3006fd6bcd3d..29d359113378 100644 --- a/keyboards/system76/launch_heavy_3/config.h +++ b/keyboards/system76/launch_heavy_3/config.h @@ -34,7 +34,7 @@ #define DIODE_DIRECTION COL2ROW #ifdef RGB_MATRIX_ENABLE -# define RGB_DI_PIN GP5 +# define WS2812_DI_PIN GP5 # define RGB_MATRIX_LED_COUNT 105 # define RGB_MATRIX_KEYPRESSES // Reacts to keypresses // # define RGB_MATRIX_KEYRELEASES // Reacts to keyreleases (instead of keypresses) @@ -70,7 +70,7 @@ #define LOCKING_RESYNC_ENABLE // I2C { -#define I2C_DRIVER I2CD2 +#define I2C_DRIVER I2CD1 #define I2C1_CLOCK_SPEED 100000UL // Run I2C bus at 100 kHz #define I2C1_SCL_PIN GP27 #define I2C1_SDA_PIN GP26 diff --git a/keyboards/system76/launch_lite_1/config.h b/keyboards/system76/launch_lite_1/config.h index 57ffef97dfaa..ae7f4a70f3c1 100644 --- a/keyboards/system76/launch_lite_1/config.h +++ b/keyboards/system76/launch_lite_1/config.h @@ -34,7 +34,7 @@ #define DIODE_DIRECTION COL2ROW #ifdef RGB_MATRIX_ENABLE -# define RGB_DI_PIN F7 +# define WS2812_DI_PIN F7 # define RGB_MATRIX_LED_COUNT 70 # define RGB_MATRIX_KEYPRESSES // Reacts to keypresses // # define RGB_MATRIX_KEYRELEASES // Reacts to keyreleases (instead of keypresses) diff --git a/keyboards/system76/launch_lite_1/post_rules.mk b/keyboards/system76/launch_lite_1/post_rules.mk deleted file mode 100644 index 3751a8b8c31b..000000000000 --- a/keyboards/system76/launch_lite_1/post_rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# System76 EC -# remove the RESET HID command -VALID_SYSTEM76_EC_TYPES := yes -SYSTEM76_EC_ENABLE ?= no -ifneq ($(strip $(SYSTEM76_EC_ENABLE)),no) - ifeq ($(filter $(SYSTEM76_EC_ENABLE),$(VALID_SYSTEM76_EC_TYPES)),) - $(error SYSTEM76_EC_EN="$(strip $(SYSTEM76_EC_ENABLE))" is not a valid type for the System76 EC option) - endif - ifneq ($(strip $(SYSTEM76_EC_ENABLE)),no) - OPT_DEFS += -DSYSTEM76_EC - endif -endif diff --git a/keyboards/system76/launch_test/config.h b/keyboards/system76/launch_test/config.h index efc868a04d2f..f2e6cfce4c10 100644 --- a/keyboards/system76/launch_test/config.h +++ b/keyboards/system76/launch_test/config.h @@ -42,7 +42,7 @@ #define DEBOUNCE 5 #ifdef RGB_MATRIX_ENABLE -# define RGB_DI_PIN E6 +# define WS2812_DI_PIN E6 # define RGB_MATRIX_LED_COUNT 22 # define RGB_MATRIX_KEYPRESSES // Reacts to keypresses // # define RGB_MATRIX_KEYRELEASES // Reacts to keyreleases (instead of keypresses) diff --git a/keyboards/system76/virgo_keyboard_test_1/config.h b/keyboards/system76/virgo_keyboard_test_1/config.h index 8fcbc33dc2e0..6559455167b5 100644 --- a/keyboards/system76/virgo_keyboard_test_1/config.h +++ b/keyboards/system76/virgo_keyboard_test_1/config.h @@ -34,7 +34,7 @@ #define DIODE_DIRECTION COL2ROW #ifdef RGB_MATRIX_ENABLE -# define RGB_DI_PIN GP5 +# define WS2812_DI_PIN GP5 # define RGB_MATRIX_LED_COUNT 84 # define RGB_MATRIX_KEYPRESSES // Reacts to keypresses // # define RGB_MATRIX_KEYRELEASES // Reacts to keyreleases (instead of keypresses) From acc420990aa5fd72e61f028dcf93a30bda3a6566 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Wed, 30 Aug 2023 09:38:37 -0600 Subject: [PATCH 4/4] launch-3: add jeremy keymap --- .../system76/launch_3/keymaps/jeremy/keymap.c | 91 +++++++++++++++++++ 1 file changed, 91 insertions(+) create mode 100644 keyboards/system76/launch_3/keymaps/jeremy/keymap.c diff --git a/keyboards/system76/launch_3/keymaps/jeremy/keymap.c b/keyboards/system76/launch_3/keymaps/jeremy/keymap.c new file mode 100644 index 000000000000..3bbaf119fcb0 --- /dev/null +++ b/keyboards/system76/launch_3/keymaps/jeremy/keymap.c @@ -0,0 +1,91 @@ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + /* Layer 0, default layer +__________________________________________________________________________________________________________________________________ ________ +| | | | | | | | | | | | | | || | +| ESC | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | DELETE || HOME | +|________|________|________|________|________|________|________|________|________|________|________|________|________|____________||________| +| | | | | | | | | | | | | | || | +| ~` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | _ - | = + | BACKSPACE || PGUP | +|________|________|________|________|________|________|________|________|________|________|________|________|________|____________||________| +| | | | | | | | | | | | [ | ] | || | +| TAB | Q | W | E | R | T | Y | U | I | O | P | { | } | | \ || PGDN | +|____________|________|________|________|________|________|________|________|________|________|________|________|________|________||________| + | | | | | | | | | | | ; | ' | | | | + | FN | A | S | D | F | G | H | J | K | L | : | " | ENTER | | END | + |____________|________|________|________|________|________|________|________|________|________|________|________|____________|___|________| + | | | | | | | | | , | . | / | | | + | SHIFT | Z | X | C | V | B | N | M | < | > | ? | SHIFT | UP | + |________________|________|________|________|________|________|________|________|________|________|________|____________|________|_________ + | | | | | | | | | | | | | | + | CTRL | FN | LALT | LGUI | SPACE | BACKSPACE | ESC | RALT | FN | | LEFT | DOWN | RIGHT | + |____________|________|_______|________|_________________|_________________|________|________|_____________| |________|________|________| +*/ + + [0] = LAYOUT( + 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_DEL, KC_HOME, + 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_PGUP, + 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_PGDN, + MO(1), 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_END, + 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_LCTL, MO(1), KC_LALT, KC_LGUI, KC_SPC, KC_BSPC, KC_ESC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT + ), + + /* Layer 1, function layer +__________________________________________________________________________________________________________________________________ ________ +| | | | | | | | | | | | | | || PLAY/ | +| RESET | | | | | | | | | | | | | || PAUSE | +|________|________|________|________|________|________|________|________|________|________|________|________|________|____________||________| +| | | | | | | | | | | | | | || VOLUME | +| ESC | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | DELETE || UP | +|________|________|________|________|________|________|________|________|________|________|________|________|________|____________||________| +| | | | | | | | | | | | LED | LED | LED || VOLUME | +|PRINT SCREEN| | | | | | | PGUP | HOME | PGDN | | DOWN | UP | TOGGLE || DOWN | +|____________|________|________|________|________|________|________|________|________|________|________|________|________|________||________| + | | | VOL | VOL | | | | | | | | | | | | + | | | DOWN | UP | MUTE | | LEFT | DOWN | UP | RIGHT | | | | | MUTE | + |____________|________|________|________|________|________|________|________|________|________|________|________|____________|___|________| + | | | | | | | | | | | | | | + | | | | | | | END | | | | | | PGUP | + |________________|________|________|________|________|________|________|________|________|________|________|____________|________|_________ + | | | | | | | | | | | | | | + | | | | | ENTER | DELETE | | | | | HOME | PGDN | END | + |____________|________|_______|________|_________________|_________________|________|________|_____________| |________|________|________| + +* 'RESET' resets the controller and puts the board into firmware flashing mode. If this key is hit accidentally, just unplug the board +* and plug it back in. +*/ + + [1] = LAYOUT( + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, + 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_DEL, KC_VOLU, + KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_HOME, KC_PGDN, KC_TRNS, RGB_VAD, RGB_VAI, RGB_TOG, KC_VOLD, + KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_ENT, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END + ), + + [2] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [3] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), +}; + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + return true; +}