From 230c70e28515d294fcad68e924f0a557a197f40a Mon Sep 17 00:00:00 2001 From: dbroqua Date: Sun, 7 May 2017 22:56:27 +0200 Subject: [PATCH 1/5] - Initial commit for branch DK60 --- keyboards/dk60/Makefile | 3 ++ keyboards/dk60/config.h | 61 +++++++++++++++++++++++++ keyboards/dk60/dk60.c | 13 ++++++ keyboards/dk60/dk60.h | 29 ++++++++++++ keyboards/dk60/keymaps/default/keymap.c | 52 +++++++++++++++++++++ keyboards/dk60/readme.md | 6 +++ keyboards/dk60/rules.mk | 20 ++++++++ 7 files changed, 184 insertions(+) create mode 100644 keyboards/dk60/Makefile create mode 100644 keyboards/dk60/config.h create mode 100644 keyboards/dk60/dk60.c create mode 100644 keyboards/dk60/dk60.h create mode 100644 keyboards/dk60/keymaps/default/keymap.c create mode 100644 keyboards/dk60/readme.md create mode 100644 keyboards/dk60/rules.mk diff --git a/keyboards/dk60/Makefile b/keyboards/dk60/Makefile new file mode 100644 index 00000000..4e2a6f00 --- /dev/null +++ b/keyboards/dk60/Makefile @@ -0,0 +1,3 @@ +ifndef MAKEFILE_INCLUDED + include ../../Makefile +endif \ No newline at end of file diff --git a/keyboards/dk60/config.h b/keyboards/dk60/config.h new file mode 100644 index 00000000..315f4fcb --- /dev/null +++ b/keyboards/dk60/config.h @@ -0,0 +1,61 @@ +/* +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 . +*/ + +#ifndef CONFIG_H +#define CONFIG_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 + +/* key matrix size */ +#define MATRIX_ROWS 5 +#define MATRIX_COLS 13 + +// 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} + +/* COL2ROW or ROW2COL */ +#define DIODE_DIRECTION COL2ROW + +/* 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 + +#endif diff --git a/keyboards/dk60/dk60.c b/keyboards/dk60/dk60.c new file mode 100644 index 00000000..40fee6f7 --- /dev/null +++ b/keyboards/dk60/dk60.c @@ -0,0 +1,13 @@ +#include "dk60.h" + +void led_set_kb(uint8_t usb_led) { + // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here + + if (usb_led & (1< Date: Tue, 30 May 2017 16:59:56 +0200 Subject: [PATCH 2/5] - Some changes on DK60 --- keyboards/dk60/config.h | 61 ++++++++++++------------- keyboards/dk60/dk60.c | 2 +- keyboards/dk60/dk60.h | 4 +- keyboards/dk60/keymaps/default/keymap.c | 2 +- keyboards/dk60/rules.mk | 9 ++-- 5 files changed, 37 insertions(+), 41 deletions(-) diff --git a/keyboards/dk60/config.h b/keyboards/dk60/config.h index 315f4fcb..e586056c 100644 --- a/keyboards/dk60/config.h +++ b/keyboards/dk60/config.h @@ -16,46 +16,41 @@ along with this program. If not, see . */ #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 40fee6f7..40f24c28 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 cdb75611..572100f3 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 d670f824..e69ed982 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 66e9179e..36c6bed1 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 From e280f7aad7cb0abeaae2cfeb47bba02d4b83875e Mon Sep 17 00:00:00 2001 From: Damien Broqua Date: Tue, 30 May 2017 22:13:34 +0200 Subject: [PATCH 3/5] - Added Capslock/Esc led --- keyboards/dk60/dk60.c | 31 ++++++++++-- keyboards/dk60/dk60.h | 65 +++++++++++++++---------- keyboards/dk60/keymaps/default/keymap.c | 36 ++++++++++++-- 3 files changed, 97 insertions(+), 35 deletions(-) diff --git a/keyboards/dk60/dk60.c b/keyboards/dk60/dk60.c index 40f24c28..93aeb33b 100644 --- a/keyboards/dk60/dk60.c +++ b/keyboards/dk60/dk60.c @@ -1,13 +1,34 @@ #include "dk60.h" -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here +void dk60_blink_all_leds(void) +{ + dk60_led_all_off(); + dk60_led_all_on(); + _delay_ms(500); + dk60_led_all_off(); +} + +void matrix_init_kb(void) { + led_init_ports(); + dk60_blink_all_leds(); + + matrix_init_user(); +} + +void led_init_ports(void) { + // * Set our LED pins as output + DDRE |= (1<<6); + DDRF |= (1<<0); +} - if (usb_led & (1< +// #include "led.h" + + inline void dk60_caps_led_on(void) { PORTE |= (1<<6); } + inline void dk60_esc_led_on(void) { PORTF |= (1<<0); } + + inline void dk60_caps_led_off(void) { PORTE &= ~(1<<6); } + inline void dk60_esc_led_off(void) { PORTF &= ~(1<<0); } + + inline void dk60_led_all_on(void) + { + dk60_caps_led_on(); + dk60_esc_led_on(); + } + + inline void dk60_led_all_off(void) + { + dk60_caps_led_off(); + dk60_esc_led_off(); + } + + #define ___ KC_NO + + #define KEYMAP( \ + K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K4B, K4A, \ + K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K4C, \ + K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \ + K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, \ + K41, K42, K45, K48, K49 \ + ) { \ + { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C }, \ + { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C }, \ + { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C }, \ + { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C }, \ + { ___, K41, K42, ___, ___, K45, ___, ___, K48, K49, K4A, K4B, K4C } \ + } #endif diff --git a/keyboards/dk60/keymaps/default/keymap.c b/keyboards/dk60/keymaps/default/keymap.c index e69ed982..a6a3b83f 100644 --- a/keyboards/dk60/keymaps/default/keymap.c +++ b/keyboards/dk60/keymaps/default/keymap.c @@ -1,8 +1,20 @@ #include "dk60.h" #include "action_layer.h" -#define _DEFAULT 0 -#define _FN 1 +enum planck_layers { + _QWERTY, + _FN, + _DVORAK, + _LOWER, + _RAISE, + _PLOVER, + _ADJUST +}; + +enum planck_keycodes { + QWERTY = SAFE_RANGE, + FN +}; // Fillers to make layering more clear #define ______ KC_TRNS @@ -21,11 +33,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |LGUI | LAlt | Space | RAlt |RGUI | * `-----------------------------------------------------------------' */ - [_DEFAULT] = KEYMAP( /* Basic QWERTY */ + [_QWERTY] = KEYMAP( /* Basic QWERTY */ 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_BSLS, KC_GRV, \ 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_BSPC, \ KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \ - 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(_FN), \ + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, FN, \ KC_LGUI,KC_LALT, KC_SPC, KC_RALT,KC_RGUI \ ), @@ -50,3 +62,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ______, ______, ______, KC_MSTP, ______ \ ) }; + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case FN: + if (record->event.pressed) { + layer_on(_FN); + dk60_esc_led_on(); + } else { + layer_off(_FN); + dk60_esc_led_off(); + } + return false; + break; + } + return true; +} From 05f5243426320aad7376d18cabdab3bd8cd9e0ea Mon Sep 17 00:00:00 2001 From: Damien Broqua Date: Tue, 30 May 2017 22:17:03 +0200 Subject: [PATCH 4/5] - Updated readme --- keyboards/dk60/readme.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/keyboards/dk60/readme.md b/keyboards/dk60/readme.md index 82e6d0c3..544b5b0d 100644 --- a/keyboards/dk60/readme.md +++ b/keyboards/dk60/readme.md @@ -3,4 +3,6 @@ DK60 keyboard firmware Another 60% keyboard with different HHKB layout -More information here: https://github.com/Dbroqua/MX_HHKB \ No newline at end of file +More information here: https://github.com/Dbroqua/DK60 + +Open Hardware project! From a381eb01f588ae16c36f2bbbc0836645f8d46aa8 Mon Sep 17 00:00:00 2001 From: dbroqua Date: Tue, 30 May 2017 23:09:39 +0200 Subject: [PATCH 5/5] - Updated copyright --- keyboards/dk60/config.h | 3 +-- keyboards/dk60/dk60.h | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/keyboards/dk60/config.h b/keyboards/dk60/config.h index e586056c..9c5232ef 100644 --- a/keyboards/dk60/config.h +++ b/keyboards/dk60/config.h @@ -1,5 +1,5 @@ /* -Copyright 2012 Jun Wako +Copyright 2017 Damien Broqua 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 @@ -33,7 +33,6 @@ along with this program. If not, see . #define MATRIX_COLS 13 // 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 diff --git a/keyboards/dk60/dk60.h b/keyboards/dk60/dk60.h index 859e88e0..4b915991 100644 --- a/keyboards/dk60/dk60.h +++ b/keyboards/dk60/dk60.h @@ -3,7 +3,6 @@ #include "quantum.h" #include -// #include "led.h" inline void dk60_caps_led_on(void) { PORTE |= (1<<6); } inline void dk60_esc_led_on(void) { PORTF |= (1<<0); }