From 952a4c83127d7a545bbc6b5a59caaf54ef55c1fb Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 30 Oct 2020 22:06:47 +1100 Subject: Hnah108 refactor (#10787) Co-authored-by: Drashna Jaelre --- .../handwired/hnah108/keymaps/default/config.h | 19 ----- .../handwired/hnah108/keymaps/default/keymap.c | 94 +++++++++++----------- .../handwired/hnah108/keymaps/default/readme.md | 2 +- 3 files changed, 48 insertions(+), 67 deletions(-) delete mode 100644 keyboards/handwired/hnah108/keymaps/default/config.h (limited to 'keyboards/handwired/hnah108/keymaps/default') diff --git a/keyboards/handwired/hnah108/keymaps/default/config.h b/keyboards/handwired/hnah108/keymaps/default/config.h deleted file mode 100644 index 348d7c5513..0000000000 --- a/keyboards/handwired/hnah108/keymaps/default/config.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2019 HnahKB - * - * 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 diff --git a/keyboards/handwired/hnah108/keymaps/default/keymap.c b/keyboards/handwired/hnah108/keymaps/default/keymap.c index 6d8fe072c1..1a6d3bc086 100644 --- a/keyboards/handwired/hnah108/keymaps/default/keymap.c +++ b/keyboards/handwired/hnah108/keymaps/default/keymap.c @@ -13,67 +13,67 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ + #include QMK_KEYBOARD_H -enum hnah_layers{ - _QWERTY, - _FN +enum layer_names { + _QWERTY, + _FN }; #define LOWER MO(_FN) #define RAISE MO(_QWERTY) const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_QWERTY] = LAYOUT_all( /* Base */ - KC_ESC, 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_PSCR, KC_SLCK, KC_PAUS, KC_MYCM, KC_CALC, KC_MPLY, LOWER, - KC_GRV, 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_INS, KC_HOME, KC_PGUP, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, - 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_SLSH, KC_DEL, KC_END, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_P4, KC_P5, KC_P6, - KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_BSLS, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_APP, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT - ), + [_QWERTY] = LAYOUT_all( + KC_ESC, 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_PSCR, KC_SLCK, KC_PAUS, KC_MYCM, KC_CALC, KC_MPLY, LOWER, + + KC_GRV, 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_INS, KC_HOME, KC_PGUP, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, + 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_SLSH, KC_DEL, KC_END, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_P4, KC_P5, KC_P6, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_BSLS, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_APP, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT + ), + + [_FN] = LAYOUT_all( + RESET, BL_STEP, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUI, RGB_HUD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______, - [_FN] = LAYOUT_all( /* Base */ - RESET, BL_STEP,RGB_TOG, RGB_MOD, RGB_RMOD, RGB_HUI, RGB_HUD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BRIU, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BRID, _______, _______, _______ - ), + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BRIU, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BRID, _______, _______, _______ + ) }; void encoder_update_user(uint8_t index, bool clockwise) { - if (index == 0) { - if (IS_LAYER_ON(_FN)) { - if (clockwise) { - tap_code(KC_BRIU); - } else { - tap_code(KC_BRID); + if (index == 0) { + if (IS_LAYER_ON(_FN)) { + if (clockwise) { + tap_code(KC_BRIU); + } else { + tap_code(KC_BRID); + } + } else { + if (clockwise) { + tap_code(KC_VOLU); + } else { + tap_code(KC_VOLD); + } + } } - } else { - if (clockwise) { - tap_code(KC_VOLU); +} + +void rgb_matrix_indicators_user(void) { + led_t led_state = get_host_led_state(); + if (led_state.caps_lock) { + rgb_matrix_set_color(30, 0x00, 0xFF, 0x00); + } else if (led_state.num_lock) { + rgb_matrix_set_color(30, 0xFF, 0x00, 0x00); + } else if (led_state.scroll_lock) { + rgb_matrix_set_color(30, 0x00, 0x00, 0xFF); } else { - tap_code(KC_VOLD); - } + rgb_matrix_set_color(30, 0x00, 0x00, 0x00); } - } } - -void rgb_matrix_indicators_user(void) -{ - if IS_HOST_LED_ON(USB_LED_CAPS_LOCK) - { - rgb_matrix_set_color(30, 0x00, 0xFF, 0x00); - } else if IS_HOST_LED_ON(USB_LED_NUM_LOCK) - { - rgb_matrix_set_color(30, 0xFF, 0x00, 0x00); - } else if IS_HOST_LED_ON(USB_LED_SCROLL_LOCK) - { - rgb_matrix_set_color(30, 0x00, 0x00, 0xFF); - } else { - rgb_matrix_set_color(30, 0x00, 0x00, 0x00); - } -} \ No newline at end of file diff --git a/keyboards/handwired/hnah108/keymaps/default/readme.md b/keyboards/handwired/hnah108/keymaps/default/readme.md index 37477efdb1..21d49073d7 100644 --- a/keyboards/handwired/hnah108/keymaps/default/readme.md +++ b/keyboards/handwired/hnah108/keymaps/default/readme.md @@ -1 +1 @@ -# The default keymap for hnah108 \ No newline at end of file +# The default keymap for hnah108 -- cgit v1.2.3