From d28d474dc05ee008615f8bf94c0e1664b614ad91 Mon Sep 17 00:00:00 2001 From: Craig Gardner <40006110+LeafCutterLabs@users.noreply.github.com> Date: Tue, 19 Jan 2021 18:51:33 -0800 Subject: [PATCH] [Keyboard] Leafcutterlabs (#11464) * add support for bigknob Add support for bigknob macropad * corrected files * Apply suggestions from code review Co-authored-by: Joel Challis * corrected tap dance * Update config.h * correct image link * Apply suggestions from code review Co-authored-by: Ryan * added GPL headers * Update readme.md * update rules to disable tap dance * remove tap dance * Update rules.mk trying to get to pass travis test * Update rules.mk remove tap dance Co-authored-by: Joel Challis Co-authored-by: Ryan --- keyboards/leafcutterlabs/bigknob/bigknob.c | 33 +++++----- keyboards/leafcutterlabs/bigknob/bigknob.h | 1 + keyboards/leafcutterlabs/bigknob/config.h | 34 ++++++----- .../bigknob/keymaps/default/keymap.c | 61 ++++++------------- 4 files changed, 56 insertions(+), 73 deletions(-) diff --git a/keyboards/leafcutterlabs/bigknob/bigknob.c b/keyboards/leafcutterlabs/bigknob/bigknob.c index f059864d53..4fcb70e748 100644 --- a/keyboards/leafcutterlabs/bigknob/bigknob.c +++ b/keyboards/leafcutterlabs/bigknob/bigknob.c @@ -1,16 +1,17 @@ -/* Copyright 2021 Craig Gardner - * - * 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 "bigknob.h" +/* Copyright 2021 Craig Gardner + * + * 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 "bigknob.h" \ No newline at end of file diff --git a/keyboards/leafcutterlabs/bigknob/bigknob.h b/keyboards/leafcutterlabs/bigknob/bigknob.h index 18d65d5b00..bb8e3fcaaf 100644 --- a/keyboards/leafcutterlabs/bigknob/bigknob.h +++ b/keyboards/leafcutterlabs/bigknob/bigknob.h @@ -13,6 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ + #pragma once #include "quantum.h" diff --git a/keyboards/leafcutterlabs/bigknob/config.h b/keyboards/leafcutterlabs/bigknob/config.h index eacc894794..1f1ac4e98d 100644 --- a/keyboards/leafcutterlabs/bigknob/config.h +++ b/keyboards/leafcutterlabs/bigknob/config.h @@ -1,18 +1,20 @@ -/* Copyright 2021 Craig Gardner - * - * 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 . - */ +/* +Copyright 2012 Jun Wako + +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 #include "config_common.h" @@ -54,4 +56,4 @@ /* ws2812 RGB LED */ #define RGB_DI_PIN C7 //D3 - underglow C7 - backlight #define RGBLIGHT_ANIMATIONS -#define RGBLED_NUM 5 // Number of LEDs +#define RGBLED_NUM 5 // Number of LEDs \ No newline at end of file diff --git a/keyboards/leafcutterlabs/bigknob/keymaps/default/keymap.c b/keyboards/leafcutterlabs/bigknob/keymaps/default/keymap.c index a4ad2f0da9..98186fc715 100644 --- a/keyboards/leafcutterlabs/bigknob/keymaps/default/keymap.c +++ b/keyboards/leafcutterlabs/bigknob/keymaps/default/keymap.c @@ -1,24 +1,22 @@ -/* Copyright 2021 Craig Gardner - * - * 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 . - */ +/* Copyright 2021 Craig Gardner + * + * 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 -// Defines names for use in layer keycodes and the keymap -enum layer_names { - _BASE -}; +#define _MAIN 0 void encoder_update_user(uint8_t index, bool clockwise) { if (index == 0) { @@ -30,27 +28,8 @@ void encoder_update_user(uint8_t index, bool clockwise) { } } -enum { - TD_RGB = 0 -}; - -void dance_rgb_finished (qk_tap_dance_state_t *state, void *user_data) { - if (state->count == 1) { - tap_code(KC_MNXT); - } else if (state->count == 2) { - rgblight_toggle(); - } else if (state->count == 3) { - rgblight_step(); - } -} - -//All tap dance functions would go here. Only showing this one. -qk_tap_dance_action_t tap_dance_actions[] = { - [TD_RGB] = ACTION_TAP_DANCE_FN_ADVANCED (NULL, dance_rgb_finished, NULL) -}; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //buttion closest to usb is first - [_BASE] = LAYOUT( - KC_MUTE, KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_STOP, TD(TD_RGB) + [_MAIN] = LAYOUT( + KC_MUTE, KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_STOP, KC_MNXT ) -}; +}; \ No newline at end of file