From 8030f73f443907aa2a9a7c65340bbe4b07e6060d Mon Sep 17 00:00:00 2001 From: gtips <51393966+gtips@users.noreply.github.com> Date: Thu, 24 Jun 2021 11:26:31 +0900 Subject: [PATCH 1/2] [Keymap]Add Keymap reviung34rgb (#12656) * [Keyboard] Add keyboard Reviung41 * Modified files * deleted keyboards/reviung41/keymaps/default/config.h * modified keyboards/rebiung41/keymaps/default/keymap.c * modified keyboards/reviung41/readme.md * modified keyboards/reviung41/readme.md * modified keyboards/reviung41/readme.md * Update readme.md Change the image photo of readme.md. * [Keyboard] Add reviung61 * Update readme.md * fix keyboards/reviung61/ and add keymap default_rgb * fix keyboards/reviung61/info.json * fix keyboards/reviung61/info.json * remove keyboards/reviung61/keymaps/default/config.h * [keyboard] Fixed readme.md for reviung39 and 61. * add keymap keyboards/reviung34/keymaps/default_rgb/ ,default_rgb2u --- .../reviung34/keymaps/default_rgb/config.h | 31 +++++++++ .../reviung34/keymaps/default_rgb/keymap.c | 69 +++++++++++++++++++ .../reviung34/keymaps/default_rgb/readme.md | 1 + .../reviung34/keymaps/default_rgb/rules.mk | 1 + .../reviung34/keymaps/default_rgb2u/config.h | 31 +++++++++ .../reviung34/keymaps/default_rgb2u/keymap.c | 68 ++++++++++++++++++ .../reviung34/keymaps/default_rgb2u/readme.md | 3 + .../reviung34/keymaps/default_rgb2u/rules.mk | 1 + 8 files changed, 205 insertions(+) create mode 100644 keyboards/reviung34/keymaps/default_rgb/config.h create mode 100755 keyboards/reviung34/keymaps/default_rgb/keymap.c create mode 100755 keyboards/reviung34/keymaps/default_rgb/readme.md create mode 100644 keyboards/reviung34/keymaps/default_rgb/rules.mk create mode 100644 keyboards/reviung34/keymaps/default_rgb2u/config.h create mode 100755 keyboards/reviung34/keymaps/default_rgb2u/keymap.c create mode 100755 keyboards/reviung34/keymaps/default_rgb2u/readme.md create mode 100644 keyboards/reviung34/keymaps/default_rgb2u/rules.mk diff --git a/keyboards/reviung34/keymaps/default_rgb/config.h b/keyboards/reviung34/keymaps/default_rgb/config.h new file mode 100644 index 00000000000..b68201231fb --- /dev/null +++ b/keyboards/reviung34/keymaps/default_rgb/config.h @@ -0,0 +1,31 @@ +/* Copyright 2021 gtips + * + * 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 + +// place overrides here + +#define RGB_DI_PIN D3 +#ifdef RGB_DI_PIN + #define RGBLED_NUM 9 + #define RGBLIGHT_HUE_STEP 16 + #define RGBLIGHT_SAT_STEP 16 + #define RGBLIGHT_VAL_STEP 16 + #define RGBLIGHT_LIMIT_VAL 255 + #define RGBLIGHT_SLEEP +// /*== all animations enable ==*/ + #define RGBLIGHT_ANIMATIONS +#endif \ No newline at end of file diff --git a/keyboards/reviung34/keymaps/default_rgb/keymap.c b/keyboards/reviung34/keymaps/default_rgb/keymap.c new file mode 100755 index 00000000000..e2d852354b8 --- /dev/null +++ b/keyboards/reviung34/keymaps/default_rgb/keymap.c @@ -0,0 +1,69 @@ +/* Copyright 2021 gtips + * + * 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 + +enum layer_names { + _BASE, + _LOWER, + _RAISE, + _ADJUST +}; + +#define LOWER MO(_LOWER) +#define RAISE MO(_RAISE) + +#define CT_Q LCTL_T(KC_Q) +#define CT_CM RCTL_T(KC_COMM) +#define SF_Z LSFT_T(KC_Z) +#define SF_SS RSFT_T(KC_SLSH) +#define AL_X LALT_T(KC_X) +#define AL_DT RALT_T(KC_DOT) +#define LO_TB LT(LOWER, KC_TAB) + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_BASE] = LAYOUT_reviung34( + CT_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, + KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, + SF_Z, AL_X, KC_C, KC_V, KC_B, KC_N, KC_M, CT_CM, AL_DT, SF_SS, + LO_TB, KC_BSPC, KC_SPC, RAISE + ), + + [_LOWER] = LAYOUT_reviung34( + KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, + KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_SCLN, + KC_LSFT, KC_ESC, KC_LGUI, KC_LALT, KC_QUOT, KC_HOME, KC_END, KC_PGUP, KC_PGDN, KC_BSPC, + _______, _______, _______, _______ + ), + + [_RAISE] = LAYOUT_reviung34( + 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_LBRC, KC_RBRC, KC_BSLS, XXXXXXX, XXXXXXX, KC_GRV, KC_TILD, KC_COLN, + KC_LSFT, KC_ESC, KC_RGUI, KC_LALT, KC_DQUO, KC_TAB, XXXXXXX, KC_RCTL, KC_RALT, KC_DEL, + _______, KC_DEL, _______, _______ + ), + + [_ADJUST] = LAYOUT_reviung34( + RGB_VAI, RGB_SAI, RGB_HUI, RGB_MOD, RGB_TOG, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, + RGB_VAD, RGB_SAD, RGB_HUD, RGB_RMOD,XXXXXXX, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET, KC_F11, KC_F12, KC_CAPS, XXXXXXX, KC_PSCR, + _______, _______, _______, _______ + ), +}; + +layer_state_t layer_state_set_user(layer_state_t state) { + return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); +} diff --git a/keyboards/reviung34/keymaps/default_rgb/readme.md b/keyboards/reviung34/keymaps/default_rgb/readme.md new file mode 100755 index 00000000000..81b04868cba --- /dev/null +++ b/keyboards/reviung34/keymaps/default_rgb/readme.md @@ -0,0 +1 @@ +# The default keymap for non-split reviung34 diff --git a/keyboards/reviung34/keymaps/default_rgb/rules.mk b/keyboards/reviung34/keymaps/default_rgb/rules.mk new file mode 100644 index 00000000000..1e3cebb1451 --- /dev/null +++ b/keyboards/reviung34/keymaps/default_rgb/rules.mk @@ -0,0 +1 @@ +RGBLIGHT_ENABLE = yes diff --git a/keyboards/reviung34/keymaps/default_rgb2u/config.h b/keyboards/reviung34/keymaps/default_rgb2u/config.h new file mode 100644 index 00000000000..b68201231fb --- /dev/null +++ b/keyboards/reviung34/keymaps/default_rgb2u/config.h @@ -0,0 +1,31 @@ +/* Copyright 2021 gtips + * + * 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 + +// place overrides here + +#define RGB_DI_PIN D3 +#ifdef RGB_DI_PIN + #define RGBLED_NUM 9 + #define RGBLIGHT_HUE_STEP 16 + #define RGBLIGHT_SAT_STEP 16 + #define RGBLIGHT_VAL_STEP 16 + #define RGBLIGHT_LIMIT_VAL 255 + #define RGBLIGHT_SLEEP +// /*== all animations enable ==*/ + #define RGBLIGHT_ANIMATIONS +#endif \ No newline at end of file diff --git a/keyboards/reviung34/keymaps/default_rgb2u/keymap.c b/keyboards/reviung34/keymaps/default_rgb2u/keymap.c new file mode 100755 index 00000000000..f4f1d3be509 --- /dev/null +++ b/keyboards/reviung34/keymaps/default_rgb2u/keymap.c @@ -0,0 +1,68 @@ +/* Copyright 2021 gtips + * + * 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 + +enum layer_names { + _BASE, + _LOWER, + _RAISE, + _ADJUST +}; + +#define LOWER MO(_LOWER) +#define RAISE MO(_RAISE) + +#define CT_Q LCTL_T(KC_Q) +#define CT_CM RCTL_T(KC_COMM) +#define SF_Z LSFT_T(KC_Z) +#define SF_SS RSFT_T(KC_SLSH) +#define AL_X LALT_T(KC_X) +#define AL_DT RALT_T(KC_DOT) + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_BASE] = LAYOUT_reviung34_2uL( + CT_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, + KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, + SF_Z, AL_X, KC_C, KC_V, KC_B, KC_N, KC_M, CT_CM, AL_DT, SF_SS, + LOWER, KC_SPC, RAISE + ), + + [_LOWER] = LAYOUT_reviung34_2uL( + KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, + KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_SCLN, + KC_LSFT, KC_ESC, KC_LGUI, KC_LALT, KC_QUOT, KC_HOME, KC_END, KC_PGUP, KC_PGDN, KC_BSPC, + _______, _______, _______ + ), + + [_RAISE] = LAYOUT_reviung34_2uL( + 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_LBRC, KC_RBRC, KC_BSLS, XXXXXXX, XXXXXXX, KC_GRV, KC_TILD, KC_COLN, + KC_LSFT, KC_ESC, KC_RGUI, KC_LALT, KC_DQUO, KC_TAB, XXXXXXX, KC_RCTL, KC_RALT, KC_DEL, + _______, _______, _______ + ), + + [_ADJUST] = LAYOUT_reviung34_2uL( + RGB_VAI, RGB_SAI, RGB_HUI, RGB_MOD, RGB_TOG, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, + RGB_VAD, RGB_SAD, RGB_HUD, RGB_RMOD,XXXXXXX, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET, KC_F11, KC_F12, KC_CAPS, XXXXXXX, KC_PSCR, + _______, _______, _______ + ), +}; + +layer_state_t layer_state_set_user(layer_state_t state) { + return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); +} diff --git a/keyboards/reviung34/keymaps/default_rgb2u/readme.md b/keyboards/reviung34/keymaps/default_rgb2u/readme.md new file mode 100755 index 00000000000..8acc99250fa --- /dev/null +++ b/keyboards/reviung34/keymaps/default_rgb2u/readme.md @@ -0,0 +1,3 @@ +# The default keymap for non-split reviung34 + +Use the thumb key with 2u diff --git a/keyboards/reviung34/keymaps/default_rgb2u/rules.mk b/keyboards/reviung34/keymaps/default_rgb2u/rules.mk new file mode 100644 index 00000000000..1e3cebb1451 --- /dev/null +++ b/keyboards/reviung34/keymaps/default_rgb2u/rules.mk @@ -0,0 +1 @@ +RGBLIGHT_ENABLE = yes From 480b7e595ec53a891e35895d6707deb000aeb578 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Wed, 23 Jun 2021 19:26:55 -0700 Subject: [PATCH 2/2] Studio Kestra Nue: fix info.json layout macro reference (#13318) Corrected the info.json file to reference LAYOUT_all instead of LAYOUT. --- keyboards/studiokestra/nue/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/studiokestra/nue/info.json b/keyboards/studiokestra/nue/info.json index e12b15d7461..457acd8d9c2 100644 --- a/keyboards/studiokestra/nue/info.json +++ b/keyboards/studiokestra/nue/info.json @@ -5,7 +5,7 @@ "width": 15, "height": 5, "layouts": { - "LAYOUT": { + "LAYOUT_all": { "layout": [ {"x":0, "y":0}, {"x":1, "y":0},