diff options
Diffstat (limited to 'keyboards/dp60')
-rw-r--r-- | keyboards/dp60/dp60.c | 24 | ||||
-rw-r--r-- | keyboards/dp60/keyboard.json (renamed from keyboards/dp60/info.json) | 7 | ||||
-rw-r--r-- | keyboards/dp60/keymaps/via/keymap.c | 20 | ||||
-rw-r--r-- | keyboards/dp60/matrix.c | 5 | ||||
-rw-r--r-- | keyboards/dp60/rules.mk | 14 |
5 files changed, 31 insertions, 39 deletions
diff --git a/keyboards/dp60/dp60.c b/keyboards/dp60/dp60.c index 5f23b35542..349e5cea9b 100644 --- a/keyboards/dp60/dp60.c +++ b/keyboards/dp60/dp60.c @@ -172,27 +172,3 @@ webusb_pos_t webusb_keymap[] = { {4, 0}, {4, 1}, {4, 2}, {4, 6}, {4, 10}, {4, 11}, {4, 12}, {4, 13}, }; #endif - -#ifndef RAW_ENABLE -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { -#else -bool process_record_user(uint16_t keycode, keyrecord_t *record) { -#endif - if (record->event.pressed) { - switch(keycode) { - #ifdef RGBLIGHT_ENABLE - #ifdef RGB_MATRIX_ENABLE - case KC_F13: // toggle rgb matrix - rgb_matrix_toggle(); - return false; - case KC_F14: - rgb_matrix_step(); - return false; - #endif - #endif - default: - break; - } - } - return true; -} diff --git a/keyboards/dp60/info.json b/keyboards/dp60/keyboard.json index ec36a725c3..c9b3b6fdde 100644 --- a/keyboards/dp60/info.json +++ b/keyboards/dp60/keyboard.json @@ -64,6 +64,13 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "nkro": true, + "rgb_matrix": true + }, "layout_aliases": { "LAYOUT_60_wkl": "LAYOUT_60_ansi_tsangan_split_rshift", "LAYOUT_60_wkl_split_bs": "LAYOUT_60_tsangan_hhkb" diff --git a/keyboards/dp60/keymaps/via/keymap.c b/keyboards/dp60/keymaps/via/keymap.c index 538a27886f..fab799e08a 100644 --- a/keyboards/dp60/keymaps/via/keymap.c +++ b/keyboards/dp60/keymaps/via/keymap.c @@ -44,3 +44,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______, _______, _______,_______,_______,_______) }; + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + if (record->event.pressed) { + switch(keycode) { + #ifdef RGBLIGHT_ENABLE + #ifdef RGB_MATRIX_ENABLE + case KC_F13: // toggle rgb matrix + rgb_matrix_toggle(); + return false; + case KC_F14: + rgb_matrix_step(); + return false; + #endif + #endif + default: + break; + } + } + return true; +} diff --git a/keyboards/dp60/matrix.c b/keyboards/dp60/matrix.c index e32c9a58f9..22156745f1 100644 --- a/keyboards/dp60/matrix.c +++ b/keyboards/dp60/matrix.c @@ -13,7 +13,10 @@ 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 "quantum.h" +#include "matrix.h" +#include "print.h" +#include "bitwise.h" +#include "wait.h" #ifndef DEBOUNCE # define DEBOUNCE 5 diff --git a/keyboards/dp60/rules.mk b/keyboards/dp60/rules.mk index 0aa07f4709..8784813b33 100644 --- a/keyboards/dp60/rules.mk +++ b/keyboards/dp60/rules.mk @@ -1,16 +1,2 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Use RGB underglow light -RGB_MATRIX_ENABLE = yes - CUSTOM_MATRIX = yes SRC += matrix.c |