From 5620aa9412de112dad7d34bf54aa78423ec00031 Mon Sep 17 00:00:00 2001 From: Danny Nguyen Date: Sat, 6 Feb 2021 18:15:39 -0500 Subject: [PATCH 1/9] Change USB device info from defaults --- keyboards/sx60/config.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/sx60/config.h b/keyboards/sx60/config.h index cfebb416e0bc..edf5a277cd2e 100755 --- a/keyboards/sx60/config.h +++ b/keyboards/sx60/config.h @@ -4,11 +4,11 @@ #include "config_common.h" /* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6060 +#define VENDOR_ID 0x5154 // "QT" +#define PRODUCT_ID 0x0010 #define DEVICE_VER 0x0001 -#define MANUFACTURER qmkbuilder -#define PRODUCT keyboard +#define MANUFACTURER Quantrik +#define PRODUCT SX60 /* key matrix size */ #define MATRIX_ROWS 5 From 7b6caf706cac9f6011d00a1383844735609aa131 Mon Sep 17 00:00:00 2001 From: Danny Nguyen Date: Fri, 12 Feb 2021 18:53:21 -0500 Subject: [PATCH 2/9] Add indicator LEDs --- keyboards/sx60/config.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/keyboards/sx60/config.h b/keyboards/sx60/config.h index edf5a277cd2e..8599c2a46223 100755 --- a/keyboards/sx60/config.h +++ b/keyboards/sx60/config.h @@ -23,6 +23,11 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW +/* indicator LEDs */ +#define LED_NUM_LOCK_PIN F5 +#define LED_CAPS_LOCK_PIN F4 +#define LED_SCROLL_LOCK_PIN F1 + /* number of backlight levels */ #define BACKLIGHT_PIN B7 #ifdef BACKLIGHT_PIN From 73102ed5aff573515c57d8acb652f8d1572a0ec9 Mon Sep 17 00:00:00 2001 From: Danny Nguyen Date: Sun, 14 Feb 2021 17:23:32 -0500 Subject: [PATCH 3/9] Cleanup config.h --- keyboards/sx60/config.h | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/keyboards/sx60/config.h b/keyboards/sx60/config.h index 8599c2a46223..04ba4e120d4e 100755 --- a/keyboards/sx60/config.h +++ b/keyboards/sx60/config.h @@ -1,5 +1,4 @@ -#ifndef CONFIG_H -#define CONFIG_H +#pragma once #include "config_common.h" @@ -42,13 +41,3 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -#ifdef RGB_DI_PIN -#define RGBLIGHT_ANIMATIONS -#define RGBLED_NUM 0 -#define RGBLIGHT_HUE_STEP 8 -#define RGBLIGHT_SAT_STEP 8 -#define RGBLIGHT_VAL_STEP 8 -#endif - -#endif From 609bec1ce31244beee94cb19c953a55ca30e7a20 Mon Sep 17 00:00:00 2001 From: Danny Nguyen Date: Sat, 13 Feb 2021 23:34:44 -0500 Subject: [PATCH 4/9] Add note about expander pins used --- keyboards/sx60/config.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/keyboards/sx60/config.h b/keyboards/sx60/config.h index 04ba4e120d4e..9fd6489b0d74 100755 --- a/keyboards/sx60/config.h +++ b/keyboards/sx60/config.h @@ -17,6 +17,9 @@ /* key matrix pins */ #define MATRIX_ROW_PINS { B1, B2, B3, C6, B6 } #define MATRIX_COL_PINS { F6, B5, B4, D7, D6, D5, D3, D2 } +// MCP23018 pinout: +// Rows: B4, B3, B2, B1, B0 +// Cols: A0, A1, A2, A3, A4, A5, A6, A7 #define UNUSED_PINS /* COL2ROW or ROW2COL */ From ee74ead9b24454ac6742dc1a82311e7f26a5ca1b Mon Sep 17 00:00:00 2001 From: Danny Nguyen Date: Sat, 13 Feb 2021 23:35:08 -0500 Subject: [PATCH 5/9] Cleanup default keymap --- keyboards/sx60/keymaps/default/config.h | 3 --- keyboards/sx60/keymaps/default/keymap.c | 34 ++++++++++--------------- 2 files changed, 14 insertions(+), 23 deletions(-) delete mode 100644 keyboards/sx60/keymaps/default/config.h diff --git a/keyboards/sx60/keymaps/default/config.h b/keyboards/sx60/keymaps/default/config.h deleted file mode 100644 index 271f48d0011b..000000000000 --- a/keyboards/sx60/keymaps/default/config.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -// place overrides here diff --git a/keyboards/sx60/keymaps/default/keymap.c b/keyboards/sx60/keymaps/default/keymap.c index 942e8ef8ebb7..ab0f6e575572 100755 --- a/keyboards/sx60/keymaps/default/keymap.c +++ b/keyboards/sx60/keymaps/default/keymap.c @@ -1,25 +1,19 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_ansi_split_bs_rshift( KC_ESC, 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_BSLS, KC_GRV, - 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_BSPC, - KC_PGUP, 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_PGDN, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP, - KC_END, KC_LCTL, KC_LGUI, KC_LALT, MO(1), KC_SPC, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + [0] = LAYOUT_ansi_split_bs_rshift( + KC_ESC, 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_BSLS, KC_GRV, + 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_BSPC, + KC_PGUP, 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_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, MO(1), KC_SPC, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), - [1] = LAYOUT_ansi_split_bs_rshift( RESET, 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_PGUP, KC_UP, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_MINS, KC_LPRN, KC_RPRN, KC_GRV, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_INS, KC_TRNS, KC_TRNS, - KC_TRNS, 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_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), + [1] = LAYOUT_ansi_split_bs_rshift( + RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_UP, KC_PGDN, _______, _______, _______, _______, + _______, _______, _______, KC_MINS, KC_LPRN, KC_RPRN, KC_GRV, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_INS, _______, _______, + _______, _______, _______, _______, _______, _______, _______, KC_END, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), }; - -void matrix_init_user(void) { -} - -void matrix_scan_user(void) { -} - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - return true; -} From c6390d00465b1aaccac75d4ccff94e06f9aa2f92 Mon Sep 17 00:00:00 2001 From: Danny Nguyen Date: Sun, 14 Feb 2021 17:16:53 -0500 Subject: [PATCH 6/9] Update default keymap --- keyboards/sx60/keymaps/default/keymap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/sx60/keymaps/default/keymap.c b/keyboards/sx60/keymaps/default/keymap.c index ab0f6e575572..d53dd9ca6a09 100755 --- a/keyboards/sx60/keymaps/default/keymap.c +++ b/keyboards/sx60/keymaps/default/keymap.c @@ -2,18 +2,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_ansi_split_bs_rshift( - KC_ESC, 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_BSLS, KC_GRV, - 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_BSPC, + KC_GESC, 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_DEL, + 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_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_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, MO(1), KC_SPC, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT_ansi_split_bs_rshift( - RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + RESET, 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_PGUP, KC_UP, KC_PGDN, _______, _______, _______, _______, _______, _______, _______, KC_MINS, KC_LPRN, KC_RPRN, KC_GRV, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_INS, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), }; From 90bf2bc63f5f847cdfd2ab1e52d75cfce1ec3710 Mon Sep 17 00:00:00 2001 From: Danny Nguyen Date: Sun, 14 Feb 2021 17:17:12 -0500 Subject: [PATCH 7/9] Add VIA support --- keyboards/sx60/keymaps/via/keymap.c | 35 +++++++++++++++++++++++++++++ keyboards/sx60/keymaps/via/rules.mk | 3 +++ 2 files changed, 38 insertions(+) create mode 100755 keyboards/sx60/keymaps/via/keymap.c create mode 100644 keyboards/sx60/keymaps/via/rules.mk diff --git a/keyboards/sx60/keymaps/via/keymap.c b/keyboards/sx60/keymaps/via/keymap.c new file mode 100755 index 000000000000..8082e6b0dbc4 --- /dev/null +++ b/keyboards/sx60/keymaps/via/keymap.c @@ -0,0 +1,35 @@ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_ansi_split_bs_rshift( + KC_GESC, 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_DEL, + 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_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_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, MO(1), KC_SPC, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + + [1] = LAYOUT_ansi_split_bs_rshift( + RESET, 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_PGUP, KC_UP, KC_PGDN, _______, _______, _______, _______, + _______, _______, _______, KC_MINS, KC_LPRN, KC_RPRN, KC_GRV, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_INS, _______, _______, + _______, _______, _______, _______, _______, _______, _______, KC_END, _______, _______, _______, _______, _______, _______, + BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + + [2] = LAYOUT_ansi_split_bs_rshift( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + + [3] = LAYOUT_ansi_split_bs_rshift( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/sx60/keymaps/via/rules.mk b/keyboards/sx60/keymaps/via/rules.mk new file mode 100644 index 000000000000..4b1bcabda81a --- /dev/null +++ b/keyboards/sx60/keymaps/via/rules.mk @@ -0,0 +1,3 @@ +VIA_ENABLE = yes +CONSOLE_ENABLE = yes +LTO_ENABLE = yes From b8265396b3edca9d052713f4de9eee8acb70bb44 Mon Sep 17 00:00:00 2001 From: Danny Nguyen Date: Sun, 14 Feb 2021 17:30:27 -0500 Subject: [PATCH 8/9] Fix build command --- keyboards/sx60/readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/sx60/readme.md b/keyboards/sx60/readme.md index e65363c5affc..141d6b1b5c3c 100644 --- a/keyboards/sx60/readme.md +++ b/keyboards/sx60/readme.md @@ -11,10 +11,10 @@ Hardware Availability: [geekhack.org/index.php?topic=93665.0](https://geekhack.o Make example for this keyboard (after setting up your build environment): - make SX60:default + make sx60:default Or to make and flash: - make SX60:default:dfu + make sx60:default:dfu See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. From 93808d568ba52118461758bdc26a720e9067d8f3 Mon Sep 17 00:00:00 2001 From: Danny Nguyen Date: Fri, 26 Feb 2021 17:31:01 -0500 Subject: [PATCH 9/9] Add GPL v2 headers --- keyboards/sx60/config.h | 16 ++++++++++++++++ keyboards/sx60/keymaps/default/keymap.c | 16 ++++++++++++++++ keyboards/sx60/keymaps/via/keymap.c | 16 ++++++++++++++++ 3 files changed, 48 insertions(+) diff --git a/keyboards/sx60/config.h b/keyboards/sx60/config.h index 9fd6489b0d74..a2da81940033 100755 --- a/keyboards/sx60/config.h +++ b/keyboards/sx60/config.h @@ -1,3 +1,19 @@ +/* Copyright 2021 Danny Nguyen + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + #pragma once #include "config_common.h" diff --git a/keyboards/sx60/keymaps/default/keymap.c b/keyboards/sx60/keymaps/default/keymap.c index d53dd9ca6a09..b6747c253c5c 100755 --- a/keyboards/sx60/keymaps/default/keymap.c +++ b/keyboards/sx60/keymaps/default/keymap.c @@ -1,3 +1,19 @@ +/* Copyright 2021 Danny Nguyen + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/sx60/keymaps/via/keymap.c b/keyboards/sx60/keymaps/via/keymap.c index 8082e6b0dbc4..92a305eca4c1 100755 --- a/keyboards/sx60/keymaps/via/keymap.c +++ b/keyboards/sx60/keymaps/via/keymap.c @@ -1,3 +1,19 @@ +/* Copyright 2021 Danny Nguyen + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {