From b73a29aaeabe1004423a2ea6180a94a95a1f0d91 Mon Sep 17 00:00:00 2001 From: Xelus22 <17491233+Xelus22@users.noreply.github.com> Date: Tue, 20 Jul 2021 02:50:55 +1000 Subject: [Bug] Develop - Change uint32_t to layer_state_t (#13596) * fix sat75 * update uint32_t to layer_state --- keyboards/jj50/keymaps/abstractkb/keymap.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'keyboards/jj50/keymaps/abstractkb/keymap.c') diff --git a/keyboards/jj50/keymaps/abstractkb/keymap.c b/keyboards/jj50/keymaps/abstractkb/keymap.c index 2de5ce6b99..e257649369 100644 --- a/keyboards/jj50/keymaps/abstractkb/keymap.c +++ b/keyboards/jj50/keymaps/abstractkb/keymap.c @@ -41,7 +41,7 @@ void keyboard_post_init_user(void) { led_set_user(host_keyboard_leds()); } -uint32_t layer_state_set_user(uint32_t state) { +layer_state_t layer_state_set_user(layer_state_t state) { switch (biton32(state)) { case _RAISE: rgblight_sethsv_noeeprom(170,255,255); @@ -60,7 +60,7 @@ uint32_t layer_state_set_user(uint32_t state) { rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT); break; } - + return state; } @@ -106,7 +106,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { MO(_FN), KC_LCTL, KC_LGUI, KC_LALT, MO(_LOWER),KC_SPC,KC_SPC,MO(_RAISE),KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ ), - + [_RAISE] = LAYOUT( \ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ @@ -115,7 +115,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MPLY \ ), - + [_LOWER] = LAYOUT( \ 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_GRV, _______, _______, _______, _______, _______, _______, KC_MINS, KC_EQL, KC_BSLS, _______, \ @@ -123,8 +123,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ ), - - + + [_FN] = LAYOUT( \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ -- cgit v1.2.3 From 78ccd9c201199444bc06161b05ee8d7ba9c31613 Mon Sep 17 00:00:00 2001 From: peepeetee <43021794+peepeetee@users.noreply.github.com> Date: Sat, 21 Aug 2021 22:53:49 -0500 Subject: Organize KPrepublic, K.T.E.C, xiudi boards into directories (#12159) * reset; redoing my steps; and recommit * include xd002/.noci --- keyboards/jj50/keymaps/abstractkb/keymap.c | 135 ----------------------------- 1 file changed, 135 deletions(-) delete mode 100644 keyboards/jj50/keymaps/abstractkb/keymap.c (limited to 'keyboards/jj50/keymaps/abstractkb/keymap.c') diff --git a/keyboards/jj50/keymaps/abstractkb/keymap.c b/keyboards/jj50/keymaps/abstractkb/keymap.c deleted file mode 100644 index e257649369..0000000000 --- a/keyboards/jj50/keymaps/abstractkb/keymap.c +++ /dev/null @@ -1,135 +0,0 @@ -/* -Base Copyright 2017 Luiz Ribeiro -Modified 2017 Andrew Novak -Modified 2018 Wayne Jones (WarmCatUK) -Modified 2019 AbstractKB - -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 LicensezZZ -along with this program. If not, see . -*/ - -#include QMK_KEYBOARD_H - -enum layers { - _DEFLT, - _RAISE, - _LOWER, - _FN -}; - -enum custom_keycodes { - MYRGB_TG = SAFE_RANGE -}; - -bool rgbinit = true; -bool rgbon = true; - -const uint8_t RGBLED_RAINBOW_SWIRL_INTERVALS[] PROGMEM = {1,5,5}; //only using the first one - -void keyboard_post_init_user(void) { - rgblight_enable_noeeprom(); - led_set_user(host_keyboard_leds()); -} - -layer_state_t layer_state_set_user(layer_state_t state) { - switch (biton32(state)) { - case _RAISE: - rgblight_sethsv_noeeprom(170,255,255); - rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT); - break; - case _LOWER: - rgblight_sethsv_noeeprom(0,255,255); - rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT); - break; - case _FN: - rgblight_sethsv_noeeprom(0,255,255); - rgblight_mode_noeeprom(RGBLIGHT_MODE_RAINBOW_SWIRL); - break; - default: //_DEFLT - rgblight_sethsv_noeeprom(0,0,255); - rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT); - break; - } - - return state; -} - -void led_set_user(uint8_t usb_led) { - if (usb_led & (1<event.pressed) { - myrgb_toggle(); - } - return false; - default: - return true; - } -} - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - [_DEFLT] = LAYOUT( \ - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, 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_ENT, \ - KC_BSPC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \ - MO(_FN), KC_LCTL, KC_LGUI, KC_LALT, MO(_LOWER),KC_SPC,KC_SPC,MO(_RAISE),KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ - ), - - - [_RAISE] = LAYOUT( \ - KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, LCTL(LGUI(KC_LEFT)), LGUI(KC_L), LCTL(LGUI(KC_RGHT)), _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MNXT, KC_CAPS, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MPLY \ - ), - - - [_LOWER] = LAYOUT( \ - 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_GRV, _______, _______, _______, _______, _______, _______, KC_MINS, KC_EQL, KC_BSLS, _______, \ - _______, _______, _______, KC_LBRC, KC_RBRC, S(KC_9),S(KC_0),S(KC_LBRC),S(KC_RBRC),_______,_______,_______, \ - _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ - ), - - - [_FN] = LAYOUT( \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MYRGB_TG \ - ) -}; -- cgit v1.2.3