|
|
@@ -1,19 +1,19 @@
|
|
|
/*
|
|
|
-Copyright (C) 2019 Maxr1998 <max.rumpf1998@gmail.com>
|
|
|
-
|
|
|
-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 <http://www.gnu.org/licenses/>.
|
|
|
-*/
|
|
|
+ * Copyright (C) 2019-2020 Maxr1998 <max.rumpf1998@gmail.com>
|
|
|
+ *
|
|
|
+ * 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 <http://www.gnu.org/licenses/>.
|
|
|
+ */
|
|
|
|
|
|
#include "pulse4k.h"
|
|
|
#include "rgblight.h"
|
|
|
@@ -22,7 +22,7 @@ enum combo_events {
|
|
|
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] = {
|
|
|
[LED_ADJUST] = COMBO_ACTION(led_adjust_combo)
|
|
|
@@ -30,10 +30,6 @@ combo_t key_combos[COMBO_COUNT] = {
|
|
|
|
|
|
bool led_adjust_active = false;
|
|
|
|
|
|
-void matrix_init_kb(void) {
|
|
|
- matrix_init_user();
|
|
|
-}
|
|
|
-
|
|
|
void process_combo_event(uint8_t combo_index, bool pressed) {
|
|
|
if (combo_index == LED_ADJUST) {
|
|
|
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) {
|
|
|
- if (clockwise) {
|
|
|
- tap_code(KC_PGDN);
|
|
|
- } else {
|
|
|
- tap_code(KC_PGUP);
|
|
|
- }
|
|
|
+ tap_code(!clockwise ? KC_PGUP : KC_PGDN);
|
|
|
}
|
|
|
|
|
|
__attribute__((weak)) void encoder_two_update(bool clockwise) {
|
|
|
- if (clockwise) {
|
|
|
- tap_code(KC_VOLU);
|
|
|
- } else {
|
|
|
- tap_code(KC_VOLD);
|
|
|
- }
|
|
|
+ tap_code(!clockwise ? KC_VOLD : KC_VOLU);
|
|
|
}
|