Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

[Pulse4k] Various improvements

Browse source 
Rework led adjustment combo (have it defined by keymap now), reformat code, update copyright
This commit is contained in:
Maxr1998 2020-05-14 01:33:29 +02:00 committed by James Young
parent d0e684ef55
commit 4161573b28
4 changed files with 66 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
keyboards/maxr1998/pulse4k/config.h
View file

@ -1,19 +1,19 @@
/* /*
Copyright (C) 2012-2019 Jun Wako <wakojun@gmail.com>, Maxr1998 <max.rumpf1998@gmail.com> * Copyright (C) 2019-2020 Maxr1998 <max.rumpf1998@gmail.com>
*
This program is free software: you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or * the Free Software Foundation, either version 2 of the License, or
(at your option) any later version. * (at your option) any later version.
*
This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. * GNU General Public License for more details.
*
You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#pragma once #pragma once

32
keyboards/maxr1998/pulse4k/keymaps/default/keymap.c
View file

@ -1,19 +1,19 @@
/* /*
Copyright (C) 2019 Maxr1998 <max.rumpf1998@gmail.com> * Copyright (C) 2019-2020 Maxr1998 <max.rumpf1998@gmail.com>
*
This program is free software: you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or * the Free Software Foundation, either version 2 of the License, or
(at your option) any later version. * (at your option) any later version.
*
This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. * GNU General Public License for more details.
*
You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
@ -21,6 +21,8 @@ enum layers {
DEFAULT DEFAULT
}; };
const uint16_t PROGMEM led_adjust_combo[] = {KC_LEFT, KC_RGHT, COMBO_END};
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[DEFAULT] = { [DEFAULT] = {
{ KC_END, KC_UP, KC_MUTE }, { KC_END, KC_UP, KC_MUTE },

48
keyboards/maxr1998/pulse4k/pulse4k.c
View file

@ -1,19 +1,19 @@
/* /*
Copyright (C) 2019 Maxr1998 <max.rumpf1998@gmail.com> * Copyright (C) 2019-2020 Maxr1998 <max.rumpf1998@gmail.com>
*
This program is free software: you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or * the Free Software Foundation, either version 2 of the License, or
(at your option) any later version. * (at your option) any later version.
*
This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. * GNU General Public License for more details.
*
You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "pulse4k.h" #include "pulse4k.h"
#include "rgblight.h" #include "rgblight.h"
@ -22,7 +22,7 @@ enum combo_events {
LED_ADJUST LED_ADJUST
}; };
const uint16_t PROGMEM led_adjust_combo[] = {KC_LEFT, KC_RGHT, COMBO_END}; extern const uint16_t PROGMEM led_adjust_combo[3];
combo_t key_combos[COMBO_COUNT] = { combo_t key_combos[COMBO_COUNT] = {
[LED_ADJUST] = COMBO_ACTION(led_adjust_combo) [LED_ADJUST] = COMBO_ACTION(led_adjust_combo)
@ -30,10 +30,6 @@ combo_t key_combos[COMBO_COUNT] = {
bool led_adjust_active = false; bool led_adjust_active = false;
void matrix_init_kb(void) {
matrix_init_user();
}
void process_combo_event(uint8_t combo_index, bool pressed) { void process_combo_event(uint8_t combo_index, bool pressed) {
if (combo_index == LED_ADJUST) { if (combo_index == LED_ADJUST) {
led_adjust_active = pressed; led_adjust_active = pressed;
@ -61,17 +57,9 @@ void encoder_update_kb(uint8_t index, bool clockwise) {
} }
__attribute__((weak)) void encoder_one_update(bool clockwise) { __attribute__((weak)) void encoder_one_update(bool clockwise) {
if (clockwise) { tap_code(!clockwise ? KC_PGUP : KC_PGDN);
tap_code(KC_PGDN);
} else {
tap_code(KC_PGUP);
}
} }
__attribute__((weak)) void encoder_two_update(bool clockwise) { __attribute__((weak)) void encoder_two_update(bool clockwise) {
if (clockwise) { tap_code(!clockwise ? KC_VOLD : KC_VOLU);
tap_code(KC_VOLU);
} else {
tap_code(KC_VOLD);
}
} }

30
keyboards/maxr1998/pulse4k/pulse4k.h
View file

@ -1,19 +1,19 @@
/* /*
Copyright (C) 2019 Maxr1998 <max.rumpf1998@gmail.com> * Copyright (C) 2019-2020 Maxr1998 <max.rumpf1998@gmail.com>
*
This program is free software: you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or * the Free Software Foundation, either version 2 of the License, or
(at your option) any later version. * (at your option) any later version.
*
This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. * GNU General Public License for more details.
*
You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#pragma once #pragma once