summaryrefslogtreecommitdiffstats
path: root/keyboards
diff options
context:
space:
mode:
authorDamien Broqua <dbroqua@mousur.org>2017-05-30 16:59:56 +0200
committerDamien Broqua <dbroqua@mousur.org>2017-05-30 16:59:56 +0200
commitf06f883589eaf0fbc9e15a28c09abc22d747d7a5 (patch)
treeccf11a261a639f2c983b726f16156755d06b7cd6 /keyboards
parent230c70e28515d294fcad68e924f0a557a197f40a (diff)
- Some changes on DK60
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/dk60/config.h61
-rw-r--r--keyboards/dk60/dk60.c2
-rw-r--r--keyboards/dk60/dk60.h4
-rw-r--r--keyboards/dk60/keymaps/default/keymap.c2
-rw-r--r--keyboards/dk60/rules.mk9
5 files changed, 37 insertions, 41 deletions
diff --git a/keyboards/dk60/config.h b/keyboards/dk60/config.h
index 315f4fcb1f..e586056cff 100644
--- a/keyboards/dk60/config.h
+++ b/keyboards/dk60/config.h
@@ -16,46 +16,41 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef CONFIG_H
-#define CONFIG_H
+ #define CONFIG_H
-#include "config_common.h"
+ #include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0x6060
-#define DEVICE_VER 0x0003
-#define MANUFACTURER DARKOU
-#define PRODUCT DK60
-#define DESCRIPTION QMK keyboard firmware for DK60 support
+ /* USB Device descriptor parameter */
+ #define VENDOR_ID 0xFEED
+ #define PRODUCT_ID 0x6060
+ #define DEVICE_VER 0x0003
+ #define MANUFACTURER DARKOU
+ #define PRODUCT DK60
+ #define DESCRIPTION QMK keyboard firmware for DK60 support
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 13
+ /* key matrix size */
+ #define MATRIX_ROWS 5
+ #define MATRIX_COLS 13
-// ROWS: Top to bottom, COLS: Left to right
+ // ROWS: Top to bottom, COLS: Left to right
-#define MATRIX_ROW_PINS { B6, B4, D7, D6, D4 }
-#define MATRIX_COL_PINS { B0, B3, B2, B1, D3, D5, B5, B7, C6, C7, D0, D1, D2 }
-#define UNUSED_PINS { F1, F4, F5, F6, F7}
+ #define MATRIX_ROW_PINS { B6, B4, D7, D6, D4 }
+ #define MATRIX_COL_PINS { B0, B3, B2, B1, D3, D5, B5, B7, C6, C7, D0, D1, D2 }
+ #define UNUSED_PINS
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
+ /* COL2ROW or ROW2COL */
+ #define DIODE_DIRECTION COL2ROW
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCING_DELAY 5
+ /* Set 0 if debouncing isn't needed */
+ #define DEBOUNCING_DELAY 5
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/* key combination for command */
-#define IS_COMMAND() ( \
- keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
-)
-
-/* Backlight configuration
- */
-#define BACKLIGHT_LEVELS 4
+ /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+ #define LOCKING_SUPPORT_ENABLE
+ /* Locking resynchronize hack */
+ #define LOCKING_RESYNC_ENABLE
+ /* key combination for command */
+ #define IS_COMMAND() ( \
+ keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
+ )
#endif
diff --git a/keyboards/dk60/dk60.c b/keyboards/dk60/dk60.c
index 40fee6f70e..40f24c2877 100644
--- a/keyboards/dk60/dk60.c
+++ b/keyboards/dk60/dk60.c
@@ -10,4 +10,4 @@ void led_set_kb(uint8_t usb_led) {
}
led_set_user(usb_led);
-} \ No newline at end of file
+}
diff --git a/keyboards/dk60/dk60.h b/keyboards/dk60/dk60.h
index cdb756114d..572100f3aa 100644
--- a/keyboards/dk60/dk60.h
+++ b/keyboards/dk60/dk60.h
@@ -10,7 +10,7 @@ inline void dk60_esc_led_on(void) { DDRF |= (1<<0); PORTF &= ~(1<<0); }
inline void dk60_caps_led_off(void) { DDRE &= ~(1<<6); PORTE &= ~(1<<6); }
inline void dk60_esc_led_off(void) { DDRF &= ~(1<<0); PORTF &= ~(1<<0); }
-#define ___ KC_TRNS
+#define ___ KC_NO
#define KEYMAP( \
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K4B, K4A, \
@@ -26,4 +26,4 @@ inline void dk60_esc_led_off(void) { DDRF &= ~(1<<0); PORTF &= ~(1<<0); }
{ ___, K41, K42, ___, ___, K45, ___, ___, K48, K49, K4A, K4B, K4C } \
}
-#endif \ No newline at end of file
+#endif
diff --git a/keyboards/dk60/keymaps/default/keymap.c b/keyboards/dk60/keymaps/default/keymap.c
index d670f824d3..e69ed98210 100644
--- a/keyboards/dk60/keymaps/default/keymap.c
+++ b/keyboards/dk60/keymaps/default/keymap.c
@@ -49,4 +49,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
______, KC_MPRV,KC_MPLY,KC_MNXT,______, ______, KC_PPLS,KC_PMNS,KC_END, KC_PGDN, KC_DOWN, ______, ______, \
______, ______, ______, KC_MSTP, ______ \
)
-}; \ No newline at end of file
+};
diff --git a/keyboards/dk60/rules.mk b/keyboards/dk60/rules.mk
index 66e9179ef6..36c6bed178 100644
--- a/keyboards/dk60/rules.mk
+++ b/keyboards/dk60/rules.mk
@@ -8,13 +8,14 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096
BOOTMAGIC_ENABLE ?= yes # Virtual DIP switch configuration(+1000)
MOUSEKEY_ENABLE ?= no # Mouse keys(+4700)
EXTRAKEY_ENABLE ?= yes # Audio control and System control(+450)
-CONSOLE_ENABLE ?= yes # Console for debug(+400)
-COMMAND_ENABLE ?= yes # Commands for debug and configuration
+# CONSOLE_ENABLE ?= yes # Console for debug(+400)
+# COMMAND_ENABLE ?= yes # Commands for debug and configuration
+KEYBOARD_LOCK_ENABLE ?= yes # Allow locking of keyboard via magic key
NKRO_ENABLE ?= yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
RGBLIGHT_ENABLE ?= no # Enable keyboard underlight functionality (+4870)
BACKLIGHT_ENABLE ?= no # Enable keyboard backlight functionality (+1150)
MIDI_ENABLE ?= no # MIDI controls
AUDIO_ENABLE ?= no
-UNICODE_ENABLE ?= no # Unicode
+UNICODE_ENABLE ?= yes # Unicode
BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID
-SLEEP_LED_ENABLE ?= yes \ No newline at end of file
+SLEEP_LED_ENABLE ?= yes