From f3eddb2c6db6657516cf0472427607e2b7ef1f99 Mon Sep 17 00:00:00 2001 From: leviport Date: Fri, 27 Dec 2019 15:49:03 -0700 Subject: [PATCH] Fix many issues by renaming the keyboard --- .../{so2u-virgo-left => virgortholeft}/config.h | 8 ++++---- .../keymaps/default/keymap.c | 16 ++++++++-------- .../{so2u-virgo-left => virgortholeft}/rules.mk | 2 +- .../virgo.c => virgortholeft/virgortholeft.c} | 2 +- .../virgo.h => virgortholeft/virgortholeft.h} | 14 +++++++------- 5 files changed, 21 insertions(+), 21 deletions(-) rename keyboards/system76/{so2u-virgo-left => virgortholeft}/config.h (82%) rename keyboards/system76/{so2u-virgo-left => virgortholeft}/keymaps/default/keymap.c (87%) rename keyboards/system76/{so2u-virgo-left => virgortholeft}/rules.mk (96%) rename keyboards/system76/{so2u-virgo-left/virgo.c => virgortholeft/virgortholeft.c} (86%) rename keyboards/system76/{so2u-virgo-left/virgo.h => virgortholeft/virgortholeft.h} (64%) diff --git a/keyboards/system76/so2u-virgo-left/config.h b/keyboards/system76/virgortholeft/config.h similarity index 82% rename from keyboards/system76/so2u-virgo-left/config.h rename to keyboards/system76/virgortholeft/config.h index 581d89e8ae9..71b86bb33d2 100644 --- a/keyboards/system76/so2u-virgo-left/config.h +++ b/keyboards/system76/virgortholeft/config.h @@ -4,12 +4,12 @@ #include "config_common.h" /* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6060 +#define VENDOR_ID 0x1776 +#define PRODUCT_ID 0x1776 #define DEVICE_VER 0x0001 #define MANUFACTURER System76 -#define PRODUCT Split Ortho 2U Virgo Left -#define DESCRIPTION Virgo Left +#define PRODUCT Virgortholeft +#define DESCRIPTION Left half of 2U Split Ortho /* key matrix size */ #define MATRIX_ROWS 6 diff --git a/keyboards/system76/so2u-virgo-left/keymaps/default/keymap.c b/keyboards/system76/virgortholeft/keymaps/default/keymap.c similarity index 87% rename from keyboards/system76/so2u-virgo-left/keymaps/default/keymap.c rename to keyboards/system76/virgortholeft/keymaps/default/keymap.c index 4dc17ee2c11..fb220198411 100644 --- a/keyboards/system76/so2u-virgo-left/keymaps/default/keymap.c +++ b/keyboards/system76/virgortholeft/keymaps/default/keymap.c @@ -6,7 +6,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┐ * │ Esc │ F1 │ F2 │ F3 │ F4 │ F5 │ F6 │ * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┤ - * │ ` ~ │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ + * │ ` ~ │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ * ├─────┴─────┼─────┼─────┼─────┼─────┼─────┤ * │ Tab │ Q │ W │ E │ R │ T │ * ├───────────┼─────┼─────┼─────┼─────┼─────┤ @@ -21,15 +21,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, - KC_LCTL, MO(1), KC_LALT, KC_LGUI, KC_SPC + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, + KC_LCTL, MO(1), KC_LALT, KC_LGUI, KC_SPC ), /* Layer 1, function layer * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┐ - * │ │ │ │ │ │ │ │ + * │ │ │ │ │ │ │RESET│ * ├─────┼─────┼─────┼─────┼─────┼─────┼─────┤ * │ │ │ │ │ │ │ │ * ├─────┴─────┼─────┼─────┼─────┼─────┼─────┤ @@ -49,8 +49,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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) { diff --git a/keyboards/system76/so2u-virgo-left/rules.mk b/keyboards/system76/virgortholeft/rules.mk similarity index 96% rename from keyboards/system76/so2u-virgo-left/rules.mk rename to keyboards/system76/virgortholeft/rules.mk index 51c403c9630..bc6e75d2c1a 100644 --- a/keyboards/system76/so2u-virgo-left/rules.mk +++ b/keyboards/system76/virgortholeft/rules.mk @@ -9,7 +9,7 @@ MCU = atmega32u4 # QMK DFU qmk-dfu # ATmega32A bootloadHID # ATmega328P USBasp -BOOTLOADER = atmel-dfu +BOOTLOADER = caterina # Build Options # comment out to disable the options. diff --git a/keyboards/system76/so2u-virgo-left/virgo.c b/keyboards/system76/virgortholeft/virgortholeft.c similarity index 86% rename from keyboards/system76/so2u-virgo-left/virgo.c rename to keyboards/system76/virgortholeft/virgortholeft.c index 1bb7b19599c..662fe36720b 100644 --- a/keyboards/system76/so2u-virgo-left/virgo.c +++ b/keyboards/system76/virgortholeft/virgortholeft.c @@ -1,4 +1,4 @@ -#include "virgo.h" +#include "virgortholeft.h" void keyboard_post_init_user(void) { // Customise these values to desired behaviour diff --git a/keyboards/system76/so2u-virgo-left/virgo.h b/keyboards/system76/virgortholeft/virgortholeft.h similarity index 64% rename from keyboards/system76/so2u-virgo-left/virgo.h rename to keyboards/system76/virgortholeft/virgortholeft.h index 2876a69f697..6289b124143 100644 --- a/keyboards/system76/so2u-virgo-left/virgo.h +++ b/keyboards/system76/virgortholeft/virgortholeft.h @@ -1,5 +1,5 @@ -#ifndef VIRGO_H -#define VIRGO_H +#ifndef VIRGORTHOLEFT_H +#define VIRGORTHOLEFT_H #include "quantum.h" @@ -8,10 +8,10 @@ #define LAYOUT( \ K00, K01, K02, K03, K04, K05, K06, \ K10, K11, K12, K13, K14, K15, K16, \ - K20, K21, K22, K23, K24, K25, \ - K30, K31, K32, K33, K34, K35, \ - K40, K41, K42, K43, K44, K45, \ - K50, K51, K52, K53, K54, \ + K21, K22, K23, K24, K25, K26, \ + K31, K32, K33, K34, K35, K36, \ + K41, K42, K43, K44, K45, K46, \ + K51, K52, K53, K54, K56 \ ) { \ { K00, K01, K02, K03, K04, K05, K06 }, \ { K10, K11, K12, K13, K14, K15, K16 }, \ @@ -21,4 +21,4 @@ { ___, K51, K52, K53, K54, ___, K56 }, \ } -#endif // VIRGO_H +#endif // VIRGORTHOLEFT_H