From 28525f1611fb71a1165a6cf48a576c31815956ec Mon Sep 17 00:00:00 2001 From: keyaki-namiki <28521374+keyaki-namiki@users.noreply.github.com> Date: Sat, 25 Jul 2020 19:48:07 +0900 Subject: [PATCH 01/45] update "Hardware Availability" --- keyboards/yushakobo/quick7/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/yushakobo/quick7/readme.md b/keyboards/yushakobo/quick7/readme.md index 5e9f85c248e4..56fe301ccff5 100644 --- a/keyboards/yushakobo/quick7/readme.md +++ b/keyboards/yushakobo/quick7/readme.md @@ -6,7 +6,7 @@ A simple macropad for the beginners. * Keyboard Maintainer: [yushakobo](https://github.com/yushakobo) * Hardware Supported: quick7, Pro Micro (ATmega32U4) -* Hardware Availability: (Under Preparation) +* Hardware Availability: [yushakobo Shop](https://yushakobo.jp/shop/quick7/) Make example for this keyboard (after setting up your build environment): From 22305cfdfee6bddffd644ccfb54d2507214b71c6 Mon Sep 17 00:00:00 2001 From: keyaki-namiki <28521374+keyaki-namiki@users.noreply.github.com> Date: Thu, 30 Jul 2020 17:46:03 +0900 Subject: [PATCH 02/45] add a section of "How to build" --- keyboards/yushakobo/quick7/readme.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/keyboards/yushakobo/quick7/readme.md b/keyboards/yushakobo/quick7/readme.md index 56fe301ccff5..7fbcc3e0a973 100644 --- a/keyboards/yushakobo/quick7/readme.md +++ b/keyboards/yushakobo/quick7/readme.md @@ -8,6 +8,9 @@ A simple macropad for the beginners. * Hardware Supported: quick7, Pro Micro (ATmega32U4) * Hardware Availability: [yushakobo Shop](https://yushakobo.jp/shop/quick7/) +## How to build +* Build guide available [here](https://github.com/yushakobo/build-documents/blob/master/Quick7/Buildguide-en.md). (Japanese build guide is [here](https://github.com/yushakobo/build-documents/blob/master/Quick7/BuildGuide.md).) + Make example for this keyboard (after setting up your build environment): make yushakobo/quick7:default From 21ecbbbac4109ffd8699a0e342892a138706cf5a Mon Sep 17 00:00:00 2001 From: keyaki-namiki <28521374+keyaki-namiki@users.noreply.github.com> Date: Thu, 30 Jul 2020 17:47:41 +0900 Subject: [PATCH 03/45] update "Hardware Supported" --- keyboards/yushakobo/quick7/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/yushakobo/quick7/readme.md b/keyboards/yushakobo/quick7/readme.md index 7fbcc3e0a973..3c65d46c7f72 100644 --- a/keyboards/yushakobo/quick7/readme.md +++ b/keyboards/yushakobo/quick7/readme.md @@ -5,7 +5,7 @@ A simple macropad for the beginners. * Keyboard Maintainer: [yushakobo](https://github.com/yushakobo) -* Hardware Supported: quick7, Pro Micro (ATmega32U4) +* Hardware Supported: quick7 PCB, Pro Micro (ATmega32U4) * Hardware Availability: [yushakobo Shop](https://yushakobo.jp/shop/quick7/) ## How to build From 619cb9fbb15eedd5fee6dbd31b681ee69f268d5b Mon Sep 17 00:00:00 2001 From: keyaki-namiki <28521374+keyaki-namiki@users.noreply.github.com> Date: Thu, 1 Oct 2020 19:29:33 +0900 Subject: [PATCH 04/45] start project quick17 --- keyboards/yushakobo/quick17/config.h | 146 ++++++++++++++++++ keyboards/yushakobo/quick17/info.json | 19 +++ .../quick17/keymaps/default/keymap.c | 118 ++++++++++++++ .../quick17/keymaps/default/readme.md | 1 + keyboards/yushakobo/quick17/quick17.c | 37 +++++ keyboards/yushakobo/quick17/quick17.h | 38 +++++ keyboards/yushakobo/quick17/readme.md | 19 +++ keyboards/yushakobo/quick17/rules.mk | 24 +++ 8 files changed, 402 insertions(+) create mode 100644 keyboards/yushakobo/quick17/config.h create mode 100644 keyboards/yushakobo/quick17/info.json create mode 100644 keyboards/yushakobo/quick17/keymaps/default/keymap.c create mode 100644 keyboards/yushakobo/quick17/keymaps/default/readme.md create mode 100644 keyboards/yushakobo/quick17/quick17.c create mode 100644 keyboards/yushakobo/quick17/quick17.h create mode 100644 keyboards/yushakobo/quick17/readme.md create mode 100644 keyboards/yushakobo/quick17/rules.mk diff --git a/keyboards/yushakobo/quick17/config.h b/keyboards/yushakobo/quick17/config.h new file mode 100644 index 000000000000..3cc710261140 --- /dev/null +++ b/keyboards/yushakobo/quick17/config.h @@ -0,0 +1,146 @@ +/* +Copyright 2020 yushakobo + +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" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0x3265 +#define PRODUCT_ID 0x0005 +#define DEVICE_VER 0x0001 +#define MANUFACTURER yushakobo +#define PRODUCT quick17 + +/* key matrix size */ +#define MATRIX_ROWS 3 +#define MATRIX_COLS 6 + +/* + * Keyboard Matrix Assignments + * + * Change this to how you wired your keyboard + * COLS: AVR pins used for columns, left to right + * ROWS: AVR pins used for rows, top to bottom + * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) + * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) + * + */ +#define MATRIX_ROW_PINS { B7, C5, B4 } +#define MATRIX_COL_PINS { B5, C2, D1, D2, D3, D4 } +#define UNUSED_PINS + +/* COL2ROW, ROW2COL */ +#define DIODE_DIRECTION COL2ROW + +/* + * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN. + */ +//#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6 + +//#define BACKLIGHT_PIN B7 +//#define BACKLIGHT_LEVELS 3 +//#define BACKLIGHT_BREATHING + +#define RGB_DI_PIN C6 +#define RGBLED_NUM 18 +#ifdef RGBLIGHT_ENABLE +# define RGBLIGHT_HUE_STEP 8 +# define RGBLIGHT_SAT_STEP 8 +# define RGBLIGHT_VAL_STEP 8 +# define RGBLIGHT_LIMIT_VAL 150 /* The maximum brightness level */ +//# define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ +/*== all animations enable ==*/ +//# define RGBLIGHT_ANIMATIONS +/*== or choose animations ==*/ +//# define RGBLIGHT_EFFECT_BREATHING +# define RGBLIGHT_EFFECT_RAINBOW_MOOD +# define RGBLIGHT_EFFECT_RAINBOW_SWIRL +//# define RGBLIGHT_EFFECT_SNAKE +//# define RGBLIGHT_EFFECT_KNIGHT +# define RGBLIGHT_EFFECT_CHRISTMAS +# define RGBLIGHT_EFFECT_STATIC_GRADIENT +# define RGBLIGHT_EFFECT_RGB_TEST +//# define RGBLIGHT_EFFECT_ALTERNATING +/*== customize breathing effect ==*/ +/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ +//# define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 +/*==== use exp() and sin() ====*/ +//# define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 +//# define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 +#endif + +/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ +#define DEBOUNCE 5 + +/* define if matrix has ghost (lacks anti-ghosting diodes) */ +//#define MATRIX_HAS_GHOST + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + +/* If defined, GRAVE_ESC will always act as ESC when CTRL is held. + * This is useful for the Windows task manager shortcut (ctrl+shift+esc). + */ +//#define GRAVE_ESC_CTRL_OVERRIDE + +/* + * Force NKRO + * + * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved + * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the + * makefile for this to work.) + * + * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) + * until the next keyboard reset. + * + * NKRO may prevent your keystrokes from being detected in the BIOS, but it is + * fully operational during normal computer usage. + * + * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N) + * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by + * bootmagic, NKRO mode will always be enabled until it is toggled again during a + * power-up. + * + */ +//#define FORCE_NKRO + +/* + * Feature disable options + * These options are also useful to firmware size reduction. + */ + +/* disable debug print */ +//#define NO_DEBUG + +/* disable print */ +//#define NO_PRINT + +/* disable action features */ +//#define NO_ACTION_LAYER +//#define NO_ACTION_TAPPING +//#define NO_ACTION_ONESHOT + +/* disable these deprecated features by default */ +#define NO_ACTION_MACRO +#define NO_ACTION_FUNCTION + +/* Bootmagic Lite key configuration */ +//#define BOOTMAGIC_LITE_ROW 0 +//#define BOOTMAGIC_LITE_COLUMN 0 diff --git a/keyboards/yushakobo/quick17/info.json b/keyboards/yushakobo/quick17/info.json new file mode 100644 index 000000000000..7c4d913f7543 --- /dev/null +++ b/keyboards/yushakobo/quick17/info.json @@ -0,0 +1,19 @@ +{ + "keyboard_name": "quick17", + "url": "", + "maintainer": "yushakobo", + "width": 3, + "height": 2, + "layouts": { + "LAYOUT": { + "layout": [ + {"label": "k00", "x": 0, "y": 0}, + {"label": "k01", "x": 1, "y": 0}, + {"label": "k02", "x": 2, "y": 0}, + + {"label": "k10", "x": 0, "y": 1, "w": 1.5}, + {"label": "k12", "x": 1.5, "y": 1, "w": 1.5} + ] + } + } +} diff --git a/keyboards/yushakobo/quick17/keymaps/default/keymap.c b/keyboards/yushakobo/quick17/keymaps/default/keymap.c new file mode 100644 index 000000000000..1bdc34c9526e --- /dev/null +++ b/keyboards/yushakobo/quick17/keymaps/default/keymap.c @@ -0,0 +1,118 @@ +/* Copyright 2020 yushakobo + * + * 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 +// Defines names for use in layer keycodes and the keymap +enum layer_names { + _CONTROL, + _PHOTO, + _PHOTO_SHIFT, + _FN +}; + +// Defines the keycodes used by our macros in process_record_user +enum custom_keycodes { + CONTROL = SAFE_RANGE, + FN, + MAC, + WIN, + PS_CMRL, + PS_ZIN, + PS_ZOUT, + PS_CSHR, + PS_CROP, + PS_LLYR, + PS_UNDO, + PS_REDO, + PS_SHIFT, + PS_LANG, + FN_LANG1, + FN_LANG2 +}; + + +#define PS_ERSE KC_E +#define PS_MGWD KC_W +#define PS_EYDR KC_I +#define PS_SLCT KC_A +#define PS_HAND KC_H +#define PS_LASS KC_L +#define PS_MRQE KC_M +#define PS_PEN KC_P +#define PS_MOVE KC_V +#define PS_ZOOM KC_Z +#define PS_BRSD KC_LBRC +#define PS_BRSI KC_RBRC +#define PS_BRSP KC_COMM +#define PS_BRSN KC_DOT + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* Base */ + [_CONTROL] = LAYOUT( + KC_TAB, KC_PGUP, KC_UP, KC_PGDN, KC_HOME, KC_DEL, + KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, KC_INS, + KC_LSFT, KC_ESC, KC_LALT, KC_SPC, FN, KC_ENT +), + [_PHOTO] = LAYOUT( + KC_ESC, PS_ERSE, PS_MGWD, PS_EYDR, PS_ZIN, KC_BSPC, + PS_CMRL, PS_SLCT, PS_HAND, PS_LASS, PS_MRQE, PS_PEN, + KC_LSFT, PS_ZOOM, PS_MOVE, KC_LALT, PS_SHIFT,KC_ENT +), + [_PHOTO_SHIFT] = LAYOUT( + KC_ESC, PS_BRSD, PS_BRSI, PS_UNDO, PS_REDO, KC_DEL, + PS_CMRL, PS_BRSP, PS_BRSN, PS_CSHR, PS_CROP, PS_LLYR, + KC_LSFT, PS_LANG, CONTROL, _______, _______, _______ +), + [_FN] = LAYOUT( + FN_LANG1,FN_LANG2,XXXXXXX, RGB_TOG, KC_MNXT, KC_VOLU, + PHOTO, CONTROL, KC_NO, KC_NO, KC_MPRV, KC_VOLD, + MAC, WIN, KC_NO, KC_NO, _______, KC_MUTE +) +}; + +static bool mac = true;// keymap_config.swap_ctrl_gui +static bool kana = false; + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case QMKBEST: + if (record->event.pressed) { + // when keycode QMKBEST is pressed + SEND_STRING("QMK is the best thing ever!"); + } else { + // when keycode QMKBEST is released + } + break; + case QMKURL: + if (record->event.pressed) { + // when keycode QMKURL is pressed + SEND_STRING("https://qmk.fm/\n"); + } else { + // when keycode QMKURL is released + } + break; + } + return true; +} + +void encoder_update_user(uint8_t index, bool clockwise) { + if (index == 0) { + if (clockwise) { + tap_code(KC_UP); + } else { + tap_code(KC_DOWN); + } + } +} diff --git a/keyboards/yushakobo/quick17/keymaps/default/readme.md b/keyboards/yushakobo/quick17/keymaps/default/readme.md new file mode 100644 index 000000000000..193d1b834067 --- /dev/null +++ b/keyboards/yushakobo/quick17/keymaps/default/readme.md @@ -0,0 +1 @@ +# The default keymap for quick17 diff --git a/keyboards/yushakobo/quick17/quick17.c b/keyboards/yushakobo/quick17/quick17.c new file mode 100644 index 000000000000..2a48a407cbaa --- /dev/null +++ b/keyboards/yushakobo/quick17/quick17.c @@ -0,0 +1,37 @@ +/* Copyright 2020 yushakobo + * + * 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 "quick17.h" + +#ifdef RGB_MATRIX_ENABLE +led_config_t g_led_config = { + { + { 13, 14, 15, 16, 17, 18 }, + { 1, 12, 11, 10, 9, 8 }, + { 2, 3, 4, 5, 6, 7 } + }, + { + {0,0},{44,0},{89,0},{134,0},{179,0},{224,0}, + {0,32},{44,32},{89,32},{134,32},{179,32},{224,32}, + {0,64},{44,64},{89,64},{134,64},{179,64},{224,64} + }, + { + 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4 + } +}; +#endif \ No newline at end of file diff --git a/keyboards/yushakobo/quick17/quick17.h b/keyboards/yushakobo/quick17/quick17.h new file mode 100644 index 000000000000..7aad3ecb69d5 --- /dev/null +++ b/keyboards/yushakobo/quick17/quick17.h @@ -0,0 +1,38 @@ +/* Copyright 2020 yushakobo + * + * 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 "quantum.h" + +/* This is a shortcut to help you visually see your layout. + * + * The first section contains all of the arguments representing the physical + * layout of the board and position of the keys. + * + * The second converts the arguments into a two-dimensional array which + * represents the switch matrix. + */ +#define LAYOUT( \ + k00, k01, k02, k03, k04, k05, \ + k10, k11, k12, k13, k14, k15, \ + k20, k21, k22, k23, k24, k25 \ +) \ +{ \ + { k00, k01, k02, k03, k04, k05 }, \ + { k10, k11, k12, k13, k14, k15 }, \ + { k20, k21, k22, k23, k24, k25 } \ +} diff --git a/keyboards/yushakobo/quick17/readme.md b/keyboards/yushakobo/quick17/readme.md new file mode 100644 index 000000000000..2f0e5dda36de --- /dev/null +++ b/keyboards/yushakobo/quick17/readme.md @@ -0,0 +1,19 @@ +# quick17 + +![quick17](imgur.com image replace me!) + +*A short description of the keyboard/project* + +* Keyboard Maintainer: [yushakobo](https://github.com/yourusername) +* Hardware Supported: *The PCBs, controllers supported* +* Hardware Availability: *Links to where you can find this hardware* + +Make example for this keyboard (after setting up your build environment): + + make quick17:default + +Flashing example for this keyboard: + + make quick17:default:flash + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/yushakobo/quick17/rules.mk b/keyboards/yushakobo/quick17/rules.mk new file mode 100644 index 000000000000..a168db5182b6 --- /dev/null +++ b/keyboards/yushakobo/quick17/rules.mk @@ -0,0 +1,24 @@ +# MCU name +MCU = atmega32u2 + +# Bootloader selection +BOOTLOADER = atmel-dfu + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE = no # USB Nkey Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow +BLUETOOTH_ENABLE = no # Enable Bluetooth +AUDIO_ENABLE = no # Audio output + +#RGB_MATRIX_ENABLE = WS2812 \ No newline at end of file From 8725208eb3a32bbb7cdf9c9169fb7cf4bfedcd14 Mon Sep 17 00:00:00 2001 From: keyaki-namiki <28521374+keyaki-namiki@users.noreply.github.com> Date: Sun, 4 Oct 2020 18:07:22 +0900 Subject: [PATCH 05/45] led indicator implementation [wip] --- keyboards/yushakobo/quick17/config.h | 5 ++ .../quick17/keymaps/default/keymap.c | 73 ++++++++++++++++--- keyboards/yushakobo/quick17/quick17.c | 2 +- 3 files changed, 69 insertions(+), 11 deletions(-) diff --git a/keyboards/yushakobo/quick17/config.h b/keyboards/yushakobo/quick17/config.h index 3cc710261140..330af377656c 100644 --- a/keyboards/yushakobo/quick17/config.h +++ b/keyboards/yushakobo/quick17/config.h @@ -58,6 +58,7 @@ along with this program. If not, see . #define RGB_DI_PIN C6 #define RGBLED_NUM 18 +#define RGBLIGHT_LED_MAP { 6, 12, 13, 14, 15, 16, 17, 11, 10, 9, 8, 7, 0, 1, 2, 3, 4, 5 } #ifdef RGBLIGHT_ENABLE # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 @@ -82,6 +83,10 @@ along with this program. If not, see . /*==== use exp() and sin() ====*/ //# define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 //# define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 + +#define RGBLIGHT_LAYERS +#define RGBLIGHT_MAX_LAYERS 8 + #endif /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ diff --git a/keyboards/yushakobo/quick17/keymaps/default/keymap.c b/keyboards/yushakobo/quick17/keymaps/default/keymap.c index 1bdc34c9526e..46f75898a594 100644 --- a/keyboards/yushakobo/quick17/keymaps/default/keymap.c +++ b/keyboards/yushakobo/quick17/keymaps/default/keymap.c @@ -24,11 +24,10 @@ enum layer_names { // Defines the keycodes used by our macros in process_record_user enum custom_keycodes { - CONTROL = SAFE_RANGE, - FN, + PS_CMRL = SAFE_RANGE, MAC, WIN, - PS_CMRL, + FN, PS_ZIN, PS_ZOUT, PS_CSHR, @@ -40,9 +39,12 @@ enum custom_keycodes { PS_LANG, FN_LANG1, FN_LANG2 -}; - - +};/* + PHOTO, + FN, +*/ +#define CONTROL DF(_CONTROL) +#define PHOTO DF(_PHOTO) #define PS_ERSE KC_E #define PS_MGWD KC_W #define PS_EYDR KC_I @@ -61,9 +63,9 @@ enum custom_keycodes { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Base */ [_CONTROL] = LAYOUT( - KC_TAB, KC_PGUP, KC_UP, KC_PGDN, KC_HOME, KC_DEL, + RGB_MOD, EEP_RST, RESET, KC_PGDN, KC_HOME, KC_DEL, KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, KC_INS, - KC_LSFT, KC_ESC, KC_LALT, KC_SPC, FN, KC_ENT + KC_LSFT, KC_ESC, KC_LALT, KC_SPC, MO(_FN), KC_ENT ), [_PHOTO] = LAYOUT( KC_ESC, PS_ERSE, PS_MGWD, PS_EYDR, PS_ZIN, KC_BSPC, @@ -82,11 +84,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; -static bool mac = true;// keymap_config.swap_ctrl_gui -static bool kana = false; +static bool _mode_mac = true;// keymap_config.swap_ctrl_gui +static bool _mode_ja = false; bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { + /* case QMKBEST: if (record->event.pressed) { // when keycode QMKBEST is pressed @@ -103,6 +106,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { // when keycode QMKURL is released } break; + */ } return true; } @@ -116,3 +120,52 @@ void encoder_update_user(uint8_t index, bool clockwise) { } } } + +#ifdef RGBLIGHT_LAYERS + const rgblight_segment_t PROGMEM mode_mac[] = RGBLIGHT_LAYER_SEGMENTS( + {5, 1, HSV_WHITE} + ); + const rgblight_segment_t PROGMEM mode_win[] = RGBLIGHT_LAYER_SEGMENTS( + {5, 1, HSV_TEAL} + ); + const rgblight_segment_t PROGMEM mode_photo[] = RGBLIGHT_LAYER_SEGMENTS( + {11, 1, HSV_TEAL} + ); + const rgblight_segment_t PROGMEM mode_photo1[] = RGBLIGHT_LAYER_SEGMENTS( + {11, 1, HSV_BLUE} + ); + const rgblight_segment_t PROGMEM mode_fn[] = RGBLIGHT_LAYER_SEGMENTS( + {11, 1, HSV_SPRINGGREEN} + ); + const rgblight_segment_t PROGMEM mode_ja[] = RGBLIGHT_LAYER_SEGMENTS( + {17, 1, HSV_ORANGE} + ); + const rgblight_segment_t PROGMEM mode_en[] = RGBLIGHT_LAYER_SEGMENTS( + {17, 1, HSV_YELLOW} + ); + const rgblight_segment_t* const PROGMEM quick17_rgb_layers[] = RGBLIGHT_LAYERS_LIST( + mode_photo, + mode_photo1, + mode_fn, + mode_mac, + mode_win, + mode_ja, + mode_en + ); + void keyboard_post_init_user(void){ + rgblight_layers = quick17_rgb_layers; + } + layer_state_t layer_state_set_user(layer_state_t state){ + rgblight_set_layer_state(0, layer_state_cmp(state, _PHOTO)); + rgblight_set_layer_state(1, layer_state_cmp(state, _PHOTO_SHIFT)); + rgblight_set_layer_state(2, layer_state_cmp(state, _FN)); + return state; + } + bool led_update_user(led_t led_state){ + rgblight_set_layer_state(3, _mode_mac); + rgblight_set_layer_state(4, !_mode_mac); + rgblight_set_layer_state(5, _mode_ja); + rgblight_set_layer_state(6, !_mode_ja); + return true; + } +#endif diff --git a/keyboards/yushakobo/quick17/quick17.c b/keyboards/yushakobo/quick17/quick17.c index 2a48a407cbaa..f3a21a18ac0d 100644 --- a/keyboards/yushakobo/quick17/quick17.c +++ b/keyboards/yushakobo/quick17/quick17.c @@ -34,4 +34,4 @@ led_config_t g_led_config = { 4, 4, 4, 4, 4, 4 } }; -#endif \ No newline at end of file +#endif From d594d30cd85c38584bd3c8a17114ce2d757be3f3 Mon Sep 17 00:00:00 2001 From: keyaki-namiki <28521374+keyaki-namiki@users.noreply.github.com> Date: Thu, 8 Oct 2020 18:22:17 +0900 Subject: [PATCH 06/45] switch to #define to define custom keycodes --- .../quick17/keymaps/default/keymap.c | 75 ++++++++++++------- 1 file changed, 48 insertions(+), 27 deletions(-) diff --git a/keyboards/yushakobo/quick17/keymaps/default/keymap.c b/keyboards/yushakobo/quick17/keymaps/default/keymap.c index 46f75898a594..8932083d3599 100644 --- a/keyboards/yushakobo/quick17/keymaps/default/keymap.c +++ b/keyboards/yushakobo/quick17/keymaps/default/keymap.c @@ -24,27 +24,20 @@ enum layer_names { // Defines the keycodes used by our macros in process_record_user enum custom_keycodes { - PS_CMRL = SAFE_RANGE, - MAC, + MAC = SAFE_RANGE, WIN, - FN, - PS_ZIN, - PS_ZOUT, - PS_CSHR, - PS_CROP, - PS_LLYR, - PS_UNDO, - PS_REDO, - PS_SHIFT, - PS_LANG, - FN_LANG1, - FN_LANG2 -};/* + PS_LANG +}; + +/* PHOTO, FN, */ +#define FN MO(_FN) #define CONTROL DF(_CONTROL) #define PHOTO DF(_PHOTO) +#define PHOTO_S MO(_PHOTO_SHIFT) +#define PS_CMRL KC_LGUI #define PS_ERSE KC_E #define PS_MGWD KC_W #define PS_EYDR KC_I @@ -55,32 +48,40 @@ enum custom_keycodes { #define PS_PEN KC_P #define PS_MOVE KC_V #define PS_ZOOM KC_Z +#define PS_CROP KC_C #define PS_BRSD KC_LBRC #define PS_BRSI KC_RBRC #define PS_BRSP KC_COMM #define PS_BRSN KC_DOT +#define PS_CSHR KC_CAPS + +#define PS_ZIN LGUI(KC_PLUS) +#define PS_ZOUT LGUI(KC_MINS) +#define PS_CLYR SGUI(KC_N)//ctrl shift n +#define PS_UNDO LGUI(KC_Z) +#define PS_REDO SGUI(KC_Z) const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Base */ [_CONTROL] = LAYOUT( - RGB_MOD, EEP_RST, RESET, KC_PGDN, KC_HOME, KC_DEL, + KC_TAB, KC_TAB, KC_UP, KC_PGDN, KC_HOME, KC_DEL, KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, KC_INS, - KC_LSFT, KC_ESC, KC_LALT, KC_SPC, MO(_FN), KC_ENT + KC_LSFT, KC_ESC, KC_LALT, KC_SPC, FN, KC_ENT ), [_PHOTO] = LAYOUT( KC_ESC, PS_ERSE, PS_MGWD, PS_EYDR, PS_ZIN, KC_BSPC, PS_CMRL, PS_SLCT, PS_HAND, PS_LASS, PS_MRQE, PS_PEN, - KC_LSFT, PS_ZOOM, PS_MOVE, KC_LALT, PS_SHIFT,KC_ENT + KC_LSFT, KC_Z, KC_V, KC_LALT, PHOTO_S, KC_ENT ), [_PHOTO_SHIFT] = LAYOUT( KC_ESC, PS_BRSD, PS_BRSI, PS_UNDO, PS_REDO, KC_DEL, - PS_CMRL, PS_BRSP, PS_BRSN, PS_CSHR, PS_CROP, PS_LLYR, + PS_CMRL, PS_BRSP, PS_BRSN, PS_CSHR, PS_CROP, PS_CLYR, KC_LSFT, PS_LANG, CONTROL, _______, _______, _______ ), [_FN] = LAYOUT( - FN_LANG1,FN_LANG2,XXXXXXX, RGB_TOG, KC_MNXT, KC_VOLU, - PHOTO, CONTROL, KC_NO, KC_NO, KC_MPRV, KC_VOLD, - MAC, WIN, KC_NO, KC_NO, _______, KC_MUTE + KC_LANG2,KC_LANG1,XXXXXXX, RGB_TOG, KC_MNXT, KC_VOLU, + PHOTO, CONTROL, KC_NO, RGB_MOD, KC_MPRV, KC_VOLD, + CG_NORM, CG_SWAP, KC_NO, KC_NO, _______, KC_MUTE ) }; @@ -113,10 +114,30 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { void encoder_update_user(uint8_t index, bool clockwise) { if (index == 0) { - if (clockwise) { - tap_code(KC_UP); - } else { - tap_code(KC_DOWN); + switch (layer_state) { + case _CONTROL: + if (clockwise) { + tap_code(KC_WH_U); + } else { + tap_code(KC_WH_D); + } + break; + case _PHOTO: + case _PHOTO_SHIFT: + if (clockwise) { + tap_code(KC_RBRC); + } else { + tap_code(KC_LBRC); + } + break; + case _FN: + if (clockwise) { + tap_code(KC_VOLU); + } else { + tap_code(KC_VOLD); + } + default: + break; } } } @@ -156,12 +177,12 @@ void encoder_update_user(uint8_t index, bool clockwise) { rgblight_layers = quick17_rgb_layers; } layer_state_t layer_state_set_user(layer_state_t state){ - rgblight_set_layer_state(0, layer_state_cmp(state, _PHOTO)); rgblight_set_layer_state(1, layer_state_cmp(state, _PHOTO_SHIFT)); rgblight_set_layer_state(2, layer_state_cmp(state, _FN)); return state; } bool led_update_user(led_t led_state){ + rgblight_set_layer_state(0, layer_state_cmp(layer_state, _PHOTO)); rgblight_set_layer_state(3, _mode_mac); rgblight_set_layer_state(4, !_mode_mac); rgblight_set_layer_state(5, _mode_ja); From e023762b03eefcfedb6e62032fcdefd3fb213d81 Mon Sep 17 00:00:00 2001 From: keyaki-namiki <28521374+keyaki-namiki@users.noreply.github.com> Date: Thu, 8 Oct 2020 18:23:50 +0900 Subject: [PATCH 07/45] add via keymaps --- .../yushakobo/quick17/keymaps/via/keymap.c | 205 ++++++++++++++++++ .../yushakobo/quick17/keymaps/via/readme.md | 1 + .../yushakobo/quick17/keymaps/via/rules.mk | 1 + 3 files changed, 207 insertions(+) create mode 100644 keyboards/yushakobo/quick17/keymaps/via/keymap.c create mode 100644 keyboards/yushakobo/quick17/keymaps/via/readme.md create mode 100644 keyboards/yushakobo/quick17/keymaps/via/rules.mk diff --git a/keyboards/yushakobo/quick17/keymaps/via/keymap.c b/keyboards/yushakobo/quick17/keymaps/via/keymap.c new file mode 100644 index 000000000000..7ec0df4d97d2 --- /dev/null +++ b/keyboards/yushakobo/quick17/keymaps/via/keymap.c @@ -0,0 +1,205 @@ +/* Copyright 2020 yushakobo + * + * 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 +// Defines names for use in layer keycodes and the keymap +enum layer_names { + _CONTROL, + _PHOTO, + _PHOTO_SHIFT, + _FN +}; + +// Defines the keycodes used by our macros in process_record_user +enum custom_keycodes { + PS_LANG = SAFE_RANGE, + FN_LANG +}; + +/* + PHOTO, + FN, +*/ +#define FN MO(_FN) +#define CONTROL DF(_CONTROL) +#define PHOTO DF(_PHOTO) +#define PHOTO_S MO(_PHOTO_SHIFT) +#define MAC CG_NORM +#define WIN CG_SWAP +#define PS_CMRL KC_LGUI +#define PS_ERSE KC_E +#define PS_MGWD KC_W +#define PS_EYDR KC_I +#define PS_SLCT KC_A +#define PS_HAND KC_H +#define PS_LASS KC_L +#define PS_MRQE KC_M +#define PS_PEN KC_P +#define PS_MOVE KC_V +#define PS_ZOOM KC_Z +#define PS_CROP KC_C +#define PS_BRSD KC_LBRC +#define PS_BRSI KC_RBRC +#define PS_BRSP KC_COMM +#define PS_BRSN KC_DOT +#define PS_CSHR KC_CAPS +#define PS_ZIN LGUI(KC_PLUS) +#define PS_ZOUT LGUI(KC_MINS) +#define PS_CLYR SGUI(KC_N)//ctrl shift n +#define PS_UNDO LGUI(KC_Z) +#define PS_REDO SGUI(KC_Z) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* Base */ + [_CONTROL] = LAYOUT( + KC_TAB, KC_PGUP, KC_UP, KC_PGDN, KC_HOME, KC_DEL, + KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, KC_INS, + KC_LSFT, KC_ESC, KC_LALT, KC_SPC, FN, KC_ENT +), + [_PHOTO] = LAYOUT( + KC_ESC, PS_ERSE, PS_MGWD, PS_EYDR, PS_ZIN, KC_BSPC, + PS_CMRL, PS_SLCT, PS_HAND, PS_LASS, PS_MRQE, PS_PEN, + KC_LSFT, KC_Z, KC_V, KC_LALT, PHOTO_S, KC_ENT +), + [_PHOTO_SHIFT] = LAYOUT( + KC_ESC, PS_BRSD, PS_BRSI, PS_UNDO, PS_REDO, KC_DEL, + PS_CMRL, PS_BRSP, PS_BRSN, PS_CSHR, PS_CROP, PS_CLYR, + KC_LSFT, PS_LANG, CONTROL, _______, _______, _______ +), + [_FN] = LAYOUT( + FN_LANG, KC_LANG1,XXXXXXX, RGB_TOG, KC_MNXT, KC_VOLU, + PHOTO, CONTROL, KC_NO, RGB_MOD, KC_MPRV, KC_VOLD, + MAC, WIN, KC_NO, KC_NO, _______, KC_MUTE +) +}; + +static bool _mode_ja = false; + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case PS_LANG: + if (record->event.pressed){ + if(keymap_config.swap_lctl_lgui == true){ + SEND_STRING(SS_LALT("`")); + } else { + if (_mode_ja == false){ + register_code(KC_LANG2); + } else { + register_code(KC_LANG1); + } + } + } else { + if (_mode_ja == false){ + register_code(KC_LANG2); + _mode_ja = true; + } else { + register_code(KC_LANG1); + _mode_ja = false; + } + } + break; + case FN_LANG: + if(record->event.pressed){ + if(keymap_config.swap_lctl_lgui){ + SEND_STRING(SS_LALT("`")); + } else { + register_code(KC_LANG2); + } + } else { + unregister_code(KC_LANG2); + } + break; + } + return true; +} + +void encoder_update_user(uint8_t index, bool clockwise) { + if (index == 0) { + switch (layer_state) { + case _CONTROL: + if (clockwise) { + tap_code(KC_WH_U); + } else { + tap_code(KC_WH_D); + } + break; + case _PHOTO: + case _PHOTO_SHIFT: + if (clockwise) { + tap_code(KC_RBRC); + } else { + tap_code(KC_LBRC); + } + break; + case _FN: + if (clockwise) { + tap_code(KC_VOLU); + } else { + tap_code(KC_VOLD); + } + default: + break; + } + } +} + +#ifdef RGBLIGHT_LAYERS + const rgblight_segment_t PROGMEM mode_mac[] = RGBLIGHT_LAYER_SEGMENTS( + {5, 1, HSV_WHITE} + ); + const rgblight_segment_t PROGMEM mode_win[] = RGBLIGHT_LAYER_SEGMENTS( + {5, 1, HSV_TEAL} + ); + const rgblight_segment_t PROGMEM mode_photo[] = RGBLIGHT_LAYER_SEGMENTS( + {11, 1, HSV_TEAL} + ); + const rgblight_segment_t PROGMEM mode_photo1[] = RGBLIGHT_LAYER_SEGMENTS( + {11, 1, HSV_BLUE} + ); + const rgblight_segment_t PROGMEM mode_fn[] = RGBLIGHT_LAYER_SEGMENTS( + {11, 1, HSV_SPRINGGREEN} + ); + const rgblight_segment_t PROGMEM mode_ja[] = RGBLIGHT_LAYER_SEGMENTS( + {17, 1, HSV_ORANGE} + ); + const rgblight_segment_t PROGMEM mode_en[] = RGBLIGHT_LAYER_SEGMENTS( + {17, 1, HSV_YELLOW} + ); + const rgblight_segment_t* const PROGMEM quick17_rgb_layers[] = RGBLIGHT_LAYERS_LIST( + mode_photo, + mode_photo1, + mode_fn, + mode_mac, + mode_win, + mode_ja, + mode_en + ); + void keyboard_post_init_user(void){ + rgblight_layers = quick17_rgb_layers; + } + layer_state_t layer_state_set_user(layer_state_t state){ + rgblight_set_layer_state(1, layer_state_cmp(state, _PHOTO_SHIFT)); + rgblight_set_layer_state(2, layer_state_cmp(state, _FN)); + return state; + } + bool led_update_user(led_t led_state){ + rgblight_set_layer_state(0, layer_state_cmp(layer_state, _PHOTO)); + rgblight_set_layer_state(3, keymap_config.swap_lctl_lgui); + rgblight_set_layer_state(4, !keymap_config.swap_lctl_lgui); + rgblight_set_layer_state(5, _mode_ja); + rgblight_set_layer_state(6, !_mode_ja); + return true; + } +#endif diff --git a/keyboards/yushakobo/quick17/keymaps/via/readme.md b/keyboards/yushakobo/quick17/keymaps/via/readme.md new file mode 100644 index 000000000000..193d1b834067 --- /dev/null +++ b/keyboards/yushakobo/quick17/keymaps/via/readme.md @@ -0,0 +1 @@ +# The default keymap for quick17 diff --git a/keyboards/yushakobo/quick17/keymaps/via/rules.mk b/keyboards/yushakobo/quick17/keymaps/via/rules.mk new file mode 100644 index 000000000000..036bd6d1c3ec --- /dev/null +++ b/keyboards/yushakobo/quick17/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes \ No newline at end of file From 925013e566298efee45fcd661e3989437dfebb77 Mon Sep 17 00:00:00 2001 From: keyaki-namiki <28521374+keyaki-namiki@users.noreply.github.com> Date: Wed, 14 Oct 2020 20:08:48 +0900 Subject: [PATCH 08/45] modifications in keymaps/*/keymap.c - switch layer name "control" to "base" - add test led color in keymaps/via/keymap.c --- .../quick17/keymaps/default/keymap.c | 12 ++-- .../yushakobo/quick17/keymaps/via/keymap.c | 67 ++++++++++++------- 2 files changed, 49 insertions(+), 30 deletions(-) diff --git a/keyboards/yushakobo/quick17/keymaps/default/keymap.c b/keyboards/yushakobo/quick17/keymaps/default/keymap.c index 8932083d3599..f1d9bf93a168 100644 --- a/keyboards/yushakobo/quick17/keymaps/default/keymap.c +++ b/keyboards/yushakobo/quick17/keymaps/default/keymap.c @@ -16,7 +16,7 @@ #include QMK_KEYBOARD_H // Defines names for use in layer keycodes and the keymap enum layer_names { - _CONTROL, + _BASE, _PHOTO, _PHOTO_SHIFT, _FN @@ -34,7 +34,7 @@ enum custom_keycodes { FN, */ #define FN MO(_FN) -#define CONTROL DF(_CONTROL) +#define BASE DF(_BASE) #define PHOTO DF(_PHOTO) #define PHOTO_S MO(_PHOTO_SHIFT) #define PS_CMRL KC_LGUI @@ -63,7 +63,7 @@ enum custom_keycodes { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Base */ - [_CONTROL] = LAYOUT( + [_BASE] = LAYOUT( KC_TAB, KC_TAB, KC_UP, KC_PGDN, KC_HOME, KC_DEL, KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, KC_INS, KC_LSFT, KC_ESC, KC_LALT, KC_SPC, FN, KC_ENT @@ -76,11 +76,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_PHOTO_SHIFT] = LAYOUT( KC_ESC, PS_BRSD, PS_BRSI, PS_UNDO, PS_REDO, KC_DEL, PS_CMRL, PS_BRSP, PS_BRSN, PS_CSHR, PS_CROP, PS_CLYR, - KC_LSFT, PS_LANG, CONTROL, _______, _______, _______ + KC_LSFT, PS_LANG, BASE, _______, _______, _______ ), [_FN] = LAYOUT( KC_LANG2,KC_LANG1,XXXXXXX, RGB_TOG, KC_MNXT, KC_VOLU, - PHOTO, CONTROL, KC_NO, RGB_MOD, KC_MPRV, KC_VOLD, + PHOTO, BASE, KC_NO, RGB_MOD, KC_MPRV, KC_VOLD, CG_NORM, CG_SWAP, KC_NO, KC_NO, _______, KC_MUTE ) }; @@ -115,7 +115,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { void encoder_update_user(uint8_t index, bool clockwise) { if (index == 0) { switch (layer_state) { - case _CONTROL: + case _BASE: if (clockwise) { tap_code(KC_WH_U); } else { diff --git a/keyboards/yushakobo/quick17/keymaps/via/keymap.c b/keyboards/yushakobo/quick17/keymaps/via/keymap.c index 7ec0df4d97d2..d99cb045de98 100644 --- a/keyboards/yushakobo/quick17/keymaps/via/keymap.c +++ b/keyboards/yushakobo/quick17/keymaps/via/keymap.c @@ -16,7 +16,7 @@ #include QMK_KEYBOARD_H // Defines names for use in layer keycodes and the keymap enum layer_names { - _CONTROL, + _BASE, _PHOTO, _PHOTO_SHIFT, _FN @@ -33,7 +33,7 @@ enum custom_keycodes { FN, */ #define FN MO(_FN) -#define CONTROL DF(_CONTROL) +#define BASE DF(_BASE) #define PHOTO DF(_PHOTO) #define PHOTO_S MO(_PHOTO_SHIFT) #define MAC CG_NORM @@ -63,9 +63,9 @@ enum custom_keycodes { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Base */ - [_CONTROL] = LAYOUT( - KC_TAB, KC_PGUP, KC_UP, KC_PGDN, KC_HOME, KC_DEL, - KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, KC_INS, + [_BASE] = LAYOUT( + KC_TAB, KC_PGUP, KC_UP, KC_PGDN, KC_HOME, KC_INS, + KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, KC_DEL, KC_LSFT, KC_ESC, KC_LALT, KC_SPC, FN, KC_ENT ), [_PHOTO] = LAYOUT( @@ -76,11 +76,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_PHOTO_SHIFT] = LAYOUT( KC_ESC, PS_BRSD, PS_BRSI, PS_UNDO, PS_REDO, KC_DEL, PS_CMRL, PS_BRSP, PS_BRSN, PS_CSHR, PS_CROP, PS_CLYR, - KC_LSFT, PS_LANG, CONTROL, _______, _______, _______ + KC_LSFT, PS_LANG, BASE, _______, _______, _______ ), [_FN] = LAYOUT( FN_LANG, KC_LANG1,XXXXXXX, RGB_TOG, KC_MNXT, KC_VOLU, - PHOTO, CONTROL, KC_NO, RGB_MOD, KC_MPRV, KC_VOLD, + PHOTO, BASE, KC_NO, RGB_MOD, KC_MPRV, KC_VOLD, MAC, WIN, KC_NO, KC_NO, _______, KC_MUTE ) }; @@ -102,10 +102,10 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } } else { if (_mode_ja == false){ - register_code(KC_LANG2); + unregister_code(KC_LANG2); _mode_ja = true; } else { - register_code(KC_LANG1); + unregister_code(KC_LANG1); _mode_ja = false; } } @@ -128,7 +128,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { void encoder_update_user(uint8_t index, bool clockwise) { if (index == 0) { switch (layer_state) { - case _CONTROL: + case _BASE: if (clockwise) { tap_code(KC_WH_U); } else { @@ -156,28 +156,43 @@ void encoder_update_user(uint8_t index, bool clockwise) { } #ifdef RGBLIGHT_LAYERS +#define RGBINDICATOR_TEST_A HSV_RED +#define RGBINDICATOR_TEST_B HSV_BLUE +#define RGBINDICATOR_TEST_C HSV_WHITE +#define RGBINDICATOR_TEST_D HSV_GREEN const rgblight_segment_t PROGMEM mode_mac[] = RGBLIGHT_LAYER_SEGMENTS( - {5, 1, HSV_WHITE} + {5, 1, RGBINDICATOR_TEST_A} +// {5, 1, HSV_WHITE} ); const rgblight_segment_t PROGMEM mode_win[] = RGBLIGHT_LAYER_SEGMENTS( - {5, 1, HSV_TEAL} + {5, 1, RGBINDICATOR_TEST_B} +// {5, 1, HSV_TEAL} + ); + const rgblight_segment_t PROGMEM mode_base[] = RGBLIGHT_LAYER_SEGMENTS( + {11, 1, RGBINDICATOR_TEST_D} ); const rgblight_segment_t PROGMEM mode_photo[] = RGBLIGHT_LAYER_SEGMENTS( - {11, 1, HSV_TEAL} + {11, 1, RGBINDICATOR_TEST_A} +// {11, 1, HSV_TEAL} ); const rgblight_segment_t PROGMEM mode_photo1[] = RGBLIGHT_LAYER_SEGMENTS( - {11, 1, HSV_BLUE} + {11, 1, RGBINDICATOR_TEST_B} +// {11, 1, HSV_BLUE} ); const rgblight_segment_t PROGMEM mode_fn[] = RGBLIGHT_LAYER_SEGMENTS( - {11, 1, HSV_SPRINGGREEN} + {11, 1, RGBINDICATOR_TEST_C} +// {11, 1, HSV_SPRINGGREEN} ); const rgblight_segment_t PROGMEM mode_ja[] = RGBLIGHT_LAYER_SEGMENTS( - {17, 1, HSV_ORANGE} + {17, 1, RGBINDICATOR_TEST_A} +// {17, 1, HSV_ORANGE} ); const rgblight_segment_t PROGMEM mode_en[] = RGBLIGHT_LAYER_SEGMENTS( - {17, 1, HSV_YELLOW} + {17, 1, RGBINDICATOR_TEST_B} +// {17, 1, HSV_YELLOW} ); const rgblight_segment_t* const PROGMEM quick17_rgb_layers[] = RGBLIGHT_LAYERS_LIST( + mode_base, mode_photo, mode_photo1, mode_fn, @@ -188,18 +203,22 @@ void encoder_update_user(uint8_t index, bool clockwise) { ); void keyboard_post_init_user(void){ rgblight_layers = quick17_rgb_layers; + } layer_state_t layer_state_set_user(layer_state_t state){ - rgblight_set_layer_state(1, layer_state_cmp(state, _PHOTO_SHIFT)); - rgblight_set_layer_state(2, layer_state_cmp(state, _FN)); + rgblight_set_layer_state(0, layer_state_cmp(state, _BASE)); + rgblight_set_layer_state(1, layer_state_cmp(state, _PHOTO)); + rgblight_set_layer_state(2, layer_state_cmp(state, _PHOTO_SHIFT)); + rgblight_set_layer_state(3, layer_state_cmp(state, _FN)); + rgblight_set_layer_state(4, keymap_config.swap_lctl_lgui == true); + rgblight_set_layer_state(5, keymap_config.swap_lctl_lgui == false); + rgblight_set_layer_state(6, _mode_ja); + rgblight_set_layer_state(7, !_mode_ja); return state; } + /* bool led_update_user(led_t led_state){ - rgblight_set_layer_state(0, layer_state_cmp(layer_state, _PHOTO)); - rgblight_set_layer_state(3, keymap_config.swap_lctl_lgui); - rgblight_set_layer_state(4, !keymap_config.swap_lctl_lgui); - rgblight_set_layer_state(5, _mode_ja); - rgblight_set_layer_state(6, !_mode_ja); return true; } + */ #endif From 4b7eb45b94575b717adf7344cb55ab34bfaf7f4f Mon Sep 17 00:00:00 2001 From: keyaki-namiki <28521374+keyaki-namiki@users.noreply.github.com> Date: Thu, 5 Nov 2020 11:29:05 +0900 Subject: [PATCH 09/45] cleanup some lines --- keyboards/yushakobo/quick17/keymaps/default/keymap.c | 6 +++--- keyboards/yushakobo/quick17/keymaps/via/keymap.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/keyboards/yushakobo/quick17/keymaps/default/keymap.c b/keyboards/yushakobo/quick17/keymaps/default/keymap.c index f1d9bf93a168..29681766841c 100644 --- a/keyboards/yushakobo/quick17/keymaps/default/keymap.c +++ b/keyboards/yushakobo/quick17/keymaps/default/keymap.c @@ -64,7 +64,7 @@ enum custom_keycodes { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Base */ [_BASE] = LAYOUT( - KC_TAB, KC_TAB, KC_UP, KC_PGDN, KC_HOME, KC_DEL, + KC_TAB, KC_PGUP, KC_UP, KC_PGDN, KC_HOME, KC_DEL, KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, KC_INS, KC_LSFT, KC_ESC, KC_LALT, KC_SPC, FN, KC_ENT ), @@ -76,11 +76,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_PHOTO_SHIFT] = LAYOUT( KC_ESC, PS_BRSD, PS_BRSI, PS_UNDO, PS_REDO, KC_DEL, PS_CMRL, PS_BRSP, PS_BRSN, PS_CSHR, PS_CROP, PS_CLYR, - KC_LSFT, PS_LANG, BASE, _______, _______, _______ + KC_LSFT, PS_LANG, BASE, _______, _______, _______ ), [_FN] = LAYOUT( KC_LANG2,KC_LANG1,XXXXXXX, RGB_TOG, KC_MNXT, KC_VOLU, - PHOTO, BASE, KC_NO, RGB_MOD, KC_MPRV, KC_VOLD, + PHOTO, BASE, KC_NO, RGB_MOD, KC_MPRV, KC_VOLD, CG_NORM, CG_SWAP, KC_NO, KC_NO, _______, KC_MUTE ) }; diff --git a/keyboards/yushakobo/quick17/keymaps/via/keymap.c b/keyboards/yushakobo/quick17/keymaps/via/keymap.c index d99cb045de98..b535cd9bd72a 100644 --- a/keyboards/yushakobo/quick17/keymaps/via/keymap.c +++ b/keyboards/yushakobo/quick17/keymaps/via/keymap.c @@ -76,11 +76,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_PHOTO_SHIFT] = LAYOUT( KC_ESC, PS_BRSD, PS_BRSI, PS_UNDO, PS_REDO, KC_DEL, PS_CMRL, PS_BRSP, PS_BRSN, PS_CSHR, PS_CROP, PS_CLYR, - KC_LSFT, PS_LANG, BASE, _______, _______, _______ + KC_LSFT, PS_LANG, BASE, _______, _______, _______ ), [_FN] = LAYOUT( FN_LANG, KC_LANG1,XXXXXXX, RGB_TOG, KC_MNXT, KC_VOLU, - PHOTO, BASE, KC_NO, RGB_MOD, KC_MPRV, KC_VOLD, + PHOTO, BASE, KC_NO, RGB_MOD, KC_MPRV, KC_VOLD, MAC, WIN, KC_NO, KC_NO, _______, KC_MUTE ) }; From 53e49e73dafd0f8596a7fb3c8a79a6a1ee597927 Mon Sep 17 00:00:00 2001 From: keyaki-namiki <28521374+keyaki-namiki@users.noreply.github.com> Date: Thu, 12 Nov 2020 19:11:53 +0900 Subject: [PATCH 10/45] switch to use ProMicro --- keyboards/yushakobo/quick17/config.h | 8 ++++---- keyboards/yushakobo/quick17/rules.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/keyboards/yushakobo/quick17/config.h b/keyboards/yushakobo/quick17/config.h index 330af377656c..79e4487e8e86 100644 --- a/keyboards/yushakobo/quick17/config.h +++ b/keyboards/yushakobo/quick17/config.h @@ -40,8 +40,8 @@ along with this program. If not, see . * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) * */ -#define MATRIX_ROW_PINS { B7, C5, B4 } -#define MATRIX_COL_PINS { B5, C2, D1, D2, D3, D4 } +#define MATRIX_ROW_PINS { F4, B3, B6 } +#define MATRIX_COL_PINS { F5, D4, E6, F7, C6, D7 } #define UNUSED_PINS /* COL2ROW, ROW2COL */ @@ -56,9 +56,9 @@ along with this program. If not, see . //#define BACKLIGHT_LEVELS 3 //#define BACKLIGHT_BREATHING -#define RGB_DI_PIN C6 +#define RGB_DI_PIN D2 #define RGBLED_NUM 18 -#define RGBLIGHT_LED_MAP { 6, 12, 13, 14, 15, 16, 17, 11, 10, 9, 8, 7, 0, 1, 2, 3, 4, 5 } +// #define RGBLIGHT_LED_MAP { 6, 12, 13, 14, 15, 16, 17, 11, 10, 9, 8, 7, 0, 1, 2, 3, 4, 5 } #ifdef RGBLIGHT_ENABLE # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/yushakobo/quick17/rules.mk b/keyboards/yushakobo/quick17/rules.mk index a168db5182b6..258240648775 100644 --- a/keyboards/yushakobo/quick17/rules.mk +++ b/keyboards/yushakobo/quick17/rules.mk @@ -1,5 +1,5 @@ # MCU name -MCU = atmega32u2 +MCU = atmega32u4 # Bootloader selection BOOTLOADER = atmel-dfu From 3aaf6884b588528070d329e7acba4e24fe2d854f Mon Sep 17 00:00:00 2001 From: keyaki-namiki <28521374+keyaki-namiki@users.noreply.github.com> Date: Sat, 13 Feb 2021 15:15:11 +0900 Subject: [PATCH 11/45] update config.h --- keyboards/yushakobo/quick17/config.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/keyboards/yushakobo/quick17/config.h b/keyboards/yushakobo/quick17/config.h index 79e4487e8e86..daf72655426d 100644 --- a/keyboards/yushakobo/quick17/config.h +++ b/keyboards/yushakobo/quick17/config.h @@ -21,7 +21,7 @@ along with this program. If not, see . /* USB Device descriptor parameter */ #define VENDOR_ID 0x3265 -#define PRODUCT_ID 0x0005 +#define PRODUCT_ID 0x0006 #define DEVICE_VER 0x0001 #define MANUFACTURER yushakobo #define PRODUCT quick17 @@ -89,6 +89,11 @@ along with this program. If not, see . #endif +#ifdef ENCODER_ENABLE +#define ENCODERS_PAD_A { B4 } +#define ENCODERS_PAD_B { B5 } +#endif + /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ #define DEBOUNCE 5 From 06ca08d660398fe24868540fb997c94d9af9e63b Mon Sep 17 00:00:00 2001 From: keyaki-namiki <28521374+keyaki-namiki@users.noreply.github.com> Date: Wed, 17 Feb 2021 14:50:31 +0900 Subject: [PATCH 12/45] clean up default keymaps on yushakobo/quick17 --- .../quick17/keymaps/default/keymap.c | 261 ++++++++---------- 1 file changed, 111 insertions(+), 150 deletions(-) diff --git a/keyboards/yushakobo/quick17/keymaps/default/keymap.c b/keyboards/yushakobo/quick17/keymaps/default/keymap.c index 29681766841c..d870f178e828 100644 --- a/keyboards/yushakobo/quick17/keymaps/default/keymap.c +++ b/keyboards/yushakobo/quick17/keymaps/default/keymap.c @@ -14,179 +14,140 @@ * along with this program. If not, see . */ #include QMK_KEYBOARD_H -// Defines names for use in layer keycodes and the keymap -enum layer_names { - _BASE, - _PHOTO, - _PHOTO_SHIFT, - _FN -}; // Defines the keycodes used by our macros in process_record_user enum custom_keycodes { - MAC = SAFE_RANGE, - WIN, - PS_LANG -}; + BASE = SAFE_RANGE, + KC_LSPC, -/* - PHOTO, - FN, -*/ -#define FN MO(_FN) -#define BASE DF(_BASE) -#define PHOTO DF(_PHOTO) -#define PHOTO_S MO(_PHOTO_SHIFT) -#define PS_CMRL KC_LGUI -#define PS_ERSE KC_E -#define PS_MGWD KC_W -#define PS_EYDR KC_I -#define PS_SLCT KC_A -#define PS_HAND KC_H -#define PS_LASS KC_L -#define PS_MRQE KC_M -#define PS_PEN KC_P -#define PS_MOVE KC_V -#define PS_ZOOM KC_Z -#define PS_CROP KC_C -#define PS_BRSD KC_LBRC -#define PS_BRSI KC_RBRC -#define PS_BRSP KC_COMM -#define PS_BRSN KC_DOT -#define PS_CSHR KC_CAPS -#define PS_ZIN LGUI(KC_PLUS) -#define PS_ZOUT LGUI(KC_MINS) -#define PS_CLYR SGUI(KC_N)//ctrl shift n -#define PS_UNDO LGUI(KC_Z) -#define PS_REDO SGUI(KC_Z) +}; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Base */ - [_BASE] = LAYOUT( - KC_TAB, KC_PGUP, KC_UP, KC_PGDN, KC_HOME, KC_DEL, - KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, KC_INS, - KC_LSFT, KC_ESC, KC_LALT, KC_SPC, FN, KC_ENT + LAYOUT( + KC_TAB, KC_PGUP,KC_UP, KC_PGDN,KC_HOME,KC_INS, + KC_LCTL,KC_LEFT,KC_DOWN,KC_RGHT,KC_END, KC_DEL, + KC_LSFT,KC_LGUI,KC_ESC, KC_LALT,KC_SPC, DF(1) ), - [_PHOTO] = LAYOUT( - KC_ESC, PS_ERSE, PS_MGWD, PS_EYDR, PS_ZIN, KC_BSPC, - PS_CMRL, PS_SLCT, PS_HAND, PS_LASS, PS_MRQE, PS_PEN, - KC_LSFT, KC_Z, KC_V, KC_LALT, PHOTO_S, KC_ENT + LAYOUT( + KC_ESC, KC_W, KC_E, KC_R, KC_Y, KC_BSPC, + KC_LCTL,KC_A, KC_D, KC_F, KC_H, LCTL(KC_Z), + KC_LSFT,KC_X, KC_V, KC_B, KC_LSPC,LCTL(KC_S) ), - [_PHOTO_SHIFT] = LAYOUT( - KC_ESC, PS_BRSD, PS_BRSI, PS_UNDO, PS_REDO, KC_DEL, - PS_CMRL, PS_BRSP, PS_BRSN, PS_CSHR, PS_CROP, PS_CLYR, - KC_LSFT, PS_LANG, BASE, _______, _______, _______ + LAYOUT( + KC_ESC, KC_Q, KC_BTN3,KC_INS, KC_NO, KC_NO, + KC_LCTL,KC_LBRC,KC_RBRC,KC_PGDN,KC_PGUP,LCTL(KC_Y), + KC_LSFT,DF(3), KC_NO, DF(0), _______,KC_NO ), - [_FN] = LAYOUT( - KC_LANG2,KC_LANG1,XXXXXXX, RGB_TOG, KC_MNXT, KC_VOLU, - PHOTO, BASE, KC_NO, RGB_MOD, KC_MPRV, KC_VOLD, - CG_NORM, CG_SWAP, KC_NO, KC_NO, _______, KC_MUTE + LAYOUT( + KC_ESC, KC_P0, KC_P7, KC_P8, KC_P9, KC_NLCK, + KC_TAB, KC_PDOT,KC_P4, KC_P5, KC_P6, KC_BSPC, + KC_LSFT,KC_ENT, KC_P1, KC_P2, KC_P3, DF(2) ) }; -static bool _mode_mac = true;// keymap_config.swap_ctrl_gui -static bool _mode_ja = false; +static bool layer_shift = false; bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { - /* - case QMKBEST: - if (record->event.pressed) { - // when keycode QMKBEST is pressed - SEND_STRING("QMK is the best thing ever!"); - } else { - // when keycode QMKBEST is released + case KC_LSPC: + if (record->event.pressed){ + layer_shift = 1; + layer_on(2); + }else{ + layer_off(2); + if(layer_shift){ + register_code(KC_SPC); + unregister_code(KC_SPC); + } } + return false; break; - case QMKURL: - if (record->event.pressed) { - // when keycode QMKURL is pressed - SEND_STRING("https://qmk.fm/\n"); - } else { - // when keycode QMKURL is released + default: + if (record->event.pressed){ + layer_shift = 0; } break; - */ } return true; } -void encoder_update_user(uint8_t index, bool clockwise) { - if (index == 0) { - switch (layer_state) { - case _BASE: - if (clockwise) { - tap_code(KC_WH_U); - } else { - tap_code(KC_WH_D); - } - break; - case _PHOTO: - case _PHOTO_SHIFT: - if (clockwise) { - tap_code(KC_RBRC); - } else { - tap_code(KC_LBRC); - } - break; - case _FN: - if (clockwise) { - tap_code(KC_VOLU); - } else { - tap_code(KC_VOLD); - } - default: - break; - } - } -} +//void encoder_update_user(uint8_t index, bool clockwise) { +// if (index == 0) { +// switch (layer_state) { +// case _BASE: +// if (clockwise) { +// tap_code(KC_WH_U); +// } else { +// tap_code(KC_WH_D); +// } +// break; +// case _PHOTO: +// case _PHOTO_SHIFT: +// if (clockwise) { +// tap_code(KC_RBRC); +// } else { +// tap_code(KC_LBRC); +// } +// break; +// case _FN: +// if (clockwise) { +// tap_code(KC_VOLU); +// } else { +// tap_code(KC_VOLD); +// } +// default: +// break; +// } +// } +//} -#ifdef RGBLIGHT_LAYERS - const rgblight_segment_t PROGMEM mode_mac[] = RGBLIGHT_LAYER_SEGMENTS( - {5, 1, HSV_WHITE} - ); - const rgblight_segment_t PROGMEM mode_win[] = RGBLIGHT_LAYER_SEGMENTS( - {5, 1, HSV_TEAL} - ); - const rgblight_segment_t PROGMEM mode_photo[] = RGBLIGHT_LAYER_SEGMENTS( - {11, 1, HSV_TEAL} - ); - const rgblight_segment_t PROGMEM mode_photo1[] = RGBLIGHT_LAYER_SEGMENTS( - {11, 1, HSV_BLUE} - ); - const rgblight_segment_t PROGMEM mode_fn[] = RGBLIGHT_LAYER_SEGMENTS( - {11, 1, HSV_SPRINGGREEN} - ); - const rgblight_segment_t PROGMEM mode_ja[] = RGBLIGHT_LAYER_SEGMENTS( - {17, 1, HSV_ORANGE} - ); - const rgblight_segment_t PROGMEM mode_en[] = RGBLIGHT_LAYER_SEGMENTS( - {17, 1, HSV_YELLOW} - ); - const rgblight_segment_t* const PROGMEM quick17_rgb_layers[] = RGBLIGHT_LAYERS_LIST( - mode_photo, - mode_photo1, - mode_fn, - mode_mac, - mode_win, - mode_ja, - mode_en - ); - void keyboard_post_init_user(void){ - rgblight_layers = quick17_rgb_layers; - } - layer_state_t layer_state_set_user(layer_state_t state){ - rgblight_set_layer_state(1, layer_state_cmp(state, _PHOTO_SHIFT)); - rgblight_set_layer_state(2, layer_state_cmp(state, _FN)); - return state; - } - bool led_update_user(led_t led_state){ - rgblight_set_layer_state(0, layer_state_cmp(layer_state, _PHOTO)); - rgblight_set_layer_state(3, _mode_mac); - rgblight_set_layer_state(4, !_mode_mac); - rgblight_set_layer_state(5, _mode_ja); - rgblight_set_layer_state(6, !_mode_ja); - return true; - } -#endif +// #ifdef RGBLIGHT_LAYERS +// const rgblight_segment_t PROGMEM mode_mac[] = RGBLIGHT_LAYER_SEGMENTS( +// {5, 1, HSV_WHITE} +// ); +// const rgblight_segment_t PROGMEM mode_win[] = RGBLIGHT_LAYER_SEGMENTS( +// {5, 1, HSV_TEAL} +// ); +// const rgblight_segment_t PROGMEM mode_photo[] = RGBLIGHT_LAYER_SEGMENTS( +// {11, 1, HSV_TEAL} +// ); +// const rgblight_segment_t PROGMEM mode_photo1[] = RGBLIGHT_LAYER_SEGMENTS( +// {11, 1, HSV_BLUE} +// ); +// const rgblight_segment_t PROGMEM mode_fn[] = RGBLIGHT_LAYER_SEGMENTS( +// {11, 1, HSV_SPRINGGREEN} +// ); +// const rgblight_segment_t PROGMEM mode_ja[] = RGBLIGHT_LAYER_SEGMENTS( +// {17, 1, HSV_ORANGE} +// ); +// const rgblight_segment_t PROGMEM mode_en[] = RGBLIGHT_LAYER_SEGMENTS( +// {17, 1, HSV_YELLOW} +// ); +// const rgblight_segment_t* const PROGMEM quick17_rgb_layers[] = RGBLIGHT_LAYERS_LIST( +// mode_photo, +// mode_photo1, +// mode_fn, +// mode_mac, +// mode_win, +// mode_ja, +// mode_en +// ); +// void keyboard_post_init_user(void){ +// rgblight_layers = quick17_rgb_layers; +// } +// layer_state_t layer_state_set_user(layer_state_t state){ +// rgblight_set_layer_state(1, layer_state_cmp(state, _PHOTO_SHIFT)); +// rgblight_set_layer_state(2, layer_state_cmp(state, _FN)); +// return state; +// } +// bool led_update_user(led_t led_state){ +// rgblight_set_layer_state(0, layer_state_cmp(layer_state, _PHOTO)); +// rgblight_set_layer_state(3, _mode_mac); +// rgblight_set_layer_state(4, !_mode_mac); +// rgblight_set_layer_state(5, _mode_ja); +// rgblight_set_layer_state(6, !_mode_ja); +// return true; +// } +// #endif From 03080d76fd3520b17a383035bb8eb3762c62f92e Mon Sep 17 00:00:00 2001 From: keyaki-namiki <28521374+keyaki-namiki@users.noreply.github.com> Date: Wed, 17 Feb 2021 14:51:36 +0900 Subject: [PATCH 13/45] change bootloader to caterina --- keyboards/yushakobo/quick17/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/yushakobo/quick17/rules.mk b/keyboards/yushakobo/quick17/rules.mk index 258240648775..8d357cd278dd 100644 --- a/keyboards/yushakobo/quick17/rules.mk +++ b/keyboards/yushakobo/quick17/rules.mk @@ -2,7 +2,7 @@ MCU = atmega32u4 # Bootloader selection -BOOTLOADER = atmel-dfu +BOOTLOADER = caterina # Build Options # change yes to no to disable From 94572dfdf7d27708579a8856ec51f75502a2beb8 Mon Sep 17 00:00:00 2001 From: keyaki-namiki <28521374+keyaki-namiki@users.noreply.github.com> Date: Thu, 15 Apr 2021 15:42:53 +0900 Subject: [PATCH 14/45] update default keymaps --- .../quick17/keymaps/default/keymap.c | 135 +++++++----------- 1 file changed, 48 insertions(+), 87 deletions(-) diff --git a/keyboards/yushakobo/quick17/keymaps/default/keymap.c b/keyboards/yushakobo/quick17/keymaps/default/keymap.c index d870f178e828..27aafcf1d5f7 100644 --- a/keyboards/yushakobo/quick17/keymaps/default/keymap.c +++ b/keyboards/yushakobo/quick17/keymaps/default/keymap.c @@ -18,32 +18,37 @@ // Defines the keycodes used by our macros in process_record_user enum custom_keycodes { BASE = SAFE_RANGE, - KC_LSPC, - + KC_LSPC +}; +enum layer_names { + _CONTROL, + _EDIT1, + _EDIT2, + _NUMPAD }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Base */ - LAYOUT( + [_CONTROL] = LAYOUT( KC_TAB, KC_PGUP,KC_UP, KC_PGDN,KC_HOME,KC_INS, KC_LCTL,KC_LEFT,KC_DOWN,KC_RGHT,KC_END, KC_DEL, - KC_LSFT,KC_LGUI,KC_ESC, KC_LALT,KC_SPC, DF(1) + KC_LSFT,KC_LGUI,KC_ESC, KC_LALT,KC_SPC, TO(1) ), - LAYOUT( + [_EDIT1] = LAYOUT( KC_ESC, KC_W, KC_E, KC_R, KC_Y, KC_BSPC, KC_LCTL,KC_A, KC_D, KC_F, KC_H, LCTL(KC_Z), KC_LSFT,KC_X, KC_V, KC_B, KC_LSPC,LCTL(KC_S) ), - LAYOUT( - KC_ESC, KC_Q, KC_BTN3,KC_INS, KC_NO, KC_NO, + [_EDIT2] = LAYOUT( + KC_ESC, KC_Q, KC_BTN3,KC_INS, KC_NO, KC_DEL, KC_LCTL,KC_LBRC,KC_RBRC,KC_PGDN,KC_PGUP,LCTL(KC_Y), - KC_LSFT,DF(3), KC_NO, DF(0), _______,KC_NO + KC_LSFT,TO(3), RGB_TOG,TO(0), _______,RESET ), - LAYOUT( + [_NUMPAD] = LAYOUT( KC_ESC, KC_P0, KC_P7, KC_P8, KC_P9, KC_NLCK, KC_TAB, KC_PDOT,KC_P4, KC_P5, KC_P6, KC_BSPC, - KC_LSFT,KC_ENT, KC_P1, KC_P2, KC_P3, DF(2) + KC_LSFT,KC_ENT, KC_P1, KC_P2, KC_P3, TO(1) ) }; @@ -73,81 +78,37 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { return true; } -//void encoder_update_user(uint8_t index, bool clockwise) { -// if (index == 0) { -// switch (layer_state) { -// case _BASE: -// if (clockwise) { -// tap_code(KC_WH_U); -// } else { -// tap_code(KC_WH_D); -// } -// break; -// case _PHOTO: -// case _PHOTO_SHIFT: -// if (clockwise) { -// tap_code(KC_RBRC); -// } else { -// tap_code(KC_LBRC); -// } -// break; -// case _FN: -// if (clockwise) { -// tap_code(KC_VOLU); -// } else { -// tap_code(KC_VOLD); -// } -// default: -// break; -// } -// } -//} +void encoder_update_user(uint8_t index, bool clockwise){ + if (index == 0) { + if (IS_LAYER_ON(_EDIT1) && !layer_shift){ + if (clockwise) { + tap_code(KC_WH_U); + } else { + tap_code(KC_WH_D); + } + } else if (IS_LAYER_ON(_EDIT2)){ + if (clockwise) { + tap_code(KC_LBRC); + } else { + tap_code(KC_RBRC); + } + } else if (IS_LAYER_ON(_NUMPAD)){ + if (clockwise) { + tap_code(KC_UP); + } else { + tap_code(KC_DOWN); + } + } else { // IS_LAYER_ON(_CONTROL) + if (clockwise) { + tap_code(KC_VOLU); + } else { + tap_code(KC_VOLD); + } + } + + } +} -// #ifdef RGBLIGHT_LAYERS -// const rgblight_segment_t PROGMEM mode_mac[] = RGBLIGHT_LAYER_SEGMENTS( -// {5, 1, HSV_WHITE} -// ); -// const rgblight_segment_t PROGMEM mode_win[] = RGBLIGHT_LAYER_SEGMENTS( -// {5, 1, HSV_TEAL} -// ); -// const rgblight_segment_t PROGMEM mode_photo[] = RGBLIGHT_LAYER_SEGMENTS( -// {11, 1, HSV_TEAL} -// ); -// const rgblight_segment_t PROGMEM mode_photo1[] = RGBLIGHT_LAYER_SEGMENTS( -// {11, 1, HSV_BLUE} -// ); -// const rgblight_segment_t PROGMEM mode_fn[] = RGBLIGHT_LAYER_SEGMENTS( -// {11, 1, HSV_SPRINGGREEN} -// ); -// const rgblight_segment_t PROGMEM mode_ja[] = RGBLIGHT_LAYER_SEGMENTS( -// {17, 1, HSV_ORANGE} -// ); -// const rgblight_segment_t PROGMEM mode_en[] = RGBLIGHT_LAYER_SEGMENTS( -// {17, 1, HSV_YELLOW} -// ); -// const rgblight_segment_t* const PROGMEM quick17_rgb_layers[] = RGBLIGHT_LAYERS_LIST( -// mode_photo, -// mode_photo1, -// mode_fn, -// mode_mac, -// mode_win, -// mode_ja, -// mode_en -// ); -// void keyboard_post_init_user(void){ -// rgblight_layers = quick17_rgb_layers; -// } -// layer_state_t layer_state_set_user(layer_state_t state){ -// rgblight_set_layer_state(1, layer_state_cmp(state, _PHOTO_SHIFT)); -// rgblight_set_layer_state(2, layer_state_cmp(state, _FN)); -// return state; -// } -// bool led_update_user(led_t led_state){ -// rgblight_set_layer_state(0, layer_state_cmp(layer_state, _PHOTO)); -// rgblight_set_layer_state(3, _mode_mac); -// rgblight_set_layer_state(4, !_mode_mac); -// rgblight_set_layer_state(5, _mode_ja); -// rgblight_set_layer_state(6, !_mode_ja); -// return true; -// } -// #endif +void keyboard_post_init_user(void){ + rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL); +} \ No newline at end of file From b05e5f57b261298e49c5d060c7bd14d3083e86cc Mon Sep 17 00:00:00 2001 From: keyaki-namiki <28521374+keyaki-namiki@users.noreply.github.com> Date: Thu, 22 Apr 2021 14:25:10 +0900 Subject: [PATCH 15/45] changed the order of the LEDs --- keyboards/yushakobo/quick17/config.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/keyboards/yushakobo/quick17/config.h b/keyboards/yushakobo/quick17/config.h index daf72655426d..8c294c05f227 100644 --- a/keyboards/yushakobo/quick17/config.h +++ b/keyboards/yushakobo/quick17/config.h @@ -58,7 +58,11 @@ along with this program. If not, see . #define RGB_DI_PIN D2 #define RGBLED_NUM 18 -// #define RGBLIGHT_LED_MAP { 6, 12, 13, 14, 15, 16, 17, 11, 10, 9, 8, 7, 0, 1, 2, 3, 4, 5 } +#define RGBLIGHT_LED_MAP {\ + 6, 7, 12, 13, 14, 15,\ + 16, 17, 11, 10, 9, 8,\ + 0, 1, 2, 3, 4, 5\ +} #ifdef RGBLIGHT_ENABLE # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 From 946b77f404d150bf31b639060d8d578c96a4b219 Mon Sep 17 00:00:00 2001 From: keyaki-namiki <28521374+keyaki-namiki@users.noreply.github.com> Date: Thu, 22 Apr 2021 14:27:01 +0900 Subject: [PATCH 16/45] enable rotary encoder --- keyboards/yushakobo/quick17/rules.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/yushakobo/quick17/rules.mk b/keyboards/yushakobo/quick17/rules.mk index 8d357cd278dd..4137d7f14150 100644 --- a/keyboards/yushakobo/quick17/rules.mk +++ b/keyboards/yushakobo/quick17/rules.mk @@ -20,5 +20,6 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow BLUETOOTH_ENABLE = no # Enable Bluetooth AUDIO_ENABLE = no # Audio output +ENCODER_ENABLE = yes #RGB_MATRIX_ENABLE = WS2812 \ No newline at end of file From 75d959c3b65fde5d41ebe16f477b769efe3072f8 Mon Sep 17 00:00:00 2001 From: keyaki-namiki <28521374+keyaki-namiki@users.noreply.github.com> Date: Thu, 22 Apr 2021 14:27:29 +0900 Subject: [PATCH 17/45] update LED animations[wip] --- .../quick17/keymaps/default/keymap.c | 125 +++++++++++++----- 1 file changed, 94 insertions(+), 31 deletions(-) diff --git a/keyboards/yushakobo/quick17/keymaps/default/keymap.c b/keyboards/yushakobo/quick17/keymaps/default/keymap.c index 27aafcf1d5f7..612e2afc74b2 100644 --- a/keyboards/yushakobo/quick17/keymaps/default/keymap.c +++ b/keyboards/yushakobo/quick17/keymaps/default/keymap.c @@ -25,7 +25,7 @@ enum layer_names { _CONTROL, _EDIT1, _EDIT2, - _NUMPAD + _FN }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_CONTROL] = LAYOUT( KC_TAB, KC_PGUP,KC_UP, KC_PGDN,KC_HOME,KC_INS, KC_LCTL,KC_LEFT,KC_DOWN,KC_RGHT,KC_END, KC_DEL, - KC_LSFT,KC_LGUI,KC_ESC, KC_LALT,KC_SPC, TO(1) + KC_LSFT,KC_LGUI,KC_ESC, KC_LALT,LT(3,KC_SPC),TO(1) ), [_EDIT1] = LAYOUT( KC_ESC, KC_W, KC_E, KC_R, KC_Y, KC_BSPC, @@ -45,14 +45,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL,KC_LBRC,KC_RBRC,KC_PGDN,KC_PGUP,LCTL(KC_Y), KC_LSFT,TO(3), RGB_TOG,TO(0), _______,RESET ), - [_NUMPAD] = LAYOUT( - KC_ESC, KC_P0, KC_P7, KC_P8, KC_P9, KC_NLCK, - KC_TAB, KC_PDOT,KC_P4, KC_P5, KC_P6, KC_BSPC, - KC_LSFT,KC_ENT, KC_P1, KC_P2, KC_P3, TO(1) + [_FN] = LAYOUT( + KC_ESC, KC_LANG,KC_NO, RGB_TOG,KC_MNXT,KC_NLCK, + KC_TAB, KC_PDOT,KC_NO, RGB_MOD,KC_MPRV,KC_BSPC, + CG_NORM,CG_SWAP,KC_NO, KC_NO, _______,KC_MUTE ) }; static bool layer_shift = false; +static bool _mode_jaen = false; bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { @@ -69,6 +70,10 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } return false; break; + case KC_LANG: + if (record->event.pressed){ + + } default: if (record->event.pressed){ layer_shift = 0; @@ -81,34 +86,92 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { void encoder_update_user(uint8_t index, bool clockwise){ if (index == 0) { if (IS_LAYER_ON(_EDIT1) && !layer_shift){ - if (clockwise) { - tap_code(KC_WH_U); - } else { - tap_code(KC_WH_D); - } + if (clockwise) { + tap_code(KC_VOLU); + } else { + tap_code(KC_VOLD); + } } else if (IS_LAYER_ON(_EDIT2)){ - if (clockwise) { - tap_code(KC_LBRC); - } else { - tap_code(KC_RBRC); - } - } else if (IS_LAYER_ON(_NUMPAD)){ - if (clockwise) { - tap_code(KC_UP); - } else { - tap_code(KC_DOWN); - } + if (clockwise) { + tap_code(KC_LBRC); + } else { + tap_code(KC_RBRC); + } + } else if (IS_LAYER_ON(_FN)){ + if (clockwise) { + tap_code(KC_MNXT); + } else { + tap_code(KC_MPRV); + } } else { // IS_LAYER_ON(_CONTROL) - if (clockwise) { - tap_code(KC_VOLU); - } else { - tap_code(KC_VOLD); - } + if (clockwise) { + tap_code(KC_WH_U); + } else { + tap_code(KC_WH_D); + } } - } } -void keyboard_post_init_user(void){ - rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL); -} \ No newline at end of file +#ifdef RGBLIGHT_LAYERS +#define INDICATOR_LAYERS 5 +#define INDICATOR_PCS 17 +#define INDICATOR_LANG 11 +#define + const rgblight_segment_t PROGMEM mode_mac[] = RGBLIGHT_LAYER_SEGMENTS( + {INDICATOR_PCS, 1, HSV_WHITE} + ); + const rgblight_segment_t PROGMEM mode_win[] = RGBLIGHT_LAYER_SEGMENTS( + {INDICATOR_PCS, 1, HSV_AZURE} + ); + const rgblight_segment_t PROGMEM layer_ctrl[] = RGBLIGHT_LAYER_SEGMENTS( + {INDICATOR_LAYERS, 1, HSV_TEAL} + ); + const rgblight_segment_t PROGMEM layer_edit1[] = RGBLIGHT_LAYER_SEGMENTS( + {INDICATOR_LAYERS, 1, HSV_GREEN} + ); + const rgblight_segment_t PROGMEM layer_edit2[] = RGBLIGHT_LAYER_SEGMENTS( + {INDICATOR_LAYERS, 1, HSV_GOLD} + ); + const rgblight_segment_t PROGMEM layer_fn[] = RGBLIGHT_LAYER_SEGMENTS( + {INDICATOR_LAYERS, 1, HSV_BLUE} + {0, 1, HSV_RED} + {1, 1, HSV_PURPLE} + ); + const rgblight_segment_t PROGMEM lang_ja[] = RGBLIGHT_LAYER_SEGMENTS( + {INDICATOR_LANG, 1, HSV_RED} + ); + const rgblight_segment_t PROGMEM lang_en[] = RGBLIGHT_LAYER_SEGMENTS( + {INDICATOR_LANG, 1, HSV_PURPLE} + ); + const rgblight_segment_t* const PROGMEM quick17_rgb_layers[] = + RGBLIGHT_LAYERS_LIST( + layer_ctrl, + layer_edit1, + layer_edit2, + layer_fn, + mode_mac, + mode_win, + lang_ja, + lang_en + ); + void keyboard_post_init_user(void){ + rgblight_layers = quick17_rgb_layers; + rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL); + } + layer_state_t layer_state_set_user(layer_state_t state){ + rgblight_set_layer_state(0, layer_state_cmp(state, _CONTROL)); + rgblight_set_layer_state(1, layer_state_cmp(state, _EDIT1)); + rgblight_set_layer_state(2, layer_state_cmp(state, _EDIT2)); + rgblight_set_layer_state(3, layer_state_cmp(state, _FN)); + rgblight_set_layer_state(4, keymap_config.swap_lctl_lgui == true); + rgblight_set_layer_state(5, keymap_config.swap_lctl_lgui == false); + rgblight_set_layer_state(6, _mode_jaen); + rgblight_set_layer_state(7, !_mode_jaen); + return state; + } +#else + void keyboard_post_init_user(void){ + rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL); + } +#endif From d0c1e47184b3994fdc1bdc89429fa18a70f1f396 Mon Sep 17 00:00:00 2001 From: keyaki-namiki <28521374+keyaki-namiki@users.noreply.github.com> Date: Thu, 22 Apr 2021 15:49:55 +0900 Subject: [PATCH 18/45] small update in rgblight layers --- keyboards/yushakobo/quick17/keymaps/default/keymap.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/keyboards/yushakobo/quick17/keymaps/default/keymap.c b/keyboards/yushakobo/quick17/keymaps/default/keymap.c index 612e2afc74b2..2b0a20bcded0 100644 --- a/keyboards/yushakobo/quick17/keymaps/default/keymap.c +++ b/keyboards/yushakobo/quick17/keymaps/default/keymap.c @@ -18,7 +18,8 @@ // Defines the keycodes used by our macros in process_record_user enum custom_keycodes { BASE = SAFE_RANGE, - KC_LSPC + KC_LSPC, + KC_LANG }; enum layer_names { @@ -117,7 +118,6 @@ void encoder_update_user(uint8_t index, bool clockwise){ #define INDICATOR_LAYERS 5 #define INDICATOR_PCS 17 #define INDICATOR_LANG 11 -#define const rgblight_segment_t PROGMEM mode_mac[] = RGBLIGHT_LAYER_SEGMENTS( {INDICATOR_PCS, 1, HSV_WHITE} ); @@ -134,9 +134,9 @@ void encoder_update_user(uint8_t index, bool clockwise){ {INDICATOR_LAYERS, 1, HSV_GOLD} ); const rgblight_segment_t PROGMEM layer_fn[] = RGBLIGHT_LAYER_SEGMENTS( - {INDICATOR_LAYERS, 1, HSV_BLUE} - {0, 1, HSV_RED} - {1, 1, HSV_PURPLE} + {INDICATOR_LAYERS, 1, HSV_BLUE}, + {1, 1, HSV_RED}, + {2, 1, HSV_PURPLE} ); const rgblight_segment_t PROGMEM lang_ja[] = RGBLIGHT_LAYER_SEGMENTS( {INDICATOR_LANG, 1, HSV_RED} From 20c4a2427c7599db6eb3b8238412e5d99a1ac258 Mon Sep 17 00:00:00 2001 From: keyaki-namiki <28521374+keyaki-namiki@users.noreply.github.com> Date: Thu, 22 Apr 2021 19:52:20 +0900 Subject: [PATCH 19/45] enable rgb_matrix --- keyboards/yushakobo/quick17/config.h | 30 +++++++++++++++---- .../quick17/keymaps/default/keymap.c | 8 ++--- keyboards/yushakobo/quick17/quick17.c | 27 +++++++++++++---- keyboards/yushakobo/quick17/rules.mk | 5 ++-- 4 files changed, 53 insertions(+), 17 deletions(-) diff --git a/keyboards/yushakobo/quick17/config.h b/keyboards/yushakobo/quick17/config.h index 8c294c05f227..2727936b340e 100644 --- a/keyboards/yushakobo/quick17/config.h +++ b/keyboards/yushakobo/quick17/config.h @@ -58,12 +58,32 @@ along with this program. If not, see . #define RGB_DI_PIN D2 #define RGBLED_NUM 18 -#define RGBLIGHT_LED_MAP {\ - 6, 7, 12, 13, 14, 15,\ - 16, 17, 11, 10, 9, 8,\ - 0, 1, 2, 3, 4, 5\ -} + +#ifdef RGB_MATRIX_ENABLE +# define DRIVER_LED_TOTAL RGBLED_NUM +# define RGB_MATRIX_KEYPRESSES // reacts to keypresses +// # define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses) +// # define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects +# define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended +# define RGB_MATRIX_FRAMEBUFFER_EFFECTS +// # define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness) +// # define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness) +# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash. +# define RGB_MATRIX_HUE_STEP 8 +# define RGB_MATRIX_SAT_STEP 8 +# define RGB_MATRIX_VAL_STEP 8 +# define RGB_MATRIX_SPD_STEP 10 +#endif + + + + #ifdef RGBLIGHT_ENABLE +# define RGBLIGHT_LED_MAP {\ + 6, 7, 12, 13, 14, 15,\ + 16, 17, 11, 10, 9, 8,\ + 0, 1, 2, 3, 4, 5\ + } # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 # define RGBLIGHT_VAL_STEP 8 diff --git a/keyboards/yushakobo/quick17/keymaps/default/keymap.c b/keyboards/yushakobo/quick17/keymaps/default/keymap.c index 2b0a20bcded0..be55253170e4 100644 --- a/keyboards/yushakobo/quick17/keymaps/default/keymap.c +++ b/keyboards/yushakobo/quick17/keymaps/default/keymap.c @@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Base */ [_CONTROL] = LAYOUT( KC_TAB, KC_PGUP,KC_UP, KC_PGDN,KC_HOME,KC_INS, - KC_LCTL,KC_LEFT,KC_DOWN,KC_RGHT,KC_END, KC_DEL, + KC_LCTL,KC_LEFT,KC_DOWN,KC_RGHT,KC_END, EEP_RST, KC_LSFT,KC_LGUI,KC_ESC, KC_LALT,LT(3,KC_SPC),TO(1) ), [_EDIT1] = LAYOUT( @@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_EDIT2] = LAYOUT( KC_ESC, KC_Q, KC_BTN3,KC_INS, KC_NO, KC_DEL, KC_LCTL,KC_LBRC,KC_RBRC,KC_PGDN,KC_PGUP,LCTL(KC_Y), - KC_LSFT,TO(3), RGB_TOG,TO(0), _______,RESET + KC_LSFT,MO(3), RGB_TOG,TO(0), _______,RESET ), [_FN] = LAYOUT( KC_ESC, KC_LANG,KC_NO, RGB_TOG,KC_MNXT,KC_NLCK, @@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; static bool layer_shift = false; -static bool _mode_jaen = false; +//static bool _mode_jaen = false; bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { @@ -172,6 +172,6 @@ void encoder_update_user(uint8_t index, bool clockwise){ } #else void keyboard_post_init_user(void){ - rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL); +// rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL); } #endif diff --git a/keyboards/yushakobo/quick17/quick17.c b/keyboards/yushakobo/quick17/quick17.c index f3a21a18ac0d..f6f5ef032ef9 100644 --- a/keyboards/yushakobo/quick17/quick17.c +++ b/keyboards/yushakobo/quick17/quick17.c @@ -19,14 +19,29 @@ #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { - { 13, 14, 15, 16, 17, 18 }, - { 1, 12, 11, 10, 9, 8 }, - { 2, 3, 4, 5, 6, 7 } + {12, 13, 14, 15, 16, 17}, + {0, 1, 11, 10, 9, 8}, + {2, 3, 4, 5, 6, 7} }, { - {0,0},{44,0},{89,0},{134,0},{179,0},{224,0}, - {0,32},{44,32},{89,32},{134,32},{179,32},{224,32}, - {0,64},{44,64},{89,64},{134,64},{179,64},{224,64} +{0,32}, +{44,32}, +{0,64}, +{44,64}, +{89,64}, +{134,64}, +{179,64}, +{224,64}, +{224,32}, +{179,32}, +{134,32}, +{89,32}, +{0,0}, +{44,0}, +{89,0}, +{134,0}, +{179,0}, +{224,0} }, { 4, 4, 4, 4, 4, 4, diff --git a/keyboards/yushakobo/quick17/rules.mk b/keyboards/yushakobo/quick17/rules.mk index 4137d7f14150..fea39f246fde 100644 --- a/keyboards/yushakobo/quick17/rules.mk +++ b/keyboards/yushakobo/quick17/rules.mk @@ -17,9 +17,10 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work NKRO_ENABLE = no # USB Nkey Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow BLUETOOTH_ENABLE = no # Enable Bluetooth AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes -#RGB_MATRIX_ENABLE = WS2812 \ No newline at end of file +RGB_MATRIX_ENABLE = yes +RGB_MATRIX_DRIVER = WS2812 \ No newline at end of file From 4f194921bedaedb840dd9364378eb0fb4497737b Mon Sep 17 00:00:00 2001 From: keyaki-namiki <28521374+keyaki-namiki@users.noreply.github.com> Date: Mon, 10 May 2021 18:47:33 +0900 Subject: [PATCH 20/45] rearrange the LED order --- keyboards/yushakobo/quick17/quick17.c | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/keyboards/yushakobo/quick17/quick17.c b/keyboards/yushakobo/quick17/quick17.c index f6f5ef032ef9..2ec272981198 100644 --- a/keyboards/yushakobo/quick17/quick17.c +++ b/keyboards/yushakobo/quick17/quick17.c @@ -24,24 +24,9 @@ led_config_t g_led_config = { {2, 3, 4, 5, 6, 7} }, { -{0,32}, -{44,32}, -{0,64}, -{44,64}, -{89,64}, -{134,64}, -{179,64}, -{224,64}, -{224,32}, -{179,32}, -{134,32}, -{89,32}, -{0,0}, -{44,0}, -{89,0}, -{134,0}, -{179,0}, -{224,0} + {0,32}, {44,32}, {0,64}, {44,64}, {89,64}, {134,64}, + {179,64},{224,64},{224,32},{179,32},{134,32},{89,32}, + {0,0}, {44,0}, {89,0}, {134,0}, {179,0}, {224,0} }, { 4, 4, 4, 4, 4, 4, From 5adaa46ebd22ecf7066d3d3a20f241e41b306209 Mon Sep 17 00:00:00 2001 From: keyaki-namiki <28521374+keyaki-namiki@users.noreply.github.com> Date: Mon, 10 May 2021 19:31:29 +0900 Subject: [PATCH 21/45] customize rgb matrix animations --- .../quick17/keymaps/default/keymap.c | 10 +-- .../keymaps/default/rgb_matrix_user.inc | 67 +++++++++++++++++++ 2 files changed, 72 insertions(+), 5 deletions(-) create mode 100644 keyboards/yushakobo/quick17/keymaps/default/rgb_matrix_user.inc diff --git a/keyboards/yushakobo/quick17/keymaps/default/keymap.c b/keyboards/yushakobo/quick17/keymaps/default/keymap.c index be55253170e4..021db3c94803 100644 --- a/keyboards/yushakobo/quick17/keymaps/default/keymap.c +++ b/keyboards/yushakobo/quick17/keymaps/default/keymap.c @@ -33,22 +33,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Base */ [_CONTROL] = LAYOUT( KC_TAB, KC_PGUP,KC_UP, KC_PGDN,KC_HOME,KC_INS, - KC_LCTL,KC_LEFT,KC_DOWN,KC_RGHT,KC_END, EEP_RST, + KC_LCTL,KC_LEFT,KC_DOWN,KC_RGHT,KC_END, KC_DEL, KC_LSFT,KC_LGUI,KC_ESC, KC_LALT,LT(3,KC_SPC),TO(1) ), [_EDIT1] = LAYOUT( KC_ESC, KC_W, KC_E, KC_R, KC_Y, KC_BSPC, KC_LCTL,KC_A, KC_D, KC_F, KC_H, LCTL(KC_Z), - KC_LSFT,KC_X, KC_V, KC_B, KC_LSPC,LCTL(KC_S) + KC_LSFT,KC_X, KC_V, KC_B, _______,LCTL(KC_S) ), [_EDIT2] = LAYOUT( KC_ESC, KC_Q, KC_BTN3,KC_INS, KC_NO, KC_DEL, KC_LCTL,KC_LBRC,KC_RBRC,KC_PGDN,KC_PGUP,LCTL(KC_Y), - KC_LSFT,MO(3), RGB_TOG,TO(0), _______,RESET + KC_LSFT,TO(3), RGB_TOG,TO(0), _______,RESET ), [_FN] = LAYOUT( - KC_ESC, KC_LANG,KC_NO, RGB_TOG,KC_MNXT,KC_NLCK, - KC_TAB, KC_PDOT,KC_NO, RGB_MOD,KC_MPRV,KC_BSPC, + KC_ESC, KC_LANG,KC_NO, RGB_TOG,KC_MNXT,KC_VOLU, + KC_CAPS,KC_PDOT,KC_NO, RGB_MOD,KC_MPRV,KC_VOLD, CG_NORM,CG_SWAP,KC_NO, KC_NO, _______,KC_MUTE ) }; diff --git a/keyboards/yushakobo/quick17/keymaps/default/rgb_matrix_user.inc b/keyboards/yushakobo/quick17/keymaps/default/rgb_matrix_user.inc new file mode 100644 index 000000000000..b4b6f863085c --- /dev/null +++ b/keyboards/yushakobo/quick17/keymaps/default/rgb_matrix_user.inc @@ -0,0 +1,67 @@ +RGB_MATRIX_EFFECT(quick17_rgbm_effect) + +#ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS + +#include "layer_numbers.h" + +#define LED_LAYOUT( + L00, L01, L02, L03, L04, L05,\ + L10, L11, L12, L13, L14, L15,\ + L20, L21, L22, L23, L24, L25 \ +) { + L00, L01, L02, L03, L04, L05,\ + L10, L11, L12, L13, L14, L15,\ + L20, L21, L22, L23, L24, L25 \ +} + +enum lighting_types { + BOUT, + _____, + INDC1, + INDC2, + INDC3, + INDC4, + INDC5 +} + + +const uint16_t rgb_keymaps[][DRIVER_LED_TOTAL] = { + [_CONTROL] = LED_LAYOUT( + _____, INDC2, INDC1, INDC2, INDC3, INDC4, + _____, INDC1, INDC1, INDC1, INDC3, INDC4, + _____, _____, _____, _____, _____, _____ + ), + [_EDIT1] = LED_LAYOUT( + _____, _____, _____, _____, _____, _____, + _____, _____, _____, _____, _____, INDC1, + _____, _____, _____, _____, INDC2, INDC1 + ), + [_EDIT2] = LED_LAYOUT( + _____, _____, _____, _____, _____, _____, + _____, _____, _____, _____, _____, INDC1, + _____, INDC4, _____, INDC3, IND2, BOUT + ), + [_FN] = LED_LAYOUT( + _____, _____, BOUT, INDC5, INDC4, INDC4, + _____, _____, BOUT, INDC5, INDC4, INDC4, + INDC2, INDC2, BOUT, BOUT, BOUT, INDC4 + ) +} + +static void led_color_set (uint8_t index, uint8_t color_patterns) { + rgb_matrix_get_hsv()//todo: get current hsv + switch(color_patterns){ + case BOUT: + rgb_matrix_set_color(index, 0x00, 0x00, 0x00); + break; + case _____; + rgb_matrix_set_color(index)//todo: set to slight different color + } +} + + + + + + +#endif \ No newline at end of file From a8fe19e1cdb64c5e0eac7941239dc1e2cb612d78 Mon Sep 17 00:00:00 2001 From: keyaki-namiki <28521374+keyaki-namiki@users.noreply.github.com> Date: Sat, 15 May 2021 14:58:09 +0900 Subject: [PATCH 22/45] small progress in rgb_matrix_user.inc --- .../keymaps/default/rgb_matrix_user.inc | 31 ++++++++++++++----- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/keyboards/yushakobo/quick17/keymaps/default/rgb_matrix_user.inc b/keyboards/yushakobo/quick17/keymaps/default/rgb_matrix_user.inc index b4b6f863085c..c88eb30d6335 100644 --- a/keyboards/yushakobo/quick17/keymaps/default/rgb_matrix_user.inc +++ b/keyboards/yushakobo/quick17/keymaps/default/rgb_matrix_user.inc @@ -1,4 +1,4 @@ -RGB_MATRIX_EFFECT(quick17_rgbm_effect) +RGB_MATRIX_EFFECT(quick17_rgbm_effect); #ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS @@ -22,7 +22,7 @@ enum lighting_types { INDC3, INDC4, INDC5 -} +}; const uint16_t rgb_keymaps[][DRIVER_LED_TOTAL] = { @@ -46,20 +46,35 @@ const uint16_t rgb_keymaps[][DRIVER_LED_TOTAL] = { _____, _____, BOUT, INDC5, INDC4, INDC4, INDC2, INDC2, BOUT, BOUT, BOUT, INDC4 ) -} +}; + +#define _HSV(H, S, V) (HSV){ .h = H, .s = S, .v = V } -static void led_color_set (uint8_t index, uint8_t color_patterns) { - rgb_matrix_get_hsv()//todo: get current hsv +static void led_color_set(uint8_t index, uint8_t color_patterns) { + HSV hsv = rgb_matrix_get_hsv();//todo: get current hsv switch(color_patterns){ case BOUT: rgb_matrix_set_color(index, 0x00, 0x00, 0x00); break; - case _____; - rgb_matrix_set_color(index)//todo: set to slight different color + case _____: + rgb_matrix_set_color(index);//todo: set to slight different color } } - +static bool quick17_rgbfm_effect (effect_params_t* params) { + RGB_MATRIX_USE_LIMITS(led_min, led_max); + for (uint8_t i = led_min; i < led_max; i++) { + if (IS_LAYER_ON(_EDIT1) && !layer_shift){ + led_color_set(i, rgb_keymaps[_EDIT1][i]); + } else if (IS_LAYER_ON(_EDIT2)){ + led_color_set(i, rgb_keymaps[_EDIT2][i]); + } else if (IS_LAYER_ON(_FN)){ + led_color_set(i, rgb_keymaps[_FN][i]); + } else { // IS_LAYER_ON(_CONTROL) + led_set_color(i, rgb_keymaps[_CONTROL][i]); + } + } +} From a023bcad07f7c5ce4f3f18fcece6cf9442a9a26a Mon Sep 17 00:00:00 2001 From: keyaki-namiki <28521374+keyaki-namiki@users.noreply.github.com> Date: Thu, 10 Jun 2021 18:48:21 +0900 Subject: [PATCH 23/45] some progress in rgb matrix things - compile passed - not tested --- .../quick17/keymaps/default/keymap.c | 12 ++--- .../quick17/keymaps/default/layer_prefs.h | 8 +++ .../rgb_matrix_user.inc => rgb_matrix_kb.inc} | 49 +++++++++++++------ keyboards/yushakobo/quick17/rules.mk | 3 +- 4 files changed, 48 insertions(+), 24 deletions(-) create mode 100644 keyboards/yushakobo/quick17/keymaps/default/layer_prefs.h rename keyboards/yushakobo/quick17/{keymaps/default/rgb_matrix_user.inc => rgb_matrix_kb.inc} (51%) diff --git a/keyboards/yushakobo/quick17/keymaps/default/keymap.c b/keyboards/yushakobo/quick17/keymaps/default/keymap.c index 021db3c94803..3de3171f8f00 100644 --- a/keyboards/yushakobo/quick17/keymaps/default/keymap.c +++ b/keyboards/yushakobo/quick17/keymaps/default/keymap.c @@ -14,6 +14,7 @@ * along with this program. If not, see . */ #include QMK_KEYBOARD_H +#include "layer_prefs.h" // Defines the keycodes used by our macros in process_record_user enum custom_keycodes { @@ -22,13 +23,6 @@ enum custom_keycodes { KC_LANG }; -enum layer_names { - _CONTROL, - _EDIT1, - _EDIT2, - _FN -}; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Base */ [_CONTROL] = LAYOUT( @@ -53,7 +47,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; -static bool layer_shift = false; //static bool _mode_jaen = false; bool process_record_user(uint16_t keycode, keyrecord_t *record) { @@ -172,6 +165,7 @@ void encoder_update_user(uint8_t index, bool clockwise){ } #else void keyboard_post_init_user(void){ -// rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL); +// rgb_matrix_mode(RGB_MATRIX_CUSTOM_quick17_rgbm_effect); +// rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL); } #endif diff --git a/keyboards/yushakobo/quick17/keymaps/default/layer_prefs.h b/keyboards/yushakobo/quick17/keymaps/default/layer_prefs.h new file mode 100644 index 000000000000..54b6bf768114 --- /dev/null +++ b/keyboards/yushakobo/quick17/keymaps/default/layer_prefs.h @@ -0,0 +1,8 @@ +enum layer_names { + _CONTROL, + _EDIT1, + _EDIT2, + _FN +}; + +static bool layer_shift = false; \ No newline at end of file diff --git a/keyboards/yushakobo/quick17/keymaps/default/rgb_matrix_user.inc b/keyboards/yushakobo/quick17/rgb_matrix_kb.inc similarity index 51% rename from keyboards/yushakobo/quick17/keymaps/default/rgb_matrix_user.inc rename to keyboards/yushakobo/quick17/rgb_matrix_kb.inc index c88eb30d6335..cb6170bb2f97 100644 --- a/keyboards/yushakobo/quick17/keymaps/default/rgb_matrix_user.inc +++ b/keyboards/yushakobo/quick17/rgb_matrix_kb.inc @@ -1,16 +1,17 @@ -RGB_MATRIX_EFFECT(quick17_rgbm_effect); +RGB_MATRIX_EFFECT(quick17_rgbm_effect) #ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS -#include "layer_numbers.h" +#include "layer_prefs.h" -#define LED_LAYOUT( - L00, L01, L02, L03, L04, L05,\ - L10, L11, L12, L13, L14, L15,\ + +#define LED_LAYOUT(\ + L00, L01, L02, L03, L04, L05, \ + L10, L11, L12, L13, L14, L15, \ L20, L21, L22, L23, L24, L25 \ -) { - L00, L01, L02, L03, L04, L05,\ - L10, L11, L12, L13, L14, L15,\ +) {\ + L00, L01, L02, L03, L04, L05, \ + L10, L11, L12, L13, L14, L15, \ L20, L21, L22, L23, L24, L25 \ } @@ -25,7 +26,7 @@ enum lighting_types { }; -const uint16_t rgb_keymaps[][DRIVER_LED_TOTAL] = { +const uint8_t rgb_keymaps [][DRIVER_LED_TOTAL] = { [_CONTROL] = LED_LAYOUT( _____, INDC2, INDC1, INDC2, INDC3, INDC4, _____, INDC1, INDC1, INDC1, INDC3, INDC4, @@ -39,7 +40,7 @@ const uint16_t rgb_keymaps[][DRIVER_LED_TOTAL] = { [_EDIT2] = LED_LAYOUT( _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, INDC1, - _____, INDC4, _____, INDC3, IND2, BOUT + _____, INDC4, _____, INDC3, INDC2, BOUT ), [_FN] = LED_LAYOUT( _____, _____, BOUT, INDC5, INDC4, INDC4, @@ -49,19 +50,38 @@ const uint16_t rgb_keymaps[][DRIVER_LED_TOTAL] = { }; #define _HSV(H, S, V) (HSV){ .h = H, .s = S, .v = V } +#define _RGB(rgb) rgb.r, rgb.g, rgb.b static void led_color_set(uint8_t index, uint8_t color_patterns) { - HSV hsv = rgb_matrix_get_hsv();//todo: get current hsv + HSV hsv = rgb_matrix_config.hsv; + /* RGB base_color = hsv_to_rgb(hsv); */ + /* RGB accent1 = hsv_to_rgb(_HSV((hsv.h + 256 * 1 / 4) % 256, hsv.s, hsv.v)); */ + /* RGB accent2 = hsv_to_rgb(_HSV((hsv.h + 256 * 2 / 4) % 256, hsv.s, hsv.v)); */ + /* RGB accent3 = hsv_to_rgb(_HSV((hsv.h + 256 * 3 / 4) % 256, hsv.s, hsv.v)); */ + RGB base_color = hsv_to_rgb(_HSV(0, 0, hsv.v)); + RGB accent1 = hsv_to_rgb(_HSV((hsv.h + 256 * 0 / 3) % 256, hsv.s, hsv.v)); + RGB accent2 = hsv_to_rgb(_HSV((hsv.h + 256 * 1 / 3) % 256, hsv.s, hsv.v)); + RGB accent3 = hsv_to_rgb(_HSV((hsv.h + 256 * 2 / 3) % 256, hsv.s, hsv.v)); switch(color_patterns){ case BOUT: rgb_matrix_set_color(index, 0x00, 0x00, 0x00); break; case _____: - rgb_matrix_set_color(index);//todo: set to slight different color + rgb_matrix_set_color(index, _RGB(base_color));//todo: set to slight different color + break; + case INDC1: + rgb_matrix_set_color(index, _RGB(accent1)); + break; + case INDC2: + rgb_matrix_set_color(index, _RGB(accent2)); + break; + case INDC3: + rgb_matrix_set_color(index, _RGB(accent3)); + break; } } -static bool quick17_rgbfm_effect (effect_params_t* params) { +static bool quick17_rgbm_effect (effect_params_t* params) { RGB_MATRIX_USE_LIMITS(led_min, led_max); for (uint8_t i = led_min; i < led_max; i++) { if (IS_LAYER_ON(_EDIT1) && !layer_shift){ @@ -71,9 +91,10 @@ static bool quick17_rgbfm_effect (effect_params_t* params) { } else if (IS_LAYER_ON(_FN)){ led_color_set(i, rgb_keymaps[_FN][i]); } else { // IS_LAYER_ON(_CONTROL) - led_set_color(i, rgb_keymaps[_CONTROL][i]); + led_color_set(i, rgb_keymaps[_CONTROL][i]); } } + return led_max < DRIVER_LED_TOTAL; } diff --git a/keyboards/yushakobo/quick17/rules.mk b/keyboards/yushakobo/quick17/rules.mk index fea39f246fde..32e9b8202a74 100644 --- a/keyboards/yushakobo/quick17/rules.mk +++ b/keyboards/yushakobo/quick17/rules.mk @@ -23,4 +23,5 @@ AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = WS2812 \ No newline at end of file +RGB_MATRIX_DRIVER = WS2812 +RGB_MATRIX_CUSTOM_KB = yes \ No newline at end of file From 8f9454672702b4b2b0b4a3489b56ec655d7be41a Mon Sep 17 00:00:00 2001 From: keyaki-namiki <28521374+keyaki-namiki@users.noreply.github.com> Date: Thu, 24 Jun 2021 15:33:19 +0900 Subject: [PATCH 24/45] rgb matrix implementation looks complete --- keyboards/yushakobo/quick17/config.h | 4 ++ .../quick17/keymaps/default/keymap.c | 33 +++++++---- .../quick17/keymaps/default/layer_prefs.h | 4 +- keyboards/yushakobo/quick17/rgb_matrix_kb.inc | 55 ++++++++++--------- 4 files changed, 58 insertions(+), 38 deletions(-) diff --git a/keyboards/yushakobo/quick17/config.h b/keyboards/yushakobo/quick17/config.h index 2727936b340e..42e70a0f96f1 100644 --- a/keyboards/yushakobo/quick17/config.h +++ b/keyboards/yushakobo/quick17/config.h @@ -69,6 +69,10 @@ along with this program. If not, see . // # define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness) // # define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness) # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash. +// HSV_TEAL +// #define RGB_MATRIX_STARTUP_HUE 128 +// #define RGB_MATRIX_STARTUP_SAT 255 + #define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS # define RGB_MATRIX_HUE_STEP 8 # define RGB_MATRIX_SAT_STEP 8 # define RGB_MATRIX_VAL_STEP 8 diff --git a/keyboards/yushakobo/quick17/keymaps/default/keymap.c b/keyboards/yushakobo/quick17/keymaps/default/keymap.c index 3de3171f8f00..837ca4d972b7 100644 --- a/keyboards/yushakobo/quick17/keymaps/default/keymap.c +++ b/keyboards/yushakobo/quick17/keymaps/default/keymap.c @@ -15,6 +15,7 @@ */ #include QMK_KEYBOARD_H #include "layer_prefs.h" +#include "rgb_matrix.h" // Defines the keycodes used by our macros in process_record_user enum custom_keycodes { @@ -33,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_EDIT1] = LAYOUT( KC_ESC, KC_W, KC_E, KC_R, KC_Y, KC_BSPC, KC_LCTL,KC_A, KC_D, KC_F, KC_H, LCTL(KC_Z), - KC_LSFT,KC_X, KC_V, KC_B, _______,LCTL(KC_S) + KC_LSFT,KC_X, KC_V, KC_B, KC_LSPC,LCTL(KC_S) ), [_EDIT2] = LAYOUT( KC_ESC, KC_Q, KC_BTN3,KC_INS, KC_NO, KC_DEL, @@ -43,11 +44,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN] = LAYOUT( KC_ESC, KC_LANG,KC_NO, RGB_TOG,KC_MNXT,KC_VOLU, KC_CAPS,KC_PDOT,KC_NO, RGB_MOD,KC_MPRV,KC_VOLD, - CG_NORM,CG_SWAP,KC_NO, KC_NO, _______,KC_MUTE + CG_NORM,CG_SWAP,EEP_RST,KC_NO, TO(0), KC_MUTE ) }; //static bool _mode_jaen = false; +static bool layer_shift = false; bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { @@ -79,17 +81,17 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { void encoder_update_user(uint8_t index, bool clockwise){ if (index == 0) { - if (IS_LAYER_ON(_EDIT1) && !layer_shift){ + if (IS_LAYER_ON(_EDIT2)){ if (clockwise) { - tap_code(KC_VOLU); + tap_code(KC_LBRC); } else { - tap_code(KC_VOLD); + tap_code(KC_RBRC); } - } else if (IS_LAYER_ON(_EDIT2)){ + } else if (IS_LAYER_ON(_EDIT1)){ if (clockwise) { - tap_code(KC_LBRC); + tap_code(KC_VOLU); } else { - tap_code(KC_RBRC); + tap_code(KC_VOLD); } } else if (IS_LAYER_ON(_FN)){ if (clockwise) { @@ -164,8 +166,15 @@ void encoder_update_user(uint8_t index, bool clockwise){ return state; } #else - void keyboard_post_init_user(void){ -// rgb_matrix_mode(RGB_MATRIX_CUSTOM_quick17_rgbm_effect); -// rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL); - } + #ifdef RGB_MATRIX_ENABLE + void keyboard_post_init_user(void){ + // rgb_matrix_set_color_all(RGB_TEAL); + rgb_matrix_mode(RGB_MATRIX_CUSTOM_quick17_rgbm_effect); + // rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL); + } + #else + void keyboard_post_init_user(void){ + rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL); + } + #endif #endif diff --git a/keyboards/yushakobo/quick17/keymaps/default/layer_prefs.h b/keyboards/yushakobo/quick17/keymaps/default/layer_prefs.h index 54b6bf768114..c1d78024c2d2 100644 --- a/keyboards/yushakobo/quick17/keymaps/default/layer_prefs.h +++ b/keyboards/yushakobo/quick17/keymaps/default/layer_prefs.h @@ -5,4 +5,6 @@ enum layer_names { _FN }; -static bool layer_shift = false; \ No newline at end of file +//static bool layer_shift = false; +#define _HSV(H, S, V) (HSV){ .h = H, .s = S, .v = V } +#define _RGB(rgb) rgb.r, rgb.g, rgb.b \ No newline at end of file diff --git a/keyboards/yushakobo/quick17/rgb_matrix_kb.inc b/keyboards/yushakobo/quick17/rgb_matrix_kb.inc index cb6170bb2f97..64246f3cf2b0 100644 --- a/keyboards/yushakobo/quick17/rgb_matrix_kb.inc +++ b/keyboards/yushakobo/quick17/rgb_matrix_kb.inc @@ -10,9 +10,10 @@ RGB_MATRIX_EFFECT(quick17_rgbm_effect) L10, L11, L12, L13, L14, L15, \ L20, L21, L22, L23, L24, L25 \ ) {\ - L00, L01, L02, L03, L04, L05, \ - L10, L11, L12, L13, L14, L15, \ - L20, L21, L22, L23, L24, L25 \ + L10, L11, L20, L21, L22, L23,\ + L24, L25, L15, L14, L13, L12,\ + L00, L01, L02, L03, L04, L05\ +\ } enum lighting_types { @@ -49,34 +50,41 @@ const uint8_t rgb_keymaps [][DRIVER_LED_TOTAL] = { ) }; -#define _HSV(H, S, V) (HSV){ .h = H, .s = S, .v = V } -#define _RGB(rgb) rgb.r, rgb.g, rgb.b - static void led_color_set(uint8_t index, uint8_t color_patterns) { HSV hsv = rgb_matrix_config.hsv; - /* RGB base_color = hsv_to_rgb(hsv); */ - /* RGB accent1 = hsv_to_rgb(_HSV((hsv.h + 256 * 1 / 4) % 256, hsv.s, hsv.v)); */ - /* RGB accent2 = hsv_to_rgb(_HSV((hsv.h + 256 * 2 / 4) % 256, hsv.s, hsv.v)); */ - /* RGB accent3 = hsv_to_rgb(_HSV((hsv.h + 256 * 3 / 4) % 256, hsv.s, hsv.v)); */ - RGB base_color = hsv_to_rgb(_HSV(0, 0, hsv.v)); - RGB accent1 = hsv_to_rgb(_HSV((hsv.h + 256 * 0 / 3) % 256, hsv.s, hsv.v)); - RGB accent2 = hsv_to_rgb(_HSV((hsv.h + 256 * 1 / 3) % 256, hsv.s, hsv.v)); - RGB accent3 = hsv_to_rgb(_HSV((hsv.h + 256 * 2 / 3) % 256, hsv.s, hsv.v)); + RGB rgb_white = hsv_to_rgb(_HSV( 0, 0, hsv.v)); //HSV_WHITE + RGB rgb_indc1 = hsv_to_rgb(_HSV(128, 255, hsv.v)); //HSV_TEAL + RGB rgb_indc2 = hsv_to_rgb(_HSV(191, 255, hsv.v)); //HSV_PURPLE + RGB rgb_indc3 = hsv_to_rgb(_HSV( 64, 255, hsv.v)); //HSV_CHARTREUSE + RGB rgb_indc4 = hsv_to_rgb(_HSV(106, 255, hsv.v)); //HSV_SPRINGGREEN + RGB rgb_indc5 = hsv_to_rgb(_HSV(234, 128, hsv.v)); //HSV_PINK switch(color_patterns){ case BOUT: - rgb_matrix_set_color(index, 0x00, 0x00, 0x00); + rgb_matrix_set_color(index, RGB_BLACK); break; case _____: - rgb_matrix_set_color(index, _RGB(base_color));//todo: set to slight different color + rgb_matrix_set_color(index, _RGB(rgb_white)); +// rgb_matrix_decrease_val(); break; case INDC1: - rgb_matrix_set_color(index, _RGB(accent1)); + rgb_matrix_set_color(index, _RGB(rgb_indc1)); +// rgb_matrix_decrease_val(); break; case INDC2: - rgb_matrix_set_color(index, _RGB(accent2)); + rgb_matrix_set_color(index, _RGB(rgb_indc2)); +// rgb_matrix_decrease_val(); break; case INDC3: - rgb_matrix_set_color(index, _RGB(accent3)); + rgb_matrix_set_color(index, _RGB(rgb_indc3)); +// rgb_matrix_increase_val(); + break; + case INDC4: + rgb_matrix_set_color(index, _RGB(rgb_indc4)); +// rgb_matrix_decrease_val(); + break; + case INDC5: + rgb_matrix_set_color(index, _RGB(rgb_indc5)); +// rgb_matrix_decrease_val(); break; } } @@ -84,10 +92,10 @@ static void led_color_set(uint8_t index, uint8_t color_patterns) { static bool quick17_rgbm_effect (effect_params_t* params) { RGB_MATRIX_USE_LIMITS(led_min, led_max); for (uint8_t i = led_min; i < led_max; i++) { - if (IS_LAYER_ON(_EDIT1) && !layer_shift){ - led_color_set(i, rgb_keymaps[_EDIT1][i]); - } else if (IS_LAYER_ON(_EDIT2)){ + if (IS_LAYER_ON(_EDIT2)){ led_color_set(i, rgb_keymaps[_EDIT2][i]); + } else if (IS_LAYER_ON(_EDIT1)){ + led_color_set(i, rgb_keymaps[_EDIT1][i]); } else if (IS_LAYER_ON(_FN)){ led_color_set(i, rgb_keymaps[_FN][i]); } else { // IS_LAYER_ON(_CONTROL) @@ -97,7 +105,4 @@ static bool quick17_rgbm_effect (effect_params_t* params) { return led_max < DRIVER_LED_TOTAL; } - - - #endif \ No newline at end of file From 5c2ab58dfa5af2b48dcd11fa8737f36ad63cd169 Mon Sep 17 00:00:00 2001 From: keyaki-namiki <28521374+keyaki-namiki@users.noreply.github.com> Date: Thu, 24 Jun 2021 19:58:46 +0900 Subject: [PATCH 25/45] little progress in rgb_matrix_kb.inc --- .../quick17/keymaps/default/keymap.c | 81 ++++++++++--------- .../{keymaps/default => }/layer_prefs.h | 10 ++- keyboards/yushakobo/quick17/rgb_matrix_kb.inc | 46 ++++++----- 3 files changed, 77 insertions(+), 60 deletions(-) rename keyboards/yushakobo/quick17/{keymaps/default => }/layer_prefs.h (50%) diff --git a/keyboards/yushakobo/quick17/keymaps/default/keymap.c b/keyboards/yushakobo/quick17/keymaps/default/keymap.c index 837ca4d972b7..8975f68d2429 100644 --- a/keyboards/yushakobo/quick17/keymaps/default/keymap.c +++ b/keyboards/yushakobo/quick17/keymaps/default/keymap.c @@ -16,6 +16,7 @@ #include QMK_KEYBOARD_H #include "layer_prefs.h" #include "rgb_matrix.h" +//#include "keymap_jp.h" // Defines the keycodes used by our macros in process_record_user enum custom_keycodes { @@ -25,55 +26,52 @@ enum custom_keycodes { }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* Base */ - [_CONTROL] = LAYOUT( - KC_TAB, KC_PGUP,KC_UP, KC_PGDN,KC_HOME,KC_INS, - KC_LCTL,KC_LEFT,KC_DOWN,KC_RGHT,KC_END, KC_DEL, - KC_LSFT,KC_LGUI,KC_ESC, KC_LALT,LT(3,KC_SPC),TO(1) -), - [_EDIT1] = LAYOUT( - KC_ESC, KC_W, KC_E, KC_R, KC_Y, KC_BSPC, - KC_LCTL,KC_A, KC_D, KC_F, KC_H, LCTL(KC_Z), - KC_LSFT,KC_X, KC_V, KC_B, KC_LSPC,LCTL(KC_S) -), - [_EDIT2] = LAYOUT( - KC_ESC, KC_Q, KC_BTN3,KC_INS, KC_NO, KC_DEL, - KC_LCTL,KC_LBRC,KC_RBRC,KC_PGDN,KC_PGUP,LCTL(KC_Y), - KC_LSFT,TO(3), RGB_TOG,TO(0), _______,RESET -), - [_FN] = LAYOUT( - KC_ESC, KC_LANG,KC_NO, RGB_TOG,KC_MNXT,KC_VOLU, - KC_CAPS,KC_PDOT,KC_NO, RGB_MOD,KC_MPRV,KC_VOLD, - CG_NORM,CG_SWAP,EEP_RST,KC_NO, TO(0), KC_MUTE -) + [_CONTROL] = LAYOUT( + KC_TAB, KC_PGUP,KC_UP, KC_PGDN,KC_HOME,KC_INS, + KC_LCTL,KC_LEFT,KC_DOWN,KC_RGHT,KC_END, KC_DEL, + KC_LSFT,KC_LGUI,KC_ESC, KC_LALT,LT(3,KC_SPC),TO(1) + ), + [_EDIT1] = LAYOUT( + KC_ESC, KC_W, KC_E, KC_R, KC_Y, KC_BSPC, + KC_LCTL,KC_A, KC_D, KC_F, KC_H, LCTL(KC_Z), + KC_LSFT,KC_X, KC_V, KC_B, LT(2,KC_SPC),LCTL(KC_S) + ), + [_EDIT2] = LAYOUT( + KC_ESC, KC_Q, KC_BTN3,KC_INS, KC_NO, KC_DEL, + KC_LCTL,KC_LBRC,KC_RBRC,KC_PGDN,KC_PGUP,LCTL(KC_Y), + KC_LSFT,TO(3), RGB_TOG,TO(0), _______,KC_NO + ), + [_FN] = LAYOUT( + KC_ESC, KC_LANG,KC_NO, RGB_TOG,KC_MNXT,KC_VOLU, + KC_CAPS,KC_NO, KC_NO, RGB_MOD,KC_MPRV,KC_VOLD, + CG_NORM,LCG_SWP,EEP_RST,RESET, TO(0), KC_MUTE + ) }; -//static bool _mode_jaen = false; -static bool layer_shift = false; - bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { - case KC_LSPC: + case KC_LANG: if (record->event.pressed){ - layer_shift = 1; - layer_on(2); - }else{ - layer_off(2); - if(layer_shift){ - register_code(KC_SPC); - unregister_code(KC_SPC); + if (keymap_config.swap_lctl_lgui == false){ + tap_code16(LALT(KC_GRV)); + } else { + switch(INPUT_MODE){ + case _INPUT_EN: + register_code(KC_LANG1); + INPUT_MODE = _INPUT_JP; + break; + case _INPUT_JP: + register_code(KC_LANG2); + INPUT_MODE = _INPUT_EN; + break; + } } + } else { + unregister_code(KC_LANG1); + unregister_code(KC_LANG2); } - return false; break; - case KC_LANG: - if (record->event.pressed){ - - } default: - if (record->event.pressed){ - layer_shift = 0; - } break; } return true; @@ -153,6 +151,7 @@ void encoder_update_user(uint8_t index, bool clockwise){ void keyboard_post_init_user(void){ rgblight_layers = quick17_rgb_layers; rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL); + INPUT_MODE = _INPUT_EN; } layer_state_t layer_state_set_user(layer_state_t state){ rgblight_set_layer_state(0, layer_state_cmp(state, _CONTROL)); @@ -171,10 +170,12 @@ void encoder_update_user(uint8_t index, bool clockwise){ // rgb_matrix_set_color_all(RGB_TEAL); rgb_matrix_mode(RGB_MATRIX_CUSTOM_quick17_rgbm_effect); // rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL); + INPUT_MODE = _INPUT_EN; } #else void keyboard_post_init_user(void){ rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL); + INPUT_MODE = _INPUT_EN; } #endif #endif diff --git a/keyboards/yushakobo/quick17/keymaps/default/layer_prefs.h b/keyboards/yushakobo/quick17/layer_prefs.h similarity index 50% rename from keyboards/yushakobo/quick17/keymaps/default/layer_prefs.h rename to keyboards/yushakobo/quick17/layer_prefs.h index c1d78024c2d2..acd2c857d0ff 100644 --- a/keyboards/yushakobo/quick17/keymaps/default/layer_prefs.h +++ b/keyboards/yushakobo/quick17/layer_prefs.h @@ -5,6 +5,12 @@ enum layer_names { _FN }; -//static bool layer_shift = false; #define _HSV(H, S, V) (HSV){ .h = H, .s = S, .v = V } -#define _RGB(rgb) rgb.r, rgb.g, rgb.b \ No newline at end of file +#define _RGB(rgb) rgb.r, rgb.g, rgb.b + +enum _mode_ja { + _INPUT_JP = 0, + _INPUT_EN +}; + +static uint8_t INPUT_MODE; diff --git a/keyboards/yushakobo/quick17/rgb_matrix_kb.inc b/keyboards/yushakobo/quick17/rgb_matrix_kb.inc index 64246f3cf2b0..ca45f9770e54 100644 --- a/keyboards/yushakobo/quick17/rgb_matrix_kb.inc +++ b/keyboards/yushakobo/quick17/rgb_matrix_kb.inc @@ -3,7 +3,7 @@ RGB_MATRIX_EFFECT(quick17_rgbm_effect) #ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS #include "layer_prefs.h" - +//#include "keycode_config.h" #define LED_LAYOUT(\ L00, L01, L02, L03, L04, L05, \ @@ -13,7 +13,6 @@ RGB_MATRIX_EFFECT(quick17_rgbm_effect) L10, L11, L20, L21, L22, L23,\ L24, L25, L15, L14, L13, L12,\ L00, L01, L02, L03, L04, L05\ -\ } enum lighting_types { @@ -23,30 +22,30 @@ enum lighting_types { INDC2, INDC3, INDC4, - INDC5 + INDC5, + JA_EN }; - const uint8_t rgb_keymaps [][DRIVER_LED_TOTAL] = { [_CONTROL] = LED_LAYOUT( _____, INDC2, INDC1, INDC2, INDC3, INDC4, _____, INDC1, INDC1, INDC1, INDC3, INDC4, - _____, _____, _____, _____, _____, _____ + _____, _____, _____, _____, INDC5, INDC5 ), [_EDIT1] = LED_LAYOUT( - _____, _____, _____, _____, _____, _____, + _____, _____, _____, _____, _____, INDC4, _____, _____, _____, _____, _____, INDC1, - _____, _____, _____, _____, INDC2, INDC1 + _____, _____, _____, _____, INDC5, INDC1 ), [_EDIT2] = LED_LAYOUT( - _____, _____, _____, _____, _____, _____, + _____, _____, _____, _____, _____, INDC4, _____, _____, _____, _____, _____, INDC1, - _____, INDC4, _____, INDC3, INDC2, BOUT + _____, INDC5, _____, INDC5, INDC5, BOUT ), [_FN] = LED_LAYOUT( - _____, _____, BOUT, INDC5, INDC4, INDC4, - _____, _____, BOUT, INDC5, INDC4, INDC4, - INDC2, INDC2, BOUT, BOUT, BOUT, INDC4 + _____, JA_EN, BOUT, INDC3, INDC4, INDC4, + _____, _____, BOUT, INDC3, INDC4, INDC4, + INDC2, INDC2, INDC1, INDC1, INDC5, INDC4 ) }; @@ -58,33 +57,44 @@ static void led_color_set(uint8_t index, uint8_t color_patterns) { RGB rgb_indc3 = hsv_to_rgb(_HSV( 64, 255, hsv.v)); //HSV_CHARTREUSE RGB rgb_indc4 = hsv_to_rgb(_HSV(106, 255, hsv.v)); //HSV_SPRINGGREEN RGB rgb_indc5 = hsv_to_rgb(_HSV(234, 128, hsv.v)); //HSV_PINK + RGB rgb_indc_ja = hsv_to_rgb(_HSV(170, 255, hsv.v)); //HSV_BLUE + RGB rgb_indc_en = hsv_to_rgb(_HSV( 85, 255, hsv.v)); //HSV_GREEN + RGB rgb_indc_win = hsv_to_rgb(_HSV(28, 255, hsv.v)); //HSV_ORANGE switch(color_patterns){ case BOUT: rgb_matrix_set_color(index, RGB_BLACK); break; case _____: rgb_matrix_set_color(index, _RGB(rgb_white)); -// rgb_matrix_decrease_val(); break; case INDC1: rgb_matrix_set_color(index, _RGB(rgb_indc1)); -// rgb_matrix_decrease_val(); break; case INDC2: rgb_matrix_set_color(index, _RGB(rgb_indc2)); -// rgb_matrix_decrease_val(); break; case INDC3: rgb_matrix_set_color(index, _RGB(rgb_indc3)); -// rgb_matrix_increase_val(); break; case INDC4: rgb_matrix_set_color(index, _RGB(rgb_indc4)); -// rgb_matrix_decrease_val(); break; case INDC5: rgb_matrix_set_color(index, _RGB(rgb_indc5)); -// rgb_matrix_decrease_val(); + break; + case JA_EN: + if (keymap_config.swap_lctl_lgui == false) { + rgb_matrix_set_color(index, _RGB(rgb_indc_win)); + } else { + switch(INPUT_MODE){ + case _INPUT_EN: + rgb_matrix_set_color(index, _RGB(rgb_indc_en)); + break; + case _INPUT_JP: + rgb_matrix_set_color(index, _RGB(rgb_indc_ja)); + break; + } + } break; } } From cfe0ef94229e11636e23baa97f3b6ebf746b9bba Mon Sep 17 00:00:00 2001 From: keyaki-namiki <28521374+keyaki-namiki@users.noreply.github.com> Date: Sun, 27 Jun 2021 17:23:27 +0900 Subject: [PATCH 26/45] small progress in keymap.c and rgb_matrix_kb.inc --- .../quick17/keymaps/default/keymap.c | 16 +++---- keyboards/yushakobo/quick17/rgb_matrix_kb.inc | 43 +++++++++++++++---- 2 files changed, 42 insertions(+), 17 deletions(-) diff --git a/keyboards/yushakobo/quick17/keymaps/default/keymap.c b/keyboards/yushakobo/quick17/keymaps/default/keymap.c index 8975f68d2429..93c10eab8519 100644 --- a/keyboards/yushakobo/quick17/keymaps/default/keymap.c +++ b/keyboards/yushakobo/quick17/keymaps/default/keymap.c @@ -37,13 +37,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LSFT,KC_X, KC_V, KC_B, LT(2,KC_SPC),LCTL(KC_S) ), [_EDIT2] = LAYOUT( - KC_ESC, KC_Q, KC_BTN3,KC_INS, KC_NO, KC_DEL, + KC_ESC, KC_Q, KC_BTN3,KC_INS, KC_ENT, KC_DEL, KC_LCTL,KC_LBRC,KC_RBRC,KC_PGDN,KC_PGUP,LCTL(KC_Y), KC_LSFT,TO(3), RGB_TOG,TO(0), _______,KC_NO ), [_FN] = LAYOUT( KC_ESC, KC_LANG,KC_NO, RGB_TOG,KC_MNXT,KC_VOLU, - KC_CAPS,KC_NO, KC_NO, RGB_MOD,KC_MPRV,KC_VOLD, + KC_CAPS,KC_NLCK,KC_NO, RGB_MOD,KC_MPRV,KC_VOLD, CG_NORM,LCG_SWP,EEP_RST,RESET, TO(0), KC_MUTE ) }; @@ -57,13 +57,13 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } else { switch(INPUT_MODE){ case _INPUT_EN: - register_code(KC_LANG1); - INPUT_MODE = _INPUT_JP; - break; + register_code(KC_LANG1); + INPUT_MODE = _INPUT_JP; + break; case _INPUT_JP: - register_code(KC_LANG2); - INPUT_MODE = _INPUT_EN; - break; + register_code(KC_LANG2); + INPUT_MODE = _INPUT_EN; + break; } } } else { diff --git a/keyboards/yushakobo/quick17/rgb_matrix_kb.inc b/keyboards/yushakobo/quick17/rgb_matrix_kb.inc index ca45f9770e54..3d0edffb91a3 100644 --- a/keyboards/yushakobo/quick17/rgb_matrix_kb.inc +++ b/keyboards/yushakobo/quick17/rgb_matrix_kb.inc @@ -3,7 +3,8 @@ RGB_MATRIX_EFFECT(quick17_rgbm_effect) #ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS #include "layer_prefs.h" -//#include "keycode_config.h" + +extern uint8_t INPUT_MODE; #define LED_LAYOUT(\ L00, L01, L02, L03, L04, L05, \ @@ -23,7 +24,9 @@ enum lighting_types { INDC3, INDC4, INDC5, - JA_EN + JA_EN, + CAPSL, + NUM_L }; const uint8_t rgb_keymaps [][DRIVER_LED_TOTAL] = { @@ -40,11 +43,11 @@ const uint8_t rgb_keymaps [][DRIVER_LED_TOTAL] = { [_EDIT2] = LED_LAYOUT( _____, _____, _____, _____, _____, INDC4, _____, _____, _____, _____, _____, INDC1, - _____, INDC5, _____, INDC5, INDC5, BOUT + _____, INDC5, INDC3, INDC5, INDC5, BOUT ), [_FN] = LED_LAYOUT( _____, JA_EN, BOUT, INDC3, INDC4, INDC4, - _____, _____, BOUT, INDC3, INDC4, INDC4, + CAPSL, NUM_L, BOUT, INDC3, INDC4, INDC4, INDC2, INDC2, INDC1, INDC1, INDC5, INDC4 ) }; @@ -57,9 +60,10 @@ static void led_color_set(uint8_t index, uint8_t color_patterns) { RGB rgb_indc3 = hsv_to_rgb(_HSV( 64, 255, hsv.v)); //HSV_CHARTREUSE RGB rgb_indc4 = hsv_to_rgb(_HSV(106, 255, hsv.v)); //HSV_SPRINGGREEN RGB rgb_indc5 = hsv_to_rgb(_HSV(234, 128, hsv.v)); //HSV_PINK - RGB rgb_indc_ja = hsv_to_rgb(_HSV(170, 255, hsv.v)); //HSV_BLUE + RGB rgb_indc6 = hsv_to_rgb(_HSV(213, 255, hsv.v)); //HSV_MAGENTA + RGB rgb_indc_ja = hsv_to_rgb(_HSV(28, 255, hsv.v)); //HSV_ORANGE RGB rgb_indc_en = hsv_to_rgb(_HSV( 85, 255, hsv.v)); //HSV_GREEN - RGB rgb_indc_win = hsv_to_rgb(_HSV(28, 255, hsv.v)); //HSV_ORANGE + RGB rgb_indc_win = hsv_to_rgb(_HSV(170, 255, hsv.v)); //HSV_BLUE switch(color_patterns){ case BOUT: rgb_matrix_set_color(index, RGB_BLACK); @@ -86,16 +90,37 @@ static void led_color_set(uint8_t index, uint8_t color_patterns) { if (keymap_config.swap_lctl_lgui == false) { rgb_matrix_set_color(index, _RGB(rgb_indc_win)); } else { - switch(INPUT_MODE){ + switch (INPUT_MODE){ + case _INPUT_JP: + rgb_matrix_set_color(index, _RGB(rgb_indc_ja)); + break; case _INPUT_EN: rgb_matrix_set_color(index, _RGB(rgb_indc_en)); break; - case _INPUT_JP: - rgb_matrix_set_color(index, _RGB(rgb_indc_ja)); + default: + rgb_matrix_set_color(index, _RGB(rgb_white)); break; + } } break; + + + + case CAPSL: + if (host_keyboard_led_state().caps_lock) { + rgb_matrix_set_color(index, _RGB(rgb_indc6)); + } else { + rgb_matrix_set_color(index, _RGB(rgb_white)); + } + break; + case NUM_L: + if (host_keyboard_led_state().num_lock) { + rgb_matrix_set_color(index, _RGB(rgb_indc6)); + } else { + rgb_matrix_set_color(index, _RGB(rgb_white)); + } + break; } } From 3bf09188eeaef5e08ab5ea46123f6e546c80b14f Mon Sep 17 00:00:00 2001 From: keyaki-namiki <28521374+keyaki-namiki@users.noreply.github.com> Date: Thu, 1 Jul 2021 14:46:30 +0900 Subject: [PATCH 27/45] cleanup keymaps and rgb_matrix_kb.inc --- .../quick17/keymaps/default/keymap.c | 77 ++----------------- .../{layer_prefs.h => quick17_prefs.h} | 0 keyboards/yushakobo/quick17/rgb_matrix_kb.inc | 48 +++++------- 3 files changed, 26 insertions(+), 99 deletions(-) rename keyboards/yushakobo/quick17/{layer_prefs.h => quick17_prefs.h} (100%) diff --git a/keyboards/yushakobo/quick17/keymaps/default/keymap.c b/keyboards/yushakobo/quick17/keymaps/default/keymap.c index 93c10eab8519..73ecb3d6d283 100644 --- a/keyboards/yushakobo/quick17/keymaps/default/keymap.c +++ b/keyboards/yushakobo/quick17/keymaps/default/keymap.c @@ -14,9 +14,7 @@ * along with this program. If not, see . */ #include QMK_KEYBOARD_H -#include "layer_prefs.h" -#include "rgb_matrix.h" -//#include "keymap_jp.h" +#include "quick17_prefs.h" // Defines the keycodes used by our macros in process_record_user enum custom_keycodes { @@ -107,75 +105,14 @@ void encoder_update_user(uint8_t index, bool clockwise){ } } -#ifdef RGBLIGHT_LAYERS -#define INDICATOR_LAYERS 5 -#define INDICATOR_PCS 17 -#define INDICATOR_LANG 11 - const rgblight_segment_t PROGMEM mode_mac[] = RGBLIGHT_LAYER_SEGMENTS( - {INDICATOR_PCS, 1, HSV_WHITE} - ); - const rgblight_segment_t PROGMEM mode_win[] = RGBLIGHT_LAYER_SEGMENTS( - {INDICATOR_PCS, 1, HSV_AZURE} - ); - const rgblight_segment_t PROGMEM layer_ctrl[] = RGBLIGHT_LAYER_SEGMENTS( - {INDICATOR_LAYERS, 1, HSV_TEAL} - ); - const rgblight_segment_t PROGMEM layer_edit1[] = RGBLIGHT_LAYER_SEGMENTS( - {INDICATOR_LAYERS, 1, HSV_GREEN} - ); - const rgblight_segment_t PROGMEM layer_edit2[] = RGBLIGHT_LAYER_SEGMENTS( - {INDICATOR_LAYERS, 1, HSV_GOLD} - ); - const rgblight_segment_t PROGMEM layer_fn[] = RGBLIGHT_LAYER_SEGMENTS( - {INDICATOR_LAYERS, 1, HSV_BLUE}, - {1, 1, HSV_RED}, - {2, 1, HSV_PURPLE} - ); - const rgblight_segment_t PROGMEM lang_ja[] = RGBLIGHT_LAYER_SEGMENTS( - {INDICATOR_LANG, 1, HSV_RED} - ); - const rgblight_segment_t PROGMEM lang_en[] = RGBLIGHT_LAYER_SEGMENTS( - {INDICATOR_LANG, 1, HSV_PURPLE} - ); - const rgblight_segment_t* const PROGMEM quick17_rgb_layers[] = - RGBLIGHT_LAYERS_LIST( - layer_ctrl, - layer_edit1, - layer_edit2, - layer_fn, - mode_mac, - mode_win, - lang_ja, - lang_en - ); +#ifdef RGB_MATRIX_ENABLE void keyboard_post_init_user(void){ - rgblight_layers = quick17_rgb_layers; - rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL); + rgb_matrix_mode(RGB_MATRIX_CUSTOM_quick17_rgbm_effect); INPUT_MODE = _INPUT_EN; } - layer_state_t layer_state_set_user(layer_state_t state){ - rgblight_set_layer_state(0, layer_state_cmp(state, _CONTROL)); - rgblight_set_layer_state(1, layer_state_cmp(state, _EDIT1)); - rgblight_set_layer_state(2, layer_state_cmp(state, _EDIT2)); - rgblight_set_layer_state(3, layer_state_cmp(state, _FN)); - rgblight_set_layer_state(4, keymap_config.swap_lctl_lgui == true); - rgblight_set_layer_state(5, keymap_config.swap_lctl_lgui == false); - rgblight_set_layer_state(6, _mode_jaen); - rgblight_set_layer_state(7, !_mode_jaen); - return state; - } #else - #ifdef RGB_MATRIX_ENABLE - void keyboard_post_init_user(void){ - // rgb_matrix_set_color_all(RGB_TEAL); - rgb_matrix_mode(RGB_MATRIX_CUSTOM_quick17_rgbm_effect); - // rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL); - INPUT_MODE = _INPUT_EN; - } - #else - void keyboard_post_init_user(void){ - rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL); - INPUT_MODE = _INPUT_EN; - } - #endif + void keyboard_post_init_user(void){ + rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL); + INPUT_MODE = _INPUT_EN; + } #endif diff --git a/keyboards/yushakobo/quick17/layer_prefs.h b/keyboards/yushakobo/quick17/quick17_prefs.h similarity index 100% rename from keyboards/yushakobo/quick17/layer_prefs.h rename to keyboards/yushakobo/quick17/quick17_prefs.h diff --git a/keyboards/yushakobo/quick17/rgb_matrix_kb.inc b/keyboards/yushakobo/quick17/rgb_matrix_kb.inc index 3d0edffb91a3..68dd7c1afa7f 100644 --- a/keyboards/yushakobo/quick17/rgb_matrix_kb.inc +++ b/keyboards/yushakobo/quick17/rgb_matrix_kb.inc @@ -2,7 +2,7 @@ RGB_MATRIX_EFFECT(quick17_rgbm_effect) #ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS -#include "layer_prefs.h" +#include "quick17_prefs.h" extern uint8_t INPUT_MODE; @@ -53,39 +53,32 @@ const uint8_t rgb_keymaps [][DRIVER_LED_TOTAL] = { }; static void led_color_set(uint8_t index, uint8_t color_patterns) { - HSV hsv = rgb_matrix_config.hsv; - RGB rgb_white = hsv_to_rgb(_HSV( 0, 0, hsv.v)); //HSV_WHITE - RGB rgb_indc1 = hsv_to_rgb(_HSV(128, 255, hsv.v)); //HSV_TEAL - RGB rgb_indc2 = hsv_to_rgb(_HSV(191, 255, hsv.v)); //HSV_PURPLE - RGB rgb_indc3 = hsv_to_rgb(_HSV( 64, 255, hsv.v)); //HSV_CHARTREUSE - RGB rgb_indc4 = hsv_to_rgb(_HSV(106, 255, hsv.v)); //HSV_SPRINGGREEN - RGB rgb_indc5 = hsv_to_rgb(_HSV(234, 128, hsv.v)); //HSV_PINK - RGB rgb_indc6 = hsv_to_rgb(_HSV(213, 255, hsv.v)); //HSV_MAGENTA - RGB rgb_indc_ja = hsv_to_rgb(_HSV(28, 255, hsv.v)); //HSV_ORANGE - RGB rgb_indc_en = hsv_to_rgb(_HSV( 85, 255, hsv.v)); //HSV_GREEN - RGB rgb_indc_win = hsv_to_rgb(_HSV(170, 255, hsv.v)); //HSV_BLUE + HSV hsv = rgb_matrix_config.hsv; // 'quantum/rgblight_list.h' + RGB rgb_white = hsv_to_rgb(_HSV( 0, 0, hsv.v)); // HSV_WHITE + RGB rgb_indc1 = hsv_to_rgb(_HSV(128, 255, hsv.v)); // HSV_TEAL + RGB rgb_indc2 = hsv_to_rgb(_HSV(191, 255, hsv.v)); // HSV_PURPLE + RGB rgb_indc3 = hsv_to_rgb(_HSV( 64, 255, hsv.v)); // HSV_CHARTREUSE + RGB rgb_indc4 = hsv_to_rgb(_HSV(106, 255, hsv.v)); // HSV_SPRINGGREEN + RGB rgb_indc5 = hsv_to_rgb(_HSV(234, 128, hsv.v)); // HSV_PINK + RGB rgb_indc6 = hsv_to_rgb(_HSV(213, 255, hsv.v)); // HSV_MAGENTA + RGB rgb_indc_ja = hsv_to_rgb(_HSV(28, 255, hsv.v)); // HSV_ORANGE + RGB rgb_indc_en = hsv_to_rgb(_HSV( 85, 255, hsv.v)); // HSV_GREEN + RGB rgb_indc_win = hsv_to_rgb(_HSV(170, 255, hsv.v)); // HSV_BLUE switch(color_patterns){ case BOUT: - rgb_matrix_set_color(index, RGB_BLACK); - break; + rgb_matrix_set_color(index, RGB_BLACK);break; case _____: - rgb_matrix_set_color(index, _RGB(rgb_white)); - break; + rgb_matrix_set_color(index, _RGB(rgb_white));break; case INDC1: - rgb_matrix_set_color(index, _RGB(rgb_indc1)); - break; + rgb_matrix_set_color(index, _RGB(rgb_indc1));break; case INDC2: - rgb_matrix_set_color(index, _RGB(rgb_indc2)); - break; + rgb_matrix_set_color(index, _RGB(rgb_indc2));break; case INDC3: - rgb_matrix_set_color(index, _RGB(rgb_indc3)); - break; + rgb_matrix_set_color(index, _RGB(rgb_indc3));break; case INDC4: - rgb_matrix_set_color(index, _RGB(rgb_indc4)); - break; + rgb_matrix_set_color(index, _RGB(rgb_indc4));break; case INDC5: - rgb_matrix_set_color(index, _RGB(rgb_indc5)); - break; + rgb_matrix_set_color(index, _RGB(rgb_indc5));break; case JA_EN: if (keymap_config.swap_lctl_lgui == false) { rgb_matrix_set_color(index, _RGB(rgb_indc_win)); @@ -104,9 +97,6 @@ static void led_color_set(uint8_t index, uint8_t color_patterns) { } } break; - - - case CAPSL: if (host_keyboard_led_state().caps_lock) { rgb_matrix_set_color(index, _RGB(rgb_indc6)); From 809c5dc5b7824d6ccd28e39b6d1fc3219d29ea73 Mon Sep 17 00:00:00 2001 From: keyaki-namiki <28521374+keyaki-namiki@users.noreply.github.com> Date: Thu, 1 Jul 2021 14:48:39 +0900 Subject: [PATCH 28/45] update files --- keyboards/yushakobo/quick17/config.h | 2 +- .../quick17/keymaps/default/keymap.c | 2 +- .../yushakobo/quick17/keymaps/via/keymap.c | 250 +++++------------- .../yushakobo/quick17/keymaps/via/rules.mk | 4 +- keyboards/yushakobo/quick17/quick17.c | 2 +- keyboards/yushakobo/quick17/quick17.h | 2 +- 6 files changed, 79 insertions(+), 183 deletions(-) diff --git a/keyboards/yushakobo/quick17/config.h b/keyboards/yushakobo/quick17/config.h index 42e70a0f96f1..f2acf33d9ae3 100644 --- a/keyboards/yushakobo/quick17/config.h +++ b/keyboards/yushakobo/quick17/config.h @@ -1,5 +1,5 @@ /* -Copyright 2020 yushakobo +Copyright 2021 yushakobo 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 diff --git a/keyboards/yushakobo/quick17/keymaps/default/keymap.c b/keyboards/yushakobo/quick17/keymaps/default/keymap.c index 73ecb3d6d283..59af910b68d2 100644 --- a/keyboards/yushakobo/quick17/keymaps/default/keymap.c +++ b/keyboards/yushakobo/quick17/keymaps/default/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2020 yushakobo +/* Copyright 2021 yushakobo * * 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 diff --git a/keyboards/yushakobo/quick17/keymaps/via/keymap.c b/keyboards/yushakobo/quick17/keymaps/via/keymap.c index b535cd9bd72a..59af910b68d2 100644 --- a/keyboards/yushakobo/quick17/keymaps/via/keymap.c +++ b/keyboards/yushakobo/quick17/keymaps/via/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2020 yushakobo +/* Copyright 2021 yushakobo * * 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 @@ -14,211 +14,105 @@ * along with this program. If not, see . */ #include QMK_KEYBOARD_H -// Defines names for use in layer keycodes and the keymap -enum layer_names { - _BASE, - _PHOTO, - _PHOTO_SHIFT, - _FN -}; +#include "quick17_prefs.h" // Defines the keycodes used by our macros in process_record_user enum custom_keycodes { - PS_LANG = SAFE_RANGE, - FN_LANG + BASE = SAFE_RANGE, + KC_LSPC, + KC_LANG }; -/* - PHOTO, - FN, -*/ -#define FN MO(_FN) -#define BASE DF(_BASE) -#define PHOTO DF(_PHOTO) -#define PHOTO_S MO(_PHOTO_SHIFT) -#define MAC CG_NORM -#define WIN CG_SWAP -#define PS_CMRL KC_LGUI -#define PS_ERSE KC_E -#define PS_MGWD KC_W -#define PS_EYDR KC_I -#define PS_SLCT KC_A -#define PS_HAND KC_H -#define PS_LASS KC_L -#define PS_MRQE KC_M -#define PS_PEN KC_P -#define PS_MOVE KC_V -#define PS_ZOOM KC_Z -#define PS_CROP KC_C -#define PS_BRSD KC_LBRC -#define PS_BRSI KC_RBRC -#define PS_BRSP KC_COMM -#define PS_BRSN KC_DOT -#define PS_CSHR KC_CAPS -#define PS_ZIN LGUI(KC_PLUS) -#define PS_ZOUT LGUI(KC_MINS) -#define PS_CLYR SGUI(KC_N)//ctrl shift n -#define PS_UNDO LGUI(KC_Z) -#define PS_REDO SGUI(KC_Z) - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* Base */ - [_BASE] = LAYOUT( - KC_TAB, KC_PGUP, KC_UP, KC_PGDN, KC_HOME, KC_INS, - KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, KC_DEL, - KC_LSFT, KC_ESC, KC_LALT, KC_SPC, FN, KC_ENT -), - [_PHOTO] = LAYOUT( - KC_ESC, PS_ERSE, PS_MGWD, PS_EYDR, PS_ZIN, KC_BSPC, - PS_CMRL, PS_SLCT, PS_HAND, PS_LASS, PS_MRQE, PS_PEN, - KC_LSFT, KC_Z, KC_V, KC_LALT, PHOTO_S, KC_ENT -), - [_PHOTO_SHIFT] = LAYOUT( - KC_ESC, PS_BRSD, PS_BRSI, PS_UNDO, PS_REDO, KC_DEL, - PS_CMRL, PS_BRSP, PS_BRSN, PS_CSHR, PS_CROP, PS_CLYR, - KC_LSFT, PS_LANG, BASE, _______, _______, _______ -), - [_FN] = LAYOUT( - FN_LANG, KC_LANG1,XXXXXXX, RGB_TOG, KC_MNXT, KC_VOLU, - PHOTO, BASE, KC_NO, RGB_MOD, KC_MPRV, KC_VOLD, - MAC, WIN, KC_NO, KC_NO, _______, KC_MUTE -) + [_CONTROL] = LAYOUT( + KC_TAB, KC_PGUP,KC_UP, KC_PGDN,KC_HOME,KC_INS, + KC_LCTL,KC_LEFT,KC_DOWN,KC_RGHT,KC_END, KC_DEL, + KC_LSFT,KC_LGUI,KC_ESC, KC_LALT,LT(3,KC_SPC),TO(1) + ), + [_EDIT1] = LAYOUT( + KC_ESC, KC_W, KC_E, KC_R, KC_Y, KC_BSPC, + KC_LCTL,KC_A, KC_D, KC_F, KC_H, LCTL(KC_Z), + KC_LSFT,KC_X, KC_V, KC_B, LT(2,KC_SPC),LCTL(KC_S) + ), + [_EDIT2] = LAYOUT( + KC_ESC, KC_Q, KC_BTN3,KC_INS, KC_ENT, KC_DEL, + KC_LCTL,KC_LBRC,KC_RBRC,KC_PGDN,KC_PGUP,LCTL(KC_Y), + KC_LSFT,TO(3), RGB_TOG,TO(0), _______,KC_NO + ), + [_FN] = LAYOUT( + KC_ESC, KC_LANG,KC_NO, RGB_TOG,KC_MNXT,KC_VOLU, + KC_CAPS,KC_NLCK,KC_NO, RGB_MOD,KC_MPRV,KC_VOLD, + CG_NORM,LCG_SWP,EEP_RST,RESET, TO(0), KC_MUTE + ) }; -static bool _mode_ja = false; - bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { - case PS_LANG: + case KC_LANG: if (record->event.pressed){ - if(keymap_config.swap_lctl_lgui == true){ - SEND_STRING(SS_LALT("`")); + if (keymap_config.swap_lctl_lgui == false){ + tap_code16(LALT(KC_GRV)); } else { - if (_mode_ja == false){ - register_code(KC_LANG2); - } else { - register_code(KC_LANG1); + switch(INPUT_MODE){ + case _INPUT_EN: + register_code(KC_LANG1); + INPUT_MODE = _INPUT_JP; + break; + case _INPUT_JP: + register_code(KC_LANG2); + INPUT_MODE = _INPUT_EN; + break; } } } else { - if (_mode_ja == false){ - unregister_code(KC_LANG2); - _mode_ja = true; - } else { - unregister_code(KC_LANG1); - _mode_ja = false; - } - } - break; - case FN_LANG: - if(record->event.pressed){ - if(keymap_config.swap_lctl_lgui){ - SEND_STRING(SS_LALT("`")); - } else { - register_code(KC_LANG2); - } - } else { + unregister_code(KC_LANG1); unregister_code(KC_LANG2); } break; + default: + break; } return true; } -void encoder_update_user(uint8_t index, bool clockwise) { +void encoder_update_user(uint8_t index, bool clockwise){ if (index == 0) { - switch (layer_state) { - case _BASE: - if (clockwise) { - tap_code(KC_WH_U); - } else { - tap_code(KC_WH_D); - } - break; - case _PHOTO: - case _PHOTO_SHIFT: - if (clockwise) { - tap_code(KC_RBRC); - } else { - tap_code(KC_LBRC); - } - break; - case _FN: - if (clockwise) { - tap_code(KC_VOLU); - } else { - tap_code(KC_VOLD); - } - default: - break; + if (IS_LAYER_ON(_EDIT2)){ + if (clockwise) { + tap_code(KC_LBRC); + } else { + tap_code(KC_RBRC); + } + } else if (IS_LAYER_ON(_EDIT1)){ + if (clockwise) { + tap_code(KC_VOLU); + } else { + tap_code(KC_VOLD); + } + } else if (IS_LAYER_ON(_FN)){ + if (clockwise) { + tap_code(KC_MNXT); + } else { + tap_code(KC_MPRV); + } + } else { // IS_LAYER_ON(_CONTROL) + if (clockwise) { + tap_code(KC_WH_U); + } else { + tap_code(KC_WH_D); + } } } } -#ifdef RGBLIGHT_LAYERS -#define RGBINDICATOR_TEST_A HSV_RED -#define RGBINDICATOR_TEST_B HSV_BLUE -#define RGBINDICATOR_TEST_C HSV_WHITE -#define RGBINDICATOR_TEST_D HSV_GREEN - const rgblight_segment_t PROGMEM mode_mac[] = RGBLIGHT_LAYER_SEGMENTS( - {5, 1, RGBINDICATOR_TEST_A} -// {5, 1, HSV_WHITE} - ); - const rgblight_segment_t PROGMEM mode_win[] = RGBLIGHT_LAYER_SEGMENTS( - {5, 1, RGBINDICATOR_TEST_B} -// {5, 1, HSV_TEAL} - ); - const rgblight_segment_t PROGMEM mode_base[] = RGBLIGHT_LAYER_SEGMENTS( - {11, 1, RGBINDICATOR_TEST_D} - ); - const rgblight_segment_t PROGMEM mode_photo[] = RGBLIGHT_LAYER_SEGMENTS( - {11, 1, RGBINDICATOR_TEST_A} -// {11, 1, HSV_TEAL} - ); - const rgblight_segment_t PROGMEM mode_photo1[] = RGBLIGHT_LAYER_SEGMENTS( - {11, 1, RGBINDICATOR_TEST_B} -// {11, 1, HSV_BLUE} - ); - const rgblight_segment_t PROGMEM mode_fn[] = RGBLIGHT_LAYER_SEGMENTS( - {11, 1, RGBINDICATOR_TEST_C} -// {11, 1, HSV_SPRINGGREEN} - ); - const rgblight_segment_t PROGMEM mode_ja[] = RGBLIGHT_LAYER_SEGMENTS( - {17, 1, RGBINDICATOR_TEST_A} -// {17, 1, HSV_ORANGE} - ); - const rgblight_segment_t PROGMEM mode_en[] = RGBLIGHT_LAYER_SEGMENTS( - {17, 1, RGBINDICATOR_TEST_B} -// {17, 1, HSV_YELLOW} - ); - const rgblight_segment_t* const PROGMEM quick17_rgb_layers[] = RGBLIGHT_LAYERS_LIST( - mode_base, - mode_photo, - mode_photo1, - mode_fn, - mode_mac, - mode_win, - mode_ja, - mode_en - ); +#ifdef RGB_MATRIX_ENABLE void keyboard_post_init_user(void){ - rgblight_layers = quick17_rgb_layers; - - } - layer_state_t layer_state_set_user(layer_state_t state){ - rgblight_set_layer_state(0, layer_state_cmp(state, _BASE)); - rgblight_set_layer_state(1, layer_state_cmp(state, _PHOTO)); - rgblight_set_layer_state(2, layer_state_cmp(state, _PHOTO_SHIFT)); - rgblight_set_layer_state(3, layer_state_cmp(state, _FN)); - rgblight_set_layer_state(4, keymap_config.swap_lctl_lgui == true); - rgblight_set_layer_state(5, keymap_config.swap_lctl_lgui == false); - rgblight_set_layer_state(6, _mode_ja); - rgblight_set_layer_state(7, !_mode_ja); - return state; + rgb_matrix_mode(RGB_MATRIX_CUSTOM_quick17_rgbm_effect); + INPUT_MODE = _INPUT_EN; } - /* - bool led_update_user(led_t led_state){ - return true; +#else + void keyboard_post_init_user(void){ + rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL); + INPUT_MODE = _INPUT_EN; } - */ #endif diff --git a/keyboards/yushakobo/quick17/keymaps/via/rules.mk b/keyboards/yushakobo/quick17/keymaps/via/rules.mk index 036bd6d1c3ec..b5502db7c499 100644 --- a/keyboards/yushakobo/quick17/keymaps/via/rules.mk +++ b/keyboards/yushakobo/quick17/keymaps/via/rules.mk @@ -1 +1,3 @@ -VIA_ENABLE = yes \ No newline at end of file +VIA_ENABLE = yes +RGBLIGHT_ENABLE = yes +RGB_MATRIX_ENABLE = no \ No newline at end of file diff --git a/keyboards/yushakobo/quick17/quick17.c b/keyboards/yushakobo/quick17/quick17.c index 2ec272981198..ed9fe9709790 100644 --- a/keyboards/yushakobo/quick17/quick17.c +++ b/keyboards/yushakobo/quick17/quick17.c @@ -1,4 +1,4 @@ -/* Copyright 2020 yushakobo +/* Copyright 2021 yushakobo * * 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 diff --git a/keyboards/yushakobo/quick17/quick17.h b/keyboards/yushakobo/quick17/quick17.h index 7aad3ecb69d5..566df71069f1 100644 --- a/keyboards/yushakobo/quick17/quick17.h +++ b/keyboards/yushakobo/quick17/quick17.h @@ -1,4 +1,4 @@ -/* Copyright 2020 yushakobo +/* Copyright 2021 yushakobo * * 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 From 8c3dee3142d32b7f04cacb84811128fce8e280a0 Mon Sep 17 00:00:00 2001 From: keyaki-namiki <28521374+keyaki-namiki@users.noreply.github.com> Date: Thu, 1 Jul 2021 17:26:39 +0900 Subject: [PATCH 29/45] RGB_MATRIX implementation looks completed --- .../quick17/keymaps/default/keymap.c | 19 ++++----- .../yushakobo/quick17/keymaps/via/keymap.c | 19 ++++----- keyboards/yushakobo/quick17/quick17_prefs.c | 13 ++++++ keyboards/yushakobo/quick17/quick17_prefs.h | 8 +--- keyboards/yushakobo/quick17/rgb_matrix_kb.inc | 40 ++++++------------- keyboards/yushakobo/quick17/rules.mk | 4 +- 6 files changed, 46 insertions(+), 57 deletions(-) create mode 100644 keyboards/yushakobo/quick17/quick17_prefs.c diff --git a/keyboards/yushakobo/quick17/keymaps/default/keymap.c b/keyboards/yushakobo/quick17/keymaps/default/keymap.c index 59af910b68d2..f07e1b7d966c 100644 --- a/keyboards/yushakobo/quick17/keymaps/default/keymap.c +++ b/keyboards/yushakobo/quick17/keymaps/default/keymap.c @@ -53,15 +53,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { if (keymap_config.swap_lctl_lgui == false){ tap_code16(LALT(KC_GRV)); } else { - switch(INPUT_MODE){ - case _INPUT_EN: - register_code(KC_LANG1); - INPUT_MODE = _INPUT_JP; - break; - case _INPUT_JP: - register_code(KC_LANG2); - INPUT_MODE = _INPUT_EN; - break; + if(input_mode()){ + register_code(KC_LANG2); + set_input_mode(false); + } else { + register_code(KC_LANG1); + set_input_mode(true); } } } else { @@ -108,11 +105,11 @@ void encoder_update_user(uint8_t index, bool clockwise){ #ifdef RGB_MATRIX_ENABLE void keyboard_post_init_user(void){ rgb_matrix_mode(RGB_MATRIX_CUSTOM_quick17_rgbm_effect); - INPUT_MODE = _INPUT_EN; + set_input_mode(false); } #else void keyboard_post_init_user(void){ rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL); - INPUT_MODE = _INPUT_EN; + set_input_mode(false); } #endif diff --git a/keyboards/yushakobo/quick17/keymaps/via/keymap.c b/keyboards/yushakobo/quick17/keymaps/via/keymap.c index 59af910b68d2..f07e1b7d966c 100644 --- a/keyboards/yushakobo/quick17/keymaps/via/keymap.c +++ b/keyboards/yushakobo/quick17/keymaps/via/keymap.c @@ -53,15 +53,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { if (keymap_config.swap_lctl_lgui == false){ tap_code16(LALT(KC_GRV)); } else { - switch(INPUT_MODE){ - case _INPUT_EN: - register_code(KC_LANG1); - INPUT_MODE = _INPUT_JP; - break; - case _INPUT_JP: - register_code(KC_LANG2); - INPUT_MODE = _INPUT_EN; - break; + if(input_mode()){ + register_code(KC_LANG2); + set_input_mode(false); + } else { + register_code(KC_LANG1); + set_input_mode(true); } } } else { @@ -108,11 +105,11 @@ void encoder_update_user(uint8_t index, bool clockwise){ #ifdef RGB_MATRIX_ENABLE void keyboard_post_init_user(void){ rgb_matrix_mode(RGB_MATRIX_CUSTOM_quick17_rgbm_effect); - INPUT_MODE = _INPUT_EN; + set_input_mode(false); } #else void keyboard_post_init_user(void){ rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL); - INPUT_MODE = _INPUT_EN; + set_input_mode(false); } #endif diff --git a/keyboards/yushakobo/quick17/quick17_prefs.c b/keyboards/yushakobo/quick17/quick17_prefs.c new file mode 100644 index 000000000000..3e3b94e0bc47 --- /dev/null +++ b/keyboards/yushakobo/quick17/quick17_prefs.c @@ -0,0 +1,13 @@ +#include QMK_KEYBOARD_H + +bool _INPUT_JP; + +void set_input_mode(bool _mode_jaen){ + _INPUT_JP = _mode_jaen; + // japanese -> true + // english -> false +} + +bool input_mode(void){ + return _INPUT_JP; +} diff --git a/keyboards/yushakobo/quick17/quick17_prefs.h b/keyboards/yushakobo/quick17/quick17_prefs.h index acd2c857d0ff..862ac1554f17 100644 --- a/keyboards/yushakobo/quick17/quick17_prefs.h +++ b/keyboards/yushakobo/quick17/quick17_prefs.h @@ -8,9 +8,5 @@ enum layer_names { #define _HSV(H, S, V) (HSV){ .h = H, .s = S, .v = V } #define _RGB(rgb) rgb.r, rgb.g, rgb.b -enum _mode_ja { - _INPUT_JP = 0, - _INPUT_EN -}; - -static uint8_t INPUT_MODE; +bool input_mode(void); +void set_input_mode(bool _mode_jaen); diff --git a/keyboards/yushakobo/quick17/rgb_matrix_kb.inc b/keyboards/yushakobo/quick17/rgb_matrix_kb.inc index 68dd7c1afa7f..1cc77f578f39 100644 --- a/keyboards/yushakobo/quick17/rgb_matrix_kb.inc +++ b/keyboards/yushakobo/quick17/rgb_matrix_kb.inc @@ -4,8 +4,6 @@ RGB_MATRIX_EFFECT(quick17_rgbm_effect) #include "quick17_prefs.h" -extern uint8_t INPUT_MODE; - #define LED_LAYOUT(\ L00, L01, L02, L03, L04, L05, \ L10, L11, L12, L13, L14, L15, \ @@ -61,39 +59,25 @@ static void led_color_set(uint8_t index, uint8_t color_patterns) { RGB rgb_indc4 = hsv_to_rgb(_HSV(106, 255, hsv.v)); // HSV_SPRINGGREEN RGB rgb_indc5 = hsv_to_rgb(_HSV(234, 128, hsv.v)); // HSV_PINK RGB rgb_indc6 = hsv_to_rgb(_HSV(213, 255, hsv.v)); // HSV_MAGENTA - RGB rgb_indc_ja = hsv_to_rgb(_HSV(28, 255, hsv.v)); // HSV_ORANGE + RGB rgb_indc_ja = hsv_to_rgb(_HSV( 0, 255, hsv.v)); // HSV_RED RGB rgb_indc_en = hsv_to_rgb(_HSV( 85, 255, hsv.v)); // HSV_GREEN RGB rgb_indc_win = hsv_to_rgb(_HSV(170, 255, hsv.v)); // HSV_BLUE switch(color_patterns){ - case BOUT: - rgb_matrix_set_color(index, RGB_BLACK);break; - case _____: - rgb_matrix_set_color(index, _RGB(rgb_white));break; - case INDC1: - rgb_matrix_set_color(index, _RGB(rgb_indc1));break; - case INDC2: - rgb_matrix_set_color(index, _RGB(rgb_indc2));break; - case INDC3: - rgb_matrix_set_color(index, _RGB(rgb_indc3));break; - case INDC4: - rgb_matrix_set_color(index, _RGB(rgb_indc4));break; - case INDC5: - rgb_matrix_set_color(index, _RGB(rgb_indc5));break; + case BOUT: rgb_matrix_set_color(index, RGB_BLACK); break; + case _____: rgb_matrix_set_color(index, _RGB(rgb_white)); break; + case INDC1: rgb_matrix_set_color(index, _RGB(rgb_indc1)); break; + case INDC2: rgb_matrix_set_color(index, _RGB(rgb_indc2)); break; + case INDC3: rgb_matrix_set_color(index, _RGB(rgb_indc3)); break; + case INDC4: rgb_matrix_set_color(index, _RGB(rgb_indc4)); break; + case INDC5: rgb_matrix_set_color(index, _RGB(rgb_indc5)); break; case JA_EN: if (keymap_config.swap_lctl_lgui == false) { rgb_matrix_set_color(index, _RGB(rgb_indc_win)); } else { - switch (INPUT_MODE){ - case _INPUT_JP: - rgb_matrix_set_color(index, _RGB(rgb_indc_ja)); - break; - case _INPUT_EN: - rgb_matrix_set_color(index, _RGB(rgb_indc_en)); - break; - default: - rgb_matrix_set_color(index, _RGB(rgb_white)); - break; - + if (input_mode()){ + rgb_matrix_set_color(index, _RGB(rgb_indc_ja)); + } else { + rgb_matrix_set_color(index, _RGB(rgb_indc_en)); } } break; diff --git a/keyboards/yushakobo/quick17/rules.mk b/keyboards/yushakobo/quick17/rules.mk index 32e9b8202a74..e31c4bda6d13 100644 --- a/keyboards/yushakobo/quick17/rules.mk +++ b/keyboards/yushakobo/quick17/rules.mk @@ -24,4 +24,6 @@ ENCODER_ENABLE = yes RGB_MATRIX_ENABLE = yes RGB_MATRIX_DRIVER = WS2812 -RGB_MATRIX_CUSTOM_KB = yes \ No newline at end of file +RGB_MATRIX_CUSTOM_KB = yes + +SRC += quick17_prefs.c From b2ed5cad75b1f0060e43af2368af916fa37bad88 Mon Sep 17 00:00:00 2001 From: keyaki-namiki <28521374+keyaki-namiki@users.noreply.github.com> Date: Thu, 1 Jul 2021 17:49:25 +0900 Subject: [PATCH 30/45] update and cleanup some files --- keyboards/yushakobo/quick17/info.json | 13 +++++-------- .../yushakobo/quick17/keymaps/default/keymap.c | 2 -- keyboards/yushakobo/quick17/keymaps/via/keymap.c | 2 -- keyboards/yushakobo/quick17/rgb_matrix_kb.inc | 6 +++--- 4 files changed, 8 insertions(+), 15 deletions(-) diff --git a/keyboards/yushakobo/quick17/info.json b/keyboards/yushakobo/quick17/info.json index 7c4d913f7543..6e2b0dd77640 100644 --- a/keyboards/yushakobo/quick17/info.json +++ b/keyboards/yushakobo/quick17/info.json @@ -2,17 +2,14 @@ "keyboard_name": "quick17", "url": "", "maintainer": "yushakobo", - "width": 3, - "height": 2, + "width": 6, + "height": 3, "layouts": { "LAYOUT": { "layout": [ - {"label": "k00", "x": 0, "y": 0}, - {"label": "k01", "x": 1, "y": 0}, - {"label": "k02", "x": 2, "y": 0}, - - {"label": "k10", "x": 0, "y": 1, "w": 1.5}, - {"label": "k12", "x": 1.5, "y": 1, "w": 1.5} + {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, + {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, + {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2} ] } } diff --git a/keyboards/yushakobo/quick17/keymaps/default/keymap.c b/keyboards/yushakobo/quick17/keymaps/default/keymap.c index f07e1b7d966c..42b0aac55a73 100644 --- a/keyboards/yushakobo/quick17/keymaps/default/keymap.c +++ b/keyboards/yushakobo/quick17/keymaps/default/keymap.c @@ -18,8 +18,6 @@ // Defines the keycodes used by our macros in process_record_user enum custom_keycodes { - BASE = SAFE_RANGE, - KC_LSPC, KC_LANG }; diff --git a/keyboards/yushakobo/quick17/keymaps/via/keymap.c b/keyboards/yushakobo/quick17/keymaps/via/keymap.c index f07e1b7d966c..42b0aac55a73 100644 --- a/keyboards/yushakobo/quick17/keymaps/via/keymap.c +++ b/keyboards/yushakobo/quick17/keymaps/via/keymap.c @@ -18,8 +18,6 @@ // Defines the keycodes used by our macros in process_record_user enum custom_keycodes { - BASE = SAFE_RANGE, - KC_LSPC, KC_LANG }; diff --git a/keyboards/yushakobo/quick17/rgb_matrix_kb.inc b/keyboards/yushakobo/quick17/rgb_matrix_kb.inc index 1cc77f578f39..87738389b7dc 100644 --- a/keyboards/yushakobo/quick17/rgb_matrix_kb.inc +++ b/keyboards/yushakobo/quick17/rgb_matrix_kb.inc @@ -59,8 +59,8 @@ static void led_color_set(uint8_t index, uint8_t color_patterns) { RGB rgb_indc4 = hsv_to_rgb(_HSV(106, 255, hsv.v)); // HSV_SPRINGGREEN RGB rgb_indc5 = hsv_to_rgb(_HSV(234, 128, hsv.v)); // HSV_PINK RGB rgb_indc6 = hsv_to_rgb(_HSV(213, 255, hsv.v)); // HSV_MAGENTA - RGB rgb_indc_ja = hsv_to_rgb(_HSV( 0, 255, hsv.v)); // HSV_RED - RGB rgb_indc_en = hsv_to_rgb(_HSV( 85, 255, hsv.v)); // HSV_GREEN + RGB rgb_indc_ja = hsv_to_rgb(_HSV( 0, 255, hsv.v)); // HSV_RED + RGB rgb_indc_en = hsv_to_rgb(_HSV( 85, 255, hsv.v)); // HSV_GREEN RGB rgb_indc_win = hsv_to_rgb(_HSV(170, 255, hsv.v)); // HSV_BLUE switch(color_patterns){ case BOUT: rgb_matrix_set_color(index, RGB_BLACK); break; @@ -114,4 +114,4 @@ static bool quick17_rgbm_effect (effect_params_t* params) { return led_max < DRIVER_LED_TOTAL; } -#endif \ No newline at end of file +#endif From 205e3c691d063dc63f712566013366ee2a8e898e Mon Sep 17 00:00:00 2001 From: keyaki-namiki <28521374+keyaki-namiki@users.noreply.github.com> Date: Sat, 3 Jul 2021 16:50:20 +0900 Subject: [PATCH 31/45] update some readme.md --- .../quick17/keymaps/default/readme.md | 63 +++++++++++++++++++ keyboards/yushakobo/quick17/readme.md | 8 +-- 2 files changed, 67 insertions(+), 4 deletions(-) diff --git a/keyboards/yushakobo/quick17/keymaps/default/readme.md b/keyboards/yushakobo/quick17/keymaps/default/readme.md index 193d1b834067..5a5066ed58a5 100644 --- a/keyboards/yushakobo/quick17/keymaps/default/readme.md +++ b/keyboards/yushakobo/quick17/keymaps/default/readme.md @@ -1 +1,64 @@ # The default keymap for quick17 + +## CONTROL(default) Layer +``` + ,-----------------------------------------------. + | Tab | PgUp | Up | PgDn | Home | Ins | + |-------+-------+-------+-------+-------+-------| + | Ctrl | Left | Down | Right | End | Del | + |-------+-------+-------+-------+-------+-------| + | Shift | GUI | Esc | Alt | FN/Spc| EDIT1 | + `-----------------------------------------------' +``` + +## EDIT1 Layer +``` + ,--------------------------------------------------. + | Esc | W | E | R | Y | Bspc | + |-------+-------+-------+-------+---------+--------| + | Ctrl | A | D | F | H | Ctrl+Z | + |-------+-------+-------+-------+---------+--------| + | Shift | X | V | B |EDIT2/Spc| Ctrl+S | + `--------------------------------------------------' +``` + +## EDIT2 Layer +``` + ,-------------------------------------------------. + | Esc | Q | BTN3 | Ins | Enter | Bspc | + |-------+-------+-------+-------+--------+--------| + | Ctrl | [ | ] | PgDn | PgUp | Ctrl+Z | + |-------+-------+-------+-------+--------+--------| + | Shift | FN |RGB_TOG|CONTROL| (NONE) | (NONE) | + `-------------------------------------------------' +``` + +## FN Layer +``` + ,---------------------------------------------------. + | Esc | LANG | (NONE) |RGB_TOG| Media > | Vol+ | + |-------+-------+--------+-------+---------+--------| + | Caps | Numlk | (NONE) |RGB_MOD| Media < | Vol- | + |-------+-------+--------+-------+---------+--------| + | Win | mac | EEP_RST| RESET | CONTROL | Mute | + `---------------------------------------------------' +``` +### difference between mac-Mode and Win-Mode +- In mac Mode, `Ctrl` key will be changed into `command` key. +- `LANG` key will change its behaviour. + +### "LANG" key behaviour + +|LED-sign|Blue|Red|Green| +|---|---|---|---| +|mac Mode|-|かな|英数| +|Win Mode|半角/全角(Alt+`)|-|-| + +## Rotary encoder behaviour + +|On layer...|Clockwise|C-Clockwise| +|---|---|---| +|CONTROL|Scroll Up|Scroll Down| +|EDIT1|Vol+|Vol-| +|EDIT2|[|]| +|FN|Media >|Media <| diff --git a/keyboards/yushakobo/quick17/readme.md b/keyboards/yushakobo/quick17/readme.md index 2f0e5dda36de..5bfb08112e85 100644 --- a/keyboards/yushakobo/quick17/readme.md +++ b/keyboards/yushakobo/quick17/readme.md @@ -2,11 +2,11 @@ ![quick17](imgur.com image replace me!) -*A short description of the keyboard/project* +*A simple macropad for the beginners* -* Keyboard Maintainer: [yushakobo](https://github.com/yourusername) -* Hardware Supported: *The PCBs, controllers supported* -* Hardware Availability: *Links to where you can find this hardware* +* Keyboard Maintainer: [yushakobo](https://github.com/yushakobo) +* Hardware Supported: *Quick17 PCBs, Pro Micro (ATmega32u4)* +* Hardware Availability: [yushakobo shop](https://shop.yushakobo.jp/products/quick17) Make example for this keyboard (after setting up your build environment): From 70f66f08cf6e6a4c464bb48ad3b97c6b5c954d03 Mon Sep 17 00:00:00 2001 From: keyaki-namiki <28521374+keyaki-namiki@users.noreply.github.com> Date: Sat, 3 Jul 2021 18:05:40 +0900 Subject: [PATCH 32/45] update readme.md --- .../yushakobo/quick17/keymaps/via/readme.md | 63 ++++++++++++++++++- 1 file changed, 62 insertions(+), 1 deletion(-) diff --git a/keyboards/yushakobo/quick17/keymaps/via/readme.md b/keyboards/yushakobo/quick17/keymaps/via/readme.md index 193d1b834067..da0923539df5 100644 --- a/keyboards/yushakobo/quick17/keymaps/via/readme.md +++ b/keyboards/yushakobo/quick17/keymaps/via/readme.md @@ -1 +1,62 @@ -# The default keymap for quick17 +# The via keymap for quick17 + +## CONTROL(default) Layer +``` + ,-----------------------------------------------. + | Tab | PgUp | Up | PgDn | Home | Ins | + |-------+-------+-------+-------+-------+-------| + | Ctrl | Left | Down | Right | End | Del | + |-------+-------+-------+-------+-------+-------| + | Shift | GUI | Esc | Alt | FN/Spc| EDIT1 | + `-----------------------------------------------' +``` + +## EDIT1 Layer +``` + ,--------------------------------------------------. + | Esc | W | E | R | Y | Bspc | + |-------+-------+-------+-------+---------+--------| + | Ctrl | A | D | F | H | Ctrl+Z | + |-------+-------+-------+-------+---------+--------| + | Shift | X | V | B |EDIT2/Spc| Ctrl+S | + `--------------------------------------------------' +``` + +## EDIT2 Layer +``` + ,-------------------------------------------------. + | Esc | Q | BTN3 | Ins | Enter | Bspc | + |-------+-------+-------+-------+--------+--------| + | Ctrl | [ | ] | PgDn | PgUp | Ctrl+Z | + |-------+-------+-------+-------+--------+--------| + | Shift | FN |RGB_TOG|CONTROL| (NONE) | (NONE) | + `-------------------------------------------------' +``` + +## FN Layer +``` + ,---------------------------------------------------. + | Esc | LANG | (NONE) |RGB_TOG| Media > | Vol+ | + |-------+-------+--------+-------+---------+--------| + | Caps | Numlk | (NONE) |RGB_MOD| Media < | Vol- | + |-------+-------+--------+-------+---------+--------| + | Win | mac | EEP_RST| RESET | CONTROL | Mute | + `---------------------------------------------------' +``` +### difference between mac-Mode and Win-Mode +- In mac Mode, `Ctrl` key will be changed into `command` key. +- `LANG` key will change its behaviour. + +### "LANG" key behaviour + +- mac Mode: cycle around "かな" and "英数" +- Win Mode: key combinations of Alt and ` + +## Rotary encoder behaviour + +|On layer...|Clockwise|C-Clockwise| +|---|---|---| +|CONTROL|Scroll Up|Scroll Down| +|EDIT1|Vol+|Vol-| +|EDIT2|[|]| +|FN|Media >|Media <| From 0b738435f595d4892f596e75cb4a22f2b99ec847 Mon Sep 17 00:00:00 2001 From: keyaki-namiki <28521374+keyaki-namiki@users.noreply.github.com> Date: Sat, 3 Jul 2021 18:23:37 +0900 Subject: [PATCH 33/45] change callbacks for the encoder --- keyboards/yushakobo/quick17/keymaps/default/keymap.c | 3 ++- keyboards/yushakobo/quick17/keymaps/via/keymap.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/keyboards/yushakobo/quick17/keymaps/default/keymap.c b/keyboards/yushakobo/quick17/keymaps/default/keymap.c index 42b0aac55a73..5f2f45a6ebdf 100644 --- a/keyboards/yushakobo/quick17/keymaps/default/keymap.c +++ b/keyboards/yushakobo/quick17/keymaps/default/keymap.c @@ -70,7 +70,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { return true; } -void encoder_update_user(uint8_t index, bool clockwise){ +bool encoder_update_user(uint8_t index, bool clockwise){ if (index == 0) { if (IS_LAYER_ON(_EDIT2)){ if (clockwise) { @@ -98,6 +98,7 @@ void encoder_update_user(uint8_t index, bool clockwise){ } } } + return false; } #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/yushakobo/quick17/keymaps/via/keymap.c b/keyboards/yushakobo/quick17/keymaps/via/keymap.c index 42b0aac55a73..5f2f45a6ebdf 100644 --- a/keyboards/yushakobo/quick17/keymaps/via/keymap.c +++ b/keyboards/yushakobo/quick17/keymaps/via/keymap.c @@ -70,7 +70,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { return true; } -void encoder_update_user(uint8_t index, bool clockwise){ +bool encoder_update_user(uint8_t index, bool clockwise){ if (index == 0) { if (IS_LAYER_ON(_EDIT2)){ if (clockwise) { @@ -98,6 +98,7 @@ void encoder_update_user(uint8_t index, bool clockwise){ } } } + return false; } #ifdef RGB_MATRIX_ENABLE From 4ca958cd38c23d67494f0dd1488dc97fcaecf0aa Mon Sep 17 00:00:00 2001 From: keyaki-namiki <28521374+keyaki-namiki@users.noreply.github.com> Date: Thu, 8 Jul 2021 18:44:52 +0900 Subject: [PATCH 34/45] update some documents --- keyboards/yushakobo/quick17/info.json | 2 +- keyboards/yushakobo/quick17/readme.md | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/keyboards/yushakobo/quick17/info.json b/keyboards/yushakobo/quick17/info.json index 6e2b0dd77640..b440d962b864 100644 --- a/keyboards/yushakobo/quick17/info.json +++ b/keyboards/yushakobo/quick17/info.json @@ -1,6 +1,6 @@ { "keyboard_name": "quick17", - "url": "", + "url": "https://shop.yushakobo.jp/products/quick17", "maintainer": "yushakobo", "width": 6, "height": 3, diff --git a/keyboards/yushakobo/quick17/readme.md b/keyboards/yushakobo/quick17/readme.md index 5bfb08112e85..86ff396e9532 100644 --- a/keyboards/yushakobo/quick17/readme.md +++ b/keyboards/yushakobo/quick17/readme.md @@ -1,6 +1,9 @@ # quick17 -![quick17](imgur.com image replace me!) +![quick17](https://github.com/yushakobo/build-documents/raw/add_buildguide_for_quick17/Quick17/imgs/IMG_4941.JPG) + +[//]: # "the image above is the temporary address" + *A simple macropad for the beginners* From ac9102a9bc7519ed830ec876dac602452a192512 Mon Sep 17 00:00:00 2001 From: keyaki-namiki <28521374+keyaki-namiki@users.noreply.github.com> Date: Sat, 24 Jul 2021 16:30:18 +0900 Subject: [PATCH 35/45] update readme.md --- keyboards/yushakobo/quick17/readme.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/keyboards/yushakobo/quick17/readme.md b/keyboards/yushakobo/quick17/readme.md index 86ff396e9532..0b99bb2a6e13 100644 --- a/keyboards/yushakobo/quick17/readme.md +++ b/keyboards/yushakobo/quick17/readme.md @@ -1,9 +1,6 @@ # quick17 -![quick17](https://github.com/yushakobo/build-documents/raw/add_buildguide_for_quick17/Quick17/imgs/IMG_4941.JPG) - -[//]: # "the image above is the temporary address" - +![quick17](https://i.imgur.com/8SkWq0m.jpeg) *A simple macropad for the beginners* From 929573a3b4dc4f206a3990d32810b4043ae0093a Mon Sep 17 00:00:00 2001 From: MakotoKurauchi Date: Mon, 26 Jul 2021 17:19:33 +0900 Subject: [PATCH 36/45] Update keyboards/yushakobo/quick17/config.h Co-authored-by: Drashna Jaelre --- keyboards/yushakobo/quick17/config.h | 41 ---------------------------- 1 file changed, 41 deletions(-) diff --git a/keyboards/yushakobo/quick17/config.h b/keyboards/yushakobo/quick17/config.h index f2acf33d9ae3..88077ea0b277 100644 --- a/keyboards/yushakobo/quick17/config.h +++ b/keyboards/yushakobo/quick17/config.h @@ -128,47 +128,6 @@ along with this program. If not, see . /* define if matrix has ghost (lacks anti-ghosting diodes) */ //#define MATRIX_HAS_GHOST -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* If defined, GRAVE_ESC will always act as ESC when CTRL is held. - * This is useful for the Windows task manager shortcut (ctrl+shift+esc). - */ -//#define GRAVE_ESC_CTRL_OVERRIDE - -/* - * Force NKRO - * - * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved - * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the - * makefile for this to work.) - * - * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) - * until the next keyboard reset. - * - * NKRO may prevent your keystrokes from being detected in the BIOS, but it is - * fully operational during normal computer usage. - * - * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N) - * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by - * bootmagic, NKRO mode will always be enabled until it is toggled again during a - * power-up. - * - */ -//#define FORCE_NKRO - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT /* disable action features */ //#define NO_ACTION_LAYER From eeb07f57a9a60a0931064bce88caaba3d7c1e0d8 Mon Sep 17 00:00:00 2001 From: MakotoKurauchi Date: Wed, 15 Sep 2021 15:28:58 +0900 Subject: [PATCH 37/45] Update keyboards/yushakobo/quick17/config.h thanks Co-authored-by: Drashna Jaelre --- keyboards/yushakobo/quick17/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/yushakobo/quick17/config.h b/keyboards/yushakobo/quick17/config.h index 88077ea0b277..ab33c8408233 100644 --- a/keyboards/yushakobo/quick17/config.h +++ b/keyboards/yushakobo/quick17/config.h @@ -64,7 +64,7 @@ along with this program. If not, see . # define RGB_MATRIX_KEYPRESSES // reacts to keypresses // # define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses) // # define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects -# define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended +# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended # define RGB_MATRIX_FRAMEBUFFER_EFFECTS // # define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness) // # define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness) From 7f1b925328bc52cfc9c9f2c9d72051350653041a Mon Sep 17 00:00:00 2001 From: MakotoKurauchi Date: Wed, 15 Sep 2021 15:30:02 +0900 Subject: [PATCH 38/45] Update keyboards/yushakobo/quick17/keymaps/default/keymap.c thanks Co-authored-by: Drashna Jaelre --- keyboards/yushakobo/quick17/keymaps/default/keymap.c | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/yushakobo/quick17/keymaps/default/keymap.c b/keyboards/yushakobo/quick17/keymaps/default/keymap.c index 5f2f45a6ebdf..a3873bc1ee5b 100644 --- a/keyboards/yushakobo/quick17/keymaps/default/keymap.c +++ b/keyboards/yushakobo/quick17/keymaps/default/keymap.c @@ -14,7 +14,6 @@ * along with this program. If not, see . */ #include QMK_KEYBOARD_H -#include "quick17_prefs.h" // Defines the keycodes used by our macros in process_record_user enum custom_keycodes { From 99f1398049c5639abef5b0bc6bd2edd5fad84244 Mon Sep 17 00:00:00 2001 From: MakotoKurauchi Date: Wed, 15 Sep 2021 15:30:12 +0900 Subject: [PATCH 39/45] Update keyboards/yushakobo/quick17/keymaps/via/keymap.c thanks Co-authored-by: Drashna Jaelre --- keyboards/yushakobo/quick17/keymaps/via/keymap.c | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/yushakobo/quick17/keymaps/via/keymap.c b/keyboards/yushakobo/quick17/keymaps/via/keymap.c index 5f2f45a6ebdf..a3873bc1ee5b 100644 --- a/keyboards/yushakobo/quick17/keymaps/via/keymap.c +++ b/keyboards/yushakobo/quick17/keymaps/via/keymap.c @@ -14,7 +14,6 @@ * along with this program. If not, see . */ #include QMK_KEYBOARD_H -#include "quick17_prefs.h" // Defines the keycodes used by our macros in process_record_user enum custom_keycodes { From 92e4ba3b8c77e02adb595cf771f4497d96354830 Mon Sep 17 00:00:00 2001 From: MakotoKurauchi Date: Wed, 15 Sep 2021 15:37:23 +0900 Subject: [PATCH 40/45] add license header --- keyboards/yushakobo/quick17/quick17_prefs.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/keyboards/yushakobo/quick17/quick17_prefs.c b/keyboards/yushakobo/quick17/quick17_prefs.c index 3e3b94e0bc47..1a546f4e3541 100644 --- a/keyboards/yushakobo/quick17/quick17_prefs.c +++ b/keyboards/yushakobo/quick17/quick17_prefs.c @@ -1,3 +1,19 @@ +/* Copyright 2021 yushakobo + * + * 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 bool _INPUT_JP; From d44f3c3ba6b976197dc61f5dbec102e7047295bd Mon Sep 17 00:00:00 2001 From: MakotoKurauchi Date: Wed, 15 Sep 2021 15:40:00 +0900 Subject: [PATCH 41/45] Update keyboards/yushakobo/quick17/rules.mk thanks Co-authored-by: Ryan --- keyboards/yushakobo/quick17/rules.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/yushakobo/quick17/rules.mk b/keyboards/yushakobo/quick17/rules.mk index e31c4bda6d13..5b95aecc2da9 100644 --- a/keyboards/yushakobo/quick17/rules.mk +++ b/keyboards/yushakobo/quick17/rules.mk @@ -18,7 +18,6 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend NKRO_ENABLE = no # USB Nkey Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -BLUETOOTH_ENABLE = no # Enable Bluetooth AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes From 43abcc224ac18c56190a06095a2eee287ad0491a Mon Sep 17 00:00:00 2001 From: MakotoKurauchi Date: Wed, 15 Sep 2021 15:40:11 +0900 Subject: [PATCH 42/45] Update keyboards/yushakobo/quick17/readme.md thanks Co-authored-by: Ryan --- keyboards/yushakobo/quick17/readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/yushakobo/quick17/readme.md b/keyboards/yushakobo/quick17/readme.md index 0b99bb2a6e13..672cee331918 100644 --- a/keyboards/yushakobo/quick17/readme.md +++ b/keyboards/yushakobo/quick17/readme.md @@ -2,10 +2,10 @@ ![quick17](https://i.imgur.com/8SkWq0m.jpeg) -*A simple macropad for the beginners* +A simple macropad for the beginners * Keyboard Maintainer: [yushakobo](https://github.com/yushakobo) -* Hardware Supported: *Quick17 PCBs, Pro Micro (ATmega32u4)* +* Hardware Supported: Quick17 PCBs, Pro Micro (ATmega32u4) * Hardware Availability: [yushakobo shop](https://shop.yushakobo.jp/products/quick17) Make example for this keyboard (after setting up your build environment): From f565da226da9bb8b03b24ba433c30f8ee914dd0b Mon Sep 17 00:00:00 2001 From: MakotoKurauchi Date: Wed, 15 Sep 2021 15:40:39 +0900 Subject: [PATCH 43/45] Update keyboards/yushakobo/quick17/info.json thanks Co-authored-by: Ryan --- keyboards/yushakobo/quick17/info.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/yushakobo/quick17/info.json b/keyboards/yushakobo/quick17/info.json index b440d962b864..eb971110c0a6 100644 --- a/keyboards/yushakobo/quick17/info.json +++ b/keyboards/yushakobo/quick17/info.json @@ -2,8 +2,6 @@ "keyboard_name": "quick17", "url": "https://shop.yushakobo.jp/products/quick17", "maintainer": "yushakobo", - "width": 6, - "height": 3, "layouts": { "LAYOUT": { "layout": [ From 094226fec9cd24bc926318119973974a214a44da Mon Sep 17 00:00:00 2001 From: MakotoKurauchi Date: Fri, 17 Sep 2021 13:12:11 +0900 Subject: [PATCH 44/45] Update keyboards/yushakobo/quick17/rules.mk thanks Co-authored-by: Drashna Jaelre --- keyboards/yushakobo/quick17/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/yushakobo/quick17/rules.mk b/keyboards/yushakobo/quick17/rules.mk index 5b95aecc2da9..fc036091a0fd 100644 --- a/keyboards/yushakobo/quick17/rules.mk +++ b/keyboards/yushakobo/quick17/rules.mk @@ -7,7 +7,7 @@ BOOTLOADER = caterina # Build Options # change yes to no to disable # -BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control CONSOLE_ENABLE = no # Console for debug From 205fbd347f1db64deb60e0e04847ca19cd968ad2 Mon Sep 17 00:00:00 2001 From: MakotoKurauchi Date: Fri, 17 Sep 2021 14:02:38 +0900 Subject: [PATCH 45/45] add license header --- keyboards/yushakobo/quick17/quick17_prefs.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/keyboards/yushakobo/quick17/quick17_prefs.h b/keyboards/yushakobo/quick17/quick17_prefs.h index 862ac1554f17..4d81d163b99b 100644 --- a/keyboards/yushakobo/quick17/quick17_prefs.h +++ b/keyboards/yushakobo/quick17/quick17_prefs.h @@ -1,3 +1,19 @@ +/* Copyright 2021 yushakobo + * + * 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 . + */ + enum layer_names { _CONTROL, _EDIT1,