aboutsummaryrefslogtreecommitdiff
path: root/keyboards/dp60
diff options
context:
space:
mode:
authoryulei <yuleiz@gmail.com>2019-12-13 10:44:14 +0800
committerfauxpark <fauxpark@gmail.com>2019-12-13 13:44:14 +1100
commitf5638e54f51360095640fff621315997e23be30d (patch)
tree7d967ddddc0ec115089bbce019336405c89addc5 /keyboards/dp60
parent77efa1c620251c9c151dd89d9d0bd256fd146d71 (diff)
downloadqmk_firmware-f5638e54f51360095640fff621315997e23be30d.tar.gz
qmk_firmware-f5638e54f51360095640fff621315997e23be30d.zip
update dp60 configuration (#7561)
* update dp60 configuration * disable rgb underglow to avoid firmware overflow * cleanup rules.mk * Update keyboards/dp60/keymaps/allleds/rules.mk Co-Authored-By: fauxpark <fauxpark@gmail.com> * Update keyboards/dp60/keymaps/allleds/rules.mk Co-Authored-By: fauxpark <fauxpark@gmail.com> * Update keyboards/dp60/keymaps/allleds/rules.mk Co-Authored-By: fauxpark <fauxpark@gmail.com> * Update keyboards/dp60/keymaps/allleds/rules.mk Co-Authored-By: fauxpark <fauxpark@gmail.com> * Update keyboards/dp60/keymaps/allleds/rules.mk Co-Authored-By: fauxpark <fauxpark@gmail.com> * cleanup all rules.mk
Diffstat (limited to 'keyboards/dp60')
-rw-r--r--keyboards/dp60/config.h19
-rw-r--r--keyboards/dp60/dp60.c26
-rw-r--r--keyboards/dp60/keymaps/allleds/keymap.c17
-rw-r--r--keyboards/dp60/keymaps/allleds/rules.mk38
-rw-r--r--keyboards/dp60/keymaps/default/keymap.c10
-rw-r--r--keyboards/dp60/keymaps/via/readme.md1
-rw-r--r--keyboards/dp60/keymaps/via/rules.mk36
-rw-r--r--keyboards/dp60/rules.mk19
8 files changed, 108 insertions, 58 deletions
diff --git a/keyboards/dp60/config.h b/keyboards/dp60/config.h
index 730363111..87eebbe19 100644
--- a/keyboards/dp60/config.h
+++ b/keyboards/dp60/config.h
@@ -13,7 +13,6 @@
13#define MANUFACTURER astro 13#define MANUFACTURER astro
14#define PRODUCT Dumplings 14#define PRODUCT Dumplings
15#define DESCRIPTION 60% rgb keyboard with ble extension 15#define DESCRIPTION 60% rgb keyboard with ble extension
16#define LANDING_PAGE yulei.github.io/qmk_webusb_tool/60_wkl.json
17 16
18/* key matrix size */ 17/* key matrix size */
19#define MATRIX_ROWS 5 18#define MATRIX_ROWS 5
@@ -35,13 +34,6 @@
35/* disable print */ 34/* disable print */
36//#define NO_PRINT 35//#define NO_PRINT
37 36
38/* disable action features */
39//#define NO_ACTION_LAYER
40//#define NO_ACTION_TAPPING
41//#define NO_ACTION_ONESHOT
42//#define NO_ACTION_MACRO
43//#define NO_ACTION_FUNCTION
44
45//rgb light setting 37//rgb light setting
46#define RGBLED_NUM 18 38#define RGBLED_NUM 18
47#define RGB_DI_PIN D7 39#define RGB_DI_PIN D7
@@ -56,16 +48,9 @@
56#define DRIVER_COUNT 2 48#define DRIVER_COUNT 2
57#define DRIVER_1_LED_TOTAL 36 49#define DRIVER_1_LED_TOTAL 36
58#define DRIVER_2_LED_TOTAL 36 50#define DRIVER_2_LED_TOTAL 36
59#define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL 51#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
60
61// tapping setting
62//#define TAPPING_TERM 200
63//#define RETRO_TAPPING
64//#define PERMISSIVE_HOLD
65 52
66#if defined(WEBUSB_ENABLE) || defined(RAW_ENABLE) 53#if defined(RAW_ENABLE)
67#define WEBUSB_KEYCOUNT 61
68#define WEBUSB_LAYERCOUNT 2
69//VIA 54//VIA
70#define DYNAMIC_KEYMAP_LAYER_COUNT 2 55#define DYNAMIC_KEYMAP_LAYER_COUNT 2
71// EEPROM usage 56// EEPROM usage
diff --git a/keyboards/dp60/dp60.c b/keyboards/dp60/dp60.c
index b4a07bf1c..3e4780246 100644
--- a/keyboards/dp60/dp60.c
+++ b/keyboards/dp60/dp60.c
@@ -159,4 +159,28 @@ webusb_pos_t webusb_keymap[] = {
159 159
160 {4, 0}, {4, 1}, {4, 2}, {4, 6}, {4, 10}, {4, 11}, {4, 12}, {4, 13}, 160 {4, 0}, {4, 1}, {4, 2}, {4, 6}, {4, 10}, {4, 11}, {4, 12}, {4, 13},
161}; 161};
162#endif \ No newline at end of file 162#endif
163
164#ifndef RAW_ENABLE
165bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
166#else
167bool process_record_user(uint16_t keycode, keyrecord_t *record) {
168#endif
169 if (record->event.pressed) {
170 switch(keycode) {
171 #ifdef RGBLIGHT_ENABLE
172 #ifdef RGB_MATRIX_ENABLE
173 case KC_F13: // toggle rgb matrix
174 rgb_matrix_toggle();
175 return false;
176 case KC_F14:
177 rgb_matrix_step();
178 return false;
179 #endif
180 #endif
181 default:
182 break;
183 }
184 }
185 return true;
186}
diff --git a/keyboards/dp60/keymaps/allleds/keymap.c b/keyboards/dp60/keymaps/allleds/keymap.c
new file mode 100644
index 000000000..f3862c38f
--- /dev/null
+++ b/keyboards/dp60/keymaps/allleds/keymap.c
@@ -0,0 +1,17 @@
1#include QMK_KEYBOARD_H
2
3const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
4 [0] = LAYOUT_60_ansi_split_bs_rshift(
5 KC_ESC, 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_DEL, KC_BSPC,
6 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_BSLS,
7 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_ENT,
8 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH, KC_RSFT, MO(1),
9 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT,KC_RGUI, TG(1), KC_RCTL),
10
11 [1] = LAYOUT_60_ansi_split_bs_rshift(
12 _______, 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,
13 RESET, RGB_TOG,RGB_MOD,_______,KC_F13,KC_F14,_______,_______,_______,_______,_______,KC_PGUP,KC_PGDN,_______,
14 _______, _______,_______,_______,_______,_______,KC_LEFT,KC_DOWN, KC_UP,KC_RIGHT,KC_HOME,KC_END,_______,
15 _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
16 _______,_______,_______, _______, _______,_______,TG(0),_______),
17};
diff --git a/keyboards/dp60/keymaps/allleds/rules.mk b/keyboards/dp60/keymaps/allleds/rules.mk
new file mode 100644
index 000000000..746d0bcb6
--- /dev/null
+++ b/keyboards/dp60/keymaps/allleds/rules.mk
@@ -0,0 +1,38 @@
1# MCU name
2MCU = atmega32u4
3
4# Bootloader selection
5# Teensy halfkay
6# Pro Micro caterina
7# Atmel DFU atmel-dfu
8# LUFA DFU lufa-dfu
9# QMK DFU qmk-dfu
10# ATmega32A bootloadHID
11# ATmega328P USBasp
12BOOTLOADER = atmel-dfu
13
14# Build Options
15# change yes to no to disable
16#
17BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration
18MOUSEKEY_ENABLE = no # Mouse keys
19EXTRAKEY_ENABLE = yes # Audio control and System control
20CONSOLE_ENABLE = no # Console for debug
21COMMAND_ENABLE = no # Commands for debug and configuration
22# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
23SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
24# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
25NKRO_ENABLE = no # USB Nkey Rollover
26BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality on B7 by default
27MIDI_ENABLE = no # MIDI support
28UNICODE_ENABLE = no # Unicode
29BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
30AUDIO_ENABLE = no # Audio output on port C6
31FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches
32RGBLIGHT_ENABLE = yes # Use RGB underglow light
33RGB_MATRIX_ENABLE = yes # Use RGB matrix
34
35LAYOUTS = 60_ansi 60_hhkb 60_iso 60_ansi_split_bs_rshift
36
37CUSTOM_MATRIX = yes
38SRC += matrix.c
diff --git a/keyboards/dp60/keymaps/default/keymap.c b/keyboards/dp60/keymaps/default/keymap.c
index 2e2694326..f3862c38f 100644
--- a/keyboards/dp60/keymaps/default/keymap.c
+++ b/keyboards/dp60/keymaps/default/keymap.c
@@ -2,16 +2,16 @@
2 2
3const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 3const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
4 [0] = LAYOUT_60_ansi_split_bs_rshift( 4 [0] = LAYOUT_60_ansi_split_bs_rshift(
5 KC_ESC, 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_DEL, KC_BSPC, 5 KC_ESC, 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_DEL, KC_BSPC,
6 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_BSLS, 6 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_BSLS,
7 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_ENT, 7 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_ENT,
8 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH, KC_RSFT, MO(1), 8 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH, KC_RSFT, MO(1),
9 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT,KC_RGUI, TG(1), KC_RCTL), 9 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT,KC_RGUI, TG(1), KC_RCTL),
10 10
11 [1] = LAYOUT_60_ansi_split_bs_rshift( 11 [1] = LAYOUT_60_ansi_split_bs_rshift(
12 _______, 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, 12 _______, 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,
13 RESET, RGB_TOG,RGB_MOD,_______,_______,_______,_______,_______,_______,_______,_______,KC_PGUP,KC_PGDN,_______, 13 RESET, RGB_TOG,RGB_MOD,_______,KC_F13,KC_F14,_______,_______,_______,_______,_______,KC_PGUP,KC_PGDN,_______,
14 _______, _______,_______,_______,_______,_______,KC_LEFT,KC_DOWN, KC_UP,KC_RIGHT,KC_HOME,KC_END,_______, 14 _______, _______,_______,_______,_______,_______,KC_LEFT,KC_DOWN, KC_UP,KC_RIGHT,KC_HOME,KC_END,_______,
15 _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, 15 _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
16 _______,_______,_______, _______, _______,_______,TG(0),_______), 16 _______,_______,_______, _______, _______,_______,TG(0),_______),
17}; \ No newline at end of file 17};
diff --git a/keyboards/dp60/keymaps/via/readme.md b/keyboards/dp60/keymaps/via/readme.md
deleted file mode 100644
index 88851fb13..000000000
--- a/keyboards/dp60/keymaps/via/readme.md
+++ /dev/null
@@ -1 +0,0 @@
1At this point, September 2019, this requires a custom version of VIA in order for VIA enabled keymaps to work. \ No newline at end of file
diff --git a/keyboards/dp60/keymaps/via/rules.mk b/keyboards/dp60/keymaps/via/rules.mk
index 27d6223ba..6d2a73864 100644
--- a/keyboards/dp60/keymaps/via/rules.mk
+++ b/keyboards/dp60/keymaps/via/rules.mk
@@ -1,47 +1,39 @@
1# MCU name 1# MCU name
2MCU = atmega32u4 2MCU = atmega32u4
3 3
4# Interrupt driven control endpoint task(+60) 4# Bootloader selection
5OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT 5# Teensy halfkay
6 6# Pro Micro caterina
7# Boot Section Size in *bytes* 7# Atmel DFU atmel-dfu
8# Teensy halfKay 512 8# LUFA DFU lufa-dfu
9# Teensy++ halfKay 1024 9# QMK DFU qmk-dfu
10# Atmel DFU loader 4096 10# ATmega32A bootloadHID
11# LUFA bootloader 4096 11# ATmega328P USBasp
12# USBaspLoader 2048
13BOOTLOADER = atmel-dfu 12BOOTLOADER = atmel-dfu
14 13
15# Do not put the microcontroller into power saving mode
16# when we get USB suspend event. We want it to keep updating
17# backlight effects.
18#OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
19
20# Build Options 14# Build Options
21# change yes to no to disable 15# change yes to no to disable
22# 16#
23BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) 17BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration
24MOUSEKEY_ENABLE = no # Mouse keys(+4700) 18MOUSEKEY_ENABLE = no # Mouse keys
25EXTRAKEY_ENABLE = yes # Audio control and System control(+450) 19EXTRAKEY_ENABLE = yes # Audio control and System control
26CONSOLE_ENABLE = no # Console for debug(+400) 20CONSOLE_ENABLE = no # Console for debug
27COMMAND_ENABLE = no # Commands for debug and configuration 21COMMAND_ENABLE = no # Commands for debug and configuration
28# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE 22# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
29SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend 23SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
30# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work 24# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
31NKRO_ENABLE = no # USB Nkey Rollover 25NKRO_ENABLE = no # USB Nkey Rollover
32BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality on B7 by default 26BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality on B7 by default
33MIDI_ENABLE = no # MIDI support (+2400 to 4200, depending on config) 27MIDI_ENABLE = no # MIDI support
34UNICODE_ENABLE = no # Unicode 28UNICODE_ENABLE = no # Unicode
35BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID 29BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
36AUDIO_ENABLE = no # Audio output on port C6 30AUDIO_ENABLE = no # Audio output on port C6
37FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches 31FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches
38#RGBLIGHT_ENABLE = yes # Use RGB bottom light 32RGBLIGHT_ENABLE = yes # Use RGB bottom light
39RGB_MATRIX_ENABLE = yes # Use RGB matrix 33RGB_MATRIX_ENABLE = yes # Use RGB matrix
40 34
41RAW_ENABLE = yes 35RAW_ENABLE = yes
42#WEBUSB_ENABLE = yes
43DYNAMIC_KEYMAP_ENABLE = yes 36DYNAMIC_KEYMAP_ENABLE = yes
44 37
45CUSTOM_MATRIX = yes 38CUSTOM_MATRIX = yes
46SRC += matrix.c keyboards/wilba_tech/wt_main.c 39SRC += matrix.c keyboards/wilba_tech/wt_main.c
47#keyboards/stm60/webusb.c
diff --git a/keyboards/dp60/rules.mk b/keyboards/dp60/rules.mk
index 0f998746f..015e4fddb 100644
--- a/keyboards/dp60/rules.mk
+++ b/keyboards/dp60/rules.mk
@@ -11,33 +11,28 @@ MCU = atmega32u4
11# ATmega328P USBasp 11# ATmega328P USBasp
12BOOTLOADER = atmel-dfu 12BOOTLOADER = atmel-dfu
13 13
14# Do not put the microcontroller into power saving mode
15# when we get USB suspend event. We want it to keep updating
16# backlight effects.
17#OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
18
19# Build Options 14# Build Options
20# change yes to no to disable 15# change yes to no to disable
21# 16#
22BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration(+1000) 17BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration
23MOUSEKEY_ENABLE = no # Mouse keys(+4700) 18MOUSEKEY_ENABLE = no # Mouse keys
24EXTRAKEY_ENABLE = yes # Audio control and System control(+450) 19EXTRAKEY_ENABLE = yes # Audio control and System control
25CONSOLE_ENABLE = no # Console for debug(+400) 20CONSOLE_ENABLE = no # Console for debug
26COMMAND_ENABLE = no # Commands for debug and configuration 21COMMAND_ENABLE = no # Commands for debug and configuration
27# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE 22# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
28SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend 23SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
29# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work 24# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
30NKRO_ENABLE = no # USB Nkey Rollover 25NKRO_ENABLE = no # USB Nkey Rollover
31BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality on B7 by default 26BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality on B7 by default
32MIDI_ENABLE = no # MIDI support (+2400 to 4200, depending on config) 27MIDI_ENABLE = no # MIDI support
33UNICODE_ENABLE = no # Unicode 28UNICODE_ENABLE = no # Unicode
34BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID 29BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
35AUDIO_ENABLE = no # Audio output on port C6 30AUDIO_ENABLE = no # Audio output on port C6
36FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches 31FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches
37#RGBLIGHT_ENABLE = yes # Use RGB bottom light 32#RGBLIGHT_ENABLE = yes # Use RGB underglow light
38RGB_MATRIX_ENABLE = yes # Use RGB matrix 33RGB_MATRIX_ENABLE = yes # Use RGB matrix
39 34
40LAYOUTS = 60_ansi 60_hhkb 60_iso 60_ansi_split_bs_rshift 35LAYOUTS = 60_ansi 60_hhkb 60_iso 60_ansi_split_bs_rshift
41 36
42CUSTOM_MATRIX = yes 37CUSTOM_MATRIX = yes
43SRC += matrix.c 38SRC += matrix.c
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-19 01:35:14 +0000