From a12a61d480e48964cb207c16beca0358d4302ce1 Mon Sep 17 00:00:00 2001 From: Tobias Minn Date: Sat, 19 Feb 2022 16:29:54 +0100 Subject: [PATCH 01/23] Added initial keyboard files for Kuro Pad Eval. --- keyboards/kuro/kuro_pad_eval/config.h | 104 +++++++++++++++ .../kuro_pad_eval/keymaps/default/keymap.c | 11 ++ keyboards/kuro/kuro_pad_eval/kuro_pad_eval.c | 125 ++++++++++++++++++ keyboards/kuro/kuro_pad_eval/kuro_pad_eval.h | 33 +++++ keyboards/kuro/kuro_pad_eval/readme.md | 15 +++ keyboards/kuro/kuro_pad_eval/rules.mk | 21 +++ 6 files changed, 309 insertions(+) create mode 100644 keyboards/kuro/kuro_pad_eval/config.h create mode 100644 keyboards/kuro/kuro_pad_eval/keymaps/default/keymap.c create mode 100644 keyboards/kuro/kuro_pad_eval/kuro_pad_eval.c create mode 100644 keyboards/kuro/kuro_pad_eval/kuro_pad_eval.h create mode 100644 keyboards/kuro/kuro_pad_eval/readme.md create mode 100644 keyboards/kuro/kuro_pad_eval/rules.mk diff --git a/keyboards/kuro/kuro_pad_eval/config.h b/keyboards/kuro/kuro_pad_eval/config.h new file mode 100644 index 000000000000..b8d1caa89850 --- /dev/null +++ b/keyboards/kuro/kuro_pad_eval/config.h @@ -0,0 +1,104 @@ +/* Copyright 2021 DZTECH + * + * 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 0x544D +#define PRODUCT_ID 0xDEAD +#define DEVICE_VER 0x0001 +#define MANUFACTURER KURO +#define PRODUCT KUROPADEVAL + +/* key matrix size */ +#define MATRIX_ROWS 5 +#define MATRIX_COLS 5 +#define MATRIX_ROW_PINS { F5, F4, F1, F0, B0 } +#define MATRIX_COL_PINS { D4, D6, D7, B4, B5 } +#define UNUSED_PINS {E6, B7} + +/* COL2ROW, ROW2COL*/ +#define DIODE_DIRECTION COL2ROW + +/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ +#define DEBOUNCE 5 +/* disable these deprecated features by default */ +#define NO_ACTION_MACRO +#define NO_ACTION_FUNCTION +#ifdef RGB_MATRIX_ENABLE +#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects +# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended +# define USB_SUSPEND_WAKEUP_DELAY 5000 +# define RGB_MATRIX_KEYPRESSES +# define RGB_MATRIX_LED_PROCESS_LIMIT 4 +# define RGB_MATRIX_LED_FLUSH_LIMIT 26 +// RGB Matrix Animation modes. Explicitly enabled +// For full list of effects, see: +// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects +# define ENABLE_RGB_MATRIX_ALPHAS_MODS +# define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN +# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT +# define ENABLE_RGB_MATRIX_BREATHING +# define ENABLE_RGB_MATRIX_BAND_SAT +# define ENABLE_RGB_MATRIX_BAND_VAL +# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT +# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL +# define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT +# define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL +# define ENABLE_RGB_MATRIX_CYCLE_ALL +# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT +# define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN +# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON +# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN +# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL +# define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL +# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL +# define ENABLE_RGB_MATRIX_DUAL_BEACON +# define ENABLE_RGB_MATRIX_RAINBOW_BEACON +# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS +# define ENABLE_RGB_MATRIX_RAINDROPS +# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS +# define ENABLE_RGB_MATRIX_HUE_BREATHING +# define ENABLE_RGB_MATRIX_HUE_PENDULUM +# define ENABLE_RGB_MATRIX_HUE_WAVE +# define ENABLE_RGB_MATRIX_PIXEL_RAIN +# define ENABLE_RGB_MATRIX_PIXEL_FLOW +# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL +// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined +# define ENABLE_RGB_MATRIX_TYPING_HEATMAP +# define ENABLE_RGB_MATRIX_DIGITAL_RAIN +// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS +# define ENABLE_RGB_MATRIX_SPLASH +# define ENABLE_RGB_MATRIX_MULTISPLASH +# define ENABLE_RGB_MATRIX_SOLID_SPLASH +# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH + +# define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL +# define DRIVER_ADDR_1 0b0110000 +# define DRIVER_COUNT 1 +# define DRIVER_LED_TOTAL 68 +# define DRIVER_INDICATOR_LED_TOTAL 0 +#endif diff --git a/keyboards/kuro/kuro_pad_eval/keymaps/default/keymap.c b/keyboards/kuro/kuro_pad_eval/keymaps/default/keymap.c new file mode 100644 index 000000000000..efa1e099b512 --- /dev/null +++ b/keyboards/kuro/kuro_pad_eval/keymaps/default/keymap.c @@ -0,0 +1,11 @@ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + LAYOUT_pad_25( + KC_MUTE, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, + KC_MPLY, KC_P7, KC_P8, KC_P9, KC_PPLS, + KC_P4, KC_P5, KC_P6, + KC_P1, KC_P2, KC_P3, KC_PENT, + KC_P0, KC_PDOT + ) +}; diff --git a/keyboards/kuro/kuro_pad_eval/kuro_pad_eval.c b/keyboards/kuro/kuro_pad_eval/kuro_pad_eval.c new file mode 100644 index 000000000000..27d86f63b7eb --- /dev/null +++ b/keyboards/kuro/kuro_pad_eval/kuro_pad_eval.c @@ -0,0 +1,125 @@ +/* Copyright 2022 + * + * 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 "kuro_pad_eval.h" + +#ifdef RGB_MATRIX_ENABLE + +const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = { + {0, CS21_SW1, CS20_SW1, CS19_SW1}, + {0, CS21_SW2, CS20_SW2, CS19_SW2}, + {0, CS21_SW3, CS20_SW3, CS19_SW3}, + {0, CS21_SW4, CS20_SW4, CS19_SW4}, + {0, CS21_SW5, CS20_SW5, CS19_SW5}, + {0, CS21_SW6, CS20_SW6, CS19_SW6}, + {0, CS21_SW7, CS20_SW7, CS19_SW7}, + {0, CS21_SW8, CS20_SW8, CS19_SW8}, + {0, CS24_SW1, CS23_SW1, CS22_SW1}, + {0, CS24_SW2, CS23_SW2, CS22_SW2}, + {0, CS24_SW3, CS23_SW3, CS22_SW3}, + {0, CS24_SW4, CS23_SW4, CS22_SW4}, + {0, CS24_SW5, CS23_SW5, CS22_SW5}, + {0, CS24_SW6, CS23_SW6, CS22_SW6}, + {0, CS24_SW7, CS23_SW7, CS22_SW7}, + + {0, CS15_SW1, CS14_SW1, CS13_SW1}, + {0, CS15_SW2, CS14_SW2, CS13_SW2}, + {0, CS15_SW3, CS14_SW3, CS13_SW3}, + {0, CS15_SW4, CS14_SW4, CS13_SW4}, + {0, CS15_SW5, CS14_SW5, CS13_SW5}, + {0, CS15_SW6, CS14_SW6, CS13_SW6}, + {0, CS15_SW7, CS14_SW7, CS13_SW7}, + {0, CS15_SW8, CS14_SW8, CS13_SW8}, + {0, CS30_SW1, CS29_SW1, CS28_SW1}, + {0, CS30_SW2, CS29_SW2, CS28_SW2}, + {0, CS30_SW3, CS29_SW3, CS28_SW3}, + {0, CS30_SW4, CS29_SW4, CS28_SW4}, + {0, CS30_SW5, CS29_SW5, CS28_SW5}, + {0, CS30_SW6, CS29_SW6, CS28_SW6}, + {0, CS30_SW7, CS29_SW7, CS28_SW7}, + + {0, CS12_SW1, CS11_SW1, CS10_SW1}, + {0, CS12_SW2, CS11_SW2, CS10_SW2}, + {0, CS12_SW3, CS11_SW3, CS10_SW3}, + {0, CS12_SW4, CS11_SW4, CS10_SW4}, + {0, CS12_SW5, CS11_SW5, CS10_SW5}, + {0, CS12_SW6, CS11_SW6, CS10_SW6}, + {0, CS12_SW7, CS11_SW7, CS10_SW7}, + {0, CS12_SW8, CS11_SW8, CS10_SW8}, + {0, CS33_SW1, CS32_SW1, CS31_SW1}, + {0, CS33_SW2, CS32_SW2, CS31_SW2}, + {0, CS33_SW3, CS32_SW3, CS31_SW3}, + {0, CS33_SW4, CS32_SW4, CS31_SW4}, + {0, CS33_SW5, CS32_SW5, CS31_SW5}, + {0, CS33_SW7, CS32_SW7, CS31_SW7}, + + {0, CS9_SW1, CS8_SW1, CS7_SW1}, + {0, CS9_SW2, CS8_SW2, CS7_SW2}, + {0, CS9_SW3, CS8_SW3, CS7_SW3}, + {0, CS9_SW4, CS8_SW4, CS7_SW4}, + {0, CS9_SW5, CS8_SW5, CS7_SW5}, + {0, CS9_SW6, CS8_SW6, CS7_SW6}, + {0, CS9_SW7, CS8_SW7, CS7_SW7}, + {0, CS9_SW8, CS8_SW8, CS7_SW8}, + {0, CS36_SW1, CS35_SW1, CS34_SW1}, + {0, CS36_SW2, CS35_SW2, CS34_SW2}, + {0, CS36_SW3, CS35_SW3, CS34_SW3}, + {0, CS36_SW4, CS35_SW4, CS34_SW4}, + {0, CS36_SW5, CS35_SW5, CS34_SW5}, + {0, CS36_SW7, CS35_SW7, CS34_SW7}, + + {0, CS3_SW1, CS2_SW1, CS1_SW1}, + {0, CS3_SW2, CS2_SW2, CS1_SW2}, + {0, CS3_SW3, CS2_SW3, CS1_SW3}, + {0, CS3_SW6, CS2_SW6, CS1_SW6}, + {0, CS39_SW1, CS38_SW1, CS37_SW1}, + {0, CS39_SW2, CS38_SW2, CS37_SW2}, + {0, CS39_SW3, CS38_SW3, CS37_SW3}, + {0, CS39_SW4, CS38_SW4, CS37_SW4}, + {0, CS39_SW5, CS38_SW5, CS37_SW5}, + {0, CS39_SW7, CS38_SW7, CS37_SW7} + +}; +led_config_t g_led_config = { { + { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 }, + { 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29 }, + { 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, NO_LED,42, 43 }, + { 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, NO_LED,55, 56, 57 }, + { 58, 59, 60, NO_LED, NO_LED, 61, NO_LED, NO_LED, NO_LED, 62, 63, 64, 65, 66, 67 } +}, { + {0,0},{15,0},{30,0},{45,0},{60,0},{75,0},{90,0},{105,0},{120,0},{135,0},{150,0},{165,0},{180,0},{203,0},{224,0}, + {4,16},{23,16},{38,16},{53,16},{68,16},{83,16},{98,16},{113,16},{128,16},{143,16},{158,16},{173,16},{188,16},{206,16},{224,16}, + {6,32},{26,32},{41,32},{56,32},{71,32},{86,32},{101,32},{116,32},{131,32},{146,32},{161,32},{176,32},{201,32},{224,32}, + {9,48},{34,48},{49,48},{64,48},{79,48},{94,48},{109,48},{124,48},{139,48},{154,48},{169,48},{189,48},{210,48},{224,48}, + { 2, 64 }, { 21, 64 }, { 39, 64 }, { 96, 64 }, { 150, 64 }, { 165, 64 }, { 180, 64 }, { 195, 64 }, { 210, 64 }, { 224, 64 } +}, { + 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, + 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, + 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, + 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, + 1, 1, 1, 4, 1, 1, 1, 1, 1, 1 +} }; + + +__attribute__ ((weak)) +void rgb_matrix_indicators_user(void) +{ + if (host_keyboard_led_state().caps_lock) + { + rgb_matrix_set_color(30, 0xFF, 0xFF, 0xFF); + } +} +#endif diff --git a/keyboards/kuro/kuro_pad_eval/kuro_pad_eval.h b/keyboards/kuro/kuro_pad_eval/kuro_pad_eval.h new file mode 100644 index 000000000000..9deabd5dfe6f --- /dev/null +++ b/keyboards/kuro/kuro_pad_eval/kuro_pad_eval.h @@ -0,0 +1,33 @@ +/* Copyright 2022 + * + * 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" + +#define LAYOUT_pad_25( \ + K00, K01, K02, K03, K04, \ + K10, K11, K12, K13, K14, \ + K21, K22, K23, \ + K31, K32, K33, K34, \ + K42, K43 \ +) { \ + { K00, K01, K02, K03, K04 }, \ + { K10, K11, K12, K13, K14 }, \ + { KC_NO, K21, K22, K23, KC_NO}, \ + { KC_NO, K31, K32, K33, K34 }, \ + { KC_NO, KC_NO, K42, K43, KC_NO} \ +} diff --git a/keyboards/kuro/kuro_pad_eval/readme.md b/keyboards/kuro/kuro_pad_eval/readme.md new file mode 100644 index 000000000000..2a919a9f6b62 --- /dev/null +++ b/keyboards/kuro/kuro_pad_eval/readme.md @@ -0,0 +1,15 @@ +# Kuro Pad Eval Board + + + +## Bootloader mode + +To put in bootloader mode, hold the `Esc` key while plugging in the USB cable. or use reset key behind the pcb. + +## Making firmware + +Make example for this keyboard (after setting up your build environment): + + make kuro/kuro_pad_eval:default + +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/kuro/kuro_pad_eval/rules.mk b/keyboards/kuro/kuro_pad_eval/rules.mk new file mode 100644 index 000000000000..04d57343639a --- /dev/null +++ b/keyboards/kuro/kuro_pad_eval/rules.mk @@ -0,0 +1,21 @@ +# MCU name +MCU = atmega32u4 + +# Bootloader selection +BOOTLOADER = atmel-dfu + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite +MOUSEKEY_ENABLE = no # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = yes # Enable N-Key Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output +#RGB_MATRIX_ENABLE = yes # Use RGB matrix +#RGB_MATRIX_DRIVER = IS31FL3741 +LTO_ENABLE = yes From 95de8700f336669dca7aa2991bbad247b99c6c2d Mon Sep 17 00:00:00 2001 From: Tobias Minn Date: Sat, 12 Mar 2022 12:23:19 +0100 Subject: [PATCH 02/23] Implemented RGB matrix configuration for kuro_eval_board. --- keyboards/kuro/kuro_pad_eval/config.h | 2 +- .../kuro_pad_eval/keymaps/default/keymap.c | 8 +- keyboards/kuro/kuro_pad_eval/kuro_pad_eval.c | 135 ++++++------------ keyboards/kuro/kuro_pad_eval/kuro_pad_eval.h | 24 ++-- keyboards/kuro/kuro_pad_eval/rules.mk | 4 +- 5 files changed, 66 insertions(+), 107 deletions(-) diff --git a/keyboards/kuro/kuro_pad_eval/config.h b/keyboards/kuro/kuro_pad_eval/config.h index b8d1caa89850..7349c66c77ce 100644 --- a/keyboards/kuro/kuro_pad_eval/config.h +++ b/keyboards/kuro/kuro_pad_eval/config.h @@ -99,6 +99,6 @@ # define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL # define DRIVER_ADDR_1 0b0110000 # define DRIVER_COUNT 1 -# define DRIVER_LED_TOTAL 68 +# define DRIVER_LED_TOTAL 17 # define DRIVER_INDICATOR_LED_TOTAL 0 #endif diff --git a/keyboards/kuro/kuro_pad_eval/keymaps/default/keymap.c b/keyboards/kuro/kuro_pad_eval/keymaps/default/keymap.c index efa1e099b512..7e3710ac8f19 100644 --- a/keyboards/kuro/kuro_pad_eval/keymaps/default/keymap.c +++ b/keyboards/kuro/kuro_pad_eval/keymaps/default/keymap.c @@ -2,10 +2,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { LAYOUT_pad_25( - KC_MUTE, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, + KC_MUTE, KC_NUM, RGB_TOG, RGB_MOD, RGB_RMOD, KC_MPLY, KC_P7, KC_P8, KC_P9, KC_PPLS, - KC_P4, KC_P5, KC_P6, + KC_P4, KC_P5, KC_P6, KC_P1, KC_P2, KC_P3, KC_PENT, - KC_P0, KC_PDOT + KC_P0, KC_PDOT ) -}; +}; \ No newline at end of file diff --git a/keyboards/kuro/kuro_pad_eval/kuro_pad_eval.c b/keyboards/kuro/kuro_pad_eval/kuro_pad_eval.c index 27d86f63b7eb..6ab0f9c089d3 100644 --- a/keyboards/kuro/kuro_pad_eval/kuro_pad_eval.c +++ b/keyboards/kuro/kuro_pad_eval/kuro_pad_eval.c @@ -19,98 +19,57 @@ #ifdef RGB_MATRIX_ENABLE const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = { - {0, CS21_SW1, CS20_SW1, CS19_SW1}, - {0, CS21_SW2, CS20_SW2, CS19_SW2}, - {0, CS21_SW3, CS20_SW3, CS19_SW3}, - {0, CS21_SW4, CS20_SW4, CS19_SW4}, - {0, CS21_SW5, CS20_SW5, CS19_SW5}, - {0, CS21_SW6, CS20_SW6, CS19_SW6}, - {0, CS21_SW7, CS20_SW7, CS19_SW7}, - {0, CS21_SW8, CS20_SW8, CS19_SW8}, - {0, CS24_SW1, CS23_SW1, CS22_SW1}, - {0, CS24_SW2, CS23_SW2, CS22_SW2}, - {0, CS24_SW3, CS23_SW3, CS22_SW3}, - {0, CS24_SW4, CS23_SW4, CS22_SW4}, - {0, CS24_SW5, CS23_SW5, CS22_SW5}, - {0, CS24_SW6, CS23_SW6, CS22_SW6}, - {0, CS24_SW7, CS23_SW7, CS22_SW7}, - - {0, CS15_SW1, CS14_SW1, CS13_SW1}, - {0, CS15_SW2, CS14_SW2, CS13_SW2}, - {0, CS15_SW3, CS14_SW3, CS13_SW3}, - {0, CS15_SW4, CS14_SW4, CS13_SW4}, - {0, CS15_SW5, CS14_SW5, CS13_SW5}, - {0, CS15_SW6, CS14_SW6, CS13_SW6}, - {0, CS15_SW7, CS14_SW7, CS13_SW7}, - {0, CS15_SW8, CS14_SW8, CS13_SW8}, - {0, CS30_SW1, CS29_SW1, CS28_SW1}, - {0, CS30_SW2, CS29_SW2, CS28_SW2}, - {0, CS30_SW3, CS29_SW3, CS28_SW3}, - {0, CS30_SW4, CS29_SW4, CS28_SW4}, - {0, CS30_SW5, CS29_SW5, CS28_SW5}, - {0, CS30_SW6, CS29_SW6, CS28_SW6}, - {0, CS30_SW7, CS29_SW7, CS28_SW7}, - - {0, CS12_SW1, CS11_SW1, CS10_SW1}, - {0, CS12_SW2, CS11_SW2, CS10_SW2}, - {0, CS12_SW3, CS11_SW3, CS10_SW3}, - {0, CS12_SW4, CS11_SW4, CS10_SW4}, - {0, CS12_SW5, CS11_SW5, CS10_SW5}, - {0, CS12_SW6, CS11_SW6, CS10_SW6}, - {0, CS12_SW7, CS11_SW7, CS10_SW7}, - {0, CS12_SW8, CS11_SW8, CS10_SW8}, - {0, CS33_SW1, CS32_SW1, CS31_SW1}, - {0, CS33_SW2, CS32_SW2, CS31_SW2}, - {0, CS33_SW3, CS32_SW3, CS31_SW3}, - {0, CS33_SW4, CS32_SW4, CS31_SW4}, - {0, CS33_SW5, CS32_SW5, CS31_SW5}, - {0, CS33_SW7, CS32_SW7, CS31_SW7}, - - {0, CS9_SW1, CS8_SW1, CS7_SW1}, - {0, CS9_SW2, CS8_SW2, CS7_SW2}, - {0, CS9_SW3, CS8_SW3, CS7_SW3}, - {0, CS9_SW4, CS8_SW4, CS7_SW4}, - {0, CS9_SW5, CS8_SW5, CS7_SW5}, - {0, CS9_SW6, CS8_SW6, CS7_SW6}, - {0, CS9_SW7, CS8_SW7, CS7_SW7}, - {0, CS9_SW8, CS8_SW8, CS7_SW8}, - {0, CS36_SW1, CS35_SW1, CS34_SW1}, - {0, CS36_SW2, CS35_SW2, CS34_SW2}, - {0, CS36_SW3, CS35_SW3, CS34_SW3}, - {0, CS36_SW4, CS35_SW4, CS34_SW4}, - {0, CS36_SW5, CS35_SW5, CS34_SW5}, - {0, CS36_SW7, CS35_SW7, CS34_SW7}, - - {0, CS3_SW1, CS2_SW1, CS1_SW1}, - {0, CS3_SW2, CS2_SW2, CS1_SW2}, - {0, CS3_SW3, CS2_SW3, CS1_SW3}, - {0, CS3_SW6, CS2_SW6, CS1_SW6}, - {0, CS39_SW1, CS38_SW1, CS37_SW1}, - {0, CS39_SW2, CS38_SW2, CS37_SW2}, - {0, CS39_SW3, CS38_SW3, CS37_SW3}, - {0, CS39_SW4, CS38_SW4, CS37_SW4}, - {0, CS39_SW5, CS38_SW5, CS37_SW5}, - {0, CS39_SW7, CS38_SW7, CS37_SW7} - +/* Refer to IS31 manual for these locations + * driver + * | R location + * | | G location + * | | | B location + * | | | | */ + {0, CS1_SW3, CS5_SW3, CS3_SW3}, // idx 0 + {0, CS1_SW5, CS5_SW5, CS3_SW5}, // idx 1 + {0, CS1_SW7, CS5_SW7, CS3_SW7}, // idx 2 + {0, CS1_SW9, CS5_SW9, CS3_SW9}, // idx 3 + + {0, CS6_SW3, CS10_SW3, CS8_SW3}, // idx 4 + {0, CS6_SW5, CS10_SW5, CS8_SW5}, // idx 5 + {0, CS6_SW7, CS10_SW7, CS8_SW7}, // idx 6 + {0, CS6_SW9, CS10_SW9, CS8_SW9}, // idx 7 + + {0, CS11_SW3, CS15_SW3, CS13_SW3}, // idx 8 + {0, CS11_SW5, CS15_SW5, CS13_SW5}, // idx 9 + {0, CS11_SW7, CS15_SW7, CS13_SW7}, // idx 10 + + {0, CS17_SW3, CS20_SW3, CS19_SW3}, // idx 11 + {0, CS17_SW5, CS20_SW5, CS19_SW5}, // idx 12 + {0, CS17_SW7, CS20_SW7, CS19_SW7}, // idx 13 + {0, CS17_SW9, CS20_SW9, CS19_SW9}, // idx 14 + + {0, CS22_SW5, CS26_SW5, CS24_SW5}, // idx 15 + {0, CS22_SW7, CS26_SW7, CS24_SW7} // idx 16 + }; + led_config_t g_led_config = { { - { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 }, - { 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29 }, - { 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, NO_LED,42, 43 }, - { 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, NO_LED,55, 56, 57 }, - { 58, 59, 60, NO_LED, NO_LED, 61, NO_LED, NO_LED, NO_LED, 62, 63, 64, 65, 66, 67 } + // Key Matrix (5x5) to LED Index + { NO_LED, 0, 1, 2, 3 }, + { NO_LED, 4, 5, 6, 7 }, + { NO_LED, 8, 9, 10, NO_LED }, + { NO_LED, 11, 12, 13, 14 }, + { NO_LED, NO_LED, 15, 16, NO_LED } }, { - {0,0},{15,0},{30,0},{45,0},{60,0},{75,0},{90,0},{105,0},{120,0},{135,0},{150,0},{165,0},{180,0},{203,0},{224,0}, - {4,16},{23,16},{38,16},{53,16},{68,16},{83,16},{98,16},{113,16},{128,16},{143,16},{158,16},{173,16},{188,16},{206,16},{224,16}, - {6,32},{26,32},{41,32},{56,32},{71,32},{86,32},{101,32},{116,32},{131,32},{146,32},{161,32},{176,32},{201,32},{224,32}, - {9,48},{34,48},{49,48},{64,48},{79,48},{94,48},{109,48},{124,48},{139,48},{154,48},{169,48},{189,48},{210,48},{224,48}, - { 2, 64 }, { 21, 64 }, { 39, 64 }, { 96, 64 }, { 150, 64 }, { 165, 64 }, { 180, 64 }, { 195, 64 }, { 210, 64 }, { 224, 64 } + // LED Index to Physical Position + { 0, 0},{ 75, 0},{149, 0},{224, 0}, + { 0, 16},{ 75, 16},{149, 16},{224, 24}, + { 0, 32},{ 75, 32},{149, 32}, + { 0, 48},{ 75, 48},{149, 48},{224, 56}, + { 37, 64},{149, 64} }, { - 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, - 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, - 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, - 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, - 1, 1, 1, 4, 1, 1, 1, 1, 1, 1 + // LED Index to Flag + 1, 1, 1, 1, + 4, 4, 4, 1, + 4, 4, 4, + 4, 4, 4, 1, + 4, 1 } }; diff --git a/keyboards/kuro/kuro_pad_eval/kuro_pad_eval.h b/keyboards/kuro/kuro_pad_eval/kuro_pad_eval.h index 9deabd5dfe6f..e47e9383eda2 100644 --- a/keyboards/kuro/kuro_pad_eval/kuro_pad_eval.h +++ b/keyboards/kuro/kuro_pad_eval/kuro_pad_eval.h @@ -1,4 +1,4 @@ -/* Copyright 2022 +/* Copyright 2022 * * 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 @@ -13,21 +13,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - + #pragma once #include "quantum.h" #define LAYOUT_pad_25( \ - K00, K01, K02, K03, K04, \ - K10, K11, K12, K13, K14, \ - K21, K22, K23, \ - K31, K32, K33, K34, \ - K42, K43 \ + K00, K01, K02, K03, K04, \ + K10, K11, K12, K13, K14, \ + K21, K22, K23, \ + K31, K32, K33, K34, \ + K42, K43 \ ) { \ - { K00, K01, K02, K03, K04 }, \ - { K10, K11, K12, K13, K14 }, \ - { KC_NO, K21, K22, K23, KC_NO}, \ - { KC_NO, K31, K32, K33, K34 }, \ - { KC_NO, KC_NO, K42, K43, KC_NO} \ + { K00, K01, K02, K03, K04}, \ + { K10, K11, K12, K13, K14}, \ + { KC_NO, K21, K22, K23, KC_NO}, \ + { KC_NO, K31, K32, K33, K34}, \ + { KC_NO, KC_NO, K42, K43, KC_NO} \ } diff --git a/keyboards/kuro/kuro_pad_eval/rules.mk b/keyboards/kuro/kuro_pad_eval/rules.mk index 04d57343639a..fc4b56c0c19f 100644 --- a/keyboards/kuro/kuro_pad_eval/rules.mk +++ b/keyboards/kuro/kuro_pad_eval/rules.mk @@ -16,6 +16,6 @@ NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output -#RGB_MATRIX_ENABLE = yes # Use RGB matrix -#RGB_MATRIX_DRIVER = IS31FL3741 +RGB_MATRIX_ENABLE = yes # Use RGB matrix +RGB_MATRIX_DRIVER = IS31FL3741 LTO_ENABLE = yes From 01542a04231a480f48aecb7cb2b77448f4ec6512 Mon Sep 17 00:00:00 2001 From: 0x544D Date: Sun, 29 Jan 2023 15:43:45 +0100 Subject: [PATCH 03/23] Added kuro65 keyboard files to QMK repo. --- keyboards/kuro/kuro65/config.h | 106 ++++++++++++++++++ keyboards/kuro/kuro65/info.json | 9 ++ .../kuro/kuro65/keymaps/default/keymap.c | 101 +++++++++++++++++ keyboards/kuro/kuro65/kuro65.c | 76 +++++++++++++ keyboards/kuro/kuro65/kuro65.h | 50 +++++++++ keyboards/kuro/kuro65/readme.md | 15 +++ keyboards/kuro/kuro65/rules.mk | 21 ++++ 7 files changed, 378 insertions(+) create mode 100644 keyboards/kuro/kuro65/config.h create mode 100644 keyboards/kuro/kuro65/info.json create mode 100644 keyboards/kuro/kuro65/keymaps/default/keymap.c create mode 100644 keyboards/kuro/kuro65/kuro65.c create mode 100644 keyboards/kuro/kuro65/kuro65.h create mode 100644 keyboards/kuro/kuro65/readme.md create mode 100644 keyboards/kuro/kuro65/rules.mk diff --git a/keyboards/kuro/kuro65/config.h b/keyboards/kuro/kuro65/config.h new file mode 100644 index 000000000000..bea460f748bb --- /dev/null +++ b/keyboards/kuro/kuro65/config.h @@ -0,0 +1,106 @@ +/* Copyright 2021 DZTECH + * + * 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 -> deprecated, see info.json */ +// #define VENDOR_ID 0x544D +// #define PRODUCT_ID 0xC000 +// #define DEVICE_VER 0x0001 +// #define MANUFACTURER KURO +// #define PRODUCT KURO65 + +/* key matrix size */ +#define MATRIX_ROWS 5 +#define MATRIX_COLS 16 +#define MATRIX_ROW_PINS { F6, F5, F4, F1, F0 } +#define MATRIX_COL_PINS { B0, B7, D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7 } + +/* + * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) + * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) + */ +#define DIODE_DIRECTION COL2ROW + +/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ +#define DEBOUNCE 5 + +/* RGB Matrix defines*/ +#ifdef RGB_MATRIX_ENABLE +// The pin connected to the data pin of the LEDs +# define RGB_DI_PIN E6 +// The number of LEDs connected +# define RGB_MATRIX_LED_COUNT 69 + +# define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects +# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended +# define USB_SUSPEND_WAKEUP_DELAY 5000 +# define RGB_MATRIX_KEYPRESSES +# define RGB_MATRIX_LED_PROCESS_LIMIT 4 +# define RGB_MATRIX_LED_FLUSH_LIMIT 26 +// RGB Matrix Animation modes. Explicitly enabled +// For full list of effects, see: +// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects +# define ENABLE_RGB_MATRIX_ALPHAS_MODS +# define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN +# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT +# define ENABLE_RGB_MATRIX_BREATHING +# define ENABLE_RGB_MATRIX_BAND_SAT +# define ENABLE_RGB_MATRIX_BAND_VAL +# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT +# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL +# define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT +# define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL +# define ENABLE_RGB_MATRIX_CYCLE_ALL +# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT +# define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN +# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON +# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN +# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL +# define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL +# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL +# define ENABLE_RGB_MATRIX_DUAL_BEACON +# define ENABLE_RGB_MATRIX_RAINBOW_BEACON +# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS +# define ENABLE_RGB_MATRIX_RAINDROPS +# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS +# define ENABLE_RGB_MATRIX_HUE_BREATHING +# define ENABLE_RGB_MATRIX_HUE_PENDULUM +# define ENABLE_RGB_MATRIX_HUE_WAVE +# define ENABLE_RGB_MATRIX_PIXEL_RAIN +# define ENABLE_RGB_MATRIX_PIXEL_FLOW +# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL +// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined +# define ENABLE_RGB_MATRIX_TYPING_HEATMAP +# define ENABLE_RGB_MATRIX_DIGITAL_RAIN +// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS +# define ENABLE_RGB_MATRIX_SPLASH +# define ENABLE_RGB_MATRIX_MULTISPLASH +# define ENABLE_RGB_MATRIX_SOLID_SPLASH +# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH + +# define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL +#endif diff --git a/keyboards/kuro/kuro65/info.json b/keyboards/kuro/kuro65/info.json new file mode 100644 index 000000000000..7670ed8ab6e7 --- /dev/null +++ b/keyboards/kuro/kuro65/info.json @@ -0,0 +1,9 @@ +{ + "keyboard_name": "Kuro65", + "manufacturer": "Kuro", + "usb": { + "vid": "0x544D", + "pid": "0xC000", + "device_version": "1.0.0" + } +} \ No newline at end of file diff --git a/keyboards/kuro/kuro65/keymaps/default/keymap.c b/keyboards/kuro/kuro65/keymaps/default/keymap.c new file mode 100644 index 000000000000..d84d76e807ee --- /dev/null +++ b/keyboards/kuro/kuro65/keymaps/default/keymap.c @@ -0,0 +1,101 @@ +/* Copyright 2023 Tobias Minn (0x544D) + * + * 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 + +#define BL_WIN 0 // base layer Windows +#define BL_MAC 1 // base layer Mac OS +#define FN1 2 // function layer 1 +#define FN2 3 // function layer 2 + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + /* ISO 65 layout by 0x544D (ISO German keyboard layout shown) + * + * ,-----------------------------------------------------------------------------------------------. + * | Esc | 1 ! | 2 " | 3 § | 4 $ | 5 % | 6 & | 7 / | 8 ( | 9 ) | 0 = | ß ? | ´ ` | Backspace | Del | + * |-----------------------------------------------------------------------------------------------| + * | Tab | Q | W | E | R | T | Z | U | I | O | P | Ü | + * | Enter | PgU | + * |---------------------------------------------------------------------------------- |-----| + * | MO(2) | A | S | D | F | G | H | J | K | L | Ö | Ä | # ' | | PgD | + * |-----------------------------------------------------------------------------------------------| + * | Shift | < > | Y | X | C | V | B | N | M | , ; | . : | - _ | Shift | Up | Del | + * |-----------------------------------------------------------------------------------------------| + * | LCtl | LGUI | LAlt | Space |RAlt |MO(1)|RCtl | Lft | Dwn | Rgh | + * `-----------------------------------------------------------------------------------------------' + */ + [BL_WIN] = LAYOUT_65_iso( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGUP, + MO(3), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, KC_PGDN, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_DEL, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(2), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + + [BL_MAC] = LAYOUT_65_iso( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGUP, + MO(3), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, KC_PGDN, + KC_LSFT, KC_GRV, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_DEL, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(2), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + + /* Funtion Layer 1: Media Controls with arrow keys / RShift (Play Pause), F keys, + * RGB matrix control + * ,-----------------------------------------------------------------------------------------------. + * | °^ | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | Delete |Home | + * |-----------------------------------------------------------------------------------------------| + * | |RGB_T|RGB+ |RGB- |HUE+ |HUE- |SAT+ |SAT- |BGH+ |BGH- | | | | |Home | + * |---------------------------------------------------------------------------------- |-----| + * | | | | | | | | | | | | | | | End | + * |-----------------------------------------------------------------------------------------------| + * | | | | | | | | | | | | | MPlay |Vol_U| End | + * |-----------------------------------------------------------------------------------------------| + * | | | | | |Trans| | MPrv|Vol_D| MNxt| + * `-----------------------------------------------------------------------------------------------' + */ + [FN1] = LAYOUT_65_iso( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, + KC_NO, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_NO, KC_NO, KC_NO, KC_HOME, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_END, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_MPLY, KC_VOLU, KC_END, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_MPRV, KC_VOLD, KC_MNXT + ), + + + /* Funtion Layer 2: Media Controls left hand, F keys, Page up/down, Home/end, Program/RESET + * ,-----------------------------------------------------------------------------------------------. + * | °^ | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | Delete |Home | + * |-----------------------------------------------------------------------------------------------| + * | | | | | | | | | | |RESET| | | |Home | + * |---------------------------------------------------------------------------------- |-----| + * | Trans | | | | | | | | | | | | | | End | + * |-----------------------------------------------------------------------------------------------| + * | | | | | | | | |TG(1)| | | | |PGUP | End | + * |-----------------------------------------------------------------------------------------------| + * | | | | | | | | Home|PGDN | End | + * `-----------------------------------------------------------------------------------------------' + */ + [FN2] = LAYOUT_65_iso( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_NO, KC_HOME, + KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_END, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, TG(1), KC_NO, KC_NO, KC_NO, KC_NO, KC_PGUP, KC_END, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_HOME, KC_PGDN, KC_END + ) + +}; \ No newline at end of file diff --git a/keyboards/kuro/kuro65/kuro65.c b/keyboards/kuro/kuro65/kuro65.c new file mode 100644 index 000000000000..fc37641de381 --- /dev/null +++ b/keyboards/kuro/kuro65/kuro65.c @@ -0,0 +1,76 @@ +/* Copyright 2023, Tobias Minn (0x544D) + * + * 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 "kuro65.h" + +#ifdef RGB_MATRIX_ENABLE + + +led_config_t g_led_config = { { + // Key Matrix (16x5) to LED Index + { 54 , 55 , 56 , 57 , 58 , 59 , 60 , 61 , 62 , 63 , 64 , 65 , 66 , NO_LED , 67 , 68}, + { 53 , 52 , 51 , 50 , 49 , 48 , 47 , 46 , 45 , 44 , 43 , 42 , 41 , NO_LED , NO_LED , 40}, + { 25 , 26 , 27 , 28 , 29 , 30 , 31 , 32 , 33 , 34 , 35 , 36 , 37 , NO_LED , 38 , 39}, + { 24 , 20 , 19 , 18 , 17 , 16 , 15 , 14 , 13 , 12 , 11 , 10 , 9 , NO_LED , 8 , 7}, + { 23 , 22 , 21 , NO_LED , NO_LED , NO_LED , 0 , NO_LED , NO_LED , NO_LED , 1 , 2 , 3 , 4 , 5 , 6} +}, { + // LED Index to Physical Position + /* 0 , 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 10 , 11 , 12 , 13 , 14 , 15 */ + /* space , alt gr , fn , strg , left , down , right , func , up , rshift , dash , dot , comma , m , n , b */ + { 96, 64},{150, 64},{165, 64},{180, 64},{195, 64},{210, 64},{224, 64},{224, 48},{210, 48},{189, 48},{169, 48},{154, 48},{139, 48},{124, 48},{109, 48},{ 94, 48}, + /* 16 , 17 , 18 , 19 , 20 , 21 , 22 , 23 , 24 , 25 , 26 , 27 , 28 , 29 , 30 , 31 */ + /* v , c , x , y , < , alt , OS , strg , shift , caps , a , s , d , f , g , h */ + { 79, 48},{ 64, 48},{ 49, 48},{ 34, 48},{ 19, 48},{ 39, 64},{ 21, 64},{ 2, 64},{ 2, 48},{ 6, 32},{ 26, 32},{ 41, 32},{ 56, 32},{ 71, 32},{ 86, 32},{101, 32}, + /* 32 , 33 , 34 , 35 , 36 , 37 , 38 , 39 , 40 , 41 , 42 , 43 , 44 , 45 , 46 , 47 */ + /* j , k , l , ö , ä , # , ent , pgdn , pgup , + , ü , p , o , i , u , z */ + {116, 32},{131, 32},{146, 32},{161, 32},{176, 32},{191, 32},{208, 24},{224, 32},{224, 16},{188, 16},{173, 16},{158, 16},{143, 16},{128, 16},{113, 16},{ 98, 16}, + /* 48 , 49 , 50 , 51 , 52 , 53 , 54 , 55 , 56 , 57 , 58 , 59 , 60 , 61 , 62 , 63 */ + /* t , r , e , w , q , tab , esc , 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 */ + { 83, 16},{ 68, 16},{ 53, 16},{ 38, 16},{ 23, 16},{ 4, 16},{ 0, 0},{ 15, 0},{ 30, 0},{ 45, 0},{ 60, 0},{ 75, 0},{ 90, 0},{105, 0},{120, 0},{135, 0}, + /* 64 , 65 , 66 , 67 , 68 */ + /* 0 , ß , ´ , bksp , del */ + {150, 0},{165, 0},{180, 0},{203, 0},{224, 0} +}, { + // LED Index to Flag + /* 0 , 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 10 , 11 , 12 , 13 , 14 , 15 */ + /* space , alt gr , fn , strg , left , down , right , func , up , rshift , dash , dot , comma , m , n , b */ + 4 , 1 , 1 , 1 , 4 , 4 , 4 , 4 , 4 , 1 , 4 , 4 , 4 , 4 , 4 , 4 , + /* 16 , 17 , 18 , 19 , 20 , 21 , 22 , 23 , 24 , 25 , 26 , 27 , 28 , 29 , 30 , 31 */ + /* v , c , x , y , < , alt , OS , strg , shift , caps , a , s , d , f , g , h */ + 4 , 4 , 4 , 4 , 4 , 1 , 1 , 1 , 1 , 1 , 4 , 4 , 4 , 4 , 4 , 4 , + /* 32 , 33 , 34 , 35 , 36 , 37 , 38 , 39 , 40 , 41 , 42 , 43 , 44 , 45 , 46 , 47 */ + /* j , k , l , ö , ä , # , ent , pgdn , pgup , + , ü , p , o , i , u , z */ + 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , + /* 48 , 49 , 50 , 51 , 52 , 53 , 54 , 55 , 56 , 57 , 58 , 59 , 60 , 61 , 62 , 63 */ + /* t , r , e , w , q , tab , esc , 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 */ + 4 , 4 , 4 , 4 , 4 , 1 , 1 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , + /* 64 , 65 , 66 , 67 , 68 */ + /* 0 , ß , ´ , bksp , del */ + 4 , 4 , 4 , 4 , 4 +} }; + + +bool rgb_matrix_indicators_kb(void) { + if (!rgb_matrix_indicators_user()) { + return false; + } + if (host_keyboard_led_state().caps_lock) + { + rgb_matrix_set_color(25, 0xFF, 0xFF, 0xFF); + } + return true; +} +#endif diff --git a/keyboards/kuro/kuro65/kuro65.h b/keyboards/kuro/kuro65/kuro65.h new file mode 100644 index 000000000000..3bf9a72dbab0 --- /dev/null +++ b/keyboards/kuro/kuro65/kuro65.h @@ -0,0 +1,50 @@ +/* Copyright 2022 + * + * 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" + +#define ___ KC_NO + +/* Hot-swap ISO 65 layout: + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ + * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │ 0E │0F │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ + * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │ │1F │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ ├───┤ + * │20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │ 2E │2F │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤ + * │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3E │3F │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤ + * │40 │41 │42 │ 46 │4A │4B │4C │4D │4E │4F │ + * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘ + */ + +#define LAYOUT_65_iso( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E, k0F, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1F, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2E, k2F, \ + k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3E, k3F, \ + k40, k41, k42, k46, k4A, k4B, k4C, k4D, k4E, k4F \ +) \ +{ \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, ___, k0E, k0F }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, ___, ___, k1F }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, ___, k2E, k2F }, \ + { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, ___, k3E, k3F }, \ + { k40, k41, k42, ___, ___, ___, k46, ___, ___, ___, k4A, k4B, k4C, k4D, k4E, k4F } \ +} diff --git a/keyboards/kuro/kuro65/readme.md b/keyboards/kuro/kuro65/readme.md new file mode 100644 index 000000000000..7201511be5cb --- /dev/null +++ b/keyboards/kuro/kuro65/readme.md @@ -0,0 +1,15 @@ +# Kuro 65 + + + +## Bootloader mode + +To put in bootloader mode, hold the `Esc` key while plugging in the USB cable. or use reset key behind the pcb. + +## Making firmware + +Make example for this keyboard (after setting up your build environment): + + make kuro/kuro65:default + +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/kuro/kuro65/rules.mk b/keyboards/kuro/kuro65/rules.mk new file mode 100644 index 000000000000..38688c760959 --- /dev/null +++ b/keyboards/kuro/kuro65/rules.mk @@ -0,0 +1,21 @@ +# MCU name +MCU = atmega32u4 + +# Bootloader selection +BOOTLOADER = atmel-dfu + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite +MOUSEKEY_ENABLE = no # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = yes # Enable N-Key Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output +RGB_MATRIX_ENABLE = yes # Use RGB matrix +RGB_MATRIX_DRIVER = WS2812 +LTO_ENABLE = yes From 3dd8a5df0633b7a7c21f9ddd5c55b4be22cb2813 Mon Sep 17 00:00:00 2001 From: 0x544D Date: Sun, 29 Jan 2023 15:46:49 +0100 Subject: [PATCH 04/23] Updates on kuro65 source files. --- keyboards/kuro/kuro65/config.h | 2 +- keyboards/kuro/kuro65/kuro65.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/kuro/kuro65/config.h b/keyboards/kuro/kuro65/config.h index bea460f748bb..ad07cd3588f7 100644 --- a/keyboards/kuro/kuro65/config.h +++ b/keyboards/kuro/kuro65/config.h @@ -1,4 +1,4 @@ -/* Copyright 2021 DZTECH +/* Copyright 2023 Tobias Minn (0x544D) * * 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/kuro/kuro65/kuro65.h b/keyboards/kuro/kuro65/kuro65.h index 3bf9a72dbab0..68ad00a410e8 100644 --- a/keyboards/kuro/kuro65/kuro65.h +++ b/keyboards/kuro/kuro65/kuro65.h @@ -1,4 +1,4 @@ -/* Copyright 2022 +/* Copyright 2023 Tobias Minn (0x544D) * * 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 89b224b015db8442c0e0243588ffc4c9e8db055c Mon Sep 17 00:00:00 2001 From: Tobias Minn Date: Sun, 26 Feb 2023 14:25:16 +0100 Subject: [PATCH 05/23] Updated info.json and README.md of kuro65 keyboard. --- keyboards/kuro/kuro65/info.json | 81 ++++++++++++++++++++++++++++++++- keyboards/kuro/kuro65/readme.md | 5 +- 2 files changed, 84 insertions(+), 2 deletions(-) diff --git a/keyboards/kuro/kuro65/info.json b/keyboards/kuro/kuro65/info.json index 7670ed8ab6e7..12ce52aaf583 100644 --- a/keyboards/kuro/kuro65/info.json +++ b/keyboards/kuro/kuro65/info.json @@ -5,5 +5,84 @@ "vid": "0x544D", "pid": "0xC000", "device_version": "1.0.0" + }, + "layouts": { + "LAYOUT_65_iso": { + "layout": [ + {"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": 6, "y": 0}, + {"x": 7, "y": 0}, + {"x": 8, "y": 0}, + {"x": 9, "y": 0}, + {"x": 10, "y": 0}, + {"x": 11, "y": 0}, + {"x": 12, "y": 0}, + {"x": 13, "y": 0, "w":2}, + {"x": 15, "y": 0}, + + {"x": 0, "y": 1, "w":1.5}, + {"x": 1.5, "y": 1}, + {"x": 2.5, "y": 1}, + {"x": 3.5, "y": 1}, + {"x": 4.5, "y": 1}, + {"x": 5.5, "y": 1}, + {"x": 6.5, "y": 1}, + {"x": 7.5, "y": 1}, + {"x": 8.5, "y": 1}, + {"x": 9.5, "y": 1}, + {"x": 10.5, "y": 1}, + {"x": 11.5, "y": 1}, + {"x": 12.5, "y": 1}, + {"x": 15, "y": 1}, + + {"x": 0, "y": 2, "w":1.75}, + {"x": 1.75, "y": 2}, + {"x": 2.75, "y": 2}, + {"x": 3.75, "y": 2}, + {"x": 4.75, "y": 2}, + {"x": 5.75, "y": 2}, + {"x": 6.75, "y": 2}, + {"x": 7.75, "y": 2}, + {"x": 8.75, "y": 2}, + {"x": 9.75, "y": 2}, + {"x": 10.75, "y": 2}, + {"x": 11.75, "y": 2}, + {"x": 12.75, "y": 2}, + {"x": 13.75, "y": 1, "w":1.25, "h":2}, + {"x": 15, "y": 2}, + + {"x": 0, "y": 3, "w":1.25}, + {"x": 1.25, "y": 3}, + {"x": 2.25, "y": 3}, + {"x": 3.25, "y": 3}, + {"x": 4.25, "y": 3}, + {"x": 5.25, "y": 3}, + {"x": 6.25, "y": 3}, + {"x": 7.25, "y": 3}, + {"x": 8.25, "y": 3}, + {"x": 9.25, "y": 3}, + {"x": 10.25, "y": 3}, + {"x": 11.25, "y": 3, "w":1.75}, + {"x": 13, "y": 3}, + {"x": 14, "y": 3}, + {"x": 15, "y": 3}, + + {"x": 0, "y": 4, "w":1.25}, + {"x": 1.25, "y": 4, "w":1.25}, + {"x": 2.5, "y": 4, "w":1.25}, + {"x": 3.75, "y": 4, "w":6.25}, + {"x": 10, "y": 4}, + {"x": 11, "y": 4}, + {"x": 12, "y": 4}, + {"x": 13, "y": 4}, + {"x": 14, "y": 4}, + {"x": 15, "y": 4} + ] + } } -} \ No newline at end of file +} diff --git a/keyboards/kuro/kuro65/readme.md b/keyboards/kuro/kuro65/readme.md index 7201511be5cb..c22128329560 100644 --- a/keyboards/kuro/kuro65/readme.md +++ b/keyboards/kuro/kuro65/readme.md @@ -1,10 +1,13 @@ # Kuro 65 +A 65% keyboard with an ISO layout, which fits the TOFU65 case (and similar) by KBDFans. +Keyboard maintainer: [0x544D](https://github.com/0x544D) +Hardware availability: not yet available ## Bootloader mode -To put in bootloader mode, hold the `Esc` key while plugging in the USB cable. or use reset key behind the pcb. +To put in bootloader mode, hold the `Esc` key while plugging in the USB cable or use the reset key on the back of the PCB. ## Making firmware From d968c4d96ee7221bdb963afe6deffdc89c214367 Mon Sep 17 00:00:00 2001 From: Tobias Minn Date: Sun, 26 Feb 2023 14:35:42 +0100 Subject: [PATCH 06/23] Update readme.md --- keyboards/kuro/kuro65/readme.md | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/keyboards/kuro/kuro65/readme.md b/keyboards/kuro/kuro65/readme.md index c22128329560..82ce4b49ccfa 100644 --- a/keyboards/kuro/kuro65/readme.md +++ b/keyboards/kuro/kuro65/readme.md @@ -1,15 +1,23 @@ # Kuro 65 - + A 65% keyboard with an ISO layout, which fits the TOFU65 case (and similar) by KBDFans. -Keyboard maintainer: [0x544D](https://github.com/0x544D) +Keyboard maintainer: [0x544D](https://github.com/0x544D)
Hardware availability: not yet available +## Features + +- Hot-swappable ISO layout +- Per key RGB LED (south facing) +- USB-C connector +- Reset button on the back of the PCB +- Compatible with TOFU65 and similar cases + ## Bootloader mode To put in bootloader mode, hold the `Esc` key while plugging in the USB cable or use the reset key on the back of the PCB. -## Making firmware +## Building the firmware Make example for this keyboard (after setting up your build environment): From 74ce9a2267d3bac5f524cd4c44a919f917cd7ae9 Mon Sep 17 00:00:00 2001 From: Tobias Minn Date: Sun, 26 Feb 2023 14:58:16 +0100 Subject: [PATCH 07/23] Update of info.json for kuro65. --- keyboards/kuro/kuro65/info.json | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/kuro/kuro65/info.json b/keyboards/kuro/kuro65/info.json index 12ce52aaf583..780b91b83afd 100644 --- a/keyboards/kuro/kuro65/info.json +++ b/keyboards/kuro/kuro65/info.json @@ -1,6 +1,7 @@ { "keyboard_name": "Kuro65", "manufacturer": "Kuro", + "maintainer" : "0x544D", "usb": { "vid": "0x544D", "pid": "0xC000", From 149544cd550bb08e75e63cec38c68cc2382123fa Mon Sep 17 00:00:00 2001 From: Tobias Minn Date: Sun, 26 Feb 2023 15:15:02 +0100 Subject: [PATCH 08/23] Corrected key layout in info.json for kuro65. --- keyboards/kuro/kuro65/info.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/kuro/kuro65/info.json b/keyboards/kuro/kuro65/info.json index 780b91b83afd..6594157208f6 100644 --- a/keyboards/kuro/kuro65/info.json +++ b/keyboards/kuro/kuro65/info.json @@ -68,8 +68,8 @@ {"x": 8.25, "y": 3}, {"x": 9.25, "y": 3}, {"x": 10.25, "y": 3}, - {"x": 11.25, "y": 3, "w":1.75}, - {"x": 13, "y": 3}, + {"x": 11.25, "y": 3}, + {"x": 12.25, "y": 3, "w":1.75}, {"x": 14, "y": 3}, {"x": 15, "y": 3}, From 4b40d4a52e40b46c1c96453326131726ab88030a Mon Sep 17 00:00:00 2001 From: Tobias Minn Date: Mon, 27 Feb 2023 21:57:44 +0100 Subject: [PATCH 09/23] Added VIA keymap and configuration for Kuro65 keyboard. --- keyboards/kuro/kuro65/keymaps/via/keymap.c | 101 +++++++++++++++++++++ keyboards/kuro/kuro65/keymaps/via/rules.mk | 1 + 2 files changed, 102 insertions(+) create mode 100644 keyboards/kuro/kuro65/keymaps/via/keymap.c create mode 100644 keyboards/kuro/kuro65/keymaps/via/rules.mk diff --git a/keyboards/kuro/kuro65/keymaps/via/keymap.c b/keyboards/kuro/kuro65/keymaps/via/keymap.c new file mode 100644 index 000000000000..d84d76e807ee --- /dev/null +++ b/keyboards/kuro/kuro65/keymaps/via/keymap.c @@ -0,0 +1,101 @@ +/* Copyright 2023 Tobias Minn (0x544D) + * + * 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 + +#define BL_WIN 0 // base layer Windows +#define BL_MAC 1 // base layer Mac OS +#define FN1 2 // function layer 1 +#define FN2 3 // function layer 2 + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + /* ISO 65 layout by 0x544D (ISO German keyboard layout shown) + * + * ,-----------------------------------------------------------------------------------------------. + * | Esc | 1 ! | 2 " | 3 § | 4 $ | 5 % | 6 & | 7 / | 8 ( | 9 ) | 0 = | ß ? | ´ ` | Backspace | Del | + * |-----------------------------------------------------------------------------------------------| + * | Tab | Q | W | E | R | T | Z | U | I | O | P | Ü | + * | Enter | PgU | + * |---------------------------------------------------------------------------------- |-----| + * | MO(2) | A | S | D | F | G | H | J | K | L | Ö | Ä | # ' | | PgD | + * |-----------------------------------------------------------------------------------------------| + * | Shift | < > | Y | X | C | V | B | N | M | , ; | . : | - _ | Shift | Up | Del | + * |-----------------------------------------------------------------------------------------------| + * | LCtl | LGUI | LAlt | Space |RAlt |MO(1)|RCtl | Lft | Dwn | Rgh | + * `-----------------------------------------------------------------------------------------------' + */ + [BL_WIN] = LAYOUT_65_iso( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGUP, + MO(3), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, KC_PGDN, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_DEL, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(2), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + + [BL_MAC] = LAYOUT_65_iso( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGUP, + MO(3), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, KC_PGDN, + KC_LSFT, KC_GRV, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_DEL, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(2), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + + /* Funtion Layer 1: Media Controls with arrow keys / RShift (Play Pause), F keys, + * RGB matrix control + * ,-----------------------------------------------------------------------------------------------. + * | °^ | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | Delete |Home | + * |-----------------------------------------------------------------------------------------------| + * | |RGB_T|RGB+ |RGB- |HUE+ |HUE- |SAT+ |SAT- |BGH+ |BGH- | | | | |Home | + * |---------------------------------------------------------------------------------- |-----| + * | | | | | | | | | | | | | | | End | + * |-----------------------------------------------------------------------------------------------| + * | | | | | | | | | | | | | MPlay |Vol_U| End | + * |-----------------------------------------------------------------------------------------------| + * | | | | | |Trans| | MPrv|Vol_D| MNxt| + * `-----------------------------------------------------------------------------------------------' + */ + [FN1] = LAYOUT_65_iso( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, + KC_NO, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_NO, KC_NO, KC_NO, KC_HOME, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_END, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_MPLY, KC_VOLU, KC_END, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_MPRV, KC_VOLD, KC_MNXT + ), + + + /* Funtion Layer 2: Media Controls left hand, F keys, Page up/down, Home/end, Program/RESET + * ,-----------------------------------------------------------------------------------------------. + * | °^ | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | Delete |Home | + * |-----------------------------------------------------------------------------------------------| + * | | | | | | | | | | |RESET| | | |Home | + * |---------------------------------------------------------------------------------- |-----| + * | Trans | | | | | | | | | | | | | | End | + * |-----------------------------------------------------------------------------------------------| + * | | | | | | | | |TG(1)| | | | |PGUP | End | + * |-----------------------------------------------------------------------------------------------| + * | | | | | | | | Home|PGDN | End | + * `-----------------------------------------------------------------------------------------------' + */ + [FN2] = LAYOUT_65_iso( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_NO, KC_HOME, + KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_END, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, TG(1), KC_NO, KC_NO, KC_NO, KC_NO, KC_PGUP, KC_END, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_HOME, KC_PGDN, KC_END + ) + +}; \ No newline at end of file diff --git a/keyboards/kuro/kuro65/keymaps/via/rules.mk b/keyboards/kuro/kuro65/keymaps/via/rules.mk new file mode 100644 index 000000000000..1821917788e3 --- /dev/null +++ b/keyboards/kuro/kuro65/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes # enable VIA support \ No newline at end of file From 86bc11d7d8708c34a7bf91f8a6ed1687f37ffd4c Mon Sep 17 00:00:00 2001 From: Tobias Minn Date: Mon, 27 Feb 2023 22:00:00 +0100 Subject: [PATCH 10/23] Added VIA compatibility to readme.md for Kuro65. --- keyboards/kuro/kuro65/readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/kuro/kuro65/readme.md b/keyboards/kuro/kuro65/readme.md index 82ce4b49ccfa..6cae694adba6 100644 --- a/keyboards/kuro/kuro65/readme.md +++ b/keyboards/kuro/kuro65/readme.md @@ -9,6 +9,7 @@ Hardware availability: not yet available - Hot-swappable ISO layout - Per key RGB LED (south facing) +- VIA compatible - USB-C connector - Reset button on the back of the PCB - Compatible with TOFU65 and similar cases From 7e88bd0ad646935eddc91aeb5be0ceea67b27831 Mon Sep 17 00:00:00 2001 From: Tobias Minn Date: Mon, 27 Feb 2023 22:13:58 +0100 Subject: [PATCH 11/23] Changed default keymap for Kuro65 and added user keymap. --- keyboards/kuro/kuro65/keymaps/0x544D/keymap.c | 101 ++++++++++++++++++ keyboards/kuro/kuro65/keymaps/0x544D/rules.mk | 1 + .../kuro/kuro65/keymaps/default/keymap.c | 33 +++--- keyboards/kuro/kuro65/keymaps/via/keymap.c | 33 +++--- 4 files changed, 126 insertions(+), 42 deletions(-) create mode 100644 keyboards/kuro/kuro65/keymaps/0x544D/keymap.c create mode 100644 keyboards/kuro/kuro65/keymaps/0x544D/rules.mk diff --git a/keyboards/kuro/kuro65/keymaps/0x544D/keymap.c b/keyboards/kuro/kuro65/keymaps/0x544D/keymap.c new file mode 100644 index 000000000000..0af3348782d9 --- /dev/null +++ b/keyboards/kuro/kuro65/keymaps/0x544D/keymap.c @@ -0,0 +1,101 @@ +/* Copyright 2023 Tobias Minn (0x544D) + * + * 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 + +#define BL_WIN 0 // base layer Windows +#define BL_MAC 1 // base layer Mac OS +#define FN1 2 // function layer 1 +#define FN2 3 // function layer 2 + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + /* ISO 65 layout by 0x544D (ISO German keyboard layout shown) + * + * ,-----------------------------------------------------------------------------------------------. + * | Esc | 1 ! | 2 " | 3 § | 4 $ | 5 % | 6 & | 7 / | 8 ( | 9 ) | 0 = | ß ? | ´ ` | Backspace | Del | + * |-----------------------------------------------------------------------------------------------| + * | Tab | Q | W | E | R | T | Z | U | I | O | P | Ü | + * | Enter | PgU | + * |---------------------------------------------------------------------------------- |-----| + * | MO(2) | A | S | D | F | G | H | J | K | L | Ö | Ä | # ' | | PgD | + * |-----------------------------------------------------------------------------------------------| + * | Shift | < > | Y | X | C | V | B | N | M | , ; | . : | - _ | Shift | Up | Del | + * |-----------------------------------------------------------------------------------------------| + * | LCtl | LGUI | LAlt | Space |RAlt |MO(1)|RCtl | Lft | Dwn | Rgh | + * `-----------------------------------------------------------------------------------------------' + */ + [BL_WIN] = LAYOUT_65_iso( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGUP, + MO(3), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, KC_PGDN, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_DEL, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(2), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + + [BL_MAC] = LAYOUT_65_iso( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGUP, + MO(3), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, KC_PGDN, + KC_LSFT, KC_GRV, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_DEL, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(2), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + + /* Funtion Layer 1: Media Controls with arrow keys / RShift (Play Pause), F keys, + * RGB matrix control + * ,-----------------------------------------------------------------------------------------------. + * | °^ | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | Delete |Home | + * |-----------------------------------------------------------------------------------------------| + * | |RGB_T|RGB+ |RGB- |HUE+ |HUE- |SAT+ |SAT- |BGH+ |BGH- | | | | |Home | + * |---------------------------------------------------------------------------------- |-----| + * | | | | | | | | | | | | | | | End | + * |-----------------------------------------------------------------------------------------------| + * | | | | | | | | | | | | | MPlay |Vol_U| End | + * |-----------------------------------------------------------------------------------------------| + * | | | | | |Trans| | MPrv|Vol_D| MNxt| + * `-----------------------------------------------------------------------------------------------' + */ + [FN1] = LAYOUT_65_iso( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, + KC_NO, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_NO, KC_NO, KC_NO, KC_HOME, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_END, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_MPLY, KC_VOLU, KC_END, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_MPRV, KC_VOLD, KC_MNXT + ), + + + /* Funtion Layer 2: Media Controls left hand, F keys, Page up/down, Home/end, Program/RESET + * ,-----------------------------------------------------------------------------------------------. + * | °^ | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | Delete |Home | + * |-----------------------------------------------------------------------------------------------| + * | | |Vol_D|Vol_U| | | | | | |RESET| | | |Home | + * |---------------------------------------------------------------------------------- |-----| + * | Trans |MPrv |MPlay| MNxt| | | | | | | | | | | End | + * |-----------------------------------------------------------------------------------------------| + * | | | | | | | | |TG(1)| | | | |PGUP | End | + * |-----------------------------------------------------------------------------------------------| + * | | | | | | | | Home|PGDN | End | + * `-----------------------------------------------------------------------------------------------' + */ + [FN2] = LAYOUT_65_iso( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, + KC_NO, KC_NO, KC_VOLD, KC_VOLU, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_NO, KC_HOME, + KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_END, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, TG(1), KC_NO, KC_NO, KC_NO, KC_NO, KC_PGUP, KC_END, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_HOME, KC_PGDN, KC_END + ) + +}; \ No newline at end of file diff --git a/keyboards/kuro/kuro65/keymaps/0x544D/rules.mk b/keyboards/kuro/kuro65/keymaps/0x544D/rules.mk new file mode 100644 index 000000000000..1821917788e3 --- /dev/null +++ b/keyboards/kuro/kuro65/keymaps/0x544D/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes # enable VIA support \ No newline at end of file diff --git a/keyboards/kuro/kuro65/keymaps/default/keymap.c b/keyboards/kuro/kuro65/keymaps/default/keymap.c index d84d76e807ee..7561cf39c5bc 100644 --- a/keyboards/kuro/kuro65/keymaps/default/keymap.c +++ b/keyboards/kuro/kuro65/keymaps/default/keymap.c @@ -16,10 +16,9 @@ #include QMK_KEYBOARD_H -#define BL_WIN 0 // base layer Windows -#define BL_MAC 1 // base layer Mac OS -#define FN1 2 // function layer 1 -#define FN2 3 // function layer 2 +#define BASE 0 // base layer Windows +#define FN1 1 // function layer 1 +#define FN2 2 // function layer 2 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -38,20 +37,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | LCtl | LGUI | LAlt | Space |RAlt |MO(1)|RCtl | Lft | Dwn | Rgh | * `-----------------------------------------------------------------------------------------------' */ - [BL_WIN] = LAYOUT_65_iso( + [BASE] = LAYOUT_65_iso( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGUP, - MO(3), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, KC_PGDN, + MO(2), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, KC_PGDN, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_DEL, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(2), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT - ), - - [BL_MAC] = LAYOUT_65_iso( - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGUP, - MO(3), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, KC_PGDN, - KC_LSFT, KC_GRV, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_DEL, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(2), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), /* Funtion Layer 1: Media Controls with arrow keys / RShift (Play Pause), F keys, @@ -81,20 +72,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ,-----------------------------------------------------------------------------------------------. * | °^ | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | Delete |Home | * |-----------------------------------------------------------------------------------------------| - * | | | | | | | | | | |RESET| | | |Home | + * | | |Vol_D|Vol_U| | | | | | |RESET| | | |Home | * |---------------------------------------------------------------------------------- |-----| - * | Trans | | | | | | | | | | | | | | End | + * | Trans |MPrv |MPlay| MNxt| | | | | | | | | | | End | * |-----------------------------------------------------------------------------------------------| - * | | | | | | | | |TG(1)| | | | |PGUP | End | + * | | | | | | | | | | | | | |PGUP | End | * |-----------------------------------------------------------------------------------------------| * | | | | | | | | Home|PGDN | End | * `-----------------------------------------------------------------------------------------------' */ [FN2] = LAYOUT_65_iso( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_NO, KC_HOME, - KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_END, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, TG(1), KC_NO, KC_NO, KC_NO, KC_NO, KC_PGUP, KC_END, + KC_NO, KC_NO, KC_VOLD, KC_VOLU, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_NO, KC_HOME, + KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_END, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_PGUP, KC_END, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_HOME, KC_PGDN, KC_END ) diff --git a/keyboards/kuro/kuro65/keymaps/via/keymap.c b/keyboards/kuro/kuro65/keymaps/via/keymap.c index d84d76e807ee..7561cf39c5bc 100644 --- a/keyboards/kuro/kuro65/keymaps/via/keymap.c +++ b/keyboards/kuro/kuro65/keymaps/via/keymap.c @@ -16,10 +16,9 @@ #include QMK_KEYBOARD_H -#define BL_WIN 0 // base layer Windows -#define BL_MAC 1 // base layer Mac OS -#define FN1 2 // function layer 1 -#define FN2 3 // function layer 2 +#define BASE 0 // base layer Windows +#define FN1 1 // function layer 1 +#define FN2 2 // function layer 2 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -38,20 +37,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | LCtl | LGUI | LAlt | Space |RAlt |MO(1)|RCtl | Lft | Dwn | Rgh | * `-----------------------------------------------------------------------------------------------' */ - [BL_WIN] = LAYOUT_65_iso( + [BASE] = LAYOUT_65_iso( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGUP, - MO(3), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, KC_PGDN, + MO(2), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, KC_PGDN, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_DEL, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(2), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT - ), - - [BL_MAC] = LAYOUT_65_iso( - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGUP, - MO(3), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, KC_PGDN, - KC_LSFT, KC_GRV, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_DEL, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(2), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), /* Funtion Layer 1: Media Controls with arrow keys / RShift (Play Pause), F keys, @@ -81,20 +72,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ,-----------------------------------------------------------------------------------------------. * | °^ | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | Delete |Home | * |-----------------------------------------------------------------------------------------------| - * | | | | | | | | | | |RESET| | | |Home | + * | | |Vol_D|Vol_U| | | | | | |RESET| | | |Home | * |---------------------------------------------------------------------------------- |-----| - * | Trans | | | | | | | | | | | | | | End | + * | Trans |MPrv |MPlay| MNxt| | | | | | | | | | | End | * |-----------------------------------------------------------------------------------------------| - * | | | | | | | | |TG(1)| | | | |PGUP | End | + * | | | | | | | | | | | | | |PGUP | End | * |-----------------------------------------------------------------------------------------------| * | | | | | | | | Home|PGDN | End | * `-----------------------------------------------------------------------------------------------' */ [FN2] = LAYOUT_65_iso( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_NO, KC_HOME, - KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_END, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, TG(1), KC_NO, KC_NO, KC_NO, KC_NO, KC_PGUP, KC_END, + KC_NO, KC_NO, KC_VOLD, KC_VOLU, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_NO, KC_HOME, + KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_END, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_PGUP, KC_END, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_HOME, KC_PGDN, KC_END ) From 4bde042348754749c1a4e5b94a1794bb1f4dd4fe Mon Sep 17 00:00:00 2001 From: Tobias Minn Date: Mon, 27 Feb 2023 22:49:49 +0100 Subject: [PATCH 12/23] Removed kuro eval pad from repo. --- keyboards/kuro/kuro_pad_eval/config.h | 104 ------------------ .../kuro_pad_eval/keymaps/default/keymap.c | 11 -- keyboards/kuro/kuro_pad_eval/kuro_pad_eval.c | 84 -------------- keyboards/kuro/kuro_pad_eval/kuro_pad_eval.h | 33 ------ keyboards/kuro/kuro_pad_eval/readme.md | 15 --- keyboards/kuro/kuro_pad_eval/rules.mk | 21 ---- 6 files changed, 268 deletions(-) delete mode 100644 keyboards/kuro/kuro_pad_eval/config.h delete mode 100644 keyboards/kuro/kuro_pad_eval/keymaps/default/keymap.c delete mode 100644 keyboards/kuro/kuro_pad_eval/kuro_pad_eval.c delete mode 100644 keyboards/kuro/kuro_pad_eval/kuro_pad_eval.h delete mode 100644 keyboards/kuro/kuro_pad_eval/readme.md delete mode 100644 keyboards/kuro/kuro_pad_eval/rules.mk diff --git a/keyboards/kuro/kuro_pad_eval/config.h b/keyboards/kuro/kuro_pad_eval/config.h deleted file mode 100644 index 7349c66c77ce..000000000000 --- a/keyboards/kuro/kuro_pad_eval/config.h +++ /dev/null @@ -1,104 +0,0 @@ -/* Copyright 2021 DZTECH - * - * 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 0x544D -#define PRODUCT_ID 0xDEAD -#define DEVICE_VER 0x0001 -#define MANUFACTURER KURO -#define PRODUCT KUROPADEVAL - -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 5 -#define MATRIX_ROW_PINS { F5, F4, F1, F0, B0 } -#define MATRIX_COL_PINS { D4, D6, D7, B4, B5 } -#define UNUSED_PINS {E6, B7} - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 -/* disable these deprecated features by default */ -#define NO_ACTION_MACRO -#define NO_ACTION_FUNCTION -#ifdef RGB_MATRIX_ENABLE -#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects -# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended -# define USB_SUSPEND_WAKEUP_DELAY 5000 -# define RGB_MATRIX_KEYPRESSES -# define RGB_MATRIX_LED_PROCESS_LIMIT 4 -# define RGB_MATRIX_LED_FLUSH_LIMIT 26 -// RGB Matrix Animation modes. Explicitly enabled -// For full list of effects, see: -// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects -# define ENABLE_RGB_MATRIX_ALPHAS_MODS -# define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN -# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT -# define ENABLE_RGB_MATRIX_BREATHING -# define ENABLE_RGB_MATRIX_BAND_SAT -# define ENABLE_RGB_MATRIX_BAND_VAL -# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT -# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL -# define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT -# define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL -# define ENABLE_RGB_MATRIX_CYCLE_ALL -# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT -# define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN -# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON -# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN -# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL -# define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL -# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL -# define ENABLE_RGB_MATRIX_DUAL_BEACON -# define ENABLE_RGB_MATRIX_RAINBOW_BEACON -# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS -# define ENABLE_RGB_MATRIX_RAINDROPS -# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS -# define ENABLE_RGB_MATRIX_HUE_BREATHING -# define ENABLE_RGB_MATRIX_HUE_PENDULUM -# define ENABLE_RGB_MATRIX_HUE_WAVE -# define ENABLE_RGB_MATRIX_PIXEL_RAIN -# define ENABLE_RGB_MATRIX_PIXEL_FLOW -# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL -// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined -# define ENABLE_RGB_MATRIX_TYPING_HEATMAP -# define ENABLE_RGB_MATRIX_DIGITAL_RAIN -// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS -# define ENABLE_RGB_MATRIX_SPLASH -# define ENABLE_RGB_MATRIX_MULTISPLASH -# define ENABLE_RGB_MATRIX_SOLID_SPLASH -# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH - -# define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL -# define DRIVER_ADDR_1 0b0110000 -# define DRIVER_COUNT 1 -# define DRIVER_LED_TOTAL 17 -# define DRIVER_INDICATOR_LED_TOTAL 0 -#endif diff --git a/keyboards/kuro/kuro_pad_eval/keymaps/default/keymap.c b/keyboards/kuro/kuro_pad_eval/keymaps/default/keymap.c deleted file mode 100644 index 7e3710ac8f19..000000000000 --- a/keyboards/kuro/kuro_pad_eval/keymaps/default/keymap.c +++ /dev/null @@ -1,11 +0,0 @@ -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - LAYOUT_pad_25( - KC_MUTE, KC_NUM, RGB_TOG, RGB_MOD, RGB_RMOD, - KC_MPLY, KC_P7, KC_P8, KC_P9, KC_PPLS, - KC_P4, KC_P5, KC_P6, - KC_P1, KC_P2, KC_P3, KC_PENT, - KC_P0, KC_PDOT - ) -}; \ No newline at end of file diff --git a/keyboards/kuro/kuro_pad_eval/kuro_pad_eval.c b/keyboards/kuro/kuro_pad_eval/kuro_pad_eval.c deleted file mode 100644 index 6ab0f9c089d3..000000000000 --- a/keyboards/kuro/kuro_pad_eval/kuro_pad_eval.c +++ /dev/null @@ -1,84 +0,0 @@ -/* Copyright 2022 - * - * 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 "kuro_pad_eval.h" - -#ifdef RGB_MATRIX_ENABLE - -const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = { -/* Refer to IS31 manual for these locations - * driver - * | R location - * | | G location - * | | | B location - * | | | | */ - {0, CS1_SW3, CS5_SW3, CS3_SW3}, // idx 0 - {0, CS1_SW5, CS5_SW5, CS3_SW5}, // idx 1 - {0, CS1_SW7, CS5_SW7, CS3_SW7}, // idx 2 - {0, CS1_SW9, CS5_SW9, CS3_SW9}, // idx 3 - - {0, CS6_SW3, CS10_SW3, CS8_SW3}, // idx 4 - {0, CS6_SW5, CS10_SW5, CS8_SW5}, // idx 5 - {0, CS6_SW7, CS10_SW7, CS8_SW7}, // idx 6 - {0, CS6_SW9, CS10_SW9, CS8_SW9}, // idx 7 - - {0, CS11_SW3, CS15_SW3, CS13_SW3}, // idx 8 - {0, CS11_SW5, CS15_SW5, CS13_SW5}, // idx 9 - {0, CS11_SW7, CS15_SW7, CS13_SW7}, // idx 10 - - {0, CS17_SW3, CS20_SW3, CS19_SW3}, // idx 11 - {0, CS17_SW5, CS20_SW5, CS19_SW5}, // idx 12 - {0, CS17_SW7, CS20_SW7, CS19_SW7}, // idx 13 - {0, CS17_SW9, CS20_SW9, CS19_SW9}, // idx 14 - - {0, CS22_SW5, CS26_SW5, CS24_SW5}, // idx 15 - {0, CS22_SW7, CS26_SW7, CS24_SW7} // idx 16 - -}; - -led_config_t g_led_config = { { - // Key Matrix (5x5) to LED Index - { NO_LED, 0, 1, 2, 3 }, - { NO_LED, 4, 5, 6, 7 }, - { NO_LED, 8, 9, 10, NO_LED }, - { NO_LED, 11, 12, 13, 14 }, - { NO_LED, NO_LED, 15, 16, NO_LED } -}, { - // LED Index to Physical Position - { 0, 0},{ 75, 0},{149, 0},{224, 0}, - { 0, 16},{ 75, 16},{149, 16},{224, 24}, - { 0, 32},{ 75, 32},{149, 32}, - { 0, 48},{ 75, 48},{149, 48},{224, 56}, - { 37, 64},{149, 64} -}, { - // LED Index to Flag - 1, 1, 1, 1, - 4, 4, 4, 1, - 4, 4, 4, - 4, 4, 4, 1, - 4, 1 -} }; - - -__attribute__ ((weak)) -void rgb_matrix_indicators_user(void) -{ - if (host_keyboard_led_state().caps_lock) - { - rgb_matrix_set_color(30, 0xFF, 0xFF, 0xFF); - } -} -#endif diff --git a/keyboards/kuro/kuro_pad_eval/kuro_pad_eval.h b/keyboards/kuro/kuro_pad_eval/kuro_pad_eval.h deleted file mode 100644 index e47e9383eda2..000000000000 --- a/keyboards/kuro/kuro_pad_eval/kuro_pad_eval.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2022 - * - * 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" - -#define LAYOUT_pad_25( \ - K00, K01, K02, K03, K04, \ - K10, K11, K12, K13, K14, \ - K21, K22, K23, \ - K31, K32, K33, K34, \ - K42, K43 \ -) { \ - { K00, K01, K02, K03, K04}, \ - { K10, K11, K12, K13, K14}, \ - { KC_NO, K21, K22, K23, KC_NO}, \ - { KC_NO, K31, K32, K33, K34}, \ - { KC_NO, KC_NO, K42, K43, KC_NO} \ -} diff --git a/keyboards/kuro/kuro_pad_eval/readme.md b/keyboards/kuro/kuro_pad_eval/readme.md deleted file mode 100644 index 2a919a9f6b62..000000000000 --- a/keyboards/kuro/kuro_pad_eval/readme.md +++ /dev/null @@ -1,15 +0,0 @@ -# Kuro Pad Eval Board - - - -## Bootloader mode - -To put in bootloader mode, hold the `Esc` key while plugging in the USB cable. or use reset key behind the pcb. - -## Making firmware - -Make example for this keyboard (after setting up your build environment): - - make kuro/kuro_pad_eval:default - -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/kuro/kuro_pad_eval/rules.mk b/keyboards/kuro/kuro_pad_eval/rules.mk deleted file mode 100644 index fc4b56c0c19f..000000000000 --- a/keyboards/kuro/kuro_pad_eval/rules.mk +++ /dev/null @@ -1,21 +0,0 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -RGB_MATRIX_ENABLE = yes # Use RGB matrix -RGB_MATRIX_DRIVER = IS31FL3741 -LTO_ENABLE = yes From 8c312dc67ceb3a14fe96b1d18ba1aa971b95fa34 Mon Sep 17 00:00:00 2001 From: Tobias Minn Date: Fri, 3 Mar 2023 19:16:56 +0100 Subject: [PATCH 13/23] Updated and ported most of the config to info.json file. --- keyboards/kuro/kuro65/config.h | 22 -- keyboards/kuro/kuro65/info.json | 242 +++++++++++++----- keyboards/kuro/kuro65/keymaps/0x544D/keymap.c | 8 +- .../kuro/kuro65/keymaps/default/keymap.c | 6 +- keyboards/kuro/kuro65/keymaps/via/keymap.c | 6 +- keyboards/kuro/kuro65/kuro65.c | 76 ------ keyboards/kuro/kuro65/kuro65.h | 50 ---- keyboards/kuro/kuro65/readme.md | 16 +- keyboards/kuro/kuro65/rules.mk | 22 +- 9 files changed, 195 insertions(+), 253 deletions(-) delete mode 100644 keyboards/kuro/kuro65/kuro65.c delete mode 100644 keyboards/kuro/kuro65/kuro65.h diff --git a/keyboards/kuro/kuro65/config.h b/keyboards/kuro/kuro65/config.h index ad07cd3588f7..c05638624835 100644 --- a/keyboards/kuro/kuro65/config.h +++ b/keyboards/kuro/kuro65/config.h @@ -18,28 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter -> deprecated, see info.json */ -// #define VENDOR_ID 0x544D -// #define PRODUCT_ID 0xC000 -// #define DEVICE_VER 0x0001 -// #define MANUFACTURER KURO -// #define PRODUCT KURO65 - -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 16 -#define MATRIX_ROW_PINS { F6, F5, F4, F1, F0 } -#define MATRIX_COL_PINS { B0, B7, D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7 } - -/* - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - */ -#define DIODE_DIRECTION COL2ROW - -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - /* RGB Matrix defines*/ #ifdef RGB_MATRIX_ENABLE // The pin connected to the data pin of the LEDs diff --git a/keyboards/kuro/kuro65/info.json b/keyboards/kuro/kuro65/info.json index 6594157208f6..a35b800d79de 100644 --- a/keyboards/kuro/kuro65/info.json +++ b/keyboards/kuro/kuro65/info.json @@ -2,88 +2,190 @@ "keyboard_name": "Kuro65", "manufacturer": "Kuro", "maintainer" : "0x544D", + "url": "", + "processor": "atmega32u4", + "bootloader": "atmel-dfu", + "diode_direction": "COL2ROW", + "matrix_pins": { + "rows": ["F6", "F5", "F4", "F1", "F0"], + "cols": ["B0", "B7", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"] + }, "usb": { "vid": "0x544D", "pid": "0xC000", "device_version": "1.0.0" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": false, + "command": false, + "nkro": true, + "backlight": false, + "rgblight": false, + "audio": false, + "key_lock": false, + "rgb_matrix": true + }, "layouts": { - "LAYOUT_65_iso": { + "LAYOUT": { "layout": [ - {"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": 6, "y": 0}, - {"x": 7, "y": 0}, - {"x": 8, "y": 0}, - {"x": 9, "y": 0}, - {"x": 10, "y": 0}, - {"x": 11, "y": 0}, - {"x": 12, "y": 0}, - {"x": 13, "y": 0, "w":2}, - {"x": 15, "y": 0}, + { "matrix": [0, 0], "label":"Esc", "x": 0, "y": 0}, + { "matrix": [0, 1], "label":"1", "x": 1, "y": 0}, + { "matrix": [0, 2], "label":"2", "x": 2, "y": 0}, + { "matrix": [0, 3], "label":"3", "x": 3, "y": 0}, + { "matrix": [0, 4], "label":"4", "x": 4, "y": 0}, + { "matrix": [0, 5], "label":"5", "x": 5, "y": 0}, + { "matrix": [0, 6], "label":"6", "x": 6, "y": 0}, + { "matrix": [0, 7], "label":"7", "x": 7, "y": 0}, + { "matrix": [0, 8], "label":"8", "x": 8, "y": 0}, + { "matrix": [0, 9], "label":"9", "x": 9, "y": 0}, + { "matrix": [0, 10], "label":"0", "x": 10, "y": 0}, + { "matrix": [0, 11], "label":"?", "x": 11, "y": 0}, + { "matrix": [0, 12], "label":"`", "x": 12, "y": 0}, + { "matrix": [0, 14], "label":"Backspace", "x": 13, "y": 0, "w":2}, + { "matrix": [0, 15], "label":"Del", "x": 15, "y": 0}, - {"x": 0, "y": 1, "w":1.5}, - {"x": 1.5, "y": 1}, - {"x": 2.5, "y": 1}, - {"x": 3.5, "y": 1}, - {"x": 4.5, "y": 1}, - {"x": 5.5, "y": 1}, - {"x": 6.5, "y": 1}, - {"x": 7.5, "y": 1}, - {"x": 8.5, "y": 1}, - {"x": 9.5, "y": 1}, - {"x": 10.5, "y": 1}, - {"x": 11.5, "y": 1}, - {"x": 12.5, "y": 1}, - {"x": 15, "y": 1}, + { "matrix": [1, 0], "label":"Tab", "x": 0, "y": 1, "w":1.5}, + { "matrix": [1, 1], "label":"Q", "x": 1.5, "y": 1}, + { "matrix": [1, 2], "label":"W", "x": 2.5, "y": 1}, + { "matrix": [1, 3], "label":"E", "x": 3.5, "y": 1}, + { "matrix": [1, 4], "label":"R", "x": 4.5, "y": 1}, + { "matrix": [1, 5], "label":"T", "x": 5.5, "y": 1}, + { "matrix": [1, 6], "label":"Z", "x": 6.5, "y": 1}, + { "matrix": [1, 7], "label":"U", "x": 7.5, "y": 1}, + { "matrix": [1, 8], "label":"I", "x": 8.5, "y": 1}, + { "matrix": [1, 9], "label":"O", "x": 9.5, "y": 1}, + { "matrix": [1, 10], "label":"P", "x": 10.5, "y": 1}, + { "matrix": [1, 11], "label":"Ü", "x": 11.5, "y": 1}, + { "matrix": [1, 12], "label":"*", "x": 12.5, "y": 1}, + { "matrix": [1, 15], "label":"Page Up", "x": 15, "y": 1}, - {"x": 0, "y": 2, "w":1.75}, - {"x": 1.75, "y": 2}, - {"x": 2.75, "y": 2}, - {"x": 3.75, "y": 2}, - {"x": 4.75, "y": 2}, - {"x": 5.75, "y": 2}, - {"x": 6.75, "y": 2}, - {"x": 7.75, "y": 2}, - {"x": 8.75, "y": 2}, - {"x": 9.75, "y": 2}, - {"x": 10.75, "y": 2}, - {"x": 11.75, "y": 2}, - {"x": 12.75, "y": 2}, - {"x": 13.75, "y": 1, "w":1.25, "h":2}, - {"x": 15, "y": 2}, + { "matrix": [2, 0], "label":"Caps Lock", "x": 0, "y": 2, "w":1.75}, + { "matrix": [2, 1], "label":"A", "x": 1.75, "y": 2}, + { "matrix": [2, 2], "label":"S", "x": 2.75, "y": 2}, + { "matrix": [2, 3], "label":"D", "x": 3.75, "y": 2}, + { "matrix": [2, 4], "label":"F", "x": 4.75, "y": 2}, + { "matrix": [2, 5], "label":"G", "x": 5.75, "y": 2}, + { "matrix": [2, 6], "label":"H", "x": 6.75, "y": 2}, + { "matrix": [2, 7], "label":"J", "x": 7.75, "y": 2}, + { "matrix": [2, 8], "label":"K", "x": 8.75, "y": 2}, + { "matrix": [2, 9], "label":"L", "x": 9.75, "y": 2}, + { "matrix": [2, 10], "label":"Ö", "x": 10.75, "y": 2}, + { "matrix": [2, 11], "label":"Ä", "x": 11.75, "y": 2}, + { "matrix": [2, 12], "label":"'", "x": 12.75, "y": 2}, + { "matrix": [2, 14], "label":"Enter", "x": 13.75, "y": 1, "w":1.25, "h":2}, + { "matrix": [2, 15], "label":"Page Down", "x": 15, "y": 2}, - {"x": 0, "y": 3, "w":1.25}, - {"x": 1.25, "y": 3}, - {"x": 2.25, "y": 3}, - {"x": 3.25, "y": 3}, - {"x": 4.25, "y": 3}, - {"x": 5.25, "y": 3}, - {"x": 6.25, "y": 3}, - {"x": 7.25, "y": 3}, - {"x": 8.25, "y": 3}, - {"x": 9.25, "y": 3}, - {"x": 10.25, "y": 3}, - {"x": 11.25, "y": 3}, - {"x": 12.25, "y": 3, "w":1.75}, - {"x": 14, "y": 3}, - {"x": 15, "y": 3}, + { "matrix": [3, 0], "label":"LShift", "x": 0, "y": 3, "w":1.25}, + { "matrix": [3, 1], "label":"<", "x": 1.25, "y": 3}, + { "matrix": [3, 2], "label":"Y", "x": 2.25, "y": 3}, + { "matrix": [3, 3], "label":"X", "x": 3.25, "y": 3}, + { "matrix": [3, 4], "label":"C", "x": 4.25, "y": 3}, + { "matrix": [3, 5], "label":"V", "x": 5.25, "y": 3}, + { "matrix": [3, 6], "label":"B", "x": 6.25, "y": 3}, + { "matrix": [3, 7], "label":"N", "x": 7.25, "y": 3}, + { "matrix": [3, 8], "label":"M", "x": 8.25, "y": 3}, + { "matrix": [3, 9], "label":",", "x": 9.25, "y": 3}, + { "matrix": [3, 10], "label":".", "x": 10.25, "y": 3}, + { "matrix": [3, 11], "label":"-", "x": 11.25, "y": 3}, + { "matrix": [3, 12], "label":"RShift", "x": 12.25, "y": 3, "w":1.75}, + { "matrix": [3, 14], "label":"\u2191", "x": 14, "y": 3}, + { "matrix": [3, 15], "label":"Fn2", "x": 15, "y": 3}, - {"x": 0, "y": 4, "w":1.25}, - {"x": 1.25, "y": 4, "w":1.25}, - {"x": 2.5, "y": 4, "w":1.25}, - {"x": 3.75, "y": 4, "w":6.25}, - {"x": 10, "y": 4}, - {"x": 11, "y": 4}, - {"x": 12, "y": 4}, - {"x": 13, "y": 4}, - {"x": 14, "y": 4}, - {"x": 15, "y": 4} + { "matrix": [4, 0], "label":"LCtrl", "x": 0, "y": 4, "w":1.25}, + { "matrix": [4, 1], "label":"Win", "x": 1.25, "y": 4, "w":1.25}, + { "matrix": [4, 2], "label":"LAlt", "x": 2.5, "y": 4, "w":1.25}, + { "matrix": [4, 6], "label":"Space", "x": 3.75, "y": 4, "w":6.25}, + { "matrix": [4, 10], "label":"RAlt", "x": 10, "y": 4}, + { "matrix": [4, 11], "label":"Fn1", "x": 11, "y": 4}, + { "matrix": [4, 12], "label":"RCtrl", "x": 12, "y": 4}, + { "matrix": [4, 13], "label":"\u2190", "x": 13, "y": 4}, + { "matrix": [4, 14], "label":"\u2193", "x": 14, "y": 4}, + { "matrix": [4, 15], "label":"\u2192", "x": 15, "y": 4} ] } + }, + "rgb_matrix": { + "driver": "WS2812", + "layout": [ + { "flags": 4, "matrix": [4, 6], "x": 96, "y": 64}, + { "flags": 1, "matrix": [4, 10], "x":150, "y": 64}, + { "flags": 1, "matrix": [4, 11], "x":165, "y": 64}, + { "flags": 1, "matrix": [4, 12], "x":180, "y": 64}, + { "flags": 4, "matrix": [4, 13], "x":195, "y": 64}, + { "flags": 4, "matrix": [4, 14], "x":210, "y": 64}, + { "flags": 4, "matrix": [4, 15], "x":224, "y": 64}, + { "flags": 4, "matrix": [3, 15], "x":224, "y": 48}, + { "flags": 4, "matrix": [3, 14], "x":210, "y": 48}, + { "flags": 1, "matrix": [3, 12], "x":189, "y": 48}, + { "flags": 4, "matrix": [3, 11], "x":169, "y": 48}, + { "flags": 4, "matrix": [3, 10], "x":154, "y": 48}, + { "flags": 4, "matrix": [3, 9], "x":139, "y": 48}, + { "flags": 4, "matrix": [3, 8], "x":124, "y": 48}, + { "flags": 4, "matrix": [3, 7], "x":109, "y": 48}, + { "flags": 4, "matrix": [3, 6], "x": 94, "y": 48}, + { "flags": 4, "matrix": [3, 5], "x": 79, "y": 48}, + { "flags": 4, "matrix": [3, 4], "x": 64, "y": 48}, + { "flags": 4, "matrix": [3, 3], "x": 49, "y": 48}, + { "flags": 4, "matrix": [3, 2], "x": 34, "y": 48}, + { "flags": 4, "matrix": [3, 1], "x": 19, "y": 48}, + { "flags": 1, "matrix": [4, 2], "x": 39, "y": 64}, + { "flags": 1, "matrix": [4, 1], "x": 21, "y": 64}, + { "flags": 1, "matrix": [4, 0], "x": 2, "y": 64}, + { "flags": 1, "matrix": [3, 0], "x": 2, "y": 48}, + { "flags": 1, "matrix": [2, 0], "x": 6, "y": 32}, + { "flags": 4, "matrix": [2, 1], "x": 26, "y": 32}, + { "flags": 4, "matrix": [2, 2], "x": 41, "y": 32}, + { "flags": 4, "matrix": [2, 3], "x": 56, "y": 32}, + { "flags": 4, "matrix": [2, 4], "x": 71, "y": 32}, + { "flags": 4, "matrix": [2, 5], "x": 86, "y": 32}, + { "flags": 4, "matrix": [2, 6], "x":101, "y": 32}, + { "flags": 4, "matrix": [2, 7], "x":116, "y": 32}, + { "flags": 4, "matrix": [2, 8], "x":131, "y": 32}, + { "flags": 4, "matrix": [2, 9], "x":146, "y": 32}, + { "flags": 4, "matrix": [2, 10], "x":161, "y": 32}, + { "flags": 4, "matrix": [2, 11], "x":176, "y": 32}, + { "flags": 4, "matrix": [2, 12], "x":191, "y": 32}, + { "flags": 4, "matrix": [2, 14], "x":208, "y": 24}, + { "flags": 4, "matrix": [2, 15], "x":224, "y": 32}, + { "flags": 4, "matrix": [1, 15], "x":224, "y": 16}, + { "flags": 4, "matrix": [1, 12], "x":188, "y": 16}, + { "flags": 4, "matrix": [1, 11], "x":173, "y": 16}, + { "flags": 4, "matrix": [1, 10], "x":158, "y": 16}, + { "flags": 4, "matrix": [1, 9], "x":143, "y": 16}, + { "flags": 4, "matrix": [1, 8], "x":128, "y": 16}, + { "flags": 4, "matrix": [1, 7], "x":113, "y": 16}, + { "flags": 4, "matrix": [1, 6], "x": 98, "y": 16}, + { "flags": 4, "matrix": [1, 5], "x": 83, "y": 16}, + { "flags": 4, "matrix": [1, 4], "x": 68, "y": 16}, + { "flags": 4, "matrix": [1, 3], "x": 53, "y": 16}, + { "flags": 4, "matrix": [1, 2], "x": 38, "y": 16}, + { "flags": 4, "matrix": [1, 1], "x": 23, "y": 16}, + { "flags": 1, "matrix": [1, 0], "x": 4, "y": 16}, + { "flags": 1, "matrix": [0, 0], "x": 0, "y": 0}, + { "flags": 4, "matrix": [0, 1], "x": 15, "y": 0}, + { "flags": 4, "matrix": [0, 2], "x": 30, "y": 0}, + { "flags": 4, "matrix": [0, 3], "x": 45, "y": 0}, + { "flags": 4, "matrix": [0, 4], "x": 60, "y": 0}, + { "flags": 4, "matrix": [0, 5], "x": 75, "y": 0}, + { "flags": 4, "matrix": [0, 6], "x": 90, "y": 0}, + { "flags": 4, "matrix": [0, 7], "x":105, "y": 0}, + { "flags": 4, "matrix": [0, 8], "x":120, "y": 0}, + { "flags": 4, "matrix": [0, 9], "x":135, "y": 0}, + { "flags": 4, "matrix": [0, 10], "x":150, "y": 0}, + { "flags": 4, "matrix": [0, 11], "x":165, "y": 0}, + { "flags": 4, "matrix": [0, 12], "x":180, "y": 0}, + { "flags": 4, "matrix": [0, 14], "x":203, "y": 0}, + { "flags": 4, "matrix": [0, 15], "x":224, "y": 0} + ] + }, + "bootmagic": { + "enabled": true, + "matrix": [0, 0] } } diff --git a/keyboards/kuro/kuro65/keymaps/0x544D/keymap.c b/keyboards/kuro/kuro65/keymaps/0x544D/keymap.c index 0af3348782d9..089693ba8071 100644 --- a/keyboards/kuro/kuro65/keymaps/0x544D/keymap.c +++ b/keyboards/kuro/kuro65/keymaps/0x544D/keymap.c @@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | LCtl | LGUI | LAlt | Space |RAlt |MO(1)|RCtl | Lft | Dwn | Rgh | * `-----------------------------------------------------------------------------------------------' */ - [BL_WIN] = LAYOUT_65_iso( + [BL_WIN] = LAYOUT( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGUP, MO(3), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, KC_PGDN, @@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(2), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), - [BL_MAC] = LAYOUT_65_iso( + [BL_MAC] = LAYOUT( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGUP, MO(3), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, KC_PGDN, @@ -68,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | | |Trans| | MPrv|Vol_D| MNxt| * `-----------------------------------------------------------------------------------------------' */ - [FN1] = LAYOUT_65_iso( + [FN1] = LAYOUT( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, KC_NO, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_NO, KC_NO, KC_NO, KC_HOME, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_END, @@ -90,7 +90,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | | | | | Home|PGDN | End | * `-----------------------------------------------------------------------------------------------' */ - [FN2] = LAYOUT_65_iso( + [FN2] = LAYOUT( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, KC_NO, KC_NO, KC_VOLD, KC_VOLU, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_NO, KC_HOME, KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_END, diff --git a/keyboards/kuro/kuro65/keymaps/default/keymap.c b/keyboards/kuro/kuro65/keymaps/default/keymap.c index 7561cf39c5bc..eb6c85700d98 100644 --- a/keyboards/kuro/kuro65/keymaps/default/keymap.c +++ b/keyboards/kuro/kuro65/keymaps/default/keymap.c @@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | LCtl | LGUI | LAlt | Space |RAlt |MO(1)|RCtl | Lft | Dwn | Rgh | * `-----------------------------------------------------------------------------------------------' */ - [BASE] = LAYOUT_65_iso( + [BASE] = LAYOUT( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGUP, MO(2), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, KC_PGDN, @@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | | |Trans| | MPrv|Vol_D| MNxt| * `-----------------------------------------------------------------------------------------------' */ - [FN1] = LAYOUT_65_iso( + [FN1] = LAYOUT( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, KC_NO, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_NO, KC_NO, KC_NO, KC_HOME, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_END, @@ -81,7 +81,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | | | | | Home|PGDN | End | * `-----------------------------------------------------------------------------------------------' */ - [FN2] = LAYOUT_65_iso( + [FN2] = LAYOUT( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, KC_NO, KC_NO, KC_VOLD, KC_VOLU, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_NO, KC_HOME, KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_END, diff --git a/keyboards/kuro/kuro65/keymaps/via/keymap.c b/keyboards/kuro/kuro65/keymaps/via/keymap.c index 7561cf39c5bc..eb6c85700d98 100644 --- a/keyboards/kuro/kuro65/keymaps/via/keymap.c +++ b/keyboards/kuro/kuro65/keymaps/via/keymap.c @@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | LCtl | LGUI | LAlt | Space |RAlt |MO(1)|RCtl | Lft | Dwn | Rgh | * `-----------------------------------------------------------------------------------------------' */ - [BASE] = LAYOUT_65_iso( + [BASE] = LAYOUT( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGUP, MO(2), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, KC_PGDN, @@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | | |Trans| | MPrv|Vol_D| MNxt| * `-----------------------------------------------------------------------------------------------' */ - [FN1] = LAYOUT_65_iso( + [FN1] = LAYOUT( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, KC_NO, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_NO, KC_NO, KC_NO, KC_HOME, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_END, @@ -81,7 +81,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | | | | | Home|PGDN | End | * `-----------------------------------------------------------------------------------------------' */ - [FN2] = LAYOUT_65_iso( + [FN2] = LAYOUT( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, KC_NO, KC_NO, KC_VOLD, KC_VOLU, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_NO, KC_HOME, KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_END, diff --git a/keyboards/kuro/kuro65/kuro65.c b/keyboards/kuro/kuro65/kuro65.c deleted file mode 100644 index fc37641de381..000000000000 --- a/keyboards/kuro/kuro65/kuro65.c +++ /dev/null @@ -1,76 +0,0 @@ -/* Copyright 2023, Tobias Minn (0x544D) - * - * 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 "kuro65.h" - -#ifdef RGB_MATRIX_ENABLE - - -led_config_t g_led_config = { { - // Key Matrix (16x5) to LED Index - { 54 , 55 , 56 , 57 , 58 , 59 , 60 , 61 , 62 , 63 , 64 , 65 , 66 , NO_LED , 67 , 68}, - { 53 , 52 , 51 , 50 , 49 , 48 , 47 , 46 , 45 , 44 , 43 , 42 , 41 , NO_LED , NO_LED , 40}, - { 25 , 26 , 27 , 28 , 29 , 30 , 31 , 32 , 33 , 34 , 35 , 36 , 37 , NO_LED , 38 , 39}, - { 24 , 20 , 19 , 18 , 17 , 16 , 15 , 14 , 13 , 12 , 11 , 10 , 9 , NO_LED , 8 , 7}, - { 23 , 22 , 21 , NO_LED , NO_LED , NO_LED , 0 , NO_LED , NO_LED , NO_LED , 1 , 2 , 3 , 4 , 5 , 6} -}, { - // LED Index to Physical Position - /* 0 , 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 10 , 11 , 12 , 13 , 14 , 15 */ - /* space , alt gr , fn , strg , left , down , right , func , up , rshift , dash , dot , comma , m , n , b */ - { 96, 64},{150, 64},{165, 64},{180, 64},{195, 64},{210, 64},{224, 64},{224, 48},{210, 48},{189, 48},{169, 48},{154, 48},{139, 48},{124, 48},{109, 48},{ 94, 48}, - /* 16 , 17 , 18 , 19 , 20 , 21 , 22 , 23 , 24 , 25 , 26 , 27 , 28 , 29 , 30 , 31 */ - /* v , c , x , y , < , alt , OS , strg , shift , caps , a , s , d , f , g , h */ - { 79, 48},{ 64, 48},{ 49, 48},{ 34, 48},{ 19, 48},{ 39, 64},{ 21, 64},{ 2, 64},{ 2, 48},{ 6, 32},{ 26, 32},{ 41, 32},{ 56, 32},{ 71, 32},{ 86, 32},{101, 32}, - /* 32 , 33 , 34 , 35 , 36 , 37 , 38 , 39 , 40 , 41 , 42 , 43 , 44 , 45 , 46 , 47 */ - /* j , k , l , ö , ä , # , ent , pgdn , pgup , + , ü , p , o , i , u , z */ - {116, 32},{131, 32},{146, 32},{161, 32},{176, 32},{191, 32},{208, 24},{224, 32},{224, 16},{188, 16},{173, 16},{158, 16},{143, 16},{128, 16},{113, 16},{ 98, 16}, - /* 48 , 49 , 50 , 51 , 52 , 53 , 54 , 55 , 56 , 57 , 58 , 59 , 60 , 61 , 62 , 63 */ - /* t , r , e , w , q , tab , esc , 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 */ - { 83, 16},{ 68, 16},{ 53, 16},{ 38, 16},{ 23, 16},{ 4, 16},{ 0, 0},{ 15, 0},{ 30, 0},{ 45, 0},{ 60, 0},{ 75, 0},{ 90, 0},{105, 0},{120, 0},{135, 0}, - /* 64 , 65 , 66 , 67 , 68 */ - /* 0 , ß , ´ , bksp , del */ - {150, 0},{165, 0},{180, 0},{203, 0},{224, 0} -}, { - // LED Index to Flag - /* 0 , 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 10 , 11 , 12 , 13 , 14 , 15 */ - /* space , alt gr , fn , strg , left , down , right , func , up , rshift , dash , dot , comma , m , n , b */ - 4 , 1 , 1 , 1 , 4 , 4 , 4 , 4 , 4 , 1 , 4 , 4 , 4 , 4 , 4 , 4 , - /* 16 , 17 , 18 , 19 , 20 , 21 , 22 , 23 , 24 , 25 , 26 , 27 , 28 , 29 , 30 , 31 */ - /* v , c , x , y , < , alt , OS , strg , shift , caps , a , s , d , f , g , h */ - 4 , 4 , 4 , 4 , 4 , 1 , 1 , 1 , 1 , 1 , 4 , 4 , 4 , 4 , 4 , 4 , - /* 32 , 33 , 34 , 35 , 36 , 37 , 38 , 39 , 40 , 41 , 42 , 43 , 44 , 45 , 46 , 47 */ - /* j , k , l , ö , ä , # , ent , pgdn , pgup , + , ü , p , o , i , u , z */ - 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , - /* 48 , 49 , 50 , 51 , 52 , 53 , 54 , 55 , 56 , 57 , 58 , 59 , 60 , 61 , 62 , 63 */ - /* t , r , e , w , q , tab , esc , 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 */ - 4 , 4 , 4 , 4 , 4 , 1 , 1 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , - /* 64 , 65 , 66 , 67 , 68 */ - /* 0 , ß , ´ , bksp , del */ - 4 , 4 , 4 , 4 , 4 -} }; - - -bool rgb_matrix_indicators_kb(void) { - if (!rgb_matrix_indicators_user()) { - return false; - } - if (host_keyboard_led_state().caps_lock) - { - rgb_matrix_set_color(25, 0xFF, 0xFF, 0xFF); - } - return true; -} -#endif diff --git a/keyboards/kuro/kuro65/kuro65.h b/keyboards/kuro/kuro65/kuro65.h deleted file mode 100644 index 68ad00a410e8..000000000000 --- a/keyboards/kuro/kuro65/kuro65.h +++ /dev/null @@ -1,50 +0,0 @@ -/* Copyright 2023 Tobias Minn (0x544D) - * - * 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" - -#define ___ KC_NO - -/* Hot-swap ISO 65 layout: - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ - * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │ 0E │0F │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ - * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │ │1F │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ ├───┤ - * │20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │ 2E │2F │ - * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤ - * │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3E │3F │ - * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤ - * │40 │41 │42 │ 46 │4A │4B │4C │4D │4E │4F │ - * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘ - */ - -#define LAYOUT_65_iso( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E, k0F, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1F, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2E, k2F, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3E, k3F, \ - k40, k41, k42, k46, k4A, k4B, k4C, k4D, k4E, k4F \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, ___, k0E, k0F }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, ___, ___, k1F }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, ___, k2E, k2F }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, ___, k3E, k3F }, \ - { k40, k41, k42, ___, ___, ___, k46, ___, ___, ___, k4A, k4B, k4C, k4D, k4E, k4F } \ -} diff --git a/keyboards/kuro/kuro65/readme.md b/keyboards/kuro/kuro65/readme.md index 6cae694adba6..f7698caeaa88 100644 --- a/keyboards/kuro/kuro65/readme.md +++ b/keyboards/kuro/kuro65/readme.md @@ -14,14 +14,22 @@ Hardware availability: not yet available - Reset button on the back of the PCB - Compatible with TOFU65 and similar cases -## Bootloader mode - -To put in bootloader mode, hold the `Esc` key while plugging in the USB cable or use the reset key on the back of the PCB. - ## Building the firmware Make example for this keyboard (after setting up your build environment): make kuro/kuro65:default +Flashing example for this keyboard: + + make kuro/kuro65: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). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard. +* **Physical reset button**: Briefly press the button on the back of the PCB. +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available. \ No newline at end of file diff --git a/keyboards/kuro/kuro65/rules.mk b/keyboards/kuro/kuro65/rules.mk index 38688c760959..d6b023bddce8 100644 --- a/keyboards/kuro/kuro65/rules.mk +++ b/keyboards/kuro/kuro65/rules.mk @@ -1,21 +1 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -RGB_MATRIX_ENABLE = yes # Use RGB matrix -RGB_MATRIX_DRIVER = WS2812 -LTO_ENABLE = yes +# This file is left blank intentionally. See info.json for config. \ No newline at end of file From 8bddfa61c8065afb34080fae281d09c5493284cc Mon Sep 17 00:00:00 2001 From: Tobias Minn Date: Tue, 14 Mar 2023 17:56:50 +0100 Subject: [PATCH 14/23] Added pictures to readme.md --- keyboards/kuro/kuro65/readme.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/keyboards/kuro/kuro65/readme.md b/keyboards/kuro/kuro65/readme.md index f7698caeaa88..35e79b9c5c52 100644 --- a/keyboards/kuro/kuro65/readme.md +++ b/keyboards/kuro/kuro65/readme.md @@ -14,6 +14,12 @@ Hardware availability: not yet available - Reset button on the back of the PCB - Compatible with TOFU65 and similar cases +## Pictures + +![kuro65_pcb](https://user-images.githubusercontent.com/28592326/225080112-e31c2d8d-801e-48e6-b4a8-996fe5636419.jpeg) + +![kuro65_case](https://user-images.githubusercontent.com/28592326/225080143-74d2be9f-fc1b-4c57-8ad6-8ea516279ff8.jpeg) + ## Building the firmware Make example for this keyboard (after setting up your build environment): @@ -32,4 +38,4 @@ Enter the bootloader in 3 ways: * **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard. * **Physical reset button**: Briefly press the button on the back of the PCB. -* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available. \ No newline at end of file +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available. From e6b5e8315b687702b97ac5a83fc421ee0f8bc0a7 Mon Sep 17 00:00:00 2001 From: Tobias Minn Date: Tue, 14 Mar 2023 18:05:24 +0100 Subject: [PATCH 15/23] Update readme.md --- keyboards/kuro/kuro65/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/kuro/kuro65/readme.md b/keyboards/kuro/kuro65/readme.md index 35e79b9c5c52..34ce45157093 100644 --- a/keyboards/kuro/kuro65/readme.md +++ b/keyboards/kuro/kuro65/readme.md @@ -3,7 +3,7 @@ A 65% keyboard with an ISO layout, which fits the TOFU65 case (and similar) by KBDFans. Keyboard maintainer: [0x544D](https://github.com/0x544D)
-Hardware availability: not yet available +Hardware availability: [0x544D/kuro65](https://github.com/0x544D/kuro65) ## Features From 1704a6fb415ccd9ed92ea793a20e4702e216da90 Mon Sep 17 00:00:00 2001 From: Tobias Minn Date: Tue, 14 Mar 2023 18:18:35 +0100 Subject: [PATCH 16/23] Changes in 0x544D keymap of kuro65 keyboard. --- keyboards/kuro/kuro65/keymaps/0x544D/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/kuro/kuro65/keymaps/0x544D/keymap.c b/keyboards/kuro/kuro65/keymaps/0x544D/keymap.c index 089693ba8071..a9bc78b4b086 100644 --- a/keyboards/kuro/kuro65/keymaps/0x544D/keymap.c +++ b/keyboards/kuro/kuro65/keymaps/0x544D/keymap.c @@ -72,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, KC_NO, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_NO, KC_NO, KC_NO, KC_HOME, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_END, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_MPLY, KC_VOLU, KC_END, + KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_MPLY, KC_VOLU, KC_END, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_MPRV, KC_VOLD, KC_MNXT ), @@ -94,7 +94,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, KC_NO, KC_NO, KC_VOLD, KC_VOLU, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_NO, KC_HOME, KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_END, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, TG(1), KC_NO, KC_NO, KC_NO, KC_NO, KC_PGUP, KC_END, + KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, TG(1), KC_NO, KC_NO, KC_NO, KC_NO, KC_PGUP, KC_END, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_HOME, KC_PGDN, KC_END ) From 9f61412eec14a9a07f9ed41055ca7f6ea96c645f Mon Sep 17 00:00:00 2001 From: Tobias Minn Date: Wed, 15 Mar 2023 22:23:04 +0100 Subject: [PATCH 17/23] Apply suggestions from code review Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/kuro/kuro65/config.h | 4 +--- keyboards/kuro/kuro65/keymaps/0x544D/keymap.c | 11 ++++++----- keyboards/kuro/kuro65/keymaps/default/keymap.c | 9 +++++---- keyboards/kuro/kuro65/keymaps/via/keymap.c | 9 +++++---- 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/keyboards/kuro/kuro65/config.h b/keyboards/kuro/kuro65/config.h index c05638624835..115201c7538d 100644 --- a/keyboards/kuro/kuro65/config.h +++ b/keyboards/kuro/kuro65/config.h @@ -16,7 +16,6 @@ #pragma once -#include "config_common.h" /* RGB Matrix defines*/ #ifdef RGB_MATRIX_ENABLE @@ -25,7 +24,6 @@ // The number of LEDs connected # define RGB_MATRIX_LED_COUNT 69 -# define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects # define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended # define USB_SUSPEND_WAKEUP_DELAY 5000 # define RGB_MATRIX_KEYPRESSES @@ -80,5 +78,5 @@ # define ENABLE_RGB_MATRIX_SOLID_SPLASH # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH -# define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL +# define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL #endif diff --git a/keyboards/kuro/kuro65/keymaps/0x544D/keymap.c b/keyboards/kuro/kuro65/keymaps/0x544D/keymap.c index a9bc78b4b086..627a215f8d8e 100644 --- a/keyboards/kuro/kuro65/keymaps/0x544D/keymap.c +++ b/keyboards/kuro/kuro65/keymaps/0x544D/keymap.c @@ -16,11 +16,12 @@ #include QMK_KEYBOARD_H -#define BL_WIN 0 // base layer Windows -#define BL_MAC 1 // base layer Mac OS -#define FN1 2 // function layer 1 -#define FN2 3 // function layer 2 - +enum layers { + BL_WIN, + BL_MAC, + FN1, + FN2 +}; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/kuro/kuro65/keymaps/default/keymap.c b/keyboards/kuro/kuro65/keymaps/default/keymap.c index eb6c85700d98..64967fe1d5d9 100644 --- a/keyboards/kuro/kuro65/keymaps/default/keymap.c +++ b/keyboards/kuro/kuro65/keymaps/default/keymap.c @@ -16,10 +16,11 @@ #include QMK_KEYBOARD_H -#define BASE 0 // base layer Windows -#define FN1 1 // function layer 1 -#define FN2 2 // function layer 2 - +enum layers { + BASE, + FN1, + FN2 +}; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/kuro/kuro65/keymaps/via/keymap.c b/keyboards/kuro/kuro65/keymaps/via/keymap.c index eb6c85700d98..64967fe1d5d9 100644 --- a/keyboards/kuro/kuro65/keymaps/via/keymap.c +++ b/keyboards/kuro/kuro65/keymaps/via/keymap.c @@ -16,10 +16,11 @@ #include QMK_KEYBOARD_H -#define BASE 0 // base layer Windows -#define FN1 1 // function layer 1 -#define FN2 2 // function layer 2 - +enum layers { + BASE, + FN1, + FN2 +}; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { From 6853e367fb819cb49b2fa7e62bdab7b29311bfed Mon Sep 17 00:00:00 2001 From: Tobias Minn Date: Wed, 15 Mar 2023 22:39:03 +0100 Subject: [PATCH 18/23] Hosted pictures of PCB and keyboard on imgur --- keyboards/kuro/kuro65/readme.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/kuro/kuro65/readme.md b/keyboards/kuro/kuro65/readme.md index 34ce45157093..2bd6fa2e8502 100644 --- a/keyboards/kuro/kuro65/readme.md +++ b/keyboards/kuro/kuro65/readme.md @@ -1,5 +1,5 @@ # Kuro 65 - + A 65% keyboard with an ISO layout, which fits the TOFU65 case (and similar) by KBDFans. Keyboard maintainer: [0x544D](https://github.com/0x544D)
@@ -16,9 +16,9 @@ Hardware availability: [0x544D/kuro65](https://github.com/0x544D/kuro65) ## Pictures -![kuro65_pcb](https://user-images.githubusercontent.com/28592326/225080112-e31c2d8d-801e-48e6-b4a8-996fe5636419.jpeg) +![kuro65_pcb](https://i.imgur.com/m5KoeQw.jpg) -![kuro65_case](https://user-images.githubusercontent.com/28592326/225080143-74d2be9f-fc1b-4c57-8ad6-8ea516279ff8.jpeg) +![kuro65_case](https://i.imgur.com/jmoACMS.jpg) ## Building the firmware From 740ea9258d82eb491b986bea1cb426baf8adabfc Mon Sep 17 00:00:00 2001 From: Tobias Minn Date: Wed, 15 Mar 2023 22:41:07 +0100 Subject: [PATCH 19/23] Update readme.md --- keyboards/kuro/kuro65/readme.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/kuro/kuro65/readme.md b/keyboards/kuro/kuro65/readme.md index 2bd6fa2e8502..5489c9239846 100644 --- a/keyboards/kuro/kuro65/readme.md +++ b/keyboards/kuro/kuro65/readme.md @@ -1,8 +1,8 @@ # Kuro 65 - A 65% keyboard with an ISO layout, which fits the TOFU65 case (and similar) by KBDFans. -Keyboard maintainer: [0x544D](https://github.com/0x544D)
+Keyboard maintainer: [0x544D](https://github.com/0x544D) + Hardware availability: [0x544D/kuro65](https://github.com/0x544D/kuro65) ## Features @@ -16,9 +16,9 @@ Hardware availability: [0x544D/kuro65](https://github.com/0x544D/kuro65) ## Pictures -![kuro65_pcb](https://i.imgur.com/m5KoeQw.jpg) +![kuro65_pcb](https://i.imgur.com/m5KoeQwh.jpg) -![kuro65_case](https://i.imgur.com/jmoACMS.jpg) +![kuro65_case](https://i.imgur.com/jmoACMSh.jpg) ## Building the firmware From ac8a8d3726fedad08317d24f1e900529305f07db Mon Sep 17 00:00:00 2001 From: Tobias Minn Date: Thu, 16 Mar 2023 12:17:41 +0100 Subject: [PATCH 20/23] Update keyboards/kuro/kuro65/info.json Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/kuro/kuro65/info.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/keyboards/kuro/kuro65/info.json b/keyboards/kuro/kuro65/info.json index a35b800d79de..5a196947e75b 100644 --- a/keyboards/kuro/kuro65/info.json +++ b/keyboards/kuro/kuro65/info.json @@ -183,9 +183,5 @@ { "flags": 4, "matrix": [0, 14], "x":203, "y": 0}, { "flags": 4, "matrix": [0, 15], "x":224, "y": 0} ] - }, - "bootmagic": { - "enabled": true, - "matrix": [0, 0] } } From 352b019ac676c535168f6716638c3f1b505e7c97 Mon Sep 17 00:00:00 2001 From: Tobias Minn Date: Sat, 18 Mar 2023 14:17:09 +0100 Subject: [PATCH 21/23] Apply suggestions from code review Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- keyboards/kuro/kuro65/info.json | 3 ++- keyboards/kuro/kuro65/keymaps/0x544D/keymap.c | 8 ++++---- keyboards/kuro/kuro65/keymaps/default/keymap.c | 6 +++--- keyboards/kuro/kuro65/keymaps/via/keymap.c | 6 +++--- keyboards/kuro/kuro65/readme.md | 4 ++-- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/keyboards/kuro/kuro65/info.json b/keyboards/kuro/kuro65/info.json index 5a196947e75b..648e1f9abb6d 100644 --- a/keyboards/kuro/kuro65/info.json +++ b/keyboards/kuro/kuro65/info.json @@ -31,8 +31,9 @@ "key_lock": false, "rgb_matrix": true }, + "community_layouts": [ "65_iso" ], "layouts": { - "LAYOUT": { + "LAYOUT_65_iso": { "layout": [ { "matrix": [0, 0], "label":"Esc", "x": 0, "y": 0}, { "matrix": [0, 1], "label":"1", "x": 1, "y": 0}, diff --git a/keyboards/kuro/kuro65/keymaps/0x544D/keymap.c b/keyboards/kuro/kuro65/keymaps/0x544D/keymap.c index 627a215f8d8e..bc7986f5578e 100644 --- a/keyboards/kuro/kuro65/keymaps/0x544D/keymap.c +++ b/keyboards/kuro/kuro65/keymaps/0x544D/keymap.c @@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | LCtl | LGUI | LAlt | Space |RAlt |MO(1)|RCtl | Lft | Dwn | Rgh | * `-----------------------------------------------------------------------------------------------' */ - [BL_WIN] = LAYOUT( + [BL_WIN] = LAYOUT_65_iso( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGUP, MO(3), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, KC_PGDN, @@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(2), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), - [BL_MAC] = LAYOUT( + [BL_MAC] = LAYOUT_65_iso( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGUP, MO(3), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, KC_PGDN, @@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | | |Trans| | MPrv|Vol_D| MNxt| * `-----------------------------------------------------------------------------------------------' */ - [FN1] = LAYOUT( + [FN1] = LAYOUT_65_iso( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, KC_NO, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_NO, KC_NO, KC_NO, KC_HOME, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_END, @@ -91,7 +91,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | | | | | Home|PGDN | End | * `-----------------------------------------------------------------------------------------------' */ - [FN2] = LAYOUT( + [FN2] = LAYOUT_65_iso( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, KC_NO, KC_NO, KC_VOLD, KC_VOLU, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_NO, KC_HOME, KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_END, diff --git a/keyboards/kuro/kuro65/keymaps/default/keymap.c b/keyboards/kuro/kuro65/keymaps/default/keymap.c index 64967fe1d5d9..cb8d125a8f79 100644 --- a/keyboards/kuro/kuro65/keymaps/default/keymap.c +++ b/keyboards/kuro/kuro65/keymaps/default/keymap.c @@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | LCtl | LGUI | LAlt | Space |RAlt |MO(1)|RCtl | Lft | Dwn | Rgh | * `-----------------------------------------------------------------------------------------------' */ - [BASE] = LAYOUT( + [BASE] = LAYOUT_65_iso( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGUP, MO(2), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, KC_PGDN, @@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | | |Trans| | MPrv|Vol_D| MNxt| * `-----------------------------------------------------------------------------------------------' */ - [FN1] = LAYOUT( + [FN1] = LAYOUT_65_iso( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, KC_NO, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_NO, KC_NO, KC_NO, KC_HOME, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_END, @@ -82,7 +82,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | | | | | Home|PGDN | End | * `-----------------------------------------------------------------------------------------------' */ - [FN2] = LAYOUT( + [FN2] = LAYOUT_65_iso( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, KC_NO, KC_NO, KC_VOLD, KC_VOLU, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_NO, KC_HOME, KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_END, diff --git a/keyboards/kuro/kuro65/keymaps/via/keymap.c b/keyboards/kuro/kuro65/keymaps/via/keymap.c index 64967fe1d5d9..cb8d125a8f79 100644 --- a/keyboards/kuro/kuro65/keymaps/via/keymap.c +++ b/keyboards/kuro/kuro65/keymaps/via/keymap.c @@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | LCtl | LGUI | LAlt | Space |RAlt |MO(1)|RCtl | Lft | Dwn | Rgh | * `-----------------------------------------------------------------------------------------------' */ - [BASE] = LAYOUT( + [BASE] = LAYOUT_65_iso( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGUP, MO(2), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, KC_PGDN, @@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | | |Trans| | MPrv|Vol_D| MNxt| * `-----------------------------------------------------------------------------------------------' */ - [FN1] = LAYOUT( + [FN1] = LAYOUT_65_iso( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, KC_NO, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_NO, KC_NO, KC_NO, KC_HOME, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_END, @@ -82,7 +82,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | | | | | Home|PGDN | End | * `-----------------------------------------------------------------------------------------------' */ - [FN2] = LAYOUT( + [FN2] = LAYOUT_65_iso( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, KC_NO, KC_NO, KC_VOLD, KC_VOLU, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_NO, KC_HOME, KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_END, diff --git a/keyboards/kuro/kuro65/readme.md b/keyboards/kuro/kuro65/readme.md index 5489c9239846..399258938018 100644 --- a/keyboards/kuro/kuro65/readme.md +++ b/keyboards/kuro/kuro65/readme.md @@ -36,6 +36,6 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to Enter the bootloader in 3 ways: -* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard. +* **Bootmagic reset**: Hold down the top-left key and plug in the keyboard. * **Physical reset button**: Briefly press the button on the back of the PCB. -* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available. +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available. In the pre-supplied keymaps it is on the third or fourth layer, replacing the P key. From 3ad0fe3b12a1a5225957e8f64fd4b571b19b9d26 Mon Sep 17 00:00:00 2001 From: Tobias Minn Date: Sat, 18 Mar 2023 14:20:16 +0100 Subject: [PATCH 22/23] Kuro65: Renamed keymap folder to lowercase according to PR checklist. --- keyboards/kuro/kuro65/keymaps/{0x544D => 0x544d}/keymap.c | 0 keyboards/kuro/kuro65/keymaps/{0x544D => 0x544d}/rules.mk | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename keyboards/kuro/kuro65/keymaps/{0x544D => 0x544d}/keymap.c (100%) rename keyboards/kuro/kuro65/keymaps/{0x544D => 0x544d}/rules.mk (100%) diff --git a/keyboards/kuro/kuro65/keymaps/0x544D/keymap.c b/keyboards/kuro/kuro65/keymaps/0x544d/keymap.c similarity index 100% rename from keyboards/kuro/kuro65/keymaps/0x544D/keymap.c rename to keyboards/kuro/kuro65/keymaps/0x544d/keymap.c diff --git a/keyboards/kuro/kuro65/keymaps/0x544D/rules.mk b/keyboards/kuro/kuro65/keymaps/0x544d/rules.mk similarity index 100% rename from keyboards/kuro/kuro65/keymaps/0x544D/rules.mk rename to keyboards/kuro/kuro65/keymaps/0x544d/rules.mk From 4bd68440bc5ab7eb7fd517934cf468038b6a3d60 Mon Sep 17 00:00:00 2001 From: Tobias Minn Date: Sat, 18 Mar 2023 14:24:05 +0100 Subject: [PATCH 23/23] Update readme.md --- keyboards/kuro/kuro65/readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/kuro/kuro65/readme.md b/keyboards/kuro/kuro65/readme.md index 399258938018..6c57c45a4285 100644 --- a/keyboards/kuro/kuro65/readme.md +++ b/keyboards/kuro/kuro65/readme.md @@ -36,6 +36,6 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to Enter the bootloader in 3 ways: -* **Bootmagic reset**: Hold down the top-left key and plug in the keyboard. +* **Bootmagic reset**: Hold down the top-left key (ESC) and plug in the keyboard. * **Physical reset button**: Briefly press the button on the back of the PCB. -* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available. In the pre-supplied keymaps it is on the third or fourth layer, replacing the P key. +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available. In the pre-supplied keymaps it is on the Function 2 (FN2) layer, replacing the P key.