From eac8fa799909817bfc7cb4043448f85551154c6b Mon Sep 17 00:00:00 2001 From: Ofer Plesser Date: Sat, 10 Dec 2016 00:49:11 +0200 Subject: [PATCH 01/65] Implemented basic key combination feature --- build_keyboard.mk | 5 ++ quantum/process_keycode/process_combo.c | 66 +++++++++++++++++++++++++ quantum/process_keycode/process_combo.h | 25 ++++++++++ quantum/quantum.c | 3 ++ quantum/quantum.h | 4 ++ 5 files changed, 103 insertions(+) create mode 100644 quantum/process_keycode/process_combo.c create mode 100644 quantum/process_keycode/process_combo.h diff --git a/build_keyboard.mk b/build_keyboard.mk index ce505de12..14f4f36bc 100644 --- a/build_keyboard.mk +++ b/build_keyboard.mk @@ -144,6 +144,11 @@ ifeq ($(strip $(MIDI_ENABLE)), yes) SRC += $(QUANTUM_DIR)/process_keycode/process_midi.c endif +ifeq ($(strip $(COMBO_ENABLE)), yes) + OPT_DEFS += -DCOMBO_ENABLE + SRC += $(QUANTUM_DIR)/process_keycode/process_combo.c +endif + ifeq ($(strip $(VIRTSER_ENABLE)), yes) OPT_DEFS += -DVIRTSER_ENABLE endif diff --git a/quantum/process_keycode/process_combo.c b/quantum/process_keycode/process_combo.c new file mode 100644 index 000000000..a6cfed11a --- /dev/null +++ b/quantum/process_keycode/process_combo.c @@ -0,0 +1,66 @@ +#include "process_combo.h" +#include "print.h" + +// __attribute__ ((weak)) +// combo_t key_combos[] = { + +// }; + +#define SEND_KEY(key) \ +do { \ + register_code16(key); \ + send_keyboard_report(); \ + unregister_code16(key); \ +} while(0) + + +#define ALL_COMBO_KEYS_ARE_DOWN (((1<state) +static bool process_single_combo(combo_t *combo, uint16_t keycode, keyrecord_t *record) +{ + uint8_t count = 0; + bool is_combo_key = false; + // bool combo_key_released = false; + + // Count the number of combo keys + for (const uint16_t *key = combo->keys; COMBO_END != pgm_read_word(key); ++key, ++count); + + for (uint8_t i = 0; i < count; ++i) { + uint16_t key = pgm_read_word(&combo->keys[i]); + + if (key == keycode) { + is_combo_key = true; + + if (record->event.pressed) { + combo->state |= (1<state) { + // The combo was sent, no need to send released key + return true; + } + + combo->state &= ~(1<action); + combo->state = 0; + } + + return is_combo_key; +} + + +bool process_combo(uint16_t keycode, keyrecord_t *record) +{ + bool is_combo_key = false; + + for (int i = 0; i < NUM_ELEMS(key_combos); ++i) { + combo_t *combo = &key_combos[i]; + is_combo_key |= process_single_combo(combo, keycode, record); + } + + return !is_combo_key; +} \ No newline at end of file diff --git a/quantum/process_keycode/process_combo.h b/quantum/process_keycode/process_combo.h new file mode 100644 index 000000000..68786c0f1 --- /dev/null +++ b/quantum/process_keycode/process_combo.h @@ -0,0 +1,25 @@ +#ifndef PROCESS_COMBO_H +#define PROCESS_COMBO_H + +#include +#include "progmem.h" +#include "quantum.h" + + +typedef struct +{ + const uint16_t *keys; + uint16_t action; + uint32_t state; +} combo_t; + + +#define COMBO_END 0 +#define NUM_ELEMS(a) (sizeof(a)/sizeof 0[a]) + + +extern combo_t key_combos[1]; + +bool process_combo(uint16_t keycode, keyrecord_t *record); + +#endif \ No newline at end of file diff --git a/quantum/quantum.c b/quantum/quantum.c index f653564a6..eabeacff8 100644 --- a/quantum/quantum.c +++ b/quantum/quantum.c @@ -113,6 +113,9 @@ bool process_record_quantum(keyrecord_t *record) { if (!( process_record_kb(keycode, record) && + #ifdef COMBO_ENABLE + process_combo(keycode, record) && + #endif #ifdef MIDI_ENABLE process_midi(keycode, record) && #endif diff --git a/quantum/quantum.h b/quantum/quantum.h index e6adf974a..8614c053a 100644 --- a/quantum/quantum.h +++ b/quantum/quantum.h @@ -63,6 +63,10 @@ extern uint32_t default_layer_state; #include "process_printer.h" #endif +#ifdef COMBO_ENABLE + #include "process_combo.h" +#endif + #define SEND_STRING(str) send_string(PSTR(str)) void send_string(const char *str); From b6bf4e0dce062a535685c4e772f613252d401ed3 Mon Sep 17 00:00:00 2001 From: Ofer Plesser Date: Sat, 10 Dec 2016 16:11:59 +0200 Subject: [PATCH 02/65] Added support for timing out combos if a key as been pressed for longer than COMBO_TERM --- quantum/process_keycode/process_combo.c | 111 +++++++++++++++++------- quantum/process_keycode/process_combo.h | 20 ++++- quantum/quantum.c | 5 ++ 3 files changed, 103 insertions(+), 33 deletions(-) diff --git a/quantum/process_keycode/process_combo.c b/quantum/process_keycode/process_combo.c index a6cfed11a..ff7e8aba5 100644 --- a/quantum/process_keycode/process_combo.c +++ b/quantum/process_keycode/process_combo.c @@ -1,11 +1,6 @@ #include "process_combo.h" #include "print.h" -// __attribute__ ((weak)) -// combo_t key_combos[] = { - -// }; - #define SEND_KEY(key) \ do { \ register_code16(key); \ @@ -13,54 +8,110 @@ do { \ unregister_code16(key); \ } while(0) +#define COMBO_TIMER_ELAPSED -1 + +#if COMBO_TERM +#define IS_COMBO_KEY_HELD(combo) (COMBO_TIMER_ELAPSED == combo->timer ? false : true) +#define RESET_COMBO_TIMER_AND_KEY(combo) combo->timer = 0; combo->key = 0 +#else +#define IS_COMBO_KEY_HELD(combo) (true) +#define RESET_COMBO_TIMER_AND_KEY(combo) do {} while (0) +#endif + + +__attribute__ ((weak)) +combo_t key_combos[COMBO_COUNT] = { + +}; + +static inline void reset_combo(combo_t *combo) +{ + combo->state = 0; + RESET_COMBO_TIMER_AND_KEY(combo); +} #define ALL_COMBO_KEYS_ARE_DOWN (((1<state) +#define NO_COMBO_KEYS_ARE_DOWN (0 == combo->state) +#define KEY_STATE_DOWN(key) do{ combo->state |= (1<state &= ~(1<keys; ;++count) { + uint16_t key = pgm_read_word(&keys[count]); + if (keycode == key) index = count; + if (COMBO_END == key) break; + } - // Count the number of combo keys - for (const uint16_t *key = combo->keys; COMBO_END != pgm_read_word(key); ++key, ++count); + /* Return if not a combo key */ + if (-1 == index) return false; - for (uint8_t i = 0; i < count; ++i) { - uint16_t key = pgm_read_word(&combo->keys[i]); + bool is_combo_active = IS_COMBO_KEY_HELD(combo); - if (key == keycode) { - is_combo_key = true; - - if (record->event.pressed) { - combo->state |= (1<state) { - // The combo was sent, no need to send released key - return true; - } - - combo->state &= ~(1<event.pressed) { + KEY_STATE_DOWN(index); + +#if COMBO_TERM + if (is_combo_active) { + combo->timer = timer_read(); + combo->key = keycode; } +#endif + + } else { + if (is_combo_active && combo->state) { /* Combo key was tapped */ + RESET_COMBO_TIMER_AND_KEY(combo); + SEND_KEY(keycode); + } + +#if COMBO_TERM + if (!is_combo_active && keycode == combo->key) { /* Held combo key was released */ + unregister_code16(combo->key); + } +#endif + + KEY_STATE_UP(index); } - if (ALL_COMBO_KEYS_ARE_DOWN) { + if (ALL_COMBO_KEYS_ARE_DOWN && is_combo_active) { SEND_KEY(combo->action); - combo->state = 0; + reset_combo(combo); + } + + if(NO_COMBO_KEYS_ARE_DOWN && !is_combo_active) { + reset_combo(combo); } - return is_combo_key; + return is_combo_active; } - bool process_combo(uint16_t keycode, keyrecord_t *record) { bool is_combo_key = false; - for (int i = 0; i < NUM_ELEMS(key_combos); ++i) { + for (int i = 0; i < COMBO_COUNT; ++i) { combo_t *combo = &key_combos[i]; is_combo_key |= process_single_combo(combo, keycode, record); } return !is_combo_key; +} + +void matrix_scan_combo(void) +{ +#if COMBO_TERM + for (int i = 0; i < COMBO_COUNT; ++i) { + combo_t *combo = &key_combos[i]; + if (combo->timer && + combo->timer != COMBO_TIMER_ELAPSED && + timer_elapsed(combo->timer) > COMBO_TERM) { + + combo->timer = COMBO_TIMER_ELAPSED; + unregister_code16(combo->key); + register_code16(combo->key); + } + } +#endif } \ No newline at end of file diff --git a/quantum/process_keycode/process_combo.h b/quantum/process_keycode/process_combo.h index 68786c0f1..c475acd33 100644 --- a/quantum/process_keycode/process_combo.h +++ b/quantum/process_keycode/process_combo.h @@ -5,21 +5,35 @@ #include "progmem.h" #include "quantum.h" +#ifndef COMBO_TERM +#define COMBO_TERM TAPPING_TERM +#endif typedef struct { const uint16_t *keys; uint16_t action; uint32_t state; +#if COMBO_TERM + uint16_t timer; + uint16_t key; +#endif } combo_t; +#if COMBO_TERM +#define COMBO(ck, ca) {.keys = &(ck)[0], .action = (ca), .state = 0, .timer = 0, .key = 0} +#else +#define COMBO(ck, ca) {.keys = &(ck)[0], .action = (ca), .state = 0 } +#endif #define COMBO_END 0 -#define NUM_ELEMS(a) (sizeof(a)/sizeof 0[a]) +#ifndef COMBO_COUNT +#define COMBO_COUNT 0 +#endif - -extern combo_t key_combos[1]; +extern combo_t key_combos[COMBO_COUNT]; bool process_combo(uint16_t keycode, keyrecord_t *record); +void matrix_scan_combo(void); #endif \ No newline at end of file diff --git a/quantum/quantum.c b/quantum/quantum.c index eabeacff8..7767b6301 100644 --- a/quantum/quantum.c +++ b/quantum/quantum.c @@ -509,6 +509,11 @@ void matrix_scan_quantum() { #ifdef TAP_DANCE_ENABLE matrix_scan_tap_dance(); #endif + + #ifdef COMBO_ENABLE + matrix_scan_combo(); + #endif + matrix_scan_kb(); } From 6e7cfa83b9424061914793b02757fa4ec75b356b Mon Sep 17 00:00:00 2001 From: Ofer Plesser Date: Fri, 16 Dec 2016 21:50:28 +0200 Subject: [PATCH 03/65] Refactored as well as added support for action keys in combos --- quantum/process_keycode/process_combo.c | 125 ++++++++++++++---------- quantum/process_keycode/process_combo.h | 34 ++++--- 2 files changed, 90 insertions(+), 69 deletions(-) diff --git a/quantum/process_keycode/process_combo.c b/quantum/process_keycode/process_combo.c index ff7e8aba5..e2189ad98 100644 --- a/quantum/process_keycode/process_combo.c +++ b/quantum/process_keycode/process_combo.c @@ -1,39 +1,39 @@ #include "process_combo.h" #include "print.h" -#define SEND_KEY(key) \ -do { \ - register_code16(key); \ - send_keyboard_report(); \ - unregister_code16(key); \ -} while(0) #define COMBO_TIMER_ELAPSED -1 -#if COMBO_TERM -#define IS_COMBO_KEY_HELD(combo) (COMBO_TIMER_ELAPSED == combo->timer ? false : true) -#define RESET_COMBO_TIMER_AND_KEY(combo) combo->timer = 0; combo->key = 0 -#else -#define IS_COMBO_KEY_HELD(combo) (true) -#define RESET_COMBO_TIMER_AND_KEY(combo) do {} while (0) -#endif - __attribute__ ((weak)) -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { }; -static inline void reset_combo(combo_t *combo) -{ - combo->state = 0; - RESET_COMBO_TIMER_AND_KEY(combo); +__attribute__ ((weak)) +void process_combo_event(uint8_t combo_index, bool pressed) { + } -#define ALL_COMBO_KEYS_ARE_DOWN (((1<state) -#define NO_COMBO_KEYS_ARE_DOWN (0 == combo->state) -#define KEY_STATE_DOWN(key) do{ combo->state |= (1<state &= ~(1<state) +#define NO_COMBO_KEYS_ARE_DOWN (0 == combo->state) +#define KEY_STATE_DOWN(key) do{ combo->state |= (1<state &= ~(1<timer ? false : true; if (record->event.pressed) { KEY_STATE_DOWN(index); - -#if COMBO_TERM + if (is_combo_active) { - combo->timer = timer_read(); - combo->key = keycode; - } + if (ALL_COMBO_KEYS_ARE_DOWN) { /* Combo was pressed */ + send_combo(combo->keycode, true); + combo->timer = COMBO_TIMER_ELAPSED; + } else { /* Combo key was pressed */ + combo->timer = timer_read(); +#ifdef COMBO_ALLOW_ACTION_KEYS + combo->prev_record = *record; +#else + combo->prev_key = keycode; #endif - + } + } } else { - if (is_combo_active && combo->state) { /* Combo key was tapped */ - RESET_COMBO_TIMER_AND_KEY(combo); - SEND_KEY(keycode); + if (ALL_COMBO_KEYS_ARE_DOWN) { /* Combo was released */ + send_combo(combo->keycode, false); } -#if COMBO_TERM - if (!is_combo_active && keycode == combo->key) { /* Held combo key was released */ - unregister_code16(combo->key); - } + if (is_combo_active) { /* Combo key was tapped */ +#ifdef COMBO_ALLOW_ACTION_KEYS + record->event.pressed = true; + process_action(record, store_or_get_action(record->event.pressed, record->event.key)); + record->event.pressed = false; + process_action(record, store_or_get_action(record->event.pressed, record->event.key)); +#else + register_code16(keycode); + send_keyboard_report(); + unregister_code16(keycode); #endif + combo->timer = 0; + } - KEY_STATE_UP(index); + KEY_STATE_UP(index); } - if (ALL_COMBO_KEYS_ARE_DOWN && is_combo_active) { - SEND_KEY(combo->action); - reset_combo(combo); - } - - if(NO_COMBO_KEYS_ARE_DOWN && !is_combo_active) { - reset_combo(combo); + if (NO_COMBO_KEYS_ARE_DOWN) { + combo->timer = 0; } return is_combo_active; @@ -91,8 +100,8 @@ bool process_combo(uint16_t keycode, keyrecord_t *record) { bool is_combo_key = false; - for (int i = 0; i < COMBO_COUNT; ++i) { - combo_t *combo = &key_combos[i]; + for (current_combo_index = 0; current_combo_index < COMBO_COUNT; ++current_combo_index) { + combo_t *combo = &key_combos[current_combo_index]; is_combo_key |= process_single_combo(combo, keycode, record); } @@ -101,17 +110,25 @@ bool process_combo(uint16_t keycode, keyrecord_t *record) void matrix_scan_combo(void) { -#if COMBO_TERM for (int i = 0; i < COMBO_COUNT; ++i) { combo_t *combo = &key_combos[i]; if (combo->timer && combo->timer != COMBO_TIMER_ELAPSED && timer_elapsed(combo->timer) > COMBO_TERM) { - + + /* This disables the combo, meaning key events for this + * combo will be handled by the next processors in the chain + */ combo->timer = COMBO_TIMER_ELAPSED; - unregister_code16(combo->key); - register_code16(combo->key); + +#ifdef COMBO_ALLOW_ACTION_KEYS + process_action(&combo->prev_record, + store_or_get_action(combo->prev_record.event.pressed, + combo->prev_record.event.key)); +#else + unregister_code16(combo->prev_key); + register_code16(combo->prev_key); +#endif } } -#endif -} \ No newline at end of file +} diff --git a/quantum/process_keycode/process_combo.h b/quantum/process_keycode/process_combo.h index c475acd33..847f2b737 100644 --- a/quantum/process_keycode/process_combo.h +++ b/quantum/process_keycode/process_combo.h @@ -5,35 +5,39 @@ #include "progmem.h" #include "quantum.h" -#ifndef COMBO_TERM -#define COMBO_TERM TAPPING_TERM -#endif - typedef struct { const uint16_t *keys; - uint16_t action; + uint16_t keycode; +#ifdef EXTRA_EXTRA_LONG_COMBOS uint32_t state; -#if COMBO_TERM +#elif EXTRA_LONG_COMBOS + uint16_t state; +#else + uint8_t state; +#endif uint16_t timer; - uint16_t key; +#ifdef COMBO_ALLOW_ACTION_KEYS + keyrecord_t prev_record; +#else + uint16_t prev_key; #endif } combo_t; -#if COMBO_TERM -#define COMBO(ck, ca) {.keys = &(ck)[0], .action = (ca), .state = 0, .timer = 0, .key = 0} -#else -#define COMBO(ck, ca) {.keys = &(ck)[0], .action = (ca), .state = 0 } -#endif +#define COMBO(ck, ca) {.keys = &(ck)[0], .keycode = (ca)} +#define COMBO_ACTION(ck) {.keys = &(ck)[0]} + #define COMBO_END 0 #ifndef COMBO_COUNT #define COMBO_COUNT 0 #endif - -extern combo_t key_combos[COMBO_COUNT]; +#ifndef COMBO_TERM +#define COMBO_TERM TAPPING_TERM +#endif bool process_combo(uint16_t keycode, keyrecord_t *record); void matrix_scan_combo(void); +void process_combo_event(uint8_t combo_index, bool pressed); -#endif \ No newline at end of file +#endif From 40abf8bc9ce22cab472f79e3a97c413ac5648986 Mon Sep 17 00:00:00 2001 From: Ofer Plesser Date: Fri, 16 Dec 2016 22:00:29 +0200 Subject: [PATCH 04/65] Moved combo processing lower down in process logic --- quantum/quantum.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/quantum/quantum.c b/quantum/quantum.c index 7767b6301..e5385bc21 100644 --- a/quantum/quantum.c +++ b/quantum/quantum.c @@ -113,9 +113,6 @@ bool process_record_quantum(keyrecord_t *record) { if (!( process_record_kb(keycode, record) && - #ifdef COMBO_ENABLE - process_combo(keycode, record) && - #endif #ifdef MIDI_ENABLE process_midi(keycode, record) && #endif @@ -131,6 +128,9 @@ bool process_record_quantum(keyrecord_t *record) { #ifndef DISABLE_CHORDING process_chording(keycode, record) && #endif + #ifdef COMBO_ENABLE + process_combo(keycode, record) && + #endif #ifdef UNICODE_ENABLE process_unicode(keycode, record) && #endif From 0aa413af44b292e4b44d8f8aee1a92f2cb113438 Mon Sep 17 00:00:00 2001 From: Jonas Oberschweiber Date: Sat, 31 Dec 2016 19:37:56 +0100 Subject: [PATCH 05/65] Add support for supplementary planes for OS X --- quantum/process_keycode/process_unicode.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/quantum/process_keycode/process_unicode.c b/quantum/process_keycode/process_unicode.c index cd3a610b4..2606cf0c8 100644 --- a/quantum/process_keycode/process_unicode.c +++ b/quantum/process_keycode/process_unicode.c @@ -116,7 +116,16 @@ bool process_unicode_map(uint16_t keycode, keyrecord_t *record) { const uint32_t* map = unicode_map; uint16_t index = keycode & 0x7FF; uint32_t code = pgm_read_dword_far(&map[index]); - if ((code > 0xFFFF && input_mode == UC_OSX) || (code > 0xFFFFF && input_mode == UC_LNX)) { + if (code > 0xFFFF && code <= 0x10ffff && input_mode == UC_OSX) { + // Convert to UTF-16 surrogate pair + code -= 0x10000; + uint32_t lo = code & 0x3ff; + uint32_t hi = (code & 0xffc00) >> 10; + unicode_input_start(); + register_hex32(hi + 0xd800); + register_hex32(lo + 0xdc00); + unicode_input_finish(); + } else if ((code > 0x10ffff && input_mode == UC_OSX) || (code > 0xFFFFF && input_mode == UC_LNX)) { // when character is out of range supported by the OS unicode_map_input_error(); } else { From 6f44ca7a59d60e20c1d35e8edc916571f5fe40ef Mon Sep 17 00:00:00 2001 From: SjB Date: Sun, 15 Jan 2017 23:12:42 -0500 Subject: [PATCH 06/65] oneshot timeout would only timeout after an event. After setting a ONESHOT_TIMEOUT value, the oneshot layer state would not expire without an event being triggered (key pressed). The reason was that in the process_record function we would return priort to execute the process_action function if it detected a NOEVENT cycle. The process_action contained the codes to timeout the oneshot layer state. The codes to clear the oneshot layer state have been move just in front of where we check for the NOEVENT cycle in the process_record function. --- tmk_core/common/action.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tmk_core/common/action.c b/tmk_core/common/action.c index d485b46c7..a77177240 100644 --- a/tmk_core/common/action.c +++ b/tmk_core/common/action.c @@ -102,6 +102,13 @@ bool process_record_quantum(keyrecord_t *record) { void process_record(keyrecord_t *record) { +#if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0)) + if (has_oneshot_layer_timed_out()) { + dprintf("Oneshot layer: timeout\n"); + clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED); + } +#endif + if (IS_NOEVENT(record->event)) { return; } if(!process_record_quantum(record)) @@ -126,13 +133,6 @@ void process_action(keyrecord_t *record, action_t action) uint8_t tap_count = record->tap.count; #endif -#if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0)) - if (has_oneshot_layer_timed_out()) { - dprintf("Oneshot layer: timeout\n"); - clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED); - } -#endif - if (event.pressed) { // clear the potential weak mods left by previously pressed keys clear_weak_mods(); From 2b3859937b1e7f96b684408d31ff12a4e682f7ee Mon Sep 17 00:00:00 2001 From: SjB Date: Sat, 21 Jan 2017 02:01:55 -0500 Subject: [PATCH 07/65] speeding up (un)register_code16 In register_code16 and unregister_code16 we call register_code and unregister_code twice, once for the mods and once for the keycode. The (un)register_code have many check to see that keycode we have sent however because we know that we are sending it a mods key, why not just skip all of it and call (un)register_mods instead. This will skip alot of checks and should speedup the loop a little. --- quantum/quantum.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/quantum/quantum.c b/quantum/quantum.c index 63ffe2074..1767faed4 100644 --- a/quantum/quantum.c +++ b/quantum/quantum.c @@ -33,14 +33,22 @@ static void do_code16 (uint16_t code, void (*f) (uint8_t)) { f(KC_RGUI); } +static inline void qk_register_mods(uint8_t kc) { + register_mods(MOD_BIT(kc)); +} + +static inline void qk_unregister_mods(uint8_t kc) { + unregister_mods(MOD_BIT(kc)); +} + void register_code16 (uint16_t code) { - do_code16 (code, register_code); + do_code16 (code, qk_register_mods); register_code (code); } void unregister_code16 (uint16_t code) { unregister_code (code); - do_code16 (code, unregister_code); + do_code16 (code, qk_unregister_mods); } __attribute__ ((weak)) From 63e406eca4da805617889f7ab769a781c0046742 Mon Sep 17 00:00:00 2001 From: Stephen Tudor Date: Thu, 26 Jan 2017 00:24:51 -0500 Subject: [PATCH 08/65] Add smt keymap for Planck --- keyboards/planck/keymaps/smt/Makefile | 3 + keyboards/planck/keymaps/smt/keymap.c | 232 +++++++++++++++++++++++++ keyboards/planck/keymaps/smt/readme.md | 78 +++++++++ 3 files changed, 313 insertions(+) create mode 100644 keyboards/planck/keymaps/smt/Makefile create mode 100644 keyboards/planck/keymaps/smt/keymap.c create mode 100644 keyboards/planck/keymaps/smt/readme.md diff --git a/keyboards/planck/keymaps/smt/Makefile b/keyboards/planck/keymaps/smt/Makefile new file mode 100644 index 000000000..457a3d01d --- /dev/null +++ b/keyboards/planck/keymaps/smt/Makefile @@ -0,0 +1,3 @@ +ifndef QUANTUM_DIR + include ../../../../Makefile +endif diff --git a/keyboards/planck/keymaps/smt/keymap.c b/keyboards/planck/keymaps/smt/keymap.c new file mode 100644 index 000000000..47e9d8c70 --- /dev/null +++ b/keyboards/planck/keymaps/smt/keymap.c @@ -0,0 +1,232 @@ +// This is the canonical layout file for the Quantum project. If you want to add another keyboard, +// this is the style you want to emulate. + +#include "planck.h" +#include "action_layer.h" +#ifdef AUDIO_ENABLE + #include "audio.h" +#endif +#include "eeconfig.h" + +extern keymap_config_t keymap_config; + +// Each layer gets a name for readability, which is then used in the keymap matrix below. +// The underscores don't mean anything - you can have a layer called STUFF or any other name. +// Layer names don't all need to be of the same length, obviously, and you can also skip them +// entirely and just use numbers. +#define _DVORAK 0 +#define _QWERTY 1 +#define _LOWER 2 +#define _RAISE 3 +#define _ADJUST 16 + +enum planck_keycodes { + DVORAK = SAFE_RANGE, + QWERTY, + LOWER, + RAISE, + BACKLIT +}; + +// Fillers to make layering more clear +#define _______ KC_TRNS +#define XXXXXXX KC_NO + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +/* Dvorak + * ,-----------------------------------------------------------------------------------. + * | Tab | " | , | . | P | Y | F | G | C | R | L | Bksp | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | Esc | A | O | E | U | I | D | H | T | N | S | - | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | Shift| ; | Q | J | K | X | B | M | W | V | Z |Enter | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | Brite| Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | + * `-----------------------------------------------------------------------------------' + */ +[_DVORAK] = { + {KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC}, + {KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS}, + {KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, SFT_T(KC_ENT)}, + {BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT} +}, + +/* Qwerty + * ,-----------------------------------------------------------------------------------. + * | Tab | Q | W | E | R | T | Y | U | I | O | P | Bksp | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | Esc | A | S | D | F | G | H | J | K | L | ; | " | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | Shift| Z | X | C | V | B | N | M | , | . | / |Enter | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | Brite| Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | + * `-----------------------------------------------------------------------------------' + */ +[_QWERTY] = { + {_______, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC}, + {_______, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT}, + {_______, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, _______}, + {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______} +}, + +/* Lower + * ,-----------------------------------------------------------------------------------. + * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Del | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | | F1 | F2 | F3 | F4 | F5 | F6 | 4 | 5 | 6 | Home |PageUp| + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | | F7 | F8 | F9 | F10 | F11 | F12 | 1 | 2 | 3 | End |PageDn| + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | Next | Vol- | Vol+ | Play | + * `-----------------------------------------------------------------------------------' + */ +[_LOWER] = { + {KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL}, + {_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_4, KC_5, KC_6, KC_HOME, KC_PGUP}, + {_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_1, KC_2, KC_3, KC_END, KC_PGDN}, + {_______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY} +}, + +/* Raise + * ,-----------------------------------------------------------------------------------. + * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Del | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | | | | | | | _ | ? | + | { | } | | | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | | | | | | | - | / | = | [ | ] | \ | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | Next | Vol- | Vol+ | Play | + * `-----------------------------------------------------------------------------------' + */ +[_RAISE] = { + {KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL}, + {_______, _______, _______, _______, _______, _______, KC_UNDS, KC_QUES, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE}, + {_______, _______, _______, _______, _______, _______, KC_MINS, KC_SLSH, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS}, + {_______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY} +}, + +/* Adjust (Lower + Raise) + * ,-----------------------------------------------------------------------------------. + * | | Reset| | | | | | | | | | Del | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | | | |Aud on|Audoff|AGnorm|AGswap|Dvorak|Qwerty| | | | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof| | | | | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | + * `-----------------------------------------------------------------------------------' + */ +[_ADJUST] = { + {_______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL}, + {_______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, DVORAK, QWERTY, _______, _______, _______}, + {_______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______}, + {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______} +} + + +}; + +#ifdef AUDIO_ENABLE + +float tone_startup[][2] = SONG(STARTUP_SOUND); +float tone_qwerty[][2] = SONG(QWERTY_SOUND); +float tone_dvorak[][2] = SONG(DVORAK_SOUND); +float music_scale[][2] = SONG(MUSIC_SCALE_SOUND); + +float tone_goodbye[][2] = SONG(GOODBYE_SOUND); +#endif + + +void persistant_default_layer_set(uint16_t default_layer) { + eeconfig_update_default_layer(default_layer); + default_layer_set(default_layer); +} + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case DVORAK: + if (record->event.pressed) { + #ifdef AUDIO_ENABLE + PLAY_NOTE_ARRAY(tone_dvorak, false, 0); + #endif + persistant_default_layer_set(1UL<<_DVORAK); + } + return false; + break; + case QWERTY: + if (record->event.pressed) { + #ifdef AUDIO_ENABLE + PLAY_NOTE_ARRAY(tone_qwerty, false, 0); + #endif + persistant_default_layer_set(1UL<<_QWERTY); + } + return false; + break; + case LOWER: + if (record->event.pressed) { + layer_on(_LOWER); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } else { + layer_off(_LOWER); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } + return false; + break; + case RAISE: + if (record->event.pressed) { + layer_on(_RAISE); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } else { + layer_off(_RAISE); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } + return false; + break; + case BACKLIT: + if (record->event.pressed) { + register_code(KC_RSFT); + #ifdef BACKLIGHT_ENABLE + backlight_step(); + #endif + } else { + unregister_code(KC_RSFT); + } + return false; + break; + } + return true; +} + +void matrix_init_user(void) { + #ifdef AUDIO_ENABLE + startup_user(); + #endif +} + +#ifdef AUDIO_ENABLE + +void startup_user() +{ + _delay_ms(20); // gets rid of tick + PLAY_NOTE_ARRAY(tone_startup, false, 0); +} + +void shutdown_user() +{ + PLAY_NOTE_ARRAY(tone_goodbye, false, 0); + _delay_ms(150); + stop_all_notes(); +} + +void music_on_user(void) +{ + music_scale_user(); +} + +void music_scale_user(void) +{ + PLAY_NOTE_ARRAY(music_scale, false, 0); +} + +#endif diff --git a/keyboards/planck/keymaps/smt/readme.md b/keyboards/planck/keymaps/smt/readme.md new file mode 100644 index 000000000..52d702df0 --- /dev/null +++ b/keyboards/planck/keymaps/smt/readme.md @@ -0,0 +1,78 @@ +# smt's Planck keymap + +This keymap is primarily based on the default Planck keymap. + +Notable differences from the default are: + +1. **Dvorak by default** + + I happen to type in Dvorak, and prefer that layer to be the default on my keyboard. This is easy enough to switch around with Qwerty, Colemak, or whatever. + +2. **Right Shift** + + I use both the left and right shift keys when I type. When I want to modify a key with shift, I hold shift with the hand opposite the one typing the key. In the default keymap, Enter is where shift would be on a standard keyboard layout. Oh, muscle memory. + + Thankfully, QMK supports [mod-tap](https://github.com/jackhumbert/qmk_firmware/wiki#fun-with-modifier-keys) keys, and this allows me to set the Enter key to send a modifier (MOD_LSFT) when held, and KC_ENT when tapped. Awesome! + +## Dvorak (default) + +``` +,-----------------------------------------------------------------------------------. +| Tab | " | , | . | P | Y | F | G | C | R | L | Bksp | +|------+------+------+------+------+-------------+------+------+------+------+------| +| Esc | A | O | E | U | I | D | H | T | N | S | - | +|------+------+------+------+------+------|------+------+------+------+------+------| +| Shift| ; | Q | J | K | X | B | M | W | V | Z |Enter | +|------+------+------+------+------+------+------+------+------+------+------+------| +| Brite| Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | +`-----------------------------------------------------------------------------------' +``` + +## Qwerty (same as default) + +``` +,-----------------------------------------------------------------------------------. +| Tab | Q | W | E | R | T | Y | U | I | O | P | Bksp | +|------+------+------+------+------+-------------+------+------+------+------+------| +| Esc | A | S | D | F | G | H | J | K | L | ; | " | +|------+------+------+------+------+------|------+------+------+------+------+------| +| Shift| Z | X | C | V | B | N | M | , | . | / |Enter | +|------+------+------+------+------+------+------+------+------+------+------+------| +| Brite| Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | +`-----------------------------------------------------------------------------------' +``` + +## Lower + +This is where I put the number row, a numpad cluster, function keys, and some light navigation via Home/End/PageUp/PageDn. Like the "Raise" layer, the top row is redundant to help with Planck compatibility. + +``` +,-----------------------------------------------------------------------------------. +| ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Del | +|------+------+------+------+------+-------------+------+------+------+------+------| +| | F1 | F2 | F3 | F4 | F5 | F6 | 4 | 5 | 6 | Home |PageUp| +|------+------+------+------+------+------|------+------+------+------+------+------| +| | F7 | F8 | F9 | F10 | F11 | F12 | 1 | 2 | 3 | End |PageDn| +|------+------+------+------+------+------+------+------+------+------+------+------| +| | | | | | | | Next | Vol- | Vol+ | Play | +`-----------------------------------------------------------------------------------' +``` + +## Raise + +As a developer, it makes the most sense for me to group all the commonly-used symbols that don't fit on the main layer. In particular, having the dual-column of parens-braces-brackets really helps a lot. + +I haven't completely filled this layer, which leaves room for future mappings and macros. + +``` +,-----------------------------------------------------------------------------------. +| ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Del | +|------+------+------+------+------+-------------+------+------+------+------+------| +| | | | | | | _ | ? | + | { | } | | | +|------+------+------+------+------+------|------+------+------+------+------+------| +| | | | | | | - | / | = | [ | ] | \ | +|------+------+------+------+------+------+------+------+------+------+------+------| +| | | | | | | | Next | Vol- | Vol+ | Play | +`-----------------------------------------------------------------------------------' +``` + From 87bc36253dd915c51571e1972b771f49db9673d3 Mon Sep 17 00:00:00 2001 From: Luke Silva Date: Thu, 26 Jan 2017 22:44:22 +1100 Subject: [PATCH 09/65] Fix documentation for TMK actions --- tmk_core/common/action_code.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tmk_core/common/action_code.h b/tmk_core/common/action_code.h index 33da35f35..b15aaa0eb 100644 --- a/tmk_core/common/action_code.h +++ b/tmk_core/common/action_code.h @@ -47,10 +47,15 @@ along with this program. If not, see . * 0100|10| usage(10) (reserved) * 0100|11| usage(10) (reserved) * - * ACT_MOUSEKEY(0110): TODO: Not needed? + * + * ACT_MOUSEKEY(0101): TODO: Merge these two actions to conserve space? * 0101|xxxx| keycode Mouse key * - * 011x|xxxx xxxx xxxx (reseved) + * ACT_SWAP_HANDS(0110): + * 0110|xxxx| keycode Swap hands (keycode on tap, or options) + * + * + * 0111|xxxx xxxx xxxx (reserved) * * * Layer Actions(10xx) @@ -67,7 +72,6 @@ along with this program. If not, see . * ee: on event(01:press, 10:release, 11:both) * * 1001|xxxx|xxxx xxxx (reserved) - * 1001|oopp|BBBB BBBB 8-bit Bitwise Operation??? * * ACT_LAYER_TAP(101x): * 101E|LLLL| keycode On/Off with tap key (0x00-DF)[TAP] From 3131d655638927fb1802c6526f7b9b7afff03a5e Mon Sep 17 00:00:00 2001 From: Nic Aitch Date: Thu, 26 Jan 2017 09:31:27 -0600 Subject: [PATCH 10/65] Add avrdude target --- keyboards/lets_split/rules.mk | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/keyboards/lets_split/rules.mk b/keyboards/lets_split/rules.mk index 1aee5313c..0dc549130 100644 --- a/keyboards/lets_split/rules.mk +++ b/keyboards/lets_split/rules.mk @@ -73,3 +73,13 @@ USE_I2C ?= yes SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend CUSTOM_MATRIX = yes + +avrdude: build + ls /dev/tty* > /tmp/1; \ + echo "Reset your Pro Micro then hit any key to continue..."; \ + read -n 1 -s; \ + ls /dev/tty* > /tmp/2; \ + USB=`diff /tmp/1 /tmp/2 | grep '>' | sed -e 's/> //'`; \ + avrdude -p $(MCU) -c avr109 -P $$USB -U flash:w:$(BUILD_DIR)/$(TARGET).hex + +.PHONY: avrdude From 890ecf6a2ae1e782cdcd7750572c339c1ad7bb3a Mon Sep 17 00:00:00 2001 From: Nic Aitch Date: Thu, 26 Jan 2017 09:31:40 -0600 Subject: [PATCH 11/65] Update readme --- keyboards/lets_split/readme.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/keyboards/lets_split/readme.md b/keyboards/lets_split/readme.md index 6e296737a..a63ce5907 100644 --- a/keyboards/lets_split/readme.md +++ b/keyboards/lets_split/readme.md @@ -74,6 +74,10 @@ not be very difficult to adapt it to support more if required. Flashing -------- +From the keymap directory run `make SUBPROJECT-KEYMAP-avrdude` for automatic serial port resolution and flashing. + +Example: `make rev2-serial-avrdude` + If you define `EE_HANDS` in your `config.h`, you will need to set the EEPROM for the left and right halves. The EEPROM is used to store whether the half is left handed or right handed. This makes it so that the same firmware From cfc4149712217625fcb75e50348094fd9df432f5 Mon Sep 17 00:00:00 2001 From: Luke Silva Date: Fri, 27 Jan 2017 10:28:42 +1100 Subject: [PATCH 12/65] Add ability to use tap macros without using functions --- quantum/keymap_common.c | 5 ++++- quantum/quantum_keycodes.h | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/quantum/keymap_common.c b/quantum/keymap_common.c index eced3d2bb..5190f24e8 100644 --- a/quantum/keymap_common.c +++ b/quantum/keymap_common.c @@ -80,7 +80,10 @@ action_t action_for_key(uint8_t layer, keypos_t key) action.code = keymap_function_id_to_action( (int)keycode & 0xFFF ); break; case QK_MACRO ... QK_MACRO_MAX: - action.code = ACTION_MACRO(keycode & 0xFF); + if (keycode & 0x800) // tap macros have upper bit set + action.code = ACTION_MACRO_TAP(keycode & 0xFF); + else + action.code = ACTION_MACRO(keycode & 0xFF); break; case QK_LAYER_TAP ... QK_LAYER_TAP_MAX: action.code = ACTION_LAYER_TAP_KEY((keycode >> 0x8) & 0xF, keycode & 0xFF); diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h index 4853655f9..4566395fd 100644 --- a/quantum/quantum_keycodes.h +++ b/quantum/quantum_keycodes.h @@ -246,6 +246,7 @@ enum quantum_keycodes { #define M(kc) (kc | QK_MACRO) +#define MACROTAP(kc) (kc | QK_MACRO | FUNC_TAP<<8) #define MACRODOWN(...) (record->event.pressed ? MACRO(__VA_ARGS__) : MACRO_NONE) // L-ayer, T-ap - 256 keycode max, 16 layer max From 8c794d73fa75fa2f3f985617a2b566974f3b29bf Mon Sep 17 00:00:00 2001 From: folkert4 Date: Fri, 27 Jan 2017 13:51:39 -0500 Subject: [PATCH 13/65] Added Espynn's keymap --- keyboards/planck/keymaps/espynn/Makefile | 63 ++++ .../planck/keymaps/espynn/keyboard-layout.jpg | Bin 0 -> 52908 bytes keyboards/planck/keymaps/espynn/keymap.c | 151 ++++++++++ keyboards/planck/keymaps/espynn/layout.json | 271 ++++++++++++++++++ keyboards/planck/keymaps/espynn/readme.md | 18 ++ 5 files changed, 503 insertions(+) create mode 100644 keyboards/planck/keymaps/espynn/Makefile create mode 100644 keyboards/planck/keymaps/espynn/keyboard-layout.jpg create mode 100644 keyboards/planck/keymaps/espynn/keymap.c create mode 100644 keyboards/planck/keymaps/espynn/layout.json create mode 100644 keyboards/planck/keymaps/espynn/readme.md diff --git a/keyboards/planck/keymaps/espynn/Makefile b/keyboards/planck/keymaps/espynn/Makefile new file mode 100644 index 000000000..44a030ba3 --- /dev/null +++ b/keyboards/planck/keymaps/espynn/Makefile @@ -0,0 +1,63 @@ +#---------------------------------------------------------------------------- +# On command line: +# +# make all = Make software. +# +# make clean = Clean out built project files. +# +# make coff = Convert ELF to AVR COFF. +# +# make extcoff = Convert ELF to AVR Extended COFF. +# +# make program = Download the hex file to the device. +# Please customize your programmer settings(PROGRAM_CMD) +# +# make teensy = Download the hex file to the device, using teensy_loader_cli. +# (must have teensy_loader_cli installed). +# +# make dfu = Download the hex file to the device, using dfu-programmer (must +# have dfu-programmer installed). +# +# make flip = Download the hex file to the device, using Atmel FLIP (must +# have Atmel FLIP installed). +# +# make dfu-ee = Download the eeprom file to the device, using dfu-programmer +# (must have dfu-programmer installed). +# +# make flip-ee = Download the eeprom file to the device, using Atmel FLIP +# (must have Atmel FLIP installed). +# +# make debug = Start either simulavr or avarice as specified for debugging, +# with avr-gdb or avr-insight as the front end for debugging. +# +# make filename.s = Just compile filename.c into the assembler code only. +# +# make filename.i = Create a preprocessed source file for use in submitting +# bug reports to the GCC project. +# +# To rebuild project do "make clean" then "make all". +#---------------------------------------------------------------------------- + +# Build Options +# change to "no" to disable the options, or define them in the makefile.mk in +# the appropriate keymap folder that will get included automatically +# +BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) +MOUSEKEY_ENABLE = yes # Mouse keys(+4700) +EXTRAKEY_ENABLE = yes # Audio control and System control(+450) +CONSOLE_ENABLE = no # Console for debug(+400) +COMMAND_ENABLE = yes # Commands for debug and configuration +NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality +MIDI_ENABLE = no # MIDI controls +AUDIO_ENABLE = no # Audio output on port C6 +UNICODE_ENABLE = no # Unicode +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. + +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend + +ifndef QUANTUM_DIR + include ../../../../Makefile +endif diff --git a/keyboards/planck/keymaps/espynn/keyboard-layout.jpg b/keyboards/planck/keymaps/espynn/keyboard-layout.jpg new file mode 100644 index 0000000000000000000000000000000000000000..55e5396bfde7346da254bac1c926a9abe205a05b GIT binary patch literal 52908 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 literal 0 HcmV?d00001 diff --git a/keyboards/planck/keymaps/espynn/keymap.c b/keyboards/planck/keymaps/espynn/keymap.c new file mode 100644 index 000000000..4a3fe32b8 --- /dev/null +++ b/keyboards/planck/keymaps/espynn/keymap.c @@ -0,0 +1,151 @@ +#include "planck.h" +#include "action_layer.h" +#include "eeconfig.h" +#ifdef BACKLIGHT_ENABLE + #include "backlight.h" +#endif +#define PREVENT_STUCK_MODIFIERS +extern keymap_config_t keymap_config; + +// Symbolic names for macro IDs. +#define _QWERTY 0 // QUERTY layer +#define _LOWER 1 // Lower layer +#define _RAISE 2 // Raise layer +#define _CUSTOM 3 // Custom layer (LOWER + RAISE) +#define _BL 4 // Backlight +#define _CUS0 5 // Mobile# +#define _CUS1 6 // signature +#define _CUS2 7 // macro 2 +#define _CUS3 8 // macro 3 +#define _CUS4 9 // macro 4 +#define _CUS5 10 // email +#define _COPY 11 // copy +#define _PASTE 12 // paste +#define _CUT 13 // cut + +// Macro shortcuts. +#define QWERTY M(_LOWER) +#define LOWER M(_LOWER) +#define RAISE M(_RAISE) +#define CUSTOM M(_CUSTOM) +#define BL M(_BL) +#define CUS0 M(_CUS0) +#define CUS1 M(_CUS1) +#define CUS2 M(_CUS2) +#define CUS3 M(_CUS3) +#define CUS4 M(_CUS4) +#define CUS5 M(_CUS5) +#define COPY M(_COPY) +#define PASTE M(_PASTE) +#define CUT M(_CUT) + +// Func macro definitions. +#define LWR_PGDN FUNC(0) // Tap for PgDn, hold for LOWER +#define RSE_PGUP FUNC(1) // Tap for PgUp, hold for RAISE +#define CTL_CAPS FUNC(2) // Tap for Caps, hold for Ctrl (DOESN'T SEEM TO WORK) +#define SFT_ENT FUNC(3) // Tap for Enter, hold for Shift +#define ZM_NRM FUNC(4) // Zoom normal +#define ZM_IN FUNC(5) // Zoom out +#define ZM_OUT FUNC(6) // Zoom in + +// Enable these functions using FUNC(n) macro. +const uint16_t PROGMEM fn_actions[] = { + [0] = ACTION_LAYER_TAP_KEY(_LOWER, KC_PGDN), + [1] = ACTION_LAYER_TAP_KEY(_RAISE, KC_PGUP), + [2] = ACTION_MODS_TAP_KEY(MOD_LCTL, KC_CAPS), + [3] = ACTION_MODS_TAP_KEY(MOD_RSFT, KC_ENT), + [4] = ACTION_MODS_KEY(MOD_LCTL, KC_0), + [5] = ACTION_MODS_KEY(MOD_LCTL, KC_MINS), + [6] = ACTION_MODS_KEY(MOD_LCTL, KC_PLUS), + [7] = ACTION_MODS_KEY(MOD_LCTL, KC_UNDS), + }; + +// This config can be found at Keyboard layout editor site: http://goo.gl/zjXL2l +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +[_QWERTY] = { /* QWERTY */ + {KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC}, + {KC_DEL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT}, + {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SFT_ENT}, + {KC_LCTL, KC_ESC, KC_LGUI, KC_LALT, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT} +}, +[_LOWER] = { /* LOWER */ + {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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LPRN, KC_RPRN, KC_LCBR, KC_RCBR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS}, + {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_QUOT, KC_DQT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS}, + {KC_TRNS, ZM_NRM, ZM_IN, ZM_OUT, KC_TRNS, KC_PGDN, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS} +}, +[_RAISE] = { /* RAISE */ + {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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LCBR, KC_LCBR, KC_BSLS, KC_TRNS}, + {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSLS, KC_PIPE, KC_GRV, KC_TILD, KC_LBRC, KC_LBRC, KC_TRNS, KC_TRNS}, + {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_PGUP, KC_TRNS, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY} +}, +[_CUSTOM] = { /* CUSTOM */ + {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, CUS4, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS}, + {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, CUS0, CUS3, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS}, + {KC_TRNS, KC_TRNS, CUT, COPY, PASTE, CUS1, CUS5, CUS2, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS}, + {BL, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS} +} +}; + +// Set a layer persistantly. +void persistant_default_layer_set(uint16_t default_layer) { + eeconfig_update_default_layer(default_layer); + default_layer_set(default_layer); +} + +// Macro actions for each corresponding ID. +const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) +{ + switch(id) { + case _RAISE: // Raised layer. + if (record->event.pressed) { + layer_on(_RAISE); + update_tri_layer(_LOWER, _RAISE, _CUSTOM); + } else { + layer_off(_RAISE); + update_tri_layer(_LOWER, _RAISE, _CUSTOM); + } + break; + case _LOWER: // Lowered layer. + if (record->event.pressed) { + layer_on(_LOWER); + update_tri_layer(_LOWER, _RAISE, _CUSTOM); + } else { + layer_off(_LOWER); + update_tri_layer(_LOWER, _RAISE, _CUSTOM); + } + break; + case _BL: // Backlight + if (record->event.pressed) { + register_code(KC_RSFT); +#ifdef BACKLIGHT_ENABLE + backlight_step(); +#endif + } else { + unregister_code(KC_RSFT); + } + break; + case _CUS0: // enter your mobile# here + return MACRODOWN(T(9), T(9), T(9), T(MINS),T(9), T(9), T(9), T(MINS),T(9), T(9), T(9), T(9),END); + case _CUS1: // signature line for email + return MACRODOWN(T(ENT), T(ENT), T(MINS), T(J), T(W), END); + case _CUS2: // Custom macro 2 + return MACRODOWN( DOWN(KC_LSFT), TYPE(KC_L), UP(KC_LSFT), END ); + case _CUS3: // custom macro 3 + return MACRODOWN( DOWN(KC_LSFT), TYPE(KC_F), UP(KC_LSFT), END ); + case _CUS4: // custom macro 4 + return MACRODOWN( DOWN(KC_LSFT), TYPE(KC_I), UP(KC_LSFT), END ); + case _CUS5: // Enter your email here + return MACRODOWN( TYPE(KC_F), + DOWN(KC_LSFT), TYPE(KC_2), UP(KC_LSFT), + TYPE(KC_G), TYPE(KC_M), TYPE(KC_A), TYPE(KC_I), TYPE(KC_L), TYPE(KC_DOT), TYPE(KC_C), TYPE(KC_O), TYPE(KC_M), END ); + case _CUT: //cut macro + return MACRODOWN( DOWN(KC_LCTL), TYPE(KC_X), UP(KC_LCTL), END ); + case _COPY: // copy macro + return MACRODOWN( DOWN(KC_LCTL), TYPE(KC_C), UP(KC_LCTL), END ); + case _PASTE: // paste macro + return MACRODOWN( DOWN(KC_LCTL), TYPE(KC_V), UP(KC_LCTL), END ); + }; + return MACRO_NONE; +} \ No newline at end of file diff --git a/keyboards/planck/keymaps/espynn/layout.json b/keyboards/planck/keymaps/espynn/layout.json new file mode 100644 index 000000000..38ccc3452 --- /dev/null +++ b/keyboards/planck/keymaps/espynn/layout.json @@ -0,0 +1,271 @@ +[ + { + "backcolor": "#858585", + "name": "Planck 40%", + "author": "James Folkert", + "background": { + "name": "Aluminium brushed", + "style": "background-image: url('/bg/metal/aluminum_texture1642.jpg');" + }, + "switchMount": "cherry", + "switchBrand": "cherry", + "switchType": "MX1A-A1xx", + "pcb": true, + "plate": true + }, + [ + { + "fa": [ + 2, + 2, + 0, + 2 + ] + }, + "F1\n1\n\n!\n\n\n\n\n\n", + "F2\n2\n\n@\n\n\n\n\n\nQ", + "F3\n3\n\n#\n\n\n\n\n\nW", + "F4\n4\n\n$\n\n\n\n\n\nE", + "F5\n5\n\n%\n\n\n\n\n\nR", + "F6\n6\n\n^\n\n\n\n\n\nT", + "F7\n6\n\n&\n\n\n\n\n\nY", + "F8\n8\n\n*\nMacro4\n\n\n\n\nU", + "F9\n9\n\n(\n\n\n\n\n\nI", + { + "fa": [ + 0, + 0, + 0, + 2 + ] + }, + "F10\n0\n\n)\n\n\n\n\n\nO", + { + "fa": [ + 2, + 2, + 0, + 2 + ] + }, + "F11\n-\n\n_\n\n\n\n\n\nP", + "F12\n=\n\n+\n\n\n\n\n\n" + ], + [ + { + "a": 7, + "f": 3 + }, + "", + { + "f": 3 + }, + "A", + { + "f": 3 + }, + "S", + { + "f": 3 + }, + "D", + { + "t": "#ff0000", + "a": 4, + "f": 3 + }, + "\n(\n\n\n\n\n\n\n\nF", + { + "t": "#000000", + "f": 3 + }, + "\n)\n\n\n\n\n\n\n\nG", + { + "f": 3 + }, + "\n{\n\n\nMacro0\n\n\n\n\nH", + { + "t": "#ff0000", + "f": 3 + }, + "\n}\n\n\nMacro3\n\n\n\n\nJ", + { + "t": "#000000", + "f": 3 + }, + "{\n\n\n\n\n\n\n\n\nK", + { + "f": 3 + }, + "{\n\n\n\n\n\n\n\n\nL", + { + "fa": [ + 2, + 2, + 2, + 2, + 0, + 0, + 0, + 2 + ] + }, + "\\\n\n|\n\n\n\n\n:\n\n;", + { + "a": 7, + "fa": [ + 9 + ] + }, + "" + ], + [ + { + "f": 3 + }, + "Shift", + { + "f": 3 + }, + "Z", + { + "f": 3 + }, + "X\n\n\n\nCut", + { + "f": 3 + }, + "C\n\n\n\nCopy", + { + "a": 4, + "fa": [ + 2, + 2, + 2, + 2 + ] + }, + "\\\n[\n|\n{\nPaste\n\n\n\n\nV", + "|\n]\n\n}\nMacro1\n\n\n\n\nB", + "`\n'\n~\n\"\nMacro5\n\n\n\n\nN", + "~\n\"\n\n\nMacro2\n\n\n\n\nM", + { + "fa": [ + 2, + 2, + 2, + 2, + 0, + 0, + 0, + 1 + ] + }, + "[\n\n{\n\n\n\n\n<\n\n,", + "[\n\n{\n\n\n\n\n\n\n.", + { + "a": 6 + }, + "\n\n?\n\n\n\n\n\n/", + { + "a": 4, + "fa": [ + 2, + 2, + 2, + 0, + 0, + 0, + 0, + 1, + 9, + 0 + ] + }, + "\n\n\nShift\n\n\n\n\n\n\nShift" + ], + [ + { + "a": 7, + "f": 3 + }, + "Ctrl\n\n\n\nBLight", + { + "a": 4, + "fa": [ + 2, + 1, + 2, + 0, + 0, + 0, + 0, + 1, + 9, + 9 + ] + }, + "\nZNorm\n\n\nRESET\n\n\n\n\n", + { + "fa": [ + 2, + 1, + 2, + 0, + 0, + 0, + 0, + 1, + 9, + 6 + ] + }, + "\nZIn\n\n\n\n\n\n\n\n", + { + "fa": [ + 2, + 1, + 2, + 0, + 0, + 0, + 0, + 1, + 9, + 9 + ] + }, + "\nZOut\n\n\n\n\n\n\n\n", + { + "a": 7, + "fa": [ + 9 + ] + }, + "⇓", + { + "a": 4, + "fa": [ + 9, + 5, + 5 + ], + "w": 2 + }, + "\n\n", + { + "a": 7 + }, + "⇑", + { + "a": 4, + "fa": [ + 2 + ] + }, + "\n\n\n\n\n\n\n\n\n←", + "\n\n\n\n\n\n\n\n\n↓", + "\n\n\n\n\n\n\n\n\n↑", + "\n\n\n\n\n\n\n\n\n→" + ] +] \ No newline at end of file diff --git a/keyboards/planck/keymaps/espynn/readme.md b/keyboards/planck/keymaps/espynn/readme.md new file mode 100644 index 000000000..8882f4601 --- /dev/null +++ b/keyboards/planck/keymaps/espynn/readme.md @@ -0,0 +1,18 @@ +# Espynn's keymap for Planck Ortholinear 40% Mechanical Keyboard +Created by James Folkert: https://twitter.com/trekloFsemaJ +Added several custom functions to the keymap from the "ab" map. Special thanks to "mollat" for demonstration of macros in their keymap.c + + +![Layout](keyboard-layout.png "Practical Keymap") + + +* Online keyboard layout editor: http://www.keyboard-layout-editor.com/ +* [JSON of raw layout] (layout.json "JSON of raw layout") + +# Notes +* Simultaneous RAISE+LOWER enters CUSTOM layer. Several custom keymaps are here +* I disregarded the advice of Jack and used macros for passwords. I accept my fate. These have been abstracted to macros 2, 3, and 4 +* add your mobile and email to the keymap before make +* RAISE and LOWER also acts as PgUp and PgDn when tapped. +* [CapsLock] also acts as [Ctrl] key when you press and hold. It is convenient for GNU Emacs users. (not sure if this works) +* Bracket/ paran/ brace keys are placed in the center of the keyboard for programmer's convenience. \ No newline at end of file From 321904b8e38e35e7db8a19488ee96456f6393672 Mon Sep 17 00:00:00 2001 From: Stephen Tudor Date: Sat, 28 Jan 2017 01:37:59 -0500 Subject: [PATCH 14/65] Improve Planck keymap - added escape+shift mod-tap key - replaced BRITE with backtick --- keyboards/planck/keymaps/smt/keymap.c | 15 ++++++------- keyboards/planck/keymaps/smt/readme.md | 29 ++++++++++++++++++++++++-- 2 files changed, 33 insertions(+), 11 deletions(-) diff --git a/keyboards/planck/keymaps/smt/keymap.c b/keyboards/planck/keymaps/smt/keymap.c index 47e9d8c70..51e5a40bf 100644 --- a/keyboards/planck/keymaps/smt/keymap.c +++ b/keyboards/planck/keymaps/smt/keymap.c @@ -1,6 +1,3 @@ -// This is the canonical layout file for the Quantum project. If you want to add another keyboard, -// this is the style you want to emulate. - #include "planck.h" #include "action_layer.h" #ifdef AUDIO_ENABLE @@ -42,14 +39,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+------|------+------+------+------+------+------| * | Shift| ; | Q | J | K | X | B | M | W | V | Z |Enter | * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Brite| Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | + * | ` | Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | * `-----------------------------------------------------------------------------------' */ [_DVORAK] = { - {KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC}, - {KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS}, - {KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, SFT_T(KC_ENT)}, - {BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT} + {KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC}, + {KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS}, + {SFT_T(KC_ESC), KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, SFT_T(KC_ENT)}, + {ALL_T(KC_GRV), KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT} }, /* Qwerty @@ -60,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+------|------+------+------+------+------+------| * | Shift| Z | X | C | V | B | N | M | , | . | / |Enter | * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Brite| Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | + * | ` | Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | * `-----------------------------------------------------------------------------------' */ [_QWERTY] = { diff --git a/keyboards/planck/keymaps/smt/readme.md b/keyboards/planck/keymaps/smt/readme.md index 52d702df0..0e955a574 100644 --- a/keyboards/planck/keymaps/smt/readme.md +++ b/keyboards/planck/keymaps/smt/readme.md @@ -14,6 +14,16 @@ Notable differences from the default are: Thankfully, QMK supports [mod-tap](https://github.com/jackhumbert/qmk_firmware/wiki#fun-with-modifier-keys) keys, and this allows me to set the Enter key to send a modifier (MOD_LSFT) when held, and KC_ENT when tapped. Awesome! +3. Escape + + I am experimenting with using Left Shift as a mod-tap key for Escape, similar to how I use the Enter key. It's set up like this on my Minivan, so in the interest of consistency... + +4. Backtick + + I don't currently have LEDs on any of my keyboards, and even if I did, I don't think I would want their controls on a base layer. + + So, why use backtick in the lower left corner? I use it as my tmux prefix key, so I need to type it more frequently than most people. Putting it on the base layer works well for me. + ## Dvorak (default) ``` @@ -24,7 +34,7 @@ Notable differences from the default are: |------+------+------+------+------+------|------+------+------+------+------+------| | Shift| ; | Q | J | K | X | B | M | W | V | Z |Enter | |------+------+------+------+------+------+------+------+------+------+------+------| -| Brite| Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | +| ` | Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | `-----------------------------------------------------------------------------------' ``` @@ -38,7 +48,7 @@ Notable differences from the default are: |------+------+------+------+------+------|------+------+------+------+------+------| | Shift| Z | X | C | V | B | N | M | , | . | / |Enter | |------+------+------+------+------+------+------+------+------+------+------+------| -| Brite| Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | +| ` | Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | `-----------------------------------------------------------------------------------' ``` @@ -76,3 +86,18 @@ I haven't completely filled this layer, which leaves room for future mappings an `-----------------------------------------------------------------------------------' ``` +## Adjust (Lower + Raise) + +Utility layer. This is where I'd switch to Qwerty, or ~~fool around with~~ adjust the audio/music settings. + +``` +,-----------------------------------------------------------------------------------. +| | Reset| | | | | | | | | | Del | +|------+------+------+------+------+-------------+------+------+------+------+------| +| | | |Aud on|AudOff|AGnorm|AGswap|Dvorak|Qwerty| | | | +|------+------+------+------+------+------|------+------+------+------+------+------| +| |Voice-|Voice+|Mus on|MusOff|MidiOn|MidOff| | | | | | +|------+------+------+------+------+------+------+------+------+------+------+------| +| | | | | | | | | | | | +`-----------------------------------------------------------------------------------' +``` From 7c24ecf580471f7b0d360dd115d6730adf6e59d8 Mon Sep 17 00:00:00 2001 From: Stephen Tudor Date: Sat, 28 Jan 2017 01:38:58 -0500 Subject: [PATCH 15/65] Carry over Planck updates to my Preonic keymap --- keyboards/preonic/keymaps/smt/keymap.c | 30 +++++++++--------- keyboards/preonic/keymaps/smt/readme.md | 42 ++++++++++++++++++++----- 2 files changed, 50 insertions(+), 22 deletions(-) diff --git a/keyboards/preonic/keymaps/smt/keymap.c b/keyboards/preonic/keymaps/smt/keymap.c index 5465d543a..ba05d9ad5 100644 --- a/keyboards/preonic/keymaps/smt/keymap.c +++ b/keyboards/preonic/keymaps/smt/keymap.c @@ -1,9 +1,9 @@ #include "preonic.h" #include "action_layer.h" -#include "eeconfig.h" #ifdef AUDIO_ENABLE #include "audio.h" #endif +#include "eeconfig.h" // Each layer gets a name for readability, which is then used in the keymap matrix below. // The underscores don't mean anything - you can have a layer called STUFF or any other name. @@ -33,39 +33,39 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ,-----------------------------------------------------------------------------------. * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp | * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Tab | " | , | . | P | Y | F | G | C | R | L | / | + * | Tab | " | , | . | P | Y | F | G | C | R | L | Bksp | * |------+------+------+------+------+-------------+------+------+------+------+------| * | Esc | A | O | E | U | I | D | H | T | N | S | - | * |------+------+------+------+------+------|------+------+------+------+------+------| * | Shift| ; | Q | J | K | X | B | M | W | V | Z |Enter | * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Brite| Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | + * | ` | Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | * `-----------------------------------------------------------------------------------' */ [_DVORAK] = { - {KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC}, - {KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH}, - {KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS}, - {KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, SFT_T(KC_ENT)}, - {BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT} + {KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC}, + {KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC}, + {KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS}, + {SFT_T(KC_ESC), KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, SFT_T(KC_ENT)}, + {ALL_T(KC_GRV), KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT} }, /* Qwerty * ,-----------------------------------------------------------------------------------. * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp | * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Tab | Q | W | E | R | T | Y | U | I | O | P | Del | + * | Tab | Q | W | E | R | T | Y | U | I | O | P | Bksp | * |------+------+------+------+------+-------------+------+------+------+------+------| * | Esc | A | S | D | F | G | H | J | K | L | ; | " | * |------+------+------+------+------+------|------+------+------+------+------+------| * | Shift| Z | X | C | V | B | N | M | , | . | / |Enter | * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Brite| Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | + * | ` | Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | * `-----------------------------------------------------------------------------------' */ [_QWERTY] = { {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______}, - {_______, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL}, + {_______, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, _______}, {_______, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT}, {_______, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, _______}, {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______} @@ -98,9 +98,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+-------------+------+------+------+------+------| * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Del | * |------+------+------+------+------+-------------+------+------+------+------+------| - * | | | | | | | | _ | + | { | } | | | + * | | | | | | | _ | ? | + | { | } | | | * |------+------+------+------+------+------|------+------+------+------+------+------| - * | | | | | | | | - | = | [ | ] | \ | + * | | | | | | | - | / | = | [ | ] | \ | * |------+------+------+------+------+------+------+------+------+------+------+------| * | | | | | | | | Next | Vol- | Vol+ | Play | * `-----------------------------------------------------------------------------------' @@ -108,8 +108,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_RAISE] = { {KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL}, {KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL}, - {_______, _______, _______, _______, _______, _______, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE}, - {_______, _______, _______, _______, _______, _______, _______, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS}, + {_______, _______, _______, _______, _______, _______, KC_UNDS, KC_QUES, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE}, + {_______, _______, _______, _______, _______, _______, KC_MINS, KC_SLSH, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS}, {_______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY} }, diff --git a/keyboards/preonic/keymaps/smt/readme.md b/keyboards/preonic/keymaps/smt/readme.md index 2dcc1927f..393d9d3e3 100644 --- a/keyboards/preonic/keymaps/smt/readme.md +++ b/keyboards/preonic/keymaps/smt/readme.md @@ -12,7 +12,17 @@ Notable differences from the default are: I use both the left and right shift keys when I type. When I want to modify a key with shift, I hold shift with the hand opposite the one typing the key. In the default keymap, Enter is where shift would be on a standard keyboard layout. Oh, muscle memory. - Thankfully, QMK supports [mod-tap](https://github.com/qmk/qmk_firmware/wiki#fun-with-modifier-keys) keys, and this allows me to set the Enter key to send a modifier (MOD_LSFT) when held, and KC_ENT when tapped. Awesome! + Thankfully, QMK supports [mod-tap](https://github.com/jackhumbert/qmk_firmware/wiki#fun-with-modifier-keys) keys, and this allows me to set the Enter key to send a modifier (MOD_LSFT) when held, and KC_ENT when tapped. Awesome! + +3. Escape + + I am experimenting with using Left Shift as a mod-tap key for Escape, similar to how I use the Enter key. It's set up like this on my Minivan, so in the interest of consistency... + +4. Backtick + + I don't currently have LEDs on any of my keyboards, and even if I did, I don't think I would want their controls on a base layer. + + So, why use backtick in the lower left corner? I use it as my tmux prefix key, so I need to type it more frequently than most people. Putting it on the base layer works well for me. ## Dvorak (default) @@ -20,13 +30,13 @@ Notable differences from the default are: ,-----------------------------------------------------------------------------------. | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp | |------+------+------+------+------+------+------+------+------+------+------+------| -| Tab | " | , | . | P | Y | F | G | C | R | L | / | +| Tab | " | , | . | P | Y | F | G | C | R | L | Bkps | |------+------+------+------+------+-------------+------+------+------+------+------| | Esc | A | O | E | U | I | D | H | T | N | S | - | |------+------+------+------+------+------|------+------+------+------+------+------| | Shift| ; | Q | J | K | X | B | M | W | V | Z |Enter | |------+------+------+------+------+------+------+------+------+------+------+------| -| Brite| Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | +| ` | Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | `-----------------------------------------------------------------------------------' ``` @@ -36,13 +46,13 @@ Notable differences from the default are: ,-----------------------------------------------------------------------------------. | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp | |------+------+------+------+------+------+------+------+------+------+------+------| -| Tab | Q | W | E | R | T | Y | U | I | O | P | Del | +| Tab | Q | W | E | R | T | Y | U | I | O | P | Bksp | |------+------+------+------+------+-------------+------+------+------+------+------| | Esc | A | S | D | F | G | H | J | K | L | ; | " | |------+------+------+------+------+------|------+------+------+------+------+------| | Shift| Z | X | C | V | B | N | M | , | . | / |Enter | |------+------+------+------+------+------+------+------+------+------+------+------| -| Brite| Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | +| ` | Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | `-----------------------------------------------------------------------------------' ``` @@ -76,10 +86,28 @@ I haven't completely filled this layer, which leaves room for future mappings an |------+------+------+------+------+-------------+------+------+------+------+------| | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Del | |------+------+------+------+------+-------------+------+------+------+------+------| -| | | | | | | | _ | + | { | } | | | +| | | | | | | _ | ? | + | { | } | | | |------+------+------+------+------+------|------+------+------+------+------+------| -| | | | | | | | - | = | [ | ] | \ | +| | | | | | | - | / | = | [ | ] | \ | |------+------+------+------+------+------+------+------+------+------+------+------| | | | | | | | | Next | Vol- | Vol+ | Play | `-----------------------------------------------------------------------------------' ``` + +## Adjust (Lower + Raise) + +Utility layer. This is where I'd switch to Qwerty, or ~~fool around with~~ adjust the audio/music settings. + +``` +,-----------------------------------------------------------------------------------. +| F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | +|------+------+------+------+------+------+------+------+------+------+------+------| +| | Reset| | | | | | | | | | Del | +|------+------+------+------+------+-------------+------+------+------+------+------| +| | | |Aud on|AudOff|AGnorm|AGswap|Dvorak|Qwerty| | | | +|------+------+------+------+------+------|------+------+------+------+------+------| +| |Voice-|Voice+|Mus on|MusOff|MidiOn|MidOff| | | | | | +|------+------+------+------+------+------+------+------+------+------+------+------| +| | | | | | | | | | | | +`-----------------------------------------------------------------------------------' +``` From a3357d078ee80123040679a357f63e93ff24c4c6 Mon Sep 17 00:00:00 2001 From: Luke Silva Date: Sat, 28 Jan 2017 18:42:35 +1100 Subject: [PATCH 16/65] Add support for various tapping macros A macro key can now be easily set to act as a modifier on hold, and press a shifted key when tapped. Or to switch layers when held, and again press a shifted key when tapped. Various other helper defines have been created which send macros when the key is pressed, released and tapped, cleaning up the action_get_macro function inside keymap definitions. The layer switching macros require a GCC extension - 'compound statements enclosed within parentheses'. The use of this extension is already present within the macro subsystem of this project, so its use in this commit should not cause any additional issues. MACRO_NONE had to be cast to a (macro_t*) to suppress compiler warnings within some tapping macros. --- quantum/quantum_keycodes.h | 1 + tmk_core/common/action_macro.h | 26 ++++++++++++++++++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h index 4566395fd..e0d469561 100644 --- a/quantum/quantum_keycodes.h +++ b/quantum/quantum_keycodes.h @@ -249,6 +249,7 @@ enum quantum_keycodes { #define MACROTAP(kc) (kc | QK_MACRO | FUNC_TAP<<8) #define MACRODOWN(...) (record->event.pressed ? MACRO(__VA_ARGS__) : MACRO_NONE) + // L-ayer, T-ap - 256 keycode max, 16 layer max #define LT(layer, kc) (kc | QK_LAYER_TAP | ((layer & 0xF) << 8)) diff --git a/tmk_core/common/action_macro.h b/tmk_core/common/action_macro.h index aedc32ec6..f373f5068 100644 --- a/tmk_core/common/action_macro.h +++ b/tmk_core/common/action_macro.h @@ -20,11 +20,33 @@ along with this program. If not, see . #include "progmem.h" -#define MACRO_NONE 0 + +typedef uint8_t macro_t; + +#define MACRO_NONE (macro_t*)0 #define MACRO(...) ({ static const macro_t __m[] PROGMEM = { __VA_ARGS__ }; &__m[0]; }) #define MACRO_GET(p) pgm_read_byte(p) -typedef uint8_t macro_t; +// Sends press when the macro key is pressed, release when release, or tap_macro when the key has been tapped +#define MACRO_TAP_HOLD(record, press, release, tap_macro) ( ((record)->event.pressed) ? \ + ( ((record)->tap.count <= 0 || (record)->tap.interrupted) ? (press) : MACRO_NONE ) : \ + ( ((record)->tap.count > 0 && !((record)->tap.interrupted)) ? (tap_macro) : (release) ) ) + +// Holds down the modifier mod when the macro key is held, or sends macro instead when tapped +#define MACRO_TAP_HOLD_MOD(record, macro, mod) MACRO_TAP_HOLD(record, (MACRO(D(mod), END)), MACRO(U(mod), END), macro) + +// Holds down the modifier mod when the macro key is held, or pressed a shifted key when tapped (eg: shift+3 for #) +#define MACRO_TAP_SHFT_KEY_HOLD_MOD(record, key, mod) MACRO_TAP_HOLD_MOD(record, (MACRO(I(10), D(LSFT), T(key), U(LSFT), END)), mod) + + +// Momentary switch layer when held, sends macro if tapped +#define MACRO_TAP_HOLD_LAYER(record, macro, layer) ( ((record)->event.pressed) ? \ + ( ((record)->tap.count <= 0 || (record)->tap.interrupted) ? ({layer_on((layer)); MACRO_NONE; }) : MACRO_NONE ) : \ + ( ((record)->tap.count > 0 && !((record)->tap.interrupted)) ? (macro) : ({layer_off((layer)); MACRO_NONE; }) ) ) + +// Momentary switch layer when held, presses a shifted key when tapped (eg: shift+3 for #) +#define MACRO_TAP_SHFT_KEY_HOLD_LAYER(record, key, layer) MACRO_TAP_HOLD_LAYER(record, MACRO(I(10), D(LSFT), T(key), U(LSFT), END), layer) + #ifndef NO_ACTION_MACRO From 77e54e34e129a03e58c128171a7188978ec908b4 Mon Sep 17 00:00:00 2001 From: Luke Silva Date: Sat, 28 Jan 2017 18:43:41 +1100 Subject: [PATCH 17/65] Add luke keymap, as an example of the tapping macros --- keyboards/planck/keymaps/luke/Makefile | 25 ++ keyboards/planck/keymaps/luke/keymap.c | 355 ++++++++++++++++++++++++ keyboards/planck/keymaps/luke/readme.md | 2 + 3 files changed, 382 insertions(+) create mode 100644 keyboards/planck/keymaps/luke/Makefile create mode 100644 keyboards/planck/keymaps/luke/keymap.c create mode 100644 keyboards/planck/keymaps/luke/readme.md diff --git a/keyboards/planck/keymaps/luke/Makefile b/keyboards/planck/keymaps/luke/Makefile new file mode 100644 index 000000000..847686873 --- /dev/null +++ b/keyboards/planck/keymaps/luke/Makefile @@ -0,0 +1,25 @@ + + +# Build Options +# change to "no" to disable the options, or define them in the Makefile in +# the appropriate keymap folder that will get included automatically +# +BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) +MOUSEKEY_ENABLE = yes # Mouse keys(+4700) +EXTRAKEY_ENABLE = yes # Audio control and System control(+450) +CONSOLE_ENABLE = no # Console for debug(+400) +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality +MIDI_ENABLE = no # MIDI controls +AUDIO_ENABLE = no # Audio output on port C6 +UNICODE_ENABLE = yes # Unicode +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. + +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend + +ifndef QUANTUM_DIR + include ../../../../Makefile +endif diff --git a/keyboards/planck/keymaps/luke/keymap.c b/keyboards/planck/keymaps/luke/keymap.c new file mode 100644 index 000000000..26dcb451b --- /dev/null +++ b/keyboards/planck/keymaps/luke/keymap.c @@ -0,0 +1,355 @@ +/* + * A keyboard layout for the gridded planck. + * + * Copyright (C) 2017 Luke Silva + * + * 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, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * ,-----------------------------------------------------------------------------------. + * | | | | | | | | | | | | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | | + * `-----------------------------------------------------------------------------------' + * + * This layout uses colemak by default, and is designed for programming, with easy access to symbols + * through either double purpose modifiers or colemak style rolling for commonly used symbol clusters + * Eg: compare colemak 'this' to '(){\n}' on the symbol layer. + * + * The layout also supports a range of multilingual characters, covering those + * needed for French, German, Swedish and likely some other European Languages. + * In the future full support for Colemak's multilingual deadkeys may be introduced. + * + * The multilingual characters are inputted through QMK's unicode engine, using + * the Linux input method by default, however this can be changed at runtime. + * + */ + + +#include "planck.h" + +#define _______ KC_TRNS +#define XXXXXXX KC_NO + + +// Layers +#define _COLEMAK 0 +#define _QWERTY 1 +#define _SYM 2 +#define _NUM 3 +#define _GR 4 +#define _GR_S 5 +#define _ADJ 6 +#define _NAV 7 +#define _PLOVER 8 + +// Macro ID numbers +#define M_ALT_HASH 1 +#define M_GR_DASH 2 +#define M_SYM_LPRN 3 +#define M_NAV_UNDS 4 +#define M_NUM_RPRN 5 +#define M_CTRL_DLR 6 +#define M_LCBR_ENT 7 +#define M_PLOVER 8 +#define M_EXT_PLV 9 +#define M_WINDOWS 10 +#define M_LINUX 11 +#define M_OSX 12 +#define M_FUNCTION 13 +#define M_THEN 14 +#define M_CATCH 15 + +// Macro keys +#define ALT_HASH MACROTAP(M_ALT_HASH) // tap for #, hold for Alt +#define GR_DASH MACROTAP(M_GR_DASH) // tap for -, hold for GR layer a-class-name +#define SYM_LPRN MACROTAP(M_SYM_LPRN) // tap for (, hold for symbols layer if() +#define NAV_UNDS MACROTAP(M_NAV_UNDS) // tap for _, hold for navigation layer snake_case_variable +#define NUM_RPRN MACROTAP(M_NUM_RPRN) // tap for ), hold for numbers layer else if() +#define CTRL_DLR MACROTAP(M_CTRL_DLR) // tap for $, hold for ctrl $php_is_really_weird +#define LCBR_ENT M(M_LCBR_ENT) // {\n easier code formatting +#define PLOVER M(M_PLOVER) // PHROPB (plover) or ERFVIK(qwerty) starts plover +#define EXT_PLV M(M_EXT_PLV) // PHRO*F (plover) or ERFVYU(qwerty) stops plover +#define WINDOWS M(M_WINDOWS) // Sets Unicode handler to windows +#define LINUX M(M_LINUX) // Sets Unicode handler to linux +#define OSX M(M_OSX) // Sets Unicode handler to OSX +#define FUNCTION M(M_FUNCTION) +#define THEN M(M_THEN) +#define CATCH M(M_CATCH) + + +// Renames of QMK keys... (would have otherwise been a macro) +#define QWERTY DF(_QWERTY) +#define COLEMAK DF(_COLEMAK) + + + + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +/* Colemak + * ,-----------------------------------------------------------------------------------. + * | Tab | Q | W | F | P | G | J | L | U | Y | ;: | Bksp | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | Bksp | A | R | S | T | D | H | N | E | I | O | '" | + * |------+------+------+------+------+------+------+------+------+------+------+------`---. + * |Shift=| Z | X | C | V | B | K | M | ,< | .> | /? |Shift/Ent | + * |------+------+------+------+------+------+------+------+------+------+------+----------| + * |CtCaps|GUIF4 | Alt# | Gr- | Sym( | Nav_ |Space | Num) |Ctrl$ | F11 | F12 |Nav toggle| + * `---------------------------------------------------------------------------------------' + */ + +[_COLEMAK] = { + {KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC}, + {KC_BSPC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT}, + {SFT_T(KC_EQL), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, SFT_T(KC_ENT) }, + {CTL_T(KC_CAPS), KC_LGUI, ALT_HASH, GR_DASH, SYM_LPRN, NAV_UNDS, KC_SPC, NUM_RPRN, CTRL_DLR, KC_F11, KC_F12, TG(_NAV)} +}, + + + +/* QWERTY + * ,-----------------------------------------------------------------------------------. + * | Tab | Q | W | E | R | T | Y | U | I | O | P | Bksp | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | Bksp | A | S | D | F | G | H | J | K | L | ;: | '" | + * |------+------+------+------+------+------+------+------+------+------+------+------`---. + * |Shift=| Z | X | C | V | B | N | M | ,< | .> | /? |Shift/Ent | + * |------+------+------+------+------+------+------+------+------+------+------+----------| + * |CtCaps|GUIF4 | Alt# | Gr- | Sym( | Nav_ |Space | Num) |Ctrl$ | F11 | F12 |Nav toggle| + * `---------------------------------------------------------------------------------------' + */ + +[_QWERTY] = { + {KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC}, + {KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT}, + {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, SFT_T(KC_ENT) }, + {CTL_T(KC_CAPS), KC_LGUI, KC_LALT, GR_DASH, SYM_LPRN,KC_SPC, KC_SPC, NUM_RPRN, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT} +}, + + +/* Symbols + * ,-----------------------------------------------------------------------------------. + * | Tab | ` | @ | / | * | ^ | % | : | + | - | Del | Bksp | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | [ | ; | } | ( | " | ' | ) | {\n | ! | ] | \ | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * |Shift | . | { | < | > | ~ | X2 | = | & | | | ? |Enter | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | Sym | _ |Space | NUM | X2 | | | | + * `-----------------------------------------------------------------------------------' + */ + +[_SYM] = { + {KC_TAB, KC_GRV, KC_AT, KC_SLSH, KC_ASTR, KC_CIRC, KC_PERC, KC_COLN, KC_PLUS, KC_MINS, KC_DEL, KC_BSPC}, + {FUNCTION,KC_LBRC, KC_SCLN, KC_RCBR, KC_LPRN, KC_DQT, KC_QUOT, KC_RPRN, LCBR_ENT,KC_EXLM, KC_RBRC, KC_BSLS}, + {KC_LSFT, KC_DOT, KC_LCBR, KC_LABK, KC_RABK, KC_TILD, _______, KC_EQL, KC_AMPR, KC_PIPE, KC_QUES, KC_ENT }, + {THEN, CATCH, XXXXXXX, XXXXXXX, _______, _______, _______, _______, _______, XXXXXXX, XXXXXXX, _______} +}, + + +/* Numbers + * ,-----------------------------------------------------------------------------------. + * | Tab | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | Bksp | x | D | E | F | + | - | 4 | 5 | 6 | 0 |Enter | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * |Shift | ( | A | B | C | * | / | 1 | 2 | 3 | ) |Enter | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | GR | SYM | _ |Space | NUM | 0 | . | f | | + * `-----------------------------------------------------------------------------------' + */ + +[_NUM] = { + {KC_TAB, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC}, + {KC_BSPC, KC_X, S(KC_D), S(KC_E), S(KC_F), KC_PLUS, KC_MINS, KC_4, KC_5, KC_6, KC_0, KC_ENT }, + {KC_LSFT, KC_LPRN, S(KC_A), S(KC_B), S(KC_C), KC_ASTR, KC_SLSH, KC_1, KC_2, KC_3, KC_RPRN, KC_ENT }, + {_______, _______, _______, _______, _______, _______, _______, _______, KC_0, KC_DOT, KC_F, _______} +}, + + +/* Gr layer / international keys + * ,-----------------------------------------------------------------------------------. + * | | ä | Ã¥ | | ¢£ | €¥ | | ë | ê | ü | ù | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | â | à | ß | | | | è | é | ï | ö | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | æ | ô | ç | Å“ | | | û | « | » | î | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | | + * `-----------------------------------------------------------------------------------' + */ + +[_GR] = { + {_______, UC(0xE4),UC(0xE5), _______,UC(0xA2), UC(0x20AC),_______,UC(0xEB),UC(0xEA),UC(0xFC),UC(0xF9), _______}, + {_______, UC(0xE2),UC(0xE0),UC(0xDF), _______, _______, _______,UC(0xE8),UC(0xE9),UC(0xEF),UC(0xF6), _______}, + {MO(_GR_S),UC(0xE6),UC(0xF4),UC(0xE7),UC(0x153),_______, _______,UC(0xFB),UC(0xAB),UC(0xBB),UC(0xEE), MO(_GR_S)}, + {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______} +}, + +// Shifted layer of the above +[_GR_S] = { + {_______, UC(0xC4),UC(0xC5), _______, UC(0xA3), UC(0xA5),_______, UC(0xCB),UC(0xCA),UC(0xDC),UC(0xD9),_______}, + {_______, UC(0xC2),UC(0xC0), UC(0xDF),_______, _______, _______, UC(0xC8),UC(0xC9),UC(0xCF),UC(0xD6),_______}, + {MO(_GR_S),UC(0xC6),UC(0xD4), UC(0xC7),UC(0x152),_______, _______, UC(0xDB),UC(0xAB),UC(0xBB),UC(0xCE),MO(_GR_S)}, + {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______} +}, + + +/* Adjust Layer (Gr + Num) + * ,-----------------------------------------------------------------------------------. + * | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | + * |------+-------------+------+------+------+------+------+------+------+------+------| + * | | |Prntscr| ESC |VOLUP | PLAY | PREV |QWERTY|COLEMAK|PLOVER| | | + * |------+-------------+------+------+------+------+------+------+------+------+------| + * | | |BACKLIT| INS |VOLDWN| MUTE | NEXT | WIND |LINUX | OSX | | | + * |------+-------------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | | + * `-----------------------------------------------------------------------------------' + */ + +[_ADJ] = { + {KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12 }, + {XXXXXXX, XXXXXXX, KC_PSCR, KC_ESC, KC_VOLU, KC_MPLY, KC_MPRV, QWERTY, COLEMAK, PLOVER, XXXXXXX, XXXXXXX}, + {XXXXXXX, XXXXXXX, BL_STEP, KC_INS, KC_VOLD, KC_MUTE, KC_MNXT, WINDOWS, LINUX, OSX, XXXXXXX, XXXXXXX}, + {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______} +}, + + +/* Navigation + * ,-----------------------------------------------------------------------------------. + * | | | BTN3 | BTN2 | BTN1 | | ACL0 | HOME | PGDN | PGUP | END | Bksp | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | |MSLEFT| MSDN | MSUP |MSRGHT| | ACL1 | LEFT | DOWN | UP | RGHT |Enter | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | |WHLEFT| WHDN | WHUP |WHRGHT| | ACL2 |C-LEFT|C-PGDN|C-PGUP|C-RGHT|Enter | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | _ |Space | ACL0 | ACL1 | ACL2 | |TGLNAV| + * `-----------------------------------------------------------------------------------' + */ + +[_NAV] = { + {XXXXXXX, XXXXXXX, KC_BTN3, KC_BTN2, KC_BTN1, XXXXXXX, KC_ACL0, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_BSPC}, + {XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, XXXXXXX, KC_ACL1, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT,KC_ENT }, + {XXXXXXX, KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R, XXXXXXX, KC_ACL2, LCTL(KC_LEFT), LCTL(KC_PGDN), LCTL(KC_PGUP), LCTL(KC_RIGHT), KC_ENT }, + {_______, _______, _______, _______, _______, _______, _______, KC_ACL0, KC_ACL1, KC_ACL2, _______, _______} +}, + +/* Plover Layer + * ,-----------------------------------------------------------------------------------. + * | | S | T | P | H | * | * | F | P | L | T | D | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * |TogOut| S | K | W | R | * | * | R | B | G | S | Z | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | # | # | # | # | # | # | # | # | # | # | # | # | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | Exit | | | # | A | O | E | U | | | | | + * `-----------------------------------------------------------------------------------' + */ + +[_PLOVER] = { + {XXXXXXX, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC}, + {XXXXXXX, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT}, + {KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1 }, + {EXT_PLV, XXXXXXX, XXXXXXX, KC_1, KC_C, KC_V, KC_N, KC_M, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX} +} + + +}; + +const uint16_t PROGMEM fn_actions[] = { +}; + + +void matrix_init_user(){ + set_unicode_input_mode(UC_LNX); +} + + +const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) +{ + switch(id) { + case M_ALT_HASH: + return MACRO_TAP_SHFT_KEY_HOLD_MOD(record, 3, LALT); + case M_GR_DASH: + { + const macro_t* macro = MACRO_TAP_HOLD_LAYER(record, MACRO(T(MINS)), _GR); + update_tri_layer(_NUM, _GR, _ADJ); + return macro; + } + case M_SYM_LPRN: + return MACRO_TAP_SHFT_KEY_HOLD_LAYER(record, 9, _SYM); + case M_NAV_UNDS: + return MACRO_TAP_SHFT_KEY_HOLD_LAYER(record, MINS, _NAV); + case M_NUM_RPRN: + { + const macro_t* macro = MACRO_TAP_SHFT_KEY_HOLD_LAYER(record, 0, _NUM); + update_tri_layer(_NUM, _GR, _ADJ); + return macro; + } + case M_CTRL_DLR: + return MACRO_TAP_SHFT_KEY_HOLD_MOD(record, 4, LCTL); + case M_LCBR_ENT: + return MACRODOWN(I(10), D(LSFT), T(LBRC), U(LSFT), T(ENT), END); + case M_PLOVER: + if (record->event.pressed) { + layer_and(0); + layer_on(_PLOVER); + default_layer_set(_PLOVER); + + // Starts plover + return MACRO(I(10), D(E), D(R), D(F), D(V), D(I), D(K), U(E), U(R), U(F), U(V), U(I), U(K), END); + } + break; + case M_EXT_PLV: + if (!record->event.pressed) { + layer_off(_PLOVER); + default_layer_set(_COLEMAK); + + //Pauses plover + return MACRO(I(10), D(E), D(R), D(F), D(V), D(Y), D(U), U(E), U(R), U(F), U(V), U(Y), U(U), END); + } + break; + case M_WINDOWS: + set_unicode_input_mode(UC_WIN); + break; + case M_LINUX: + set_unicode_input_mode(UC_LNX); + break; + case M_OSX: + set_unicode_input_mode(UC_OSX); + break; + case M_FUNCTION: + if (record->event.pressed) { + SEND_STRING("function"); + } + break; + case M_THEN: + if (record->event.pressed) { + SEND_STRING("then"); + } + break; + case M_CATCH: + if (record->event.pressed) { + SEND_STRING("catch"); + } + break; + } + return MACRO_NONE; +}; diff --git a/keyboards/planck/keymaps/luke/readme.md b/keyboards/planck/keymaps/luke/readme.md new file mode 100644 index 000000000..3a4824b5b --- /dev/null +++ b/keyboards/planck/keymaps/luke/readme.md @@ -0,0 +1,2 @@ +# A more basic Planck Layout for copying + From 1d9e0b0120d0467b6f7ff146911f01b7c701fb93 Mon Sep 17 00:00:00 2001 From: Stephen Tudor Date: Sat, 28 Jan 2017 20:54:34 -0500 Subject: [PATCH 18/65] s/Bkps/Bksp --- keyboards/preonic/keymaps/smt/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/preonic/keymaps/smt/readme.md b/keyboards/preonic/keymaps/smt/readme.md index 393d9d3e3..016da7b01 100644 --- a/keyboards/preonic/keymaps/smt/readme.md +++ b/keyboards/preonic/keymaps/smt/readme.md @@ -30,7 +30,7 @@ Notable differences from the default are: ,-----------------------------------------------------------------------------------. | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp | |------+------+------+------+------+------+------+------+------+------+------+------| -| Tab | " | , | . | P | Y | F | G | C | R | L | Bkps | +| Tab | " | , | . | P | Y | F | G | C | R | L | Bksp | |------+------+------+------+------+-------------+------+------+------+------+------| | Esc | A | O | E | U | I | D | H | T | N | S | - | |------+------+------+------+------+------|------+------+------+------+------+------| From 4eafa8656468a444f1371ceca7baa5db7f239e55 Mon Sep 17 00:00:00 2001 From: Yale Thomas Date: Tue, 23 Aug 2016 14:43:21 -0700 Subject: [PATCH 19/65] new 'yale' keymap --- keyboards/planck/keymaps/yale/Makefile | 25 +++++++ keyboards/planck/keymaps/yale/config.h | 11 +++ keyboards/planck/keymaps/yale/keymap.c | 94 ++++++++++++++++++++++++++ 3 files changed, 130 insertions(+) create mode 100644 keyboards/planck/keymaps/yale/Makefile create mode 100644 keyboards/planck/keymaps/yale/config.h create mode 100644 keyboards/planck/keymaps/yale/keymap.c diff --git a/keyboards/planck/keymaps/yale/Makefile b/keyboards/planck/keymaps/yale/Makefile new file mode 100644 index 000000000..581e08cd0 --- /dev/null +++ b/keyboards/planck/keymaps/yale/Makefile @@ -0,0 +1,25 @@ + + +# Build Options +# change to "no" to disable the options, or define them in the Makefile in +# the appropriate keymap folder that will get included automatically +# +BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) +MOUSEKEY_ENABLE = yes # Mouse keys(+4700) +EXTRAKEY_ENABLE = yes # Audio control and System control(+450) +CONSOLE_ENABLE = no # Console for debug(+400) +COMMAND_ENABLE = yes # Commands for debug and configuration +NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality +MIDI_ENABLE = no # MIDI controls +AUDIO_ENABLE = yes # Audio output on port C6 +UNICODE_ENABLE = no # Unicode +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. + +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend + +ifndef QUANTUM_DIR + include ../../../../Makefile +endif \ No newline at end of file diff --git a/keyboards/planck/keymaps/yale/config.h b/keyboards/planck/keymaps/yale/config.h new file mode 100644 index 000000000..8a916bbd0 --- /dev/null +++ b/keyboards/planck/keymaps/yale/config.h @@ -0,0 +1,11 @@ +#ifndef CONFIG_USER_H +#define CONFIG_USER_H + +#include "../../config.h" + +#define PREVENT_STUCK_MODIFIERS + +#endif + + + diff --git a/keyboards/planck/keymaps/yale/keymap.c b/keyboards/planck/keymaps/yale/keymap.c new file mode 100644 index 000000000..24f5025d0 --- /dev/null +++ b/keyboards/planck/keymaps/yale/keymap.c @@ -0,0 +1,94 @@ +// This is the canonical layout file for the Quantum project. If you want to add another keyboard, +// this is the style you want to emulate. +// +//Dropped the Dvorak layer and added two my layer buttons. Both Raise and lower can be accessed from either side now. + +#include "planck.h" +#ifdef BACKLIGHT_ENABLE + #include "backlight.h" +#endif + +// Each layer gets a name for readability, which is then used in the keymap matrix below. +// The underscores don't mean anything - you can have a layer called STUFF or any other name. +// Layer names don't all need to be of the same length, obviously, and you can also skip them +// entirely and just use numbers. +#define _QW 0 +#define _NM 1 +#define _FN 2 + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +/* Qwerty + * ,-----------------------------------------------------------------------------------. + * | Esc | Q | W | E | R | T | Y | U | I | O | P | Bksp | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * |Ctrl/Tab| A | S | D | F | G | H | J | K | L | ; | " | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | Shift| Z | X | C | V | B | N | M | , | . | / |Shift | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | Ctrl | Alt | GUI | GUI | Num | Space | FN | GUI | Alt | Ctrl | Enter| + * `-----------------------------------------------------------------------------------' + */ +[_QW] = { + {KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC}, + {CTL_T(KC_TAB), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT}, + {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT}, + {KC_LCTL, KC_LALT, KC_LGUI, KC_LGUI, MO(_NM), KC_SPC, KC_SPC, MO(_FN), KC_RGUI, KC_RALT, KC_RCTL, KC_ENT} +}, +/* Number + * ,-----------------------------------------------------------------------------------. + * | ___ | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | ____ | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | Ctrl | ` | [ | { | ( | / | \ | ) | } | ] | - | = | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | ____ | ! | @ | # | $ | % | ^ | & | * | _ | + | ____ | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | ____ | ___ | ___ | ___ | XXXX | ______ | ____ | ____ | ____ | __ | ____ | + * `-----------------------------------------------------------------------------------' + */ +[_NM] = { + {KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS}, + {KC_LCTL, KC_GRV, KC_LBRC, KC_LCBR, KC_LPRN, KC_SLSH, KC_BSLS, KC_RPRN, KC_RCBR, KC_RBRC, KC_MINS, KC_EQL}, + {KC_TRNS, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_UNDS, KC_PLUS, KC_TRNS}, + {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS} +}, +/* Function + * ,-----------------------------------------------------------------------------------. + * | ____ | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | ____ | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | ____ |Shift | Ctrl | Alt | GUI | ____ | Left | Down | Up |Right | Del | ____ | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | ____ | ____ | ____ | Vol- | Prev | Play | Mute | Next | Vol+ | ____ | ____ | ____ | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | ____ | ____ | ____ | ____ | ____ | _____ | XXXX | ____ | ____ | ____ | ____ | + * `-----------------------------------------------------------------------------------' + */ +[_FN] = { + {KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS}, + {KC_TRNS, KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_DEL, KC_TRNS}, + {KC_TRNS, M(0), KC_TRNS, KC_VOLD, KC_MPRV, KC_MPLY, KC_MUTE, KC_MNXT, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS}, + {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS} +} +}; + +const uint16_t PROGMEM fn_actions[] = { + +}; + +const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) +{ + // MACRODOWN only works in this function + switch(id) { + case 0: + if (record->event.pressed) { + register_code(KC_RSFT); + #ifdef BACKLIGHT_ENABLE + backlight_step(); + #endif + } else { + unregister_code(KC_RSFT); + } + break; + } + return MACRO_NONE; +}; From d549002d229b9ed626aae9ed9560a07e764debf0 Mon Sep 17 00:00:00 2001 From: Yale Thomas Date: Wed, 28 Sep 2016 18:29:54 -0700 Subject: [PATCH 20/65] mouse keys added --- keyboards/planck/keymaps/yale/keymap.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/keyboards/planck/keymaps/yale/keymap.c b/keyboards/planck/keymaps/yale/keymap.c index 24f5025d0..7bb27f62a 100644 --- a/keyboards/planck/keymaps/yale/keymap.c +++ b/keyboards/planck/keymaps/yale/keymap.c @@ -15,10 +15,11 @@ #define _QW 0 #define _NM 1 #define _FN 2 +#define _SU 3 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -/* Qwerty +/* QW * ,-----------------------------------------------------------------------------------. * | Esc | Q | W | E | R | T | Y | U | I | O | P | Bksp | * |------+------+------+------+------+-------------+------+------+------+------+------| @@ -35,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT}, {KC_LCTL, KC_LALT, KC_LGUI, KC_LGUI, MO(_NM), KC_SPC, KC_SPC, MO(_FN), KC_RGUI, KC_RALT, KC_RCTL, KC_ENT} }, -/* Number +/* NM * ,-----------------------------------------------------------------------------------. * | ___ | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | ____ | * |------+------+------+------+------+-------------+------+------+------+------+------| @@ -50,9 +51,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { {KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS}, {KC_LCTL, KC_GRV, KC_LBRC, KC_LCBR, KC_LPRN, KC_SLSH, KC_BSLS, KC_RPRN, KC_RCBR, KC_RBRC, KC_MINS, KC_EQL}, {KC_TRNS, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_UNDS, KC_PLUS, KC_TRNS}, - {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS} + {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(_SU), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS} }, -/* Function +/* FN * ,-----------------------------------------------------------------------------------. * | ____ | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | ____ | * |------+------+------+------+------+-------------+------+------+------+------+------| @@ -67,8 +68,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { {KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS}, {KC_TRNS, KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_DEL, KC_TRNS}, {KC_TRNS, M(0), KC_TRNS, KC_VOLD, KC_MPRV, KC_MPLY, KC_MUTE, KC_MNXT, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS}, - {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS} -} + {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(_SU), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS} +}, + +[_SU] = { + {KC_MS_ACCEL2, KC_FN1, KC_FN2, KC_FN3, KC_FN4, KC_NO, KC_NO, KC_WH_D, KC_WH_U, KC_NO, KC_NO, KC_NO}, + {KC_MS_ACCEL1, KC_MS_BTN4, KC_MS_BTN3, KC_MS_BTN2, KC_MS_BTN1, KC_NO, KC_MS_LEFT, KC_MS_DOWN, KC_MS_UP, KC_MS_RIGHT, KC_NO, KC_NO}, + {KC_MS_ACCEL0, KC_FN9, KC_FN10, KC_FN11, KC_FN12, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO}, + {KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO} +}, + }; const uint16_t PROGMEM fn_actions[] = { From ad0ce40db07f6c2bfdcd560d983d25d8cd14fa11 Mon Sep 17 00:00:00 2001 From: Yale Thomas Date: Sat, 28 Jan 2017 18:35:06 -0800 Subject: [PATCH 21/65] usability tweaks --- keyboards/planck/keymaps/yale/keymap.c | 93 ++++++++++++++------------ 1 file changed, 49 insertions(+), 44 deletions(-) diff --git a/keyboards/planck/keymaps/yale/keymap.c b/keyboards/planck/keymaps/yale/keymap.c index 7bb27f62a..a0910860a 100644 --- a/keyboards/planck/keymaps/yale/keymap.c +++ b/keyboards/planck/keymaps/yale/keymap.c @@ -1,25 +1,28 @@ // This is the canonical layout file for the Quantum project. If you want to add another keyboard, // this is the style you want to emulate. // -//Dropped the Dvorak layer and added two my layer buttons. Both Raise and lower can be accessed from either side now. #include "planck.h" #ifdef BACKLIGHT_ENABLE - #include "backlight.h" + #include "backlight.h" #endif // Each layer gets a name for readability, which is then used in the keymap matrix below. // The underscores don't mean anything - you can have a layer called STUFF or any other name. // Layer names don't all need to be of the same length, obviously, and you can also skip them // entirely and just use numbers. -#define _QW 0 -#define _NM 1 -#define _FN 2 -#define _SU 3 +#define _QWERTY 0 +#define _NUM 5 +#define _FUNC 6 +#define _NAV 7 + +// Fillers to make layering more clear +#define _______ KC_TRNS +#define XXXXXXX KC_NO const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -/* QW +/* _QWERTY * ,-----------------------------------------------------------------------------------. * | Esc | Q | W | E | R | T | Y | U | I | O | P | Bksp | * |------+------+------+------+------+-------------+------+------+------+------+------| @@ -30,13 +33,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | Ctrl | Alt | GUI | GUI | Num | Space | FN | GUI | Alt | Ctrl | Enter| * `-----------------------------------------------------------------------------------' */ -[_QW] = { - {KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC}, - {CTL_T(KC_TAB), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT}, - {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT}, - {KC_LCTL, KC_LALT, KC_LGUI, KC_LGUI, MO(_NM), KC_SPC, KC_SPC, MO(_FN), KC_RGUI, KC_RALT, KC_RCTL, KC_ENT} +[_QWERTY] = { + {KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC}, + {CTL_T(KC_TAB), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT}, + {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT}, + {KC_LCTL, KC_LALT, KC_LGUI, KC_LGUI, MO(_NUM), KC_SPC, KC_SPC, MO(_FUNC), KC_RGUI, KC_RALT, KC_RCTL, KC_ENT} }, -/* NM + +/* _NUM * ,-----------------------------------------------------------------------------------. * | ___ | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | ____ | * |------+------+------+------+------+-------------+------+------+------+------+------| @@ -47,35 +51,36 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | ____ | ___ | ___ | ___ | XXXX | ______ | ____ | ____ | ____ | __ | ____ | * `-----------------------------------------------------------------------------------' */ -[_NM] = { - {KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS}, - {KC_LCTL, KC_GRV, KC_LBRC, KC_LCBR, KC_LPRN, KC_SLSH, KC_BSLS, KC_RPRN, KC_RCBR, KC_RBRC, KC_MINS, KC_EQL}, - {KC_TRNS, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_UNDS, KC_PLUS, KC_TRNS}, - {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(_SU), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS} +[_NUM] = { + {_______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______}, + {KC_LCTL, KC_GRV, KC_LBRC, KC_LCBR, KC_LPRN, KC_SLSH, KC_BSLS, KC_RPRN, KC_RCBR, KC_RBRC, KC_MINS, KC_EQL}, + {_______, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC KC_CIRC, KC_AMPR, KC_ASTR, KC_UNDS, KC_PLUS, _______}, + {_______, _______, _______, _______, _______, _______, _______, MO(_NAV), _______, _______, _______, _______} }, -/* FN + +/* _FUNC * ,-----------------------------------------------------------------------------------. * | ____ | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | ____ | * |------+------+------+------+------+-------------+------+------+------+------+------| * | ____ |Shift | Ctrl | Alt | GUI | ____ | Left | Down | Up |Right | Del | ____ | * |------+------+------+------+------+------|------+------+------+------+------+------| - * | ____ | ____ | ____ | Vol- | Prev | Play | Mute | Next | Vol+ | ____ | ____ | ____ | + * | ____ |Light | ____ | Vol- | Prev | Play | Mute | Next | Vol+ | ____ | ____ | ____ | * |------+------+------+------+------+------+------+------+------+------+------+------| * | ____ | ____ | ____ | ____ | ____ | _____ | XXXX | ____ | ____ | ____ | ____ | * `-----------------------------------------------------------------------------------' */ -[_FN] = { - {KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS}, - {KC_TRNS, KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_DEL, KC_TRNS}, - {KC_TRNS, M(0), KC_TRNS, KC_VOLD, KC_MPRV, KC_MPLY, KC_MUTE, KC_MNXT, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS}, - {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(_SU), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS} +[_FUNC] = { + {_______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______}, + {_______, KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_DEL, _______}, + {_______, M(0), _______, KC_VOLD, KC_MPRV, KC_MPLY, KC_MUTE, KC_MNXT, KC_VOLU, _______, _______, _______}, + {_______, _______, _______, _______, MO(_NAV), _______, _______, _______, _______, _______, _______, _______} }, -[_SU] = { - {KC_MS_ACCEL2, KC_FN1, KC_FN2, KC_FN3, KC_FN4, KC_NO, KC_NO, KC_WH_D, KC_WH_U, KC_NO, KC_NO, KC_NO}, - {KC_MS_ACCEL1, KC_MS_BTN4, KC_MS_BTN3, KC_MS_BTN2, KC_MS_BTN1, KC_NO, KC_MS_LEFT, KC_MS_DOWN, KC_MS_UP, KC_MS_RIGHT, KC_NO, KC_NO}, - {KC_MS_ACCEL0, KC_FN9, KC_FN10, KC_FN11, KC_FN12, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO}, - {KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO} +[_NAV] = { + {KC_MS_ACCEL2, KC_FN1, KC_FN2, KC_FN3, KC_FN4, XXXXXXX, XXXXXXX, KC_WH_D, KC_WH_U, XXXXXXX, XXXXXXX, XXXXXXX}, + {KC_MS_ACCEL1, KC_MS_BTN4, KC_MS_BTN3, KC_MS_BTN2, KC_MS_BTN1, XXXXXXX, KC_MS_LEFT, KC_MS_DOWN, KC_MS_UP, KC_MS_RIGHT, XXXXXXX, XXXXXXX}, + {KC_MS_ACCEL0, KC_FN9, KC_FN10, KC_FN11, KC_FN12, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX}, + {XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX} }, }; @@ -86,18 +91,18 @@ const uint16_t PROGMEM fn_actions[] = { const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { - // MACRODOWN only works in this function - switch(id) { - case 0: - if (record->event.pressed) { - register_code(KC_RSFT); - #ifdef BACKLIGHT_ENABLE - backlight_step(); - #endif - } else { - unregister_code(KC_RSFT); - } - break; - } - return MACRO_NONE; + // MACRODOWN only works in this function + switch(id) { + case 0: + if (record->event.pressed) { + register_code(KC_RSFT); + #ifdef BACKLIGHT_ENABLE + backlight_step(); + #endif + } else { + unregister_code(KC_RSFT); + } + break; + } + return MACRO_NONE; }; From 8df30c1c5689bad1331f4010eb80f2a7bd1a199a Mon Sep 17 00:00:00 2001 From: Yale Thomas Date: Sat, 28 Jan 2017 18:39:08 -0800 Subject: [PATCH 22/65] added picture of layout --- .../planck/keymaps/yale/yale_layout_picture.jpg | Bin 0 -> 58141 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 keyboards/planck/keymaps/yale/yale_layout_picture.jpg diff --git a/keyboards/planck/keymaps/yale/yale_layout_picture.jpg b/keyboards/planck/keymaps/yale/yale_layout_picture.jpg new file mode 100644 index 0000000000000000000000000000000000000000..ab9c6b4ebaaade1480447863e934b8c8fb500d03 GIT binary patch literal 58141 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 Date: Sun, 29 Jan 2017 12:06:24 -0500 Subject: [PATCH 23/65] registering a weak_mods when using register_code16 Scenario: Locking the KC_LSHIFT, and then using a tap dance key that registers a S(KC_9) will unregister the KC_LSHIFT. The tap dance or any keycode that is registered should not have the side effect of cancelling a locked moditifier. We should be using a similar logic as the TMK codes in tmk_core/comman/action.c:158. --- quantum/quantum.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/quantum/quantum.c b/quantum/quantum.c index 1767faed4..0aecd238e 100644 --- a/quantum/quantum.c +++ b/quantum/quantum.c @@ -33,22 +33,42 @@ static void do_code16 (uint16_t code, void (*f) (uint8_t)) { f(KC_RGUI); } +static inline void qk_register_weak_mods(uint8_t kc) { + add_weak_mods(MOD_BIT(kc)); + send_keyboard_report(); +} + +static inline void qk_unregister_weak_mods(uint8_t kc) { + del_weak_mods(MOD_BIT(kc)); + send_keyboard_report(); +} + static inline void qk_register_mods(uint8_t kc) { - register_mods(MOD_BIT(kc)); + add_weak_mods(MOD_BIT(kc)); + send_keyboard_report(); } static inline void qk_unregister_mods(uint8_t kc) { - unregister_mods(MOD_BIT(kc)); + del_weak_mods(MOD_BIT(kc)); + send_keyboard_report(); } void register_code16 (uint16_t code) { - do_code16 (code, qk_register_mods); + if (IS_MOD(code) || code == KC_NO) { + do_code16 (code, qk_register_mods); + } else { + do_code16 (code, qk_register_weak_mods); + } register_code (code); } void unregister_code16 (uint16_t code) { unregister_code (code); - do_code16 (code, qk_unregister_mods); + if (IS_MOD(code) || code == KC_NO) { + do_code16 (code, qk_unregister_mods); + } else { + do_code16 (code, qk_unregister_weak_mods); + } } __attribute__ ((weak)) From 45e0d09414c09c626d2349b6a5036a29fe03b1c6 Mon Sep 17 00:00:00 2001 From: SjB Date: Sun, 29 Jan 2017 12:56:20 -0500 Subject: [PATCH 24/65] moved oneshot cancellation code outside of process_record. The oneshot cancellation code do not depend on the action_tapping_process and since process_record get called via the action_tapping_process logic moved the oneshot cancellation code into the action_exec function just before the action_tapping_process call --- tmk_core/common/action.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tmk_core/common/action.c b/tmk_core/common/action.c index a77177240..f03670a7f 100644 --- a/tmk_core/common/action.c +++ b/tmk_core/common/action.c @@ -49,6 +49,13 @@ void action_exec(keyevent_t event) keyrecord_t record = { .event = event }; +#if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0)) + if (has_oneshot_layer_timed_out()) { + dprintf("Oneshot layer: timeout\n"); + clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED); + } +#endif + #ifndef NO_ACTION_TAPPING action_tapping_process(record); #else @@ -100,15 +107,8 @@ bool process_record_quantum(keyrecord_t *record) { return true; } -void process_record(keyrecord_t *record) +void process_record(keyrecord_t *record) { -#if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0)) - if (has_oneshot_layer_timed_out()) { - dprintf("Oneshot layer: timeout\n"); - clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED); - } -#endif - if (IS_NOEVENT(record->event)) { return; } if(!process_record_quantum(record)) From ef9e544a7eb8551748dcf96729fde8d66ac6cc57 Mon Sep 17 00:00:00 2001 From: TerryMathews Date: Sun, 29 Jan 2017 22:22:32 -0500 Subject: [PATCH 25/65] Let's Split: establish rev2fliphalf subproject Subproject to accomodate second half pad built in opposite orientation (places TRRS jacks on opposing edges for shorter cable runs) --- keyboards/lets_split/config.h | 3 + keyboards/lets_split/keymaps/i2c/config.h | 3 + keyboards/lets_split/keymaps/serial/config.h | 3 + keyboards/lets_split/lets_split.h | 3 + keyboards/lets_split/rev2fliphalf/Makefile | 3 + keyboards/lets_split/rev2fliphalf/config.h | 91 +++++++++++++++++++ .../lets_split/rev2fliphalf/rev2fliphalf.c | 32 +++++++ .../lets_split/rev2fliphalf/rev2fliphalf.h | 28 ++++++ keyboards/lets_split/rev2fliphalf/rules.mk | 5 + 9 files changed, 171 insertions(+) create mode 100644 keyboards/lets_split/rev2fliphalf/Makefile create mode 100644 keyboards/lets_split/rev2fliphalf/config.h create mode 100644 keyboards/lets_split/rev2fliphalf/rev2fliphalf.c create mode 100644 keyboards/lets_split/rev2fliphalf/rev2fliphalf.h create mode 100644 keyboards/lets_split/rev2fliphalf/rules.mk diff --git a/keyboards/lets_split/config.h b/keyboards/lets_split/config.h index 7df0c5752..008fb0978 100644 --- a/keyboards/lets_split/config.h +++ b/keyboards/lets_split/config.h @@ -26,4 +26,7 @@ along with this program. If not, see . #ifdef SUBPROJECT_rev2 #include "rev2/config.h" #endif +#ifdef SUBPROJECT_rev2fliphalf + #include "../../rev2fliphalf/config.h" +#endif #endif diff --git a/keyboards/lets_split/keymaps/i2c/config.h b/keyboards/lets_split/keymaps/i2c/config.h index efe8bb0f2..332c990fc 100644 --- a/keyboards/lets_split/keymaps/i2c/config.h +++ b/keyboards/lets_split/keymaps/i2c/config.h @@ -24,4 +24,7 @@ along with this program. If not, see . #endif #ifdef SUBPROJECT_rev2 #include "../../rev2/config.h" +#endif +#ifdef SUBPROJECT_rev2fliphalf + #include "../../rev2fliphalf/config.h" #endif \ No newline at end of file diff --git a/keyboards/lets_split/keymaps/serial/config.h b/keyboards/lets_split/keymaps/serial/config.h index cd766cc4f..0e59b191b 100644 --- a/keyboards/lets_split/keymaps/serial/config.h +++ b/keyboards/lets_split/keymaps/serial/config.h @@ -26,4 +26,7 @@ along with this program. If not, see . #endif #ifdef SUBPROJECT_rev2 #include "../../rev2/config.h" +#endif +#ifdef SUBPROJECT_rev2fliphalf + #include "../../rev2fliphalf/config.h" #endif \ No newline at end of file diff --git a/keyboards/lets_split/lets_split.h b/keyboards/lets_split/lets_split.h index 2cdfb061f..0de308c7a 100644 --- a/keyboards/lets_split/lets_split.h +++ b/keyboards/lets_split/lets_split.h @@ -7,6 +7,9 @@ #ifdef SUBPROJECT_rev2 #include "rev2.h" #endif +#ifdef SUBPROJECT_rev2fliphalf + #include "rev2fliphalf.h" +#endif #include "quantum.h" diff --git a/keyboards/lets_split/rev2fliphalf/Makefile b/keyboards/lets_split/rev2fliphalf/Makefile new file mode 100644 index 000000000..4e2a6f00f --- /dev/null +++ b/keyboards/lets_split/rev2fliphalf/Makefile @@ -0,0 +1,3 @@ +ifndef MAKEFILE_INCLUDED + include ../../Makefile +endif \ No newline at end of file diff --git a/keyboards/lets_split/rev2fliphalf/config.h b/keyboards/lets_split/rev2fliphalf/config.h new file mode 100644 index 000000000..1c45cf136 --- /dev/null +++ b/keyboards/lets_split/rev2fliphalf/config.h @@ -0,0 +1,91 @@ +/* +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 0x3060 +#define DEVICE_VER 0x0001 +#define MANUFACTURER Wootpatoot +#define PRODUCT Lets Split v2 +#define DESCRIPTION A split keyboard for the cheap makers + +/* key matrix size */ +// Rows are doubled-up +#define MATRIX_ROWS 8 +#define MATRIX_COLS 6 + +// wiring of each half +#define MATRIX_ROW_PINS { D7, E6, B4, B5 } +//#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 } +#define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6 } //uncomment this line and comment line above if you need to reverse left-to-right key order + +//#define CATERINA_BOOTLOADER + +/* COL2ROW or ROW2COL */ +#define DIODE_DIRECTION COL2ROW + +/* define if matrix has ghost */ +//#define MATRIX_HAS_GHOST + +/* number of backlight levels */ +// #define BACKLIGHT_LEVELS 3 + +/* 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)) \ +) + +/* ws2812 RGB LED */ +#define RGB_DI_PIN D3 +#define RGBLIGHT_TIMER +#define RGBLED_NUM 12 // Number of LEDs +#define ws2812_PORTREG PORTD +#define ws2812_DDRREG DDRD + +/* + * Feature disable options + * These options are also useful to firmware size reduction. + */ + +/* disable debug print */ +// #define NO_DEBUG + +/* disable print */ +// #define NO_PRINT + +/* disable action features */ +//#define NO_ACTION_LAYER +//#define NO_ACTION_TAPPING +//#define NO_ACTION_ONESHOT +//#define NO_ACTION_MACRO +//#define NO_ACTION_FUNCTION + + +#endif \ No newline at end of file diff --git a/keyboards/lets_split/rev2fliphalf/rev2fliphalf.c b/keyboards/lets_split/rev2fliphalf/rev2fliphalf.c new file mode 100644 index 000000000..c505d3a6e --- /dev/null +++ b/keyboards/lets_split/rev2fliphalf/rev2fliphalf.c @@ -0,0 +1,32 @@ +#include "lets_split.h" + +#ifdef AUDIO_ENABLE + float tone_startup[][2] = SONG(STARTUP_SOUND); + float tone_goodbye[][2] = SONG(GOODBYE_SOUND); +#endif + +void matrix_init_kb(void) { + + #ifdef AUDIO_ENABLE + _delay_ms(20); // gets rid of tick + PLAY_NOTE_ARRAY(tone_startup, false, 0); + #endif + + // // green led on + // DDRD |= (1<<5); + // PORTD &= ~(1<<5); + + // // orange led on + // DDRB |= (1<<0); + // PORTB &= ~(1<<0); + + matrix_init_user(); +}; + +void shutdown_user(void) { + #ifdef AUDIO_ENABLE + PLAY_NOTE_ARRAY(tone_goodbye, false, 0); + _delay_ms(150); + stop_all_notes(); + #endif +} diff --git a/keyboards/lets_split/rev2fliphalf/rev2fliphalf.h b/keyboards/lets_split/rev2fliphalf/rev2fliphalf.h new file mode 100644 index 000000000..993e149dd --- /dev/null +++ b/keyboards/lets_split/rev2fliphalf/rev2fliphalf.h @@ -0,0 +1,28 @@ +#ifndef REV2FLIPHALF_H +#define REV2FLIPHALF_H + +#include "../lets_split.h" + +//void promicro_bootloader_jmp(bool program); +#include "quantum.h" + +//void promicro_bootloader_jmp(bool program); + +#define KEYMAP( \ + k00, k01, k02, k03, k04, k05, k45, k44, k43, k42, k41, k40, \ + k10, k11, k12, k13, k14, k15, k55, k54, k53, k52, k51, k50, \ + k20, k21, k22, k23, k24, k25, k65, k64, k63, k62, k61, k60, \ + k30, k31, k32, k33, k34, k35, k75, k74, k73, k72, k71, k70 \ + ) \ + { \ + { k00, k01, k02, k03, k04, k05 }, \ + { k10, k11, k12, k13, k14, k15 }, \ + { k20, k21, k22, k23, k24, k25 }, \ + { k30, k31, k32, k33, k34, k35 }, \ + { k40, k41, k42, k43, k44, k45 }, \ + { k50, k51, k52, k53, k54, k55 }, \ + { k60, k61, k62, k63, k64, k65 }, \ + { k70, k71, k72, k73, k74, k75 } \ + } + +#endif \ No newline at end of file diff --git a/keyboards/lets_split/rev2fliphalf/rules.mk b/keyboards/lets_split/rev2fliphalf/rules.mk new file mode 100644 index 000000000..80a942d06 --- /dev/null +++ b/keyboards/lets_split/rev2fliphalf/rules.mk @@ -0,0 +1,5 @@ +BACKLIGHT_ENABLE = no + +ifndef QUANTUM_DIR + include ../../../Makefile +endif From f36fc1d2e534b23bfd9794dab85859f6a9fbeb18 Mon Sep 17 00:00:00 2001 From: upils Date: Tue, 31 Jan 2017 22:37:03 +0100 Subject: [PATCH 26/65] Add reddot handwired keyboard. --- keyboards/handwired/reddot/Makefile | 3 + keyboards/handwired/reddot/config.h | 162 ++++++++++++++++++ .../handwired/reddot/keymaps/default/keymap.c | 29 ++++ .../reddot/keymaps/default/readme.md | 1 + keyboards/handwired/reddot/readme.md | 24 +++ keyboards/handwired/reddot/reddot.c | 7 + keyboards/handwired/reddot/reddot.h | 20 +++ keyboards/handwired/reddot/rules.mk | 88 ++++++++++ 8 files changed, 334 insertions(+) create mode 100755 keyboards/handwired/reddot/Makefile create mode 100755 keyboards/handwired/reddot/config.h create mode 100755 keyboards/handwired/reddot/keymaps/default/keymap.c create mode 100755 keyboards/handwired/reddot/keymaps/default/readme.md create mode 100755 keyboards/handwired/reddot/readme.md create mode 100755 keyboards/handwired/reddot/reddot.c create mode 100755 keyboards/handwired/reddot/reddot.h create mode 100755 keyboards/handwired/reddot/rules.mk diff --git a/keyboards/handwired/reddot/Makefile b/keyboards/handwired/reddot/Makefile new file mode 100755 index 000000000..191c6bb66 --- /dev/null +++ b/keyboards/handwired/reddot/Makefile @@ -0,0 +1,3 @@ +ifndef MAKEFILE_INCLUDED + include ../../../Makefile +endif \ No newline at end of file diff --git a/keyboards/handwired/reddot/config.h b/keyboards/handwired/reddot/config.h new file mode 100755 index 000000000..15f114297 --- /dev/null +++ b/keyboards/handwired/reddot/config.h @@ -0,0 +1,162 @@ +/* +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 0x0001 +#define MANUFACTURER upils +#define PRODUCT reddot +#define DESCRIPTION A custom keyboard + +/* key matrix size */ +#define MATRIX_ROWS 5 +#define MATRIX_COLS 19 + +/* + * Keyboard Matrix Assignments + * + * Change this to how you wired your keyboard + * COLS: AVR pins used for columns, left to right + * ROWS: AVR pins used for rows, top to bottom + * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) + * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) + * +*/ +#define MATRIX_ROW_PINS { B0, B1, B2, B3, E6 } +#define MATRIX_COL_PINS { B7, D0, D1, D2, D3, C6, C7, D5, D4, D7, B4, B5, B6, F7, F6, F5, F4, F1, F0 } +#define UNUSED_PINS + + +/* COL2ROW or ROW2COL */ +#define DIODE_DIRECTION COL2ROW + +// #define BACKLIGHT_PIN B7 +// #define BACKLIGHT_BREATHING +// #define BACKLIGHT_LEVELS 3 + + +/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ +#define DEBOUNCING_DELAY 5 + +/* define if matrix has ghost (lacks anti-ghosting diodes) */ +//#define MATRIX_HAS_GHOST + + +/* 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 + +/* + * Force NKRO + * + * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved + * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the + * makefile for this to work.) + * + * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) + * until the next keyboard reset. + * + * NKRO may prevent your keystrokes from being detected in the BIOS, but it is + * fully operational during normal computer usage. + * + * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N) + * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by + * bootmagic, NKRO mode will always be enabled until it is toggled again during a + * power-up. + * + */ +//#define FORCE_NKRO + +/* + * Magic Key Options + * + * Magic keys are hotkey commands that allow control over firmware functions of + * the keyboard. They are best used in combination with the HID Listen program, + * found here: https://www.pjrc.com/teensy/hid_listen.html + * + * The options below allow the magic key functionality to be changed. This is + * useful if your keyboard/keypad is missing keys and you want magic key support. + * + */ + +/* key combination for magic key command */ +#define IS_COMMAND() ( \ + keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ +) + +/* control how magic key switches layers */ +//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS true +//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS true +//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false + +/* override magic key keymap */ +//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS +//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS +//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM +//#define MAGIC_KEY_HELP1 H +//#define MAGIC_KEY_HELP2 SLASH +//#define MAGIC_KEY_DEBUG D +//#define MAGIC_KEY_DEBUG_MATRIX X +//#define MAGIC_KEY_DEBUG_KBD K +//#define MAGIC_KEY_DEBUG_MOUSE M +//#define MAGIC_KEY_VERSION V +//#define MAGIC_KEY_STATUS S +//#define MAGIC_KEY_CONSOLE C +//#define MAGIC_KEY_LAYER0_ALT1 ESC +//#define MAGIC_KEY_LAYER0_ALT2 GRAVE +//#define MAGIC_KEY_LAYER0 0 +//#define MAGIC_KEY_LAYER1 1 +//#define MAGIC_KEY_LAYER2 2 +//#define MAGIC_KEY_LAYER3 3 +//#define MAGIC_KEY_LAYER4 4 +//#define MAGIC_KEY_LAYER5 5 +//#define MAGIC_KEY_LAYER6 6 +//#define MAGIC_KEY_LAYER7 7 +//#define MAGIC_KEY_LAYER8 8 +//#define MAGIC_KEY_LAYER9 9 +//#define MAGIC_KEY_BOOTLOADER PAUSE +//#define MAGIC_KEY_LOCK CAPS +//#define MAGIC_KEY_EEPROM E +//#define MAGIC_KEY_NKRO N +//#define MAGIC_KEY_SLEEP_LED Z + +/* + * Feature disable options + * These options are also useful to firmware size reduction. + */ + +/* disable debug print */ +//#define NO_DEBUG + +/* disable print */ +//#define NO_PRINT + +/* disable action features */ +//#define NO_ACTION_LAYER +//#define NO_ACTION_TAPPING +//#define NO_ACTION_ONESHOT +//#define NO_ACTION_MACRO +//#define NO_ACTION_FUNCTION + +#endif diff --git a/keyboards/handwired/reddot/keymaps/default/keymap.c b/keyboards/handwired/reddot/keymaps/default/keymap.c new file mode 100755 index 000000000..44ee2ce51 --- /dev/null +++ b/keyboards/handwired/reddot/keymaps/default/keymap.c @@ -0,0 +1,29 @@ +#include "reddot.h" +#include "../../../../../quantum/keymap_extras/keymap_french.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +[0] = KEYMAP( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TAB, KC_CAPS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_FN0, KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS,\ + KC_LALT, FR_AMP, FR_EACU, FR_QUOT, FR_APOS, FR_LPRN, KC_BSPACE, KC_DELETE, FR_MINS, FR_EGRV, FR_UNDS, FR_CCED, FR_AGRV, FR_RPRN, FR_EQL, KC_INSERT, KC_HOME, KC_PGUP,\ + KC_LGUI, FR_A, FR_Z, KC_E, KC_R, KC_T, KC_LSFT, KC_ENT, KC_Y, KC_U, KC_I, KC_O, KC_P, FR_CIRC, FR_DLR, KC_DELETE, KC_END, KC_PGDOWN, KC_KP_PLUS,\ + KC_LCTL, FR_Q, KC_S, KC_D, KC_F, KC_G, KC_ENT, KC_H, KC_J, KC_K, KC_L, FR_M, FR_UGRV, FR_ASTR, KC_KP_1, KC_UP, KC_KP_3,\ + FR_LESS, FR_W, KC_X, KC_C, KC_V, KC_B, KC_SPACE, KC_SPACE, KC_N, FR_COMM, FR_SCLN, FR_COLN, FR_EXLM, NO_ALGR, KC_LEFT, KC_DOWN, KC_RIGHT, KC_KP_ENTER), + + [1] = KEYMAP( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TAB, KC_CAPS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_FN0, KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS,\ + KC_LALT, FR_AMP, FR_EACU, FR_QUOT, FR_APOS, FR_LPRN, KC_BSPACE, KC_DELETE, FR_MINS, FR_EGRV, FR_UNDS, FR_CCED, FR_AGRV, FR_RPRN, FR_EQL, KC_7, KC_8, KC_9,\ + KC_LGUI, FR_A, FR_Z, KC_E, KC_R, KC_T, KC_LSFT, KC_ENT, KC_Y, KC_U, KC_I, KC_O, KC_P, FR_CIRC, FR_DLR, KC_4, KC_5, KC_6, KC_KP_PLUS,\ + KC_LCTL, FR_Q, KC_S, KC_D, KC_F, KC_G, KC_ENT, KC_H, KC_J, KC_K, KC_L, FR_M, FR_UGRV, FR_ASTR, KC_1, KC_2, KC_3,\ + FR_LESS, FR_W, KC_X, KC_C, KC_V, KC_B, KC_SPACE, KC_SPACE, KC_N, FR_COMM, FR_SCLN, FR_COLN, FR_EXLM, NO_ALGR, KC_LEFT, KC_DOWN, KC_RIGHT, KC_KP_ENTER), +}; + + +const uint16_t PROGMEM fn_actions[] = { + ACTION_LAYER_TOGGLE(1), +}; + +const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { + return MACRO_NONE; +}; + diff --git a/keyboards/handwired/reddot/keymaps/default/readme.md b/keyboards/handwired/reddot/keymaps/default/readme.md new file mode 100755 index 000000000..f04833c3e --- /dev/null +++ b/keyboards/handwired/reddot/keymaps/default/readme.md @@ -0,0 +1 @@ +# The default keymap for handwired/reddot diff --git a/keyboards/handwired/reddot/readme.md b/keyboards/handwired/reddot/readme.md new file mode 100755 index 000000000..11bcba54a --- /dev/null +++ b/keyboards/handwired/reddot/readme.md @@ -0,0 +1,24 @@ +## RedDot Specific Info ## + + +## Quantum MK Firmware + +For the full Quantum feature list, see [the parent README.md](/README.md). + +## Building + +Download or clone the whole firmware and navigate to the keyboard/reddot folder. Once your dev env is setup, you'll be able to type `make` to generate your .hex - you can then use the Teensy Loader to program your .hex file. + +Depending on which keymap you would like to use, you will have to compile slightly differently. + +### Default +To build with the default keymap, simply run `make`. + +### Other Keymaps +Several version of keymap are available in advance but you are recommended to define your favorite layout yourself. To define your own keymap create file named `.c` and see keymap document (you can find in top README.md) and existent keymap files. + +To build the firmware binary hex file with a keymap just do `make` with `KEYMAP` option like: +``` +$ make KEYMAP=[default|jack|] +``` +Keymaps follow the format **__\.c__** and are stored in the `keymaps` folder. diff --git a/keyboards/handwired/reddot/reddot.c b/keyboards/handwired/reddot/reddot.c new file mode 100755 index 000000000..4e1efc06c --- /dev/null +++ b/keyboards/handwired/reddot/reddot.c @@ -0,0 +1,7 @@ +#include "reddot.h" + +void matrix_init_kb(void) { + + matrix_init_user(); +} + diff --git a/keyboards/handwired/reddot/reddot.h b/keyboards/handwired/reddot/reddot.h new file mode 100755 index 000000000..f0c4be557 --- /dev/null +++ b/keyboards/handwired/reddot/reddot.h @@ -0,0 +1,20 @@ +#ifndef REDDOT_H +#define REDDOT_H + +#include "quantum.h" + +#define KEYMAP( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k10, k11, k12, k13, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k30, k31, k32, \ + k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k50, k51, k52, k53, \ + k60, k61, k62, k63, k64, k65, k66, k68, k69, k6A, k6B, k6C, k6D, k6E, k70, k71, k72, \ + k80, k81, k82, k83, k84, k85, k86, k88, k89, k8A, k8B, k8C, k8D, k8E, k90, k91, k92, k93\ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k10, k11, k12, k13 }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k30, k31, k32, KC_NO }, \ + { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k50, k51, k52, k53 }, \ + { k60, k61, k62, k63, k64, k65, k66, KC_NO, k68, k69, k6A, k6B, k6C, k6D, k6E, k70, k71, k72, KC_NO }, \ + { k80, k81, k82, k83, k84, k85, k86, KC_NO, k88, k89, k8A, k8B, k8C, k8D, k8E, k90, k91, k92, k93 } \ +} + +#endif diff --git a/keyboards/handwired/reddot/rules.mk b/keyboards/handwired/reddot/rules.mk new file mode 100755 index 000000000..9a4409fe6 --- /dev/null +++ b/keyboards/handwired/reddot/rules.mk @@ -0,0 +1,88 @@ + +#MCU = at90usb1287 +MCU = atmega32u4 + +# Processor frequency. +# This will define a symbol, F_CPU, in all source code files equal to the +# processor frequency in Hz. You can then use this symbol in your source code to +# calculate timings. Do NOT tack on a 'UL' at the end, this will be done +# automatically to create a 32-bit value in your source code. +# +# This will be an integer division of F_USB below, as it is sourced by +# F_USB after it has run through any CPU prescalers. Note that this value +# does not *change* the processor frequency - it should merely be updated to +# reflect the processor speed set externally so that the code can use accurate +# software delays. +F_CPU = 16000000 + +# for avr upload +USB ?= /dev/cu.usbmodem1421 +# +# LUFA specific +# +# Target architecture (see library "Board Types" documentation). +ARCH = AVR8 + +# Input clock frequency. +# This will define a symbol, F_USB, in all source code files equal to the +# input clock frequency (before any prescaling is performed) in Hz. This value may +# differ from F_CPU if prescaling is used on the latter, and is required as the +# raw input clock is fed directly to the PLL sections of the AVR for high speed +# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL' +# at the end, this will be done automatically to create a 32-bit value in your +# source code. +# +# If no clock division is performed on the input clock inside the AVR (via the +# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. +F_USB = $(F_CPU) + + +ifdef TEENSY2 + OPT_DEFS += -DATREUS_TEENSY2 + ATREUS_UPLOAD_COMMAND = teensy_loader_cli -w -mmcu=$(MCU) $(TARGET).hex +else + OPT_DEFS += -DATREUS_ASTAR + OPT_DEFS += -DCATERINA_BOOTLOADER + ATREUS_UPLOAD_COMMAND = while [ ! -r $(USB) ]; do sleep 1; done; \ + avrdude -p $(MCU) -c avr109 -U flash:w:$(TARGET).hex -P $(USB) +endif +# Interrupt driven control endpoint task(+60) +OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT + + +# MCU name + +# Boot Section Size in *bytes* +# Teensy halfKay 512 +# Teensy++ halfKay 1024 +# Atmel DFU loader 4096 +# LUFA bootloader 4096 +# USBaspLoader 2048 +OPT_DEFS += -DBOOTLOADER_SIZE=4096 + + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE ?= no # Virtual DIP switch configuration(+1000) +MOUSEKEY_ENABLE = yes # Mouse keys(+4700) +EXTRAKEY_ENABLE = yes # Audio control and System control(+450) +CONSOLE_ENABLE ?= no # Console for debug(+400) +COMMAND_ENABLE ?= no # Commands for debug and configuration +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE ?= no # USB Nkey Rollover +BACKLIGHT_ENABLE ?= no # Enable keyboard backlight functionality on B7 by default +MIDI_ENABLE ?= no # MIDI controls +UNICODE_ENABLE ?= no # Unicode +BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID +AUDIO_ENABLE ?= no # Audio output on port C6 + +ifndef QUANTUM_DIR + include ../../../Makefile +endif + +upload: build + $(ATREUS_UPLOAD_COMMAND) + From d8a9c63c265869822a77ad5c5cb7c8dfa4ff1f6c Mon Sep 17 00:00:00 2001 From: Priyadi Iman Nurcahyo Date: Wed, 1 Feb 2017 05:07:05 +0700 Subject: [PATCH 27/65] Implement runtime selectable output (USB or BT) --- tmk_core/protocol/lufa.mk | 1 + tmk_core/protocol/lufa/lufa.c | 122 +++++++++++--------------- tmk_core/protocol/lufa/outputselect.c | 56 ++++++++++++ tmk_core/protocol/lufa/outputselect.h | 41 +++++++++ 4 files changed, 148 insertions(+), 72 deletions(-) create mode 100644 tmk_core/protocol/lufa/outputselect.c create mode 100644 tmk_core/protocol/lufa/outputselect.h diff --git a/tmk_core/protocol/lufa.mk b/tmk_core/protocol/lufa.mk index 151d26cbc..26337cb94 100644 --- a/tmk_core/protocol/lufa.mk +++ b/tmk_core/protocol/lufa.mk @@ -15,6 +15,7 @@ endif LUFA_SRC = lufa.c \ descriptor.c \ + outputselect.c \ $(LUFA_SRC_USB) ifeq ($(strip $(MIDI_ENABLE)), yes) diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c index 6dd5959dc..ba49284c9 100644 --- a/tmk_core/protocol/lufa/lufa.c +++ b/tmk_core/protocol/lufa/lufa.c @@ -53,6 +53,7 @@ #include "lufa.h" #include "quantum.h" #include +#include "outputselect.h" #ifdef NKRO_ENABLE #include "keycode_config.h" @@ -589,59 +590,33 @@ void EVENT_USB_Device_ControlRequest(void) /******************************************************************************* * Host driver -p ******************************************************************************/ static uint8_t keyboard_leds(void) { return keyboard_led_stats; } -#define SendToUSB 1 -#define SendToBT 2 -#define SendToBLE 4 - -static inline uint8_t where_to_send(void) { -#ifdef ADAFRUIT_BLE_ENABLE -#if 0 - if (adafruit_ble_is_connected()) { - // For testing, send to BLE as a priority - return SendToBLE; - } -#endif - - // This is the real policy - if (USB_DeviceState != DEVICE_STATE_Configured) { - if (adafruit_ble_is_connected()) { - return SendToBLE; - } - } -#endif - return ((USB_DeviceState == DEVICE_STATE_Configured) ? SendToUSB : 0) -#ifdef BLUETOOTH_ENABLE - || SendToBT -#endif - ; -} - static void send_keyboard(report_keyboard_t *report) { -#ifdef BLUETOOTH_ENABLE - bluefruit_serial_send(0xFD); - for (uint8_t i = 0; i < KEYBOARD_EPSIZE; i++) { - bluefruit_serial_send(report->raw[i]); - } -#endif - uint8_t timeout = 255; uint8_t where = where_to_send(); +#ifdef BLUETOOTH_ENABLE + if (where == OUTPUT_BLUETOOTH || where == OUTPUT_USB_AND_BT) { + bluefruit_serial_send(0xFD); + for (uint8_t i = 0; i < KEYBOARD_EPSIZE; i++) { + bluefruit_serial_send(report->raw[i]); + } + } +#endif + #ifdef ADAFRUIT_BLE_ENABLE - if (where & SendToBLE) { + if (where == OUTPUT_ADAFRUIT_BLE) { adafruit_ble_send_keys(report->mods, report->keys, sizeof(report->keys)); } #endif - if (!(where & SendToUSB)) { + if (where != OUTPUT_USB && where != OUTPUT_USB_AND_BT) { return; } @@ -681,30 +656,31 @@ static void send_keyboard(report_keyboard_t *report) static void send_mouse(report_mouse_t *report) { #ifdef MOUSE_ENABLE - -#ifdef BLUETOOTH_ENABLE - bluefruit_serial_send(0xFD); - bluefruit_serial_send(0x00); - bluefruit_serial_send(0x03); - bluefruit_serial_send(report->buttons); - bluefruit_serial_send(report->x); - bluefruit_serial_send(report->y); - bluefruit_serial_send(report->v); // should try sending the wheel v here - bluefruit_serial_send(report->h); // should try sending the wheel h here - bluefruit_serial_send(0x00); -#endif - uint8_t timeout = 255; - uint8_t where = where_to_send(); +#ifdef BLUETOOTH_ENABLE + if (where == OUTPUT_BLUETOOTH || where == OUTPUT_USB_AND_BT) { + bluefruit_serial_send(0xFD); + bluefruit_serial_send(0x00); + bluefruit_serial_send(0x03); + bluefruit_serial_send(report->buttons); + bluefruit_serial_send(report->x); + bluefruit_serial_send(report->y); + bluefruit_serial_send(report->v); // should try sending the wheel v here + bluefruit_serial_send(report->h); // should try sending the wheel h here + bluefruit_serial_send(0x00); + } +#endif + #ifdef ADAFRUIT_BLE_ENABLE - if (where & SendToBLE) { + if (where == OUTPUT_ADAFRUIT_BLE) { // FIXME: mouse buttons adafruit_ble_send_mouse_move(report->x, report->y, report->v, report->h); } #endif - if (!(where & SendToUSB)) { + + if (where != OUTPUT_USB && where != OUTPUT_USB_AND_BT) { return; } @@ -746,32 +722,34 @@ static void send_system(uint16_t data) static void send_consumer(uint16_t data) { - -#ifdef BLUETOOTH_ENABLE - static uint16_t last_data = 0; - if (data == last_data) return; - last_data = data; - uint16_t bitmap = CONSUMER2BLUEFRUIT(data); - bluefruit_serial_send(0xFD); - bluefruit_serial_send(0x00); - bluefruit_serial_send(0x02); - bluefruit_serial_send((bitmap>>8)&0xFF); - bluefruit_serial_send(bitmap&0xFF); - bluefruit_serial_send(0x00); - bluefruit_serial_send(0x00); - bluefruit_serial_send(0x00); - bluefruit_serial_send(0x00); -#endif - uint8_t timeout = 255; uint8_t where = where_to_send(); +#ifdef BLUETOOTH_ENABLE + if (where == OUTPUT_BLUETOOTH || where == OUTPUT_USB_AND_BT) { + static uint16_t last_data = 0; + if (data == last_data) return; + last_data = data; + uint16_t bitmap = CONSUMER2BLUEFRUIT(data); + bluefruit_serial_send(0xFD); + bluefruit_serial_send(0x00); + bluefruit_serial_send(0x02); + bluefruit_serial_send((bitmap>>8)&0xFF); + bluefruit_serial_send(bitmap&0xFF); + bluefruit_serial_send(0x00); + bluefruit_serial_send(0x00); + bluefruit_serial_send(0x00); + bluefruit_serial_send(0x00); + } +#endif + #ifdef ADAFRUIT_BLE_ENABLE - if (where & SendToBLE) { + if (where == OUTPUT_ADAFRUIT_BLE) { adafruit_ble_send_consumer_key(data, 0); } #endif - if (!(where & SendToUSB)) { + + if (where != OUTPUT_USB && where != OUTPUT_USB_AND_BT) { return; } diff --git a/tmk_core/protocol/lufa/outputselect.c b/tmk_core/protocol/lufa/outputselect.c new file mode 100644 index 000000000..5d2457bff --- /dev/null +++ b/tmk_core/protocol/lufa/outputselect.c @@ -0,0 +1,56 @@ +/* +Copyright 2017 Priyadi Iman Nurcahyo +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 "lufa.h" +#include "outputselect.h" +#ifdef ADAFRUIT_BLE_ENABLE + #include "adafruit_ble.h" +#endif + +uint8_t desired_output = OUTPUT_DEFAULT; + +void set_output(uint8_t output) { + set_output_user(output); + desired_output = output; +} + +__attribute__((weak)) +void set_output_user(uint8_t output) { +} + +uint8_t auto_detect_output(void) { + if (USB_DeviceState == DEVICE_STATE_Configured) { + return OUTPUT_USB; + } + +#ifdef ADAFRUIT_BLE_ENABLE + if (adafruit_ble_is_connected()) { + return OUTPUT_ADAFRUIT_BLE; + } +#endif + +#ifdef BLUETOOTH_ENABLE + return OUTPUT_BLUETOOTH; // should check if BT is connected here +#endif + + return OUTPUT_NONE; +} + +uint8_t where_to_send(void) { + if (desired_output == OUTPUT_AUTO) { + return auto_detect_output(); + } + return desired_output; +} + diff --git a/tmk_core/protocol/lufa/outputselect.h b/tmk_core/protocol/lufa/outputselect.h new file mode 100644 index 000000000..79b4dd35d --- /dev/null +++ b/tmk_core/protocol/lufa/outputselect.h @@ -0,0 +1,41 @@ +/* +Copyright 2017 Priyadi Iman Nurcahyo +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 . +*/ + +enum outputs { + OUTPUT_AUTO, + + OUTPUT_NONE, + OUTPUT_USB, + OUTPUT_BLUETOOTH, + OUTPUT_ADAFRUIT_BLE, + + // backward compatibility + OUTPUT_USB_AND_BT +}; + +/** + * backward compatibility for BLUETOOTH_ENABLE, send to BT and USB by default + */ +#ifndef OUTPUT_DEFAULT + #ifdef BLUETOOTH_ENABLE + #define OUTPUT_DEFAULT OUTPUT_USB_AND_BT + #else + #define OUTPUT_DEFAULT OUTPUT_AUTO + #endif +#endif + +void set_output(uint8_t output); +void set_output_user(uint8_t output); +uint8_t auto_detect_output(void); +uint8_t where_to_send(void); \ No newline at end of file From f46c2b3ca07c83e13bea6fc33a3c95fed4a9ece2 Mon Sep 17 00:00:00 2001 From: Erez Zukerman Date: Tue, 31 Jan 2017 21:31:05 -0500 Subject: [PATCH 28/65] Introduces ALGR_T for dual-function AltGr --- quantum/quantum_keycodes.h | 1 + 1 file changed, 1 insertion(+) diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h index 4853655f9..91324be35 100644 --- a/quantum/quantum_keycodes.h +++ b/quantum/quantum_keycodes.h @@ -290,6 +290,7 @@ enum quantum_keycodes { #define CTL_T(kc) MT(MOD_LCTL, kc) #define SFT_T(kc) MT(MOD_LSFT, kc) #define ALT_T(kc) MT(MOD_LALT, kc) +#define ALGR_T(kc) MT(MOD_RALT, kc) // dual-function AltGR #define GUI_T(kc) MT(MOD_LGUI, kc) #define C_S_T(kc) MT((MOD_LCTL | MOD_LSFT), kc) // Control + Shift e.g. for gnome-terminal #define MEH_T(kc) MT((MOD_LCTL | MOD_LSFT | MOD_LALT), kc) // Meh is a less hyper version of the Hyper key -- doesn't include Win or Cmd, so just alt+shift+ctrl From c17070eca545f654f91cf3dcba6c6c611e0f8d03 Mon Sep 17 00:00:00 2001 From: Priyadi Iman Nurcahyo Date: Wed, 1 Feb 2017 15:35:21 +0700 Subject: [PATCH 29/65] Add layer switcher keycodes: OUT_AUTO, OUT_USB, OUT_BT, OUT_BLE --- quantum/quantum.c | 29 +++++++++++++++++++++++++++++ quantum/quantum_keycodes.h | 10 ++++++++++ 2 files changed, 39 insertions(+) diff --git a/quantum/quantum.c b/quantum/quantum.c index 63ffe2074..1d1a691e2 100644 --- a/quantum/quantum.c +++ b/quantum/quantum.c @@ -1,4 +1,5 @@ #include "quantum.h" +#include "outputselect.h" #ifndef TAPPING_TERM #define TAPPING_TERM 200 @@ -212,6 +213,34 @@ bool process_record_quantum(keyrecord_t *record) { return false; break; #endif + case OUT_AUTO: + if (record->event.pressed) { + set_output(OUTPUT_AUTO); + } + return false; + break; + case OUT_USB: + if (record->event.pressed) { + set_output(OUTPUT_USB); + } + return false; + break; + #ifdef BLUETOOTH_ENABLE + case OUT_BT: + if (record->event.pressed) { + set_output(OUTPUT_BLUETOOTH); + } + return false; + break; + #endif + #ifdef ADAFRUIT_BLE_ENABLE + case OUT_BLE: + if (record->event.pressed) { + set_output(OUTPUT_ADAFRUIT_BLE); + } + return false; + break; + #endif case MAGIC_SWAP_CONTROL_CAPSLOCK ... MAGIC_TOGGLE_NKRO: if (record->event.pressed) { // MAGIC actions (BOOTMAGIC without the boot) diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h index 4853655f9..4f1345b49 100644 --- a/quantum/quantum_keycodes.h +++ b/quantum/quantum_keycodes.h @@ -141,6 +141,16 @@ enum quantum_keycodes { PRINT_ON, PRINT_OFF, + // output selection + OUT_AUTO, + OUT_USB, +#ifdef BLUETOOTH_ENABLE + OUT_BT, +#endif +#ifdef ADAFRUIT_BLE_ENABLE + OUT_BLE, +#endif + // always leave at the end SAFE_RANGE }; From 72e95809a1d3da869942441a2ad7107c7a55d688 Mon Sep 17 00:00:00 2001 From: Priyadi Iman Nurcahyo Date: Wed, 1 Feb 2017 17:55:13 +0700 Subject: [PATCH 30/65] Move outputselect to parent dir to satisfy non LUFA keyboards --- tmk_core/protocol/{lufa => }/outputselect.c | 0 tmk_core/protocol/{lufa => }/outputselect.h | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename tmk_core/protocol/{lufa => }/outputselect.c (100%) rename tmk_core/protocol/{lufa => }/outputselect.h (100%) diff --git a/tmk_core/protocol/lufa/outputselect.c b/tmk_core/protocol/outputselect.c similarity index 100% rename from tmk_core/protocol/lufa/outputselect.c rename to tmk_core/protocol/outputselect.c diff --git a/tmk_core/protocol/lufa/outputselect.h b/tmk_core/protocol/outputselect.h similarity index 100% rename from tmk_core/protocol/lufa/outputselect.h rename to tmk_core/protocol/outputselect.h From 2bef8b5b88547ce28fb056559b058e35109278b3 Mon Sep 17 00:00:00 2001 From: Priyadi Iman Nurcahyo Date: Wed, 1 Feb 2017 19:37:52 +0700 Subject: [PATCH 31/65] Limit outputselect to AVR only for now --- quantum/quantum.c | 4 ++++ quantum/quantum.h | 1 - tmk_core/protocol/lufa.mk | 2 +- tmk_core/protocol/{ => lufa}/outputselect.c | 2 +- tmk_core/protocol/{ => lufa}/outputselect.h | 0 5 files changed, 6 insertions(+), 3 deletions(-) rename tmk_core/protocol/{ => lufa}/outputselect.c (98%) rename tmk_core/protocol/{ => lufa}/outputselect.h (100%) diff --git a/quantum/quantum.c b/quantum/quantum.c index 1d1a691e2..585692d4a 100644 --- a/quantum/quantum.c +++ b/quantum/quantum.c @@ -1,5 +1,7 @@ #include "quantum.h" +#if defined(__AVR__) #include "outputselect.h" +#endif #ifndef TAPPING_TERM #define TAPPING_TERM 200 @@ -213,6 +215,7 @@ bool process_record_quantum(keyrecord_t *record) { return false; break; #endif + #if defined(__AVR__) case OUT_AUTO: if (record->event.pressed) { set_output(OUTPUT_AUTO); @@ -241,6 +244,7 @@ bool process_record_quantum(keyrecord_t *record) { return false; break; #endif + #endif case MAGIC_SWAP_CONTROL_CAPSLOCK ... MAGIC_TOGGLE_NKRO: if (record->event.pressed) { // MAGIC actions (BOOTMAGIC without the boot) diff --git a/quantum/quantum.h b/quantum/quantum.h index e6adf974a..810e9e4bb 100644 --- a/quantum/quantum.h +++ b/quantum/quantum.h @@ -15,7 +15,6 @@ #ifdef RGBLIGHT_ENABLE #include "rgblight.h" #endif - #include "action_layer.h" #include "eeconfig.h" #include diff --git a/tmk_core/protocol/lufa.mk b/tmk_core/protocol/lufa.mk index 26337cb94..de0cc795f 100644 --- a/tmk_core/protocol/lufa.mk +++ b/tmk_core/protocol/lufa.mk @@ -8,7 +8,7 @@ LUFA_PATH ?= $(LUFA_DIR)/LUFA-git ifneq (, $(wildcard $(TMK_PATH)/$(LUFA_PATH)/LUFA/Build/lufa_sources.mk)) # New build system from 20120730 LUFA_ROOT_PATH = $(LUFA_PATH)/LUFA - include $(TMK_PATH)/$(LUFA_PATH)/LUFA/Build/lufa_sources.mk + include $(TMK_PATH)/$(LUFA_PATH)/LUFA/Build/lufa_sources.mk else include $(TMK_PATH)/$(LUFA_PATH)/LUFA/makefile endif diff --git a/tmk_core/protocol/outputselect.c b/tmk_core/protocol/lufa/outputselect.c similarity index 98% rename from tmk_core/protocol/outputselect.c rename to tmk_core/protocol/lufa/outputselect.c index 5d2457bff..0110928de 100644 --- a/tmk_core/protocol/outputselect.c +++ b/tmk_core/protocol/lufa/outputselect.c @@ -12,7 +12,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "lufa.h" +#include "quantum.h" #include "outputselect.h" #ifdef ADAFRUIT_BLE_ENABLE #include "adafruit_ble.h" diff --git a/tmk_core/protocol/outputselect.h b/tmk_core/protocol/lufa/outputselect.h similarity index 100% rename from tmk_core/protocol/outputselect.h rename to tmk_core/protocol/lufa/outputselect.h From 98f9a2e6dfe302ad12844a8ed140bb34ed2c592f Mon Sep 17 00:00:00 2001 From: Priyadi Iman Nurcahyo Date: Wed, 1 Feb 2017 20:18:52 +0700 Subject: [PATCH 32/65] Fix wrong include --- tmk_core/protocol/lufa/outputselect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tmk_core/protocol/lufa/outputselect.c b/tmk_core/protocol/lufa/outputselect.c index 0110928de..5d2457bff 100644 --- a/tmk_core/protocol/lufa/outputselect.c +++ b/tmk_core/protocol/lufa/outputselect.c @@ -12,7 +12,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "quantum.h" +#include "lufa.h" #include "outputselect.h" #ifdef ADAFRUIT_BLE_ENABLE #include "adafruit_ble.h" From e7c4f621f14b60bde68c01ae076cac49cac9927e Mon Sep 17 00:00:00 2001 From: Priyadi Iman Nurcahyo Date: Wed, 1 Feb 2017 22:30:06 +0700 Subject: [PATCH 33/65] Restrict outputselect to LUFA only for now --- quantum/quantum.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/quantum/quantum.c b/quantum/quantum.c index 585692d4a..ad957a1b1 100644 --- a/quantum/quantum.c +++ b/quantum/quantum.c @@ -1,5 +1,5 @@ #include "quantum.h" -#if defined(__AVR__) +#ifdef PROTOCOL_LUFA #include "outputselect.h" #endif @@ -215,7 +215,7 @@ bool process_record_quantum(keyrecord_t *record) { return false; break; #endif - #if defined(__AVR__) + #ifdef PROTOCOL_LUFA case OUT_AUTO: if (record->event.pressed) { set_output(OUTPUT_AUTO); From a3da586505034584c75f4407e9ee1edeba50e0f8 Mon Sep 17 00:00:00 2001 From: Luiz Ribeiro Date: Wed, 1 Feb 2017 21:57:44 -0500 Subject: [PATCH 34/65] Fix V-USB bug on Windows 10 --- tmk_core/protocol/vusb/vusb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tmk_core/protocol/vusb/vusb.c b/tmk_core/protocol/vusb/vusb.c index a8c13b928..022ac6f6b 100644 --- a/tmk_core/protocol/vusb/vusb.c +++ b/tmk_core/protocol/vusb/vusb.c @@ -280,7 +280,7 @@ const PROGMEM uchar keyboard_hid_report[] = { 0x95, 0x06, // Report Count (6), 0x75, 0x08, // Report Size (8), 0x15, 0x00, // Logical Minimum (0), - 0x25, 0xFF, 0x00, // Logical Maximum(255), + 0x26, 0xFF, 0x00, // Logical Maximum(255), 0x05, 0x07, // Usage Page (Key Codes), 0x19, 0x00, // Usage Minimum (0), 0x29, 0xFF, // Usage Maximum (255), @@ -350,7 +350,7 @@ const PROGMEM uchar mouse_hid_report[] = { 0xa1, 0x01, // COLLECTION (Application) 0x85, REPORT_ID_SYSTEM, // REPORT_ID (2) 0x15, 0x01, // LOGICAL_MINIMUM (0x1) - 0x25, 0xb7, 0x00, // LOGICAL_MAXIMUM (0xb7) + 0x26, 0xb7, 0x00, // LOGICAL_MAXIMUM (0xb7) 0x19, 0x01, // USAGE_MINIMUM (0x1) 0x29, 0xb7, // USAGE_MAXIMUM (0xb7) 0x75, 0x10, // REPORT_SIZE (16) From e667e9f6da17c5551379b168cc97647b44972d10 Mon Sep 17 00:00:00 2001 From: Nikolaus Wittenstein Date: Fri, 3 Feb 2017 21:00:10 -0500 Subject: [PATCH 35/65] Fix compile warnings in light_ws2812.c Fixes the warning "function declaration isn't a prototype" by explicitly making the parameter list void. --- quantum/light_ws2812.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/quantum/light_ws2812.c b/quantum/light_ws2812.c index a883b1388..55bdd9cd8 100755 --- a/quantum/light_ws2812.c +++ b/quantum/light_ws2812.c @@ -70,7 +70,7 @@ void I2C_WriteBit(unsigned char c) // Inits bitbanging port, must be called before using the functions below // -void I2C_Init() +void I2C_Init(void) { I2C_PORT &= ~ ((1 << I2C_DAT) | (1 << I2C_CLK)); @@ -82,7 +82,7 @@ void I2C_Init() // Send a START Condition // -void I2C_Start() +void I2C_Start(void) { // set both to high at the same time I2C_DDR &= ~ ((1 << I2C_DAT) | (1 << I2C_CLK)); @@ -97,7 +97,7 @@ void I2C_Start() // Send a STOP Condition // -void I2C_Stop() +void I2C_Stop(void) { I2C_CLOCK_HI(); _delay_us(I2C_DELAY); From 3faf06c880ef5fedb4dfaaef2bc35d75c392a076 Mon Sep 17 00:00:00 2001 From: Nikolaus Wittenstein Date: Fri, 3 Feb 2017 21:06:43 -0500 Subject: [PATCH 36/65] Fix compile warnings in egodox robot_test_layout Fixes the warning "right shift count >= width of type" by adding UL to the end of constants. --- keyboards/ergodox/keymaps/robot_test_layout/keymap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/ergodox/keymaps/robot_test_layout/keymap.c b/keyboards/ergodox/keymaps/robot_test_layout/keymap.c index 480be177f..e9e2597d7 100644 --- a/keyboards/ergodox/keymaps/robot_test_layout/keymap.c +++ b/keyboards/ergodox/keymaps/robot_test_layout/keymap.c @@ -68,7 +68,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { case RGB_FF0000: if (record->event.pressed) { #ifdef RGBLIGHT_ENABLE - EZ_RGB(0xff0000); + EZ_RGB(0xff0000UL); register_code(KC_1); unregister_code(KC_1); #endif } @@ -77,7 +77,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { case RGB_00FF00: if (record->event.pressed) { #ifdef RGBLIGHT_ENABLE - EZ_RGB(0x00ff00); + EZ_RGB(0x00ff00UL); register_code(KC_2); unregister_code(KC_2); #endif } @@ -86,7 +86,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { case RGB_0000FF: if (record->event.pressed) { #ifdef RGBLIGHT_ENABLE - EZ_RGB(0x0000ff); + EZ_RGB(0x0000ffUL); register_code(KC_3); unregister_code(KC_3); #endif } @@ -95,7 +95,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { case RGB_FFFFFF: if (record->event.pressed) { #ifdef RGBLIGHT_ENABLE - EZ_RGB(0xffffff); + EZ_RGB(0xffffffUL); register_code(KC_4); unregister_code(KC_4); #endif } From 101465b6edf98ed1a09b2f4db28c6be66b3f52fb Mon Sep 17 00:00:00 2001 From: Nikolaus Wittenstein Date: Fri, 3 Feb 2017 21:09:50 -0500 Subject: [PATCH 37/65] Add missing header to ergodox ordinary keymap --- keyboards/ergodox/keymaps/ordinary/keymap.c | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/ergodox/keymaps/ordinary/keymap.c b/keyboards/ergodox/keymaps/ordinary/keymap.c index 302c41cc8..5c01d9678 100644 --- a/keyboards/ergodox/keymaps/ordinary/keymap.c +++ b/keyboards/ergodox/keymaps/ordinary/keymap.c @@ -1,5 +1,6 @@ #include "ergodox.h" #include "led.h" +#include "mousekey.h" #include "debug.h" #include "action_layer.h" #include "action_util.h" From d961c80df2391631f7b3f46afa595ce93f51f217 Mon Sep 17 00:00:00 2001 From: Nikolaus Wittenstein Date: Sun, 5 Feb 2017 19:41:08 -0500 Subject: [PATCH 38/65] Remove unused matrix_raw variable in matrix.c --- quantum/matrix.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/quantum/matrix.c b/quantum/matrix.c index 07eb87bc3..fd312bffb 100644 --- a/quantum/matrix.c +++ b/quantum/matrix.c @@ -66,7 +66,6 @@ static const uint8_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; /* matrix state(1:on, 0:off) */ static matrix_row_t matrix[MATRIX_ROWS]; -static matrix_row_t matrix_raw[MATRIX_ROWS]; static matrix_row_t matrix_debouncing[MATRIX_ROWS]; @@ -166,7 +165,6 @@ void matrix_init(void) { // initialize matrix state: all keys off for (uint8_t i=0; i < MATRIX_ROWS; i++) { matrix[i] = 0; - matrix_raw[i] = 0; matrix_debouncing[i] = 0; } From 8cbf61c91923e5399b158f7f9258096cb0089ce2 Mon Sep 17 00:00:00 2001 From: Nikolaus Wittenstein Date: Sun, 5 Feb 2017 19:42:00 -0500 Subject: [PATCH 39/65] Add new DIODE_DIRECTION option The previous two options were COL2ROW, ROW2COL; this adds CUSTOM_MATRIX to disable the built-in matrix scanning code. Most notably, this obviates the need to set MATRIX_ROW_PINS or MATRIX_COL_PINS. --- quantum/config_common.h | 6 ++++-- quantum/matrix.c | 12 +++++++----- quantum/template/config.h | 2 +- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/quantum/config_common.h b/quantum/config_common.h index 4bdb2065d..28f68b9c7 100644 --- a/quantum/config_common.h +++ b/quantum/config_common.h @@ -2,8 +2,10 @@ #define CONFIG_DEFINITIONS_H /* diode directions */ -#define COL2ROW 0 -#define ROW2COL 1 +#define COL2ROW 0 +#define ROW2COL 1 +#define CUSTOM_MATRIX 2 /* Disables built-in matrix scanning code */ + /* I/O pins */ #ifndef F0 #define B0 0x30 diff --git a/quantum/matrix.c b/quantum/matrix.c index fd312bffb..ac523482a 100644 --- a/quantum/matrix.c +++ b/quantum/matrix.c @@ -60,8 +60,10 @@ along with this program. If not, see . extern const matrix_row_t matrix_mask[]; #endif +#if (DIODE_DIRECTION == ROW2COL) || (DIODE_DIRECTION == COL2ROW) static const uint8_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS; static const uint8_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; +#endif /* matrix state(1:on, 0:off) */ static matrix_row_t matrix[MATRIX_ROWS]; @@ -75,7 +77,7 @@ static matrix_row_t matrix_debouncing[MATRIX_ROWS]; static void unselect_rows(void); static void select_row(uint8_t row); static void unselect_row(uint8_t row); -#else // ROW2COL +#elif (DIODE_DIRECTION == ROW2COL) static void init_rows(void); static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col); static void unselect_cols(void); @@ -132,7 +134,7 @@ uint8_t matrix_cols(void) { // /* PORTxn */ // _SFR_IO8((col_pins[c] >> 4) + 2) |= _BV(col_pins[c] & 0xF); // } -// #else +// #elif (DIODE_DIRECTION == ROW2COL) // for (int8_t c = MATRIX_COLS - 1; c >= 0; --c) { // /* DDRxn */ // _SFR_IO8((col_pins[c] >> 4) + 1) |= _BV(col_pins[c] & 0xF); @@ -157,7 +159,7 @@ void matrix_init(void) { #if (DIODE_DIRECTION == COL2ROW) unselect_rows(); init_cols(); -#else // ROW2COL +#elif (DIODE_DIRECTION == ROW2COL) unselect_cols(); init_rows(); #endif @@ -192,7 +194,7 @@ uint8_t matrix_scan(void) } -#else // ROW2COL +#elif (DIODE_DIRECTION == ROW2COL) // Set col, read rows for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++) { @@ -334,7 +336,7 @@ static void unselect_rows(void) } } -#else // ROW2COL +#elif (DIODE_DIRECTION == ROW2COL) static void init_rows(void) { diff --git a/quantum/template/config.h b/quantum/template/config.h index b02f0c7eb..c61c4a618 100644 --- a/quantum/template/config.h +++ b/quantum/template/config.h @@ -46,7 +46,7 @@ along with this program. If not, see . #define MATRIX_COL_PINS { F1, F0, B0 } #define UNUSED_PINS -/* COL2ROW or ROW2COL */ +/* COL2ROW, ROW2COL, or CUSTOM_MATRIX */ #define DIODE_DIRECTION COL2ROW // #define BACKLIGHT_PIN B7 From 06d21009b2198a2941f4c341807ad2290b5967f6 Mon Sep 17 00:00:00 2001 From: Nikolaus Wittenstein Date: Sun, 5 Feb 2017 19:55:08 -0500 Subject: [PATCH 40/65] Minor cleanup --- tmk_core/common/keyboard.c | 1 + tmk_core/common/matrix.h | 2 +- tmk_core/common/report.h | 7 ------- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/tmk_core/common/keyboard.c b/tmk_core/common/keyboard.c index 765350792..3aa82231b 100644 --- a/tmk_core/common/keyboard.c +++ b/tmk_core/common/keyboard.c @@ -14,6 +14,7 @@ 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 #include "keyboard.h" #include "matrix.h" diff --git a/tmk_core/common/matrix.h b/tmk_core/common/matrix.h index cee3593ee..2543f5abc 100644 --- a/tmk_core/common/matrix.h +++ b/tmk_core/common/matrix.h @@ -50,7 +50,7 @@ void matrix_init(void); uint8_t matrix_scan(void); /* whether modified from previous scan. used after matrix_scan. */ bool matrix_is_modified(void) __attribute__ ((deprecated)); -/* whether a swtich is on */ +/* whether a switch is on */ bool matrix_is_on(uint8_t row, uint8_t col); /* matrix state on row */ matrix_row_t matrix_get_row(uint8_t row); diff --git a/tmk_core/common/report.h b/tmk_core/common/report.h index 0c799eca3..8fb28b6ce 100644 --- a/tmk_core/common/report.h +++ b/tmk_core/common/report.h @@ -134,13 +134,6 @@ typedef union { } nkro; #endif } __attribute__ ((packed)) report_keyboard_t; -/* -typedef struct { - uint8_t mods; - uint8_t reserved; - uint8_t keys[REPORT_KEYS]; -} __attribute__ ((packed)) report_keyboard_t; -*/ typedef struct { uint8_t buttons; From 21015918b405d4ec5f8fc3517accff28f6ebdf17 Mon Sep 17 00:00:00 2001 From: Callum Oakley Date: Mon, 6 Feb 2017 12:40:32 +0000 Subject: [PATCH 41/65] change cmd-l and cmd-r for actual home and end --- keyboards/planck/keymaps/callum/keymap.c | 6 ++---- keyboards/planck/keymaps/callum/readme.md | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/keyboards/planck/keymaps/callum/keymap.c b/keyboards/planck/keymaps/callum/keymap.c index a1254d975..2acd988ea 100644 --- a/keyboards/planck/keymaps/callum/keymap.c +++ b/keyboards/planck/keymaps/callum/keymap.c @@ -12,8 +12,6 @@ extern keymap_config_t keymap_config; #define _SYMB 2 #define _MOUSE 3 #define _FUNC 4 -#define CMDLEFT LGUI(KC_LEFT) -#define CMDRGHT LGUI(KC_RGHT) #define ENDASH LALT(KC_MINS) #define POUND LALT(KC_3) @@ -50,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* MOVE * ,-----------------------------------------------------------------------------------. - * | Esc | | Cmd-L| Up | Cmd-R| | | Cmd-L| Up | Cmd-R| | Esc | + * | Esc | | Home | Up | End | | | Home | Up | End | | Esc | * |------+------+------+------+------+------+------+------+------+------+------+------| * | Del | Caps | Left | Down | Right| | | Left | Down | Right| Caps | Del | * |------+------+------+------+------+------+------+------+------+------+------+------| @@ -60,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------------------------------------------------' */ [_MOVE] = { - {KC_ESC, XXXXXXX, CMDLEFT, KC_UP, CMDRGHT, XXXXXXX, XXXXXXX, CMDLEFT, KC_UP, CMDRGHT, XXXXXXX, KC_ESC }, + {KC_ESC, XXXXXXX, KC_HOME, KC_UP, KC_END, XXXXXXX, XXXXXXX, KC_HOME, KC_UP, KC_END, XXXXXXX, KC_ESC }, {KC_DEL, KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_CAPS, KC_DEL }, {_______, XXXXXXX, XXXXXXX, KC_PGUP, KC_PGDN, XXXXXXX, XXXXXXX, KC_PGDN, KC_PGUP, XXXXXXX, XXXXXXX, _______}, {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______} diff --git a/keyboards/planck/keymaps/callum/readme.md b/keyboards/planck/keymaps/callum/readme.md index f970cd974..71e200b9d 100644 --- a/keyboards/planck/keymaps/callum/readme.md +++ b/keyboards/planck/keymaps/callum/readme.md @@ -23,7 +23,7 @@ We have five layers. A `BASE` layer, in colemak; a `MOVE` layer, with an arrow c /* MOVE * ,-----------------------------------------------------------------------------------. - * | Esc | | Cmd-L| Up | Cmd-R| | | Cmd-L| Up | Cmd-R| | Esc | + * | Esc | | Home | Up | End | | | Home | Up | End | | Esc | * |------+------+------+------+------+------+------+------+------+------+------+------| * | Del | Caps | Left | Down | Right| | | Left | Down | Right| Caps | Del | * |------+------+------+------+------+------+------+------+------+------+------+------| From 835cacb031faabadf2c09de51323506f8f41b4ef Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Mon, 6 Feb 2017 16:04:28 -0500 Subject: [PATCH 42/65] fixes qmk.fm linking, tests out auto version incrementing --- util/travis_compiled_push.sh | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh index f432976d0..9f23db972 100644 --- a/util/travis_compiled_push.sh +++ b/util/travis_compiled_push.sh @@ -7,6 +7,25 @@ rev=$(git rev-parse --short HEAD) git config --global user.name "Travis CI" git config --global user.email "jack.humb+travis.ci@gmail.com" +increment_version () +{ + declare -a part=( ${1//\./ } ) + part[2]=$((part[2] + 1)) + new="${part[*]}" + echo -e "${new// /.}" +} + +NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/)' | wc -l) +if [[ $NEFM -gt 0 ]] ; then + echo "Essential files modified." + lasttag=$(git tag | grep -Ev '\-' | head -1) + newtag=$(increment_version $lasttag) + git tag $newtag + git push --tags +else + echo "No essential files modified." +fi + make ergodox-ez AUTOGEN=true find . -name ".build" | xargs rm -rf @@ -23,5 +42,5 @@ cp ../qmk_firmware/readme.md qmk_readme.md ./generate.sh git add -A -git commit -m "generated from qmk_firmware/$TRAVIS_BRANCH@${rev}" +git commit -m "generated from qmk/qmk_firmware@${rev}" git push From 3a76f24cbdd0894af85fee79e371c5ca7cda0f71 Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Mon, 6 Feb 2017 16:42:18 -0500 Subject: [PATCH 43/65] [skip build] testing travis script --- .travis.yml | 4 +++- util/travis_compiled_push.sh | 36 ++++++++++++++++++++---------------- 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/.travis.yml b/.travis.yml index b206d1451..e904d8af8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,9 @@ install: before_script: - avr-gcc --version script: -- make $TARGET AUTOGEN=$AUTOGEN +- 'if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then +make $TARGET AUTOGEN=$AUTOGEN +fi' addons: apt: packages: diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh index 9f23db972..f12da913c 100644 --- a/util/travis_compiled_push.sh +++ b/util/travis_compiled_push.sh @@ -26,21 +26,25 @@ else echo "No essential files modified." fi -make ergodox-ez AUTOGEN=true +if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then -find . -name ".build" | xargs rm -rf -cd .. -git clone https://$GH_TOKEN@github.com/jackhumbert/qmk.fm.git -cd qmk.fm -git submodule update --init --recursive -rm -rf keyboard -rm -rf keyboards -cp -r ../qmk_firmware/keyboards . -mkdir keyboards/ergodox_ez/ -cp ../qmk_firmware/util/ergodox_ez.html keyboards/ergodox_ez/index.html -cp ../qmk_firmware/readme.md qmk_readme.md -./generate.sh + make ergodox-ez AUTOGEN=true -git add -A -git commit -m "generated from qmk/qmk_firmware@${rev}" -git push + find . -name ".build" | xargs rm -rf + cd .. + git clone https://$GH_TOKEN@github.com/jackhumbert/qmk.fm.git + cd qmk.fm + git submodule update --init --recursive + rm -rf keyboard + rm -rf keyboards + cp -r ../qmk_firmware/keyboards . + mkdir keyboards/ergodox_ez/ + cp ../qmk_firmware/util/ergodox_ez.html keyboards/ergodox_ez/index.html + cp ../qmk_firmware/readme.md qmk_readme.md + ./generate.sh + + git add -A + git commit -m "generated from qmk/qmk_firmware@${rev}" + git push + +fi \ No newline at end of file From 470c8436c2428dba885dfa6e4b7d4f5e725a9d07 Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Mon, 6 Feb 2017 16:46:44 -0500 Subject: [PATCH 44/65] [skip build] testing travis script --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index e904d8af8..1a0a7bf15 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,9 +19,7 @@ install: before_script: - avr-gcc --version script: -- 'if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then -make $TARGET AUTOGEN=$AUTOGEN -fi' +- 'if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then make $TARGET AUTOGEN=$AUTOGEN; fi' addons: apt: packages: From 98adda34c9095658fcc6a294a13f1264752b4df6 Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Mon, 6 Feb 2017 16:54:54 -0500 Subject: [PATCH 45/65] [skip build] testing travis script --- util/travis_compiled_push.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh index f12da913c..f1b4b2ae5 100644 --- a/util/travis_compiled_push.sh +++ b/util/travis_compiled_push.sh @@ -21,7 +21,7 @@ if [[ $NEFM -gt 0 ]] ; then lasttag=$(git tag | grep -Ev '\-' | head -1) newtag=$(increment_version $lasttag) git tag $newtag - git push --tags + git push --tags -q https://$GH_TOKEN@github.com/qmk/qmk_firmware-$TRAVIS_BRANCH else echo "No essential files modified." fi From cf8dac3538feffe4d52c0776456dd67d5787b059 Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Mon, 6 Feb 2017 16:56:39 -0500 Subject: [PATCH 46/65] [skip build] testing travis script --- util/travis_compiled_push.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh index f1b4b2ae5..d0bb0db55 100644 --- a/util/travis_compiled_push.sh +++ b/util/travis_compiled_push.sh @@ -7,6 +7,8 @@ rev=$(git rev-parse --short HEAD) git config --global user.name "Travis CI" git config --global user.email "jack.humb+travis.ci@gmail.com" +if [[ "$TRAVIS_BRANCH" == "master" ]] ; then + increment_version () { declare -a part=( ${1//\./ } ) @@ -21,7 +23,7 @@ if [[ $NEFM -gt 0 ]] ; then lasttag=$(git tag | grep -Ev '\-' | head -1) newtag=$(increment_version $lasttag) git tag $newtag - git push --tags -q https://$GH_TOKEN@github.com/qmk/qmk_firmware-$TRAVIS_BRANCH + git push --tags -q https://$GH_TOKEN@github.com/qmk/qmk_firmware-master else echo "No essential files modified." fi @@ -47,4 +49,6 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then git commit -m "generated from qmk/qmk_firmware@${rev}" git push +fi + fi \ No newline at end of file From ee386a29d1a8b46f16c5c139db74624f829d9a53 Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Mon, 6 Feb 2017 17:00:30 -0500 Subject: [PATCH 47/65] [skip build] testing travis script --- util/travis_compiled_push.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh index d0bb0db55..b70999c72 100644 --- a/util/travis_compiled_push.sh +++ b/util/travis_compiled_push.sh @@ -23,7 +23,7 @@ if [[ $NEFM -gt 0 ]] ; then lasttag=$(git tag | grep -Ev '\-' | head -1) newtag=$(increment_version $lasttag) git tag $newtag - git push --tags -q https://$GH_TOKEN@github.com/qmk/qmk_firmware-master + git push --tags -q https://$GH_TOKEN@github.com/qmk/qmk_firmware else echo "No essential files modified." fi From 0e548f8b5d6b89de877f098ea919eaea87511b6e Mon Sep 17 00:00:00 2001 From: dungdung Date: Mon, 6 Feb 2017 14:08:21 -0800 Subject: [PATCH 48/65] Christmas mode now works with even RGBED_NUM Added Christmas mode steps to reduce red and green colors blending into each other Added Christmas mode interval Increased green hue to 120 --- quantum/rgblight.c | 8 ++++---- quantum/rgblight.h | 8 ++++++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/quantum/rgblight.c b/quantum/rgblight.c index 52a09817a..f91f3caff 100644 --- a/quantum/rgblight.c +++ b/quantum/rgblight.c @@ -237,7 +237,7 @@ void rgblight_mode(uint8_t mode) { #ifdef RGBLIGHT_ANIMATIONS rgblight_timer_disable(); #endif - } else if (rgblight_config.mode >= 2 && rgblight_config.mode <= 23) { + } else if (rgblight_config.mode >= 2 && rgblight_config.mode <= 24) { // MODE 2-5, breathing // MODE 6-8, rainbow mood // MODE 9-14, rainbow swirl @@ -450,7 +450,7 @@ void rgblight_task(void) { } else if (rgblight_config.mode >= 21 && rgblight_config.mode <= 23) { // mode = 21 to 23, knight mode rgblight_effect_knight(rgblight_config.mode - 21); - } else { + } else if (rgblight_config.mode == 24) { // mode = 24, christmas mode rgblight_effect_christmas(); } @@ -604,13 +604,13 @@ void rgblight_effect_christmas(void) { static uint16_t last_timer = 0; uint16_t hue; uint8_t i; - if (timer_elapsed(last_timer) < 1000) { + if (timer_elapsed(last_timer) < RGBLIGHT_EFFECT_CHRISTMAS_INTERVAL) { return; } last_timer = timer_read(); current_offset = (current_offset + 1) % 2; for (i = 0; i < RGBLED_NUM; i++) { - hue = 0 + ((RGBLED_NUM * (i + current_offset)) % 2) * 80; + hue = 0 + ((i/RGBLIGHT_EFFECT_CHRISTMAS_STEP + current_offset) % 2) * 120; sethsv(hue, rgblight_config.sat, rgblight_config.val, (LED_TYPE *)&led[i]); } rgblight_set(); diff --git a/quantum/rgblight.h b/quantum/rgblight.h index 726b8de72..12e858305 100644 --- a/quantum/rgblight.h +++ b/quantum/rgblight.h @@ -22,6 +22,14 @@ #define RGBLIGHT_EFFECT_DUALKNIGHT_LENGTH 4 #endif +#ifndef RGBLIGHT_EFFECT_CHRISTMAS_INTERVAL +#define RGBLIGHT_EFFECT_CHRISTMAS_INTERVAL 1000 +#endif + +#ifndef RGBLIGHT_EFFECT_CHRISTMAS_STEP +#define RGBLIGHT_EFFECT_CHRISTMAS_STEP 2 +#endif + #ifndef RGBLIGHT_HUE_STEP #define RGBLIGHT_HUE_STEP 10 #endif From 5a1b68d562036ff26820069baafe40654eef70a3 Mon Sep 17 00:00:00 2001 From: dungdung Date: Mon, 6 Feb 2017 14:09:29 -0800 Subject: [PATCH 49/65] Added mode reverse step function --- quantum/rgblight.c | 8 ++++++++ quantum/rgblight.h | 1 + 2 files changed, 9 insertions(+) diff --git a/quantum/rgblight.c b/quantum/rgblight.c index f91f3caff..7e057b63e 100644 --- a/quantum/rgblight.c +++ b/quantum/rgblight.c @@ -219,6 +219,14 @@ void rgblight_step(void) { } rgblight_mode(mode); } +void rgblight_step_reverse(void) { + uint8_t mode = 0; + mode = rgblight_config.mode - 1; + if (mode < 1) { + mode = RGBLIGHT_MODES; + } + rgblight_mode(mode); +} void rgblight_mode(uint8_t mode) { if (!rgblight_config.enable) { diff --git a/quantum/rgblight.h b/quantum/rgblight.h index 12e858305..a63b24604 100644 --- a/quantum/rgblight.h +++ b/quantum/rgblight.h @@ -73,6 +73,7 @@ void rgblight_decrease(void); void rgblight_toggle(void); void rgblight_enable(void); void rgblight_step(void); +void rgblight_step_reverse(void); void rgblight_mode(uint8_t mode); void rgblight_set(void); void rgblight_update_dword(uint32_t dword); From a7882b1ffceb6002dd1adf916a8fc32523227860 Mon Sep 17 00:00:00 2001 From: dungdung Date: Mon, 6 Feb 2017 14:14:56 -0800 Subject: [PATCH 50/65] Added non-animated gradient mode --- quantum/rgblight.c | 19 +++++++++++++++++++ quantum/rgblight.h | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/quantum/rgblight.c b/quantum/rgblight.c index 7e057b63e..dd1b91c63 100644 --- a/quantum/rgblight.c +++ b/quantum/rgblight.c @@ -66,6 +66,8 @@ __attribute__ ((weak)) const uint8_t RGBLED_SNAKE_INTERVALS[] PROGMEM = {100, 50, 20}; __attribute__ ((weak)) const uint8_t RGBLED_KNIGHT_INTERVALS[] PROGMEM = {100, 50, 20}; +__attribute__ ((weak)) +const uint16_t RGBLED_GRADIENT_RANGES[] PROGMEM = {360, 240, 180, 120, 90}; rgblight_config_t rgblight_config; rgblight_config_t inmem_config; @@ -255,6 +257,12 @@ void rgblight_mode(uint8_t mode) { #ifdef RGBLIGHT_ANIMATIONS rgblight_timer_enable(); #endif + } else if (rgblight_config.mode >= 25 && rgblight_config.mode <= 34) { + // MODE 25-34, static gradient + + #ifdef RGBLIGHT_ANIMATIONS + rgblight_timer_disable(); + #endif } rgblight_sethsv(rgblight_config.hue, rgblight_config.sat, rgblight_config.val); } @@ -358,6 +366,17 @@ void rgblight_sethsv(uint16_t hue, uint8_t sat, uint8_t val) { } else if (rgblight_config.mode >= 6 && rgblight_config.mode <= 14) { // rainbow mood and rainbow swirl, ignore the change of hue hue = rgblight_config.hue; + } else if (rgblight_config.mode >= 25 && rgblight_config.mode <= 34) { + // static gradient + uint16_t _hue; + int8_t direction = ((rgblight_config.mode - 25) % 2) ? -1 : 1; + uint16_t range = pgm_read_word(&RGBLED_GRADIENT_RANGES[(rgblight_config.mode - 25) / 2]); + for (uint8_t i = 0; i < RGBLED_NUM; i++) { + _hue = (range / RGBLED_NUM * i * direction + hue + 360) % 360; + dprintf("rgblight rainbow set hsv: %u,%u,%d,%u\n", i, _hue, direction, range); + sethsv(_hue, sat, val, (LED_TYPE *)&led[i]); + } + rgblight_set(); } } rgblight_config.hue = hue; diff --git a/quantum/rgblight.h b/quantum/rgblight.h index a63b24604..2b3e791bf 100644 --- a/quantum/rgblight.h +++ b/quantum/rgblight.h @@ -2,7 +2,7 @@ #define RGBLIGHT_H #ifdef RGBLIGHT_ANIMATIONS - #define RGBLIGHT_MODES 24 + #define RGBLIGHT_MODES 34 #else #define RGBLIGHT_MODES 1 #endif From 5c8cdfd2b579c198ad37504772e663783f530685 Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Mon, 6 Feb 2017 17:51:20 -0500 Subject: [PATCH 51/65] [skip build] testing travis script --- .travis.yml | 1 + util/travis_compiled_push.sh | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1a0a7bf15..792f2cd05 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ language: c branches: except: - /^.*-automated-build$/ + - /^[0-9]+\.[0-9]+\.[0-9]+/ env: global: - secure: vBTSL34BDPxDilKUuTXqU4CJ26Pv5hogD2nghatkxSQkI1/jbdnLj/DQdPUrMJFDIY6TK3AltsBx72MaMsLQ1JO/Ou24IeHINHXzUC1FlS9yQa48cpxnhX5kzXNyGs3oa0qaFbvnr7RgYRWtmD52n4bIZuSuW+xpBv05x2OCizdT2ZonH33nATaHGFasxROm4qYZ241VfzcUv766V6RVHgL4x9V08warugs+RENVkfzxxwhk3NmkrISabze0gSVJLHBPHxroZC6EUcf/ocobcuDrCwFqtEt90i7pNIAFUE7gZsN2uE75LmpzAWin21G7lLPcPL2k4FJVd8an1HiP2WmscJU6U89fOfMb2viObnKcCzebozBCmKGtHEuXZo9FcReOx49AnQSpmESJGs+q2dL/FApkTjQiyT4J6O5dJpoww0/r57Wx0cmmqjETKBb5rSgXM51Etk3wO09mvcPHsEwrT7qH8r9XWdyCDoEn7FCLX3/LYnf/D4SmZ633YPl5gv3v9XEwxR5+04akjgnvWDSNIaDbWBdxHNb7l4pMc+WR1bwCyMyA7KXj0RrftEGOrm9ZRLe6BkbT4cycA+j77nbPOMcyZChliV9pPQos+4TOJoTzcK2L8yWVoY409aDNVuAjdP6Yum0R2maBGl/etLmIMpJC35C5/lZ+dUNjJAM= diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh index b70999c72..8025ccb8f 100644 --- a/util/travis_compiled_push.sh +++ b/util/travis_compiled_push.sh @@ -20,7 +20,8 @@ increment_version () NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/)' | wc -l) if [[ $NEFM -gt 0 ]] ; then echo "Essential files modified." - lasttag=$(git tag | grep -Ev '\-' | head -1) + git fetch --tags + lasttag=$(git tag | grep -Ev '\-' | xargs -I@ git log --format=format:"%ai @%n" -1 @ | sort | awk '{print $4}' | tail -1) newtag=$(increment_version $lasttag) git tag $newtag git push --tags -q https://$GH_TOKEN@github.com/qmk/qmk_firmware From 35edb382ee6390e1208806ce74d7dc1f4ab08f5d Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Mon, 6 Feb 2017 18:28:37 -0500 Subject: [PATCH 52/65] [skip build] testing travis script --- util/travis_compiled_push.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh index 8025ccb8f..3751da1e5 100644 --- a/util/travis_compiled_push.sh +++ b/util/travis_compiled_push.sh @@ -21,7 +21,7 @@ NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/ if [[ $NEFM -gt 0 ]] ; then echo "Essential files modified." git fetch --tags - lasttag=$(git tag | grep -Ev '\-' | xargs -I@ git log --format=format:"%ai @%n" -1 @ | sort | awk '{print $4}' | tail -1) + lasttag=$(git tag | grep -Ev '\-' | xargs -I@ git log --format=format:"%ai @%n" -1 @ | sort -V | awk '{print $4}' | tail -1) newtag=$(increment_version $lasttag) git tag $newtag git push --tags -q https://$GH_TOKEN@github.com/qmk/qmk_firmware From 0537977ba1412aa2ba753e152eec445e18858244 Mon Sep 17 00:00:00 2001 From: TerryMathews Date: Mon, 6 Feb 2017 19:14:57 -0500 Subject: [PATCH 53/65] Reverse rev2 and rev2fliphalf Flipped definitions on what constitutes "fliphalf" by popular demand. --- keyboards/lets_split/rev2/config.h | 6 +++--- keyboards/lets_split/rev2/rev2.h | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/keyboards/lets_split/rev2/config.h b/keyboards/lets_split/rev2/config.h index b34d7c004..1c45cf136 100644 --- a/keyboards/lets_split/rev2/config.h +++ b/keyboards/lets_split/rev2/config.h @@ -35,10 +35,10 @@ along with this program. If not, see . // wiring of each half #define MATRIX_ROW_PINS { D7, E6, B4, B5 } -#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 } -// #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6 } //uncomment this line and comment line above if you need to reverse left-to-right key order +//#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 } +#define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6 } //uncomment this line and comment line above if you need to reverse left-to-right key order -#define CATERINA_BOOTLOADER +//#define CATERINA_BOOTLOADER /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/lets_split/rev2/rev2.h b/keyboards/lets_split/rev2/rev2.h index 7c397912f..990976de2 100644 --- a/keyboards/lets_split/rev2/rev2.h +++ b/keyboards/lets_split/rev2/rev2.h @@ -9,10 +9,10 @@ //void promicro_bootloader_jmp(bool program); #define KEYMAP( \ - k00, k01, k02, k03, k04, k05, k40, k41, k42, k43, k44, k45, \ - k10, k11, k12, k13, k14, k15, k50, k51, k52, k53, k54, k55, \ - k20, k21, k22, k23, k24, k25, k60, k61, k62, k63, k64, k65, \ - k30, k31, k32, k33, k34, k35, k70, k71, k72, k73, k74, k75 \ + k00, k01, k02, k03, k04, k05, k45, k44, k43, k42, k41, k40, \ + k10, k11, k12, k13, k14, k15, k55, k54, k53, k52, k51, k50, \ + k20, k21, k22, k23, k24, k25, k65, k64, k63, k62, k61, k60, \ + k30, k31, k32, k33, k34, k35, k75, k74, k73, k72, k71, k70 \ ) \ { \ { k00, k01, k02, k03, k04, k05 }, \ From 5d55a44afa97386798bf7dd760123fbde8d35a28 Mon Sep 17 00:00:00 2001 From: TerryMathews Date: Mon, 6 Feb 2017 19:21:21 -0500 Subject: [PATCH 54/65] Revert "Reverse rev2 and rev2fliphalf" This reverts commit 0537977ba1412aa2ba753e152eec445e18858244. --- keyboards/lets_split/rev2/config.h | 6 +++--- keyboards/lets_split/rev2/rev2.h | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/keyboards/lets_split/rev2/config.h b/keyboards/lets_split/rev2/config.h index 1c45cf136..b34d7c004 100644 --- a/keyboards/lets_split/rev2/config.h +++ b/keyboards/lets_split/rev2/config.h @@ -35,10 +35,10 @@ along with this program. If not, see . // wiring of each half #define MATRIX_ROW_PINS { D7, E6, B4, B5 } -//#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 } -#define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6 } //uncomment this line and comment line above if you need to reverse left-to-right key order +#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 } +// #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6 } //uncomment this line and comment line above if you need to reverse left-to-right key order -//#define CATERINA_BOOTLOADER +#define CATERINA_BOOTLOADER /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/lets_split/rev2/rev2.h b/keyboards/lets_split/rev2/rev2.h index 990976de2..7c397912f 100644 --- a/keyboards/lets_split/rev2/rev2.h +++ b/keyboards/lets_split/rev2/rev2.h @@ -9,10 +9,10 @@ //void promicro_bootloader_jmp(bool program); #define KEYMAP( \ - k00, k01, k02, k03, k04, k05, k45, k44, k43, k42, k41, k40, \ - k10, k11, k12, k13, k14, k15, k55, k54, k53, k52, k51, k50, \ - k20, k21, k22, k23, k24, k25, k65, k64, k63, k62, k61, k60, \ - k30, k31, k32, k33, k34, k35, k75, k74, k73, k72, k71, k70 \ + k00, k01, k02, k03, k04, k05, k40, k41, k42, k43, k44, k45, \ + k10, k11, k12, k13, k14, k15, k50, k51, k52, k53, k54, k55, \ + k20, k21, k22, k23, k24, k25, k60, k61, k62, k63, k64, k65, \ + k30, k31, k32, k33, k34, k35, k70, k71, k72, k73, k74, k75 \ ) \ { \ { k00, k01, k02, k03, k04, k05 }, \ From 2a2be010d9d8c10d872c01637f4b4cd263f9bc1b Mon Sep 17 00:00:00 2001 From: TerryMathews Date: Mon, 6 Feb 2017 19:23:10 -0500 Subject: [PATCH 55/65] Reverse rev2 and rev2fliphalf Flipped definitions on what constitutes "fliphalf" by popular demand. --- keyboards/lets_split/rev2/rev2.h | 8 ++++---- keyboards/lets_split/rev2fliphalf/rev2fliphalf.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/keyboards/lets_split/rev2/rev2.h b/keyboards/lets_split/rev2/rev2.h index 7c397912f..990976de2 100644 --- a/keyboards/lets_split/rev2/rev2.h +++ b/keyboards/lets_split/rev2/rev2.h @@ -9,10 +9,10 @@ //void promicro_bootloader_jmp(bool program); #define KEYMAP( \ - k00, k01, k02, k03, k04, k05, k40, k41, k42, k43, k44, k45, \ - k10, k11, k12, k13, k14, k15, k50, k51, k52, k53, k54, k55, \ - k20, k21, k22, k23, k24, k25, k60, k61, k62, k63, k64, k65, \ - k30, k31, k32, k33, k34, k35, k70, k71, k72, k73, k74, k75 \ + k00, k01, k02, k03, k04, k05, k45, k44, k43, k42, k41, k40, \ + k10, k11, k12, k13, k14, k15, k55, k54, k53, k52, k51, k50, \ + k20, k21, k22, k23, k24, k25, k65, k64, k63, k62, k61, k60, \ + k30, k31, k32, k33, k34, k35, k75, k74, k73, k72, k71, k70 \ ) \ { \ { k00, k01, k02, k03, k04, k05 }, \ diff --git a/keyboards/lets_split/rev2fliphalf/rev2fliphalf.h b/keyboards/lets_split/rev2fliphalf/rev2fliphalf.h index 993e149dd..7dc8e5ba8 100644 --- a/keyboards/lets_split/rev2fliphalf/rev2fliphalf.h +++ b/keyboards/lets_split/rev2fliphalf/rev2fliphalf.h @@ -9,10 +9,10 @@ //void promicro_bootloader_jmp(bool program); #define KEYMAP( \ - k00, k01, k02, k03, k04, k05, k45, k44, k43, k42, k41, k40, \ - k10, k11, k12, k13, k14, k15, k55, k54, k53, k52, k51, k50, \ - k20, k21, k22, k23, k24, k25, k65, k64, k63, k62, k61, k60, \ - k30, k31, k32, k33, k34, k35, k75, k74, k73, k72, k71, k70 \ + k00, k01, k02, k03, k04, k05, k40, k41, k42, k43, k44, k45, \ + k10, k11, k12, k13, k14, k15, k50, k51, k52, k53, k54, k55, \ + k20, k21, k22, k23, k24, k25, k60, k61, k62, k63, k64, k65, \ + k30, k31, k32, k33, k34, k35, k70, k71, k72, k73, k74, k75 \ ) \ { \ { k00, k01, k02, k03, k04, k05 }, \ From 3dbdd153040087f23d63204b142f355936ae8bc0 Mon Sep 17 00:00:00 2001 From: Nic Aitch Date: Mon, 6 Feb 2017 19:57:34 -0600 Subject: [PATCH 56/65] Check for a new serial port every second --- keyboards/lets_split/rules.mk | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/keyboards/lets_split/rules.mk b/keyboards/lets_split/rules.mk index 0dc549130..0efa78550 100644 --- a/keyboards/lets_split/rules.mk +++ b/keyboards/lets_split/rules.mk @@ -76,10 +76,12 @@ CUSTOM_MATRIX = yes avrdude: build ls /dev/tty* > /tmp/1; \ - echo "Reset your Pro Micro then hit any key to continue..."; \ - read -n 1 -s; \ - ls /dev/tty* > /tmp/2; \ - USB=`diff /tmp/1 /tmp/2 | grep '>' | sed -e 's/> //'`; \ + echo "Reset your Pro Micro now"; \ + while [[ -z $$USB ]]; do \ + sleep 1; \ + ls /dev/tty* > /tmp/2; \ + USB=`diff /tmp/1 /tmp/2 | grep -o '/dev/tty.*'`; \ + done; \ avrdude -p $(MCU) -c avr109 -P $$USB -U flash:w:$(BUILD_DIR)/$(TARGET).hex .PHONY: avrdude From 19d63ad72c012ee3dfb9375724067b278593df8a Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Tue, 7 Feb 2017 01:35:10 -0500 Subject: [PATCH 57/65] try building only keyboards needed --- .travis.yml | 6 ++---- util/travis_build.sh | 18 ++++++++++++++++++ util/travis_compiled_push.sh | 6 +++--- 3 files changed, 23 insertions(+), 7 deletions(-) create mode 100644 util/travis_build.sh diff --git a/.travis.yml b/.travis.yml index 792f2cd05..093f13be6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,9 +9,6 @@ branches: env: global: - secure: vBTSL34BDPxDilKUuTXqU4CJ26Pv5hogD2nghatkxSQkI1/jbdnLj/DQdPUrMJFDIY6TK3AltsBx72MaMsLQ1JO/Ou24IeHINHXzUC1FlS9yQa48cpxnhX5kzXNyGs3oa0qaFbvnr7RgYRWtmD52n4bIZuSuW+xpBv05x2OCizdT2ZonH33nATaHGFasxROm4qYZ241VfzcUv766V6RVHgL4x9V08warugs+RENVkfzxxwhk3NmkrISabze0gSVJLHBPHxroZC6EUcf/ocobcuDrCwFqtEt90i7pNIAFUE7gZsN2uE75LmpzAWin21G7lLPcPL2k4FJVd8an1HiP2WmscJU6U89fOfMb2viObnKcCzebozBCmKGtHEuXZo9FcReOx49AnQSpmESJGs+q2dL/FApkTjQiyT4J6O5dJpoww0/r57Wx0cmmqjETKBb5rSgXM51Etk3wO09mvcPHsEwrT7qH8r9XWdyCDoEn7FCLX3/LYnf/D4SmZ633YPl5gv3v9XEwxR5+04akjgnvWDSNIaDbWBdxHNb7l4pMc+WR1bwCyMyA7KXj0RrftEGOrm9ZRLe6BkbT4cycA+j77nbPOMcyZChliV9pPQos+4TOJoTzcK2L8yWVoY409aDNVuAjdP6Yum0R2maBGl/etLmIMpJC35C5/lZ+dUNjJAM= - matrix: - - TARGET=all-keyboards AUTOGEN=true - - TARGET=test AUTOGEN=false before_install: - wget http://www.atmel.com/images/avr8-gnu-toolchain-3.5.4.1709-linux.any.x86_64.tar.gz install: @@ -20,7 +17,8 @@ install: before_script: - avr-gcc --version script: -- 'if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then make $TARGET AUTOGEN=$AUTOGEN; fi' +- make test AUTOGET=false +- bash util/travis_build.sh addons: apt: packages: diff --git a/util/travis_build.sh b/util/travis_build.sh new file mode 100644 index 000000000..df2e06960 --- /dev/null +++ b/util/travis_build.sh @@ -0,0 +1,18 @@ +#!/bin/bash + +TRAVIS_COMMIT_MESSAGE="${TRAVIS_COMMIT_MESSAGE:-none}" +TRAVIS_COMMIT_RANGE="${TRAVIS_COMMIT_RANGE:-HEAD~1..HEAD}" + +if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then + NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/)' | wc -l) + if [[ $NEFM -gt 0 ]] ; then + echo "Making all keymaps for all keyboards" + make all-keyboards AUTOGEN=true + else + MKB=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -oP '(?<=keyboards\/)([a-zA-Z_]+)' | sort -u) + for KB in $MKB ; do + echo "Making all keymaps for $KB" + make "$KB" AUTOGEN=true + done + fi +fi diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh index 3751da1e5..6ec558cac 100644 --- a/util/travis_compiled_push.sh +++ b/util/travis_compiled_push.sh @@ -38,9 +38,9 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then git clone https://$GH_TOKEN@github.com/jackhumbert/qmk.fm.git cd qmk.fm git submodule update --init --recursive - rm -rf keyboard - rm -rf keyboards - cp -r ../qmk_firmware/keyboards . + #rm -rf keyboard + #rm -rf keyboards + yes | cp -rf ../qmk_firmware/keyboards . mkdir keyboards/ergodox_ez/ cp ../qmk_firmware/util/ergodox_ez.html keyboards/ergodox_ez/index.html cp ../qmk_firmware/readme.md qmk_readme.md From f79f38d72637956132112014bd2eb000122cb06a Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Tue, 7 Feb 2017 01:53:46 -0500 Subject: [PATCH 58/65] add comma --- keyboards/planck/keymaps/yale/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/planck/keymaps/yale/keymap.c b/keyboards/planck/keymaps/yale/keymap.c index a0910860a..f2280778a 100644 --- a/keyboards/planck/keymaps/yale/keymap.c +++ b/keyboards/planck/keymaps/yale/keymap.c @@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_NUM] = { {_______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______}, {KC_LCTL, KC_GRV, KC_LBRC, KC_LCBR, KC_LPRN, KC_SLSH, KC_BSLS, KC_RPRN, KC_RCBR, KC_RBRC, KC_MINS, KC_EQL}, - {_______, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC KC_CIRC, KC_AMPR, KC_ASTR, KC_UNDS, KC_PLUS, _______}, + {_______, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_UNDS, KC_PLUS, _______}, {_______, _______, _______, _______, _______, _______, _______, MO(_NAV), _______, _______, _______, _______} }, From c8d5376f11642aaaae9a247287db30d5b226c3b9 Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Tue, 7 Feb 2017 01:54:58 -0500 Subject: [PATCH 59/65] fix typo --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 093f13be6..ebd4cc182 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ install: before_script: - avr-gcc --version script: -- make test AUTOGET=false +- make test AUTOGEN=false - bash util/travis_build.sh addons: apt: From 6a92cc28977ff4d51fa0bafcb757867b27ebdb45 Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Tue, 7 Feb 2017 02:00:07 -0500 Subject: [PATCH 60/65] correctly assign bash variable --- .travis.yml | 2 +- util/travis_build.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index ebd4cc182..28f01ecb0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ install: before_script: - avr-gcc --version script: -- make test AUTOGEN=false +- make test AUTOGEN="false" - bash util/travis_build.sh addons: apt: diff --git a/util/travis_build.sh b/util/travis_build.sh index df2e06960..38c1ffc65 100644 --- a/util/travis_build.sh +++ b/util/travis_build.sh @@ -7,12 +7,12 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/)' | wc -l) if [[ $NEFM -gt 0 ]] ; then echo "Making all keymaps for all keyboards" - make all-keyboards AUTOGEN=true + make all-keyboards AUTOGEN="true" else MKB=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -oP '(?<=keyboards\/)([a-zA-Z_]+)' | sort -u) for KB in $MKB ; do echo "Making all keymaps for $KB" - make "$KB" AUTOGEN=true + make "$KB" AUTOGEN="true" done fi fi From 616b8604b0b0f7e281ecfeff385d96a6a14955da Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Tue, 7 Feb 2017 11:53:43 -0500 Subject: [PATCH 61/65] variable scope fix for travis --- .travis.yml | 6 ++---- util/travis_build.sh | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 28f01ecb0..18ecde7e3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ install: before_script: - avr-gcc --version script: -- make test AUTOGEN="false" +- make test AUTOGEN=false - bash util/travis_build.sh addons: apt: @@ -29,6 +29,4 @@ addons: - libnewlib-arm-none-eabi - diffutils after_success: - if [ "$AUTOGEN" == "true" ]; then - bash util/travis_compiled_push.sh; - fi + bash util/travis_compiled_push.sh diff --git a/util/travis_build.sh b/util/travis_build.sh index 38c1ffc65..fab9178de 100644 --- a/util/travis_build.sh +++ b/util/travis_build.sh @@ -12,7 +12,7 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then MKB=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -oP '(?<=keyboards\/)([a-zA-Z_]+)' | sort -u) for KB in $MKB ; do echo "Making all keymaps for $KB" - make "$KB" AUTOGEN="true" + make "$KB" AUTOGEN=true done fi fi From de659486f52db6492be6ca03ce5450690f5d891d Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Tue, 7 Feb 2017 12:36:25 -0500 Subject: [PATCH 62/65] pass through travis errors --- keyboards/handwired/onekey/keymaps/default/keymap.c | 2 +- util/travis_build.sh | 4 ++++ util/travis_compiled_push.sh | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/keyboards/handwired/onekey/keymaps/default/keymap.c b/keyboards/handwired/onekey/keymaps/default/keymap.c index 756c4f51e..10c486718 100644 --- a/keyboards/handwired/onekey/keymaps/default/keymap.c +++ b/keyboards/handwired/onekey/keymaps/default/keymap.c @@ -1,5 +1,5 @@ #include "onekey.h" const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - { KC_A } + {{ KC_A }} }; diff --git a/util/travis_build.sh b/util/travis_build.sh index fab9178de..794b0d3a1 100644 --- a/util/travis_build.sh +++ b/util/travis_build.sh @@ -4,15 +4,19 @@ TRAVIS_COMMIT_MESSAGE="${TRAVIS_COMMIT_MESSAGE:-none}" TRAVIS_COMMIT_RANGE="${TRAVIS_COMMIT_RANGE:-HEAD~1..HEAD}" if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then + exit_code=0 NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/)' | wc -l) if [[ $NEFM -gt 0 ]] ; then echo "Making all keymaps for all keyboards" make all-keyboards AUTOGEN="true" + : $((exit_code = $exit_code + $?)) else MKB=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -oP '(?<=keyboards\/)([a-zA-Z_]+)' | sort -u) for KB in $MKB ; do echo "Making all keymaps for $KB" make "$KB" AUTOGEN=true + : $((exit_code = $exit_code + $?)) done fi + exit $exit_code fi diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh index 6ec558cac..de2481ce5 100644 --- a/util/travis_compiled_push.sh +++ b/util/travis_compiled_push.sh @@ -41,7 +41,7 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then #rm -rf keyboard #rm -rf keyboards yes | cp -rf ../qmk_firmware/keyboards . - mkdir keyboards/ergodox_ez/ + #mkdir keyboards/ergodox_ez/ cp ../qmk_firmware/util/ergodox_ez.html keyboards/ergodox_ez/index.html cp ../qmk_firmware/readme.md qmk_readme.md ./generate.sh From 9c02e2ab49f020218f39f386fcbe2edfcea3d810 Mon Sep 17 00:00:00 2001 From: Jimmy Chan Date: Mon, 6 Feb 2017 08:42:38 -0800 Subject: [PATCH 63/65] correctly put eeprom EE_HANDS at addr 0x0a (decimal 10). default to rev2 project. do not default EE_HANDS for the serial keymap if you compare split_util.h with the original project by ahtn, the address we look for isLeftHand config went from addr 7 to addr 10 (decimal). The EEP files were not updated. EE_HANDS should not be enabled by default since it's more confusing for most users --- keyboards/lets_split/Makefile | 4 +++- keyboards/lets_split/eeprom-lefthand.eep | 2 +- keyboards/lets_split/eeprom-righthand.eep | 2 +- keyboards/lets_split/keymaps/serial/config.h | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/keyboards/lets_split/Makefile b/keyboards/lets_split/Makefile index 4e2a6f00f..f5c87d4d6 100644 --- a/keyboards/lets_split/Makefile +++ b/keyboards/lets_split/Makefile @@ -1,3 +1,5 @@ +SUBPROJECT_DEFAULT = rev2 + ifndef MAKEFILE_INCLUDED include ../../Makefile -endif \ No newline at end of file +endif diff --git a/keyboards/lets_split/eeprom-lefthand.eep b/keyboards/lets_split/eeprom-lefthand.eep index a92200b12..b9666a74c 100644 --- a/keyboards/lets_split/eeprom-lefthand.eep +++ b/keyboards/lets_split/eeprom-lefthand.eep @@ -1,2 +1,2 @@ -:080000000000000000000001F7 +:0B0000000000000000000000000001F4 :00000001FF diff --git a/keyboards/lets_split/eeprom-righthand.eep b/keyboards/lets_split/eeprom-righthand.eep index 91a683170..94cc5be7f 100644 --- a/keyboards/lets_split/eeprom-righthand.eep +++ b/keyboards/lets_split/eeprom-righthand.eep @@ -1,2 +1,2 @@ -:080000000000000000000000F8 +:0B0000000000000000000000000000F5 :00000001FF diff --git a/keyboards/lets_split/keymaps/serial/config.h b/keyboards/lets_split/keymaps/serial/config.h index 0e59b191b..753f422dd 100644 --- a/keyboards/lets_split/keymaps/serial/config.h +++ b/keyboards/lets_split/keymaps/serial/config.h @@ -18,7 +18,7 @@ along with this program. If not, see . #define USE_SERIAL -#define EE_HANDS +// #define EE_HANDS #ifdef SUBPROJECT_rev1 @@ -29,4 +29,4 @@ along with this program. If not, see . #endif #ifdef SUBPROJECT_rev2fliphalf #include "../../rev2fliphalf/config.h" -#endif \ No newline at end of file +#endif From 048ef311dc5a92d736c8b0778334bfa82f8f42a8 Mon Sep 17 00:00:00 2001 From: Jimmy Chan Date: Mon, 6 Feb 2017 09:53:38 -0800 Subject: [PATCH 64/65] udpate readme to reflect QMK and not having the Makefile from ahtn's repo --- keyboards/lets_split/readme.md | 88 ++++++++++++++++++++++++++++------ 1 file changed, 73 insertions(+), 15 deletions(-) diff --git a/keyboards/lets_split/readme.md b/keyboards/lets_split/readme.md index a63ce5907..0e903065e 100644 --- a/keyboards/lets_split/readme.md +++ b/keyboards/lets_split/readme.md @@ -6,9 +6,45 @@ This readme and most of the code are from https://github.com/ahtn/tmk_keyboard/ Split keyboard firmware for Arduino Pro Micro or other ATmega32u4 based boards. + +## First Time Setup + +Download or clone the whole firmware and navigate to the keyboards/lets_split directory. Once your dev env is setup, you'll be able to generate the default .hex using: + +``` +$ make rev2 +``` + +You will see a lot of output and if everything worked correctly you will see the built hex files: + +``` +lets_split_rev2_serial.hex +lets_split_rev2_i2c.hex +``` + +If you would like to use one of the alternative keymaps, or create your own, copy one of the existing [keymaps](keymaps/) and run make like so: + + +``` +$ make rev2-YOUR_KEYMAP_NAME +``` + +If everything worked correctly you will see a file: + +``` +lets_split_rev2_YOUR_KEYMAP_NAME.hex +``` + +For more information on customizing keymaps, take a look at the primary documentation for [Customizing Your Keymap](/readme.md##customizing-your-keymap) in the main readme.md. + +### Let's split 1.0 +If you have a first generation Let's Split you will need to use the revision 1 code. To do so, use `rev1` in all your commands instead. + Features -------- +For the full Quantum Mechanical Keyboard feature list, see [the parent readme.md](/readme.md). + Some features supported by the firmware: * Either half can connect to the computer via USB, or both halves can be used @@ -62,7 +98,7 @@ unnecessary in simple use cases. Notes on Software Configuration ------------------------------- -Configuring the firmware is similar to any other TMK project. One thing +Configuring the firmware is similar to any other QMK project. One thing to note is that `MATIX_ROWS` in `config.h` is the total number of rows between the two halves, i.e. if your split keyboard has 4 rows in each half, then `MATRIX_ROWS=8`. @@ -70,37 +106,59 @@ the two halves, i.e. if your split keyboard has 4 rows in each half, then Also the current implementation assumes a maximum of 8 columns, but it would not be very difficult to adapt it to support more if required. - Flashing --------- - +------- From the keymap directory run `make SUBPROJECT-KEYMAP-avrdude` for automatic serial port resolution and flashing. - Example: `make rev2-serial-avrdude` + +Choosing which board to plug the USB cable into (choosing Master) +-------- +Because the two boards are identical, the firmware has logic to differentiate the left and right board. + +It uses two strategies to figure things out: look at the EEPROM (memory on the chip) or looks if the current board has the usb cable. + +The EEPROM approach requires additional setup (flashing the eeeprom) but allows you to swap the usb cable to either side. + +The USB cable approach is easier to setup and if you just want the usb cable on the left board, you do not need to do anything extra. + +### Setting the left hand as master +If you always plug the usb cable into the left board, nothing extra is needed as this is the default. Comment out `EE_HANDS` and comment out `I2C_MASTER_RIGHT` if for some reason it was set. + +### Setting the right hand as master +If you always plug the usb cable into the right board, add an extra flag to your `config.h` +``` + #define I2C_MASTER_RIGHT +``` + +### Setting EE_hands to use either hands as master If you define `EE_HANDS` in your `config.h`, you will need to set the -EEPROM for the left and right halves. The EEPROM is used to store whether the +EEPROM for the left and right halves. + +The EEPROM is used to store whether the half is left handed or right handed. This makes it so that the same firmware file will run on both hands instead of having to flash left and right handed versions of the firmware to each half. To flash the EEPROM file for the left half run: ``` -make eeprom-left +avrdude -p atmega32u4 -P $(COM_PORT) -c avr109 -U eeprom:w:eeprom-lefthand.eep +// or the equivalent in dfu-programmer + ``` and similarly for right half ``` -make eeprom-right +avrdude -p atmega32u4 -P $(COM_PORT) -c avr109 -U eeprom:w:eeprom-righhand.eep +// or the equivalent in dfu-programmer ``` -After you have flashed the EEPROM for the first time, you then need to program -the flash memory: -``` -make program -``` +NOTE: replace `$(COM_PORT)` with the port of your device (e.g. `/dev/ttyACM0`) + +After you have flashed the EEPROM, you then need to set `EE_HANDS` in your config.h, rebuild the hex files and reflash. + Note that you need to program both halves, but you have the option of using different keymaps for each half. You could program the left half with a QWERTY -layout and the right half with a Colemak layout. Then if you connect the left -half to a computer by USB the keyboard will use QWERTY and Colemak when the +layout and the right half with a Colemak layout using bootmagic's default layout option. +Then if you connect the left half to a computer by USB the keyboard will use QWERTY and Colemak when the right half is connected. From 56d2198b3d85f112317b4b0d09d5cf6a5c915db8 Mon Sep 17 00:00:00 2001 From: Jimmy Chan Date: Mon, 6 Feb 2017 10:03:48 -0800 Subject: [PATCH 65/65] rename I2C_MASTER_RIGHT to MASTER_RIGHT since this works for serial as well --- keyboards/lets_split/keymaps/i2c/config.h | 7 ++++--- keyboards/lets_split/keymaps/serial/config.h | 2 ++ keyboards/lets_split/readme.md | 4 ++-- keyboards/lets_split/split_util.c | 3 ++- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/keyboards/lets_split/keymaps/i2c/config.h b/keyboards/lets_split/keymaps/i2c/config.h index 332c990fc..013542731 100644 --- a/keyboards/lets_split/keymaps/i2c/config.h +++ b/keyboards/lets_split/keymaps/i2c/config.h @@ -16,8 +16,9 @@ along with this program. If not, see . */ #define USE_I2C -#define I2C_MASTER_LEFT -// #define I2C_MASTER_RIGHT +#define MASTER_LEFT +// #define _MASTER_RIGHT +// #define EE_HANDS #ifdef SUBPROJECT_rev1 #include "../../rev1/config.h" @@ -27,4 +28,4 @@ along with this program. If not, see . #endif #ifdef SUBPROJECT_rev2fliphalf #include "../../rev2fliphalf/config.h" -#endif \ No newline at end of file +#endif diff --git a/keyboards/lets_split/keymaps/serial/config.h b/keyboards/lets_split/keymaps/serial/config.h index 753f422dd..ba271d1ac 100644 --- a/keyboards/lets_split/keymaps/serial/config.h +++ b/keyboards/lets_split/keymaps/serial/config.h @@ -18,6 +18,8 @@ along with this program. If not, see . #define USE_SERIAL +#define MASTER_LEFT +// #define _MASTER_RIGHT // #define EE_HANDS diff --git a/keyboards/lets_split/readme.md b/keyboards/lets_split/readme.md index 0e903065e..ecce3f415 100644 --- a/keyboards/lets_split/readme.md +++ b/keyboards/lets_split/readme.md @@ -123,12 +123,12 @@ The EEPROM approach requires additional setup (flashing the eeeprom) but allows The USB cable approach is easier to setup and if you just want the usb cable on the left board, you do not need to do anything extra. ### Setting the left hand as master -If you always plug the usb cable into the left board, nothing extra is needed as this is the default. Comment out `EE_HANDS` and comment out `I2C_MASTER_RIGHT` if for some reason it was set. +If you always plug the usb cable into the left board, nothing extra is needed as this is the default. Comment out `EE_HANDS` and comment out `I2C_MASTER_RIGHT` or `MASTER_RIGHT` if for some reason it was set. ### Setting the right hand as master If you always plug the usb cable into the right board, add an extra flag to your `config.h` ``` - #define I2C_MASTER_RIGHT + #define MASTER_RIGHT ``` ### Setting EE_hands to use either hands as master diff --git a/keyboards/lets_split/split_util.c b/keyboards/lets_split/split_util.c index 461921798..226dc1881 100644 --- a/keyboards/lets_split/split_util.c +++ b/keyboards/lets_split/split_util.c @@ -21,7 +21,8 @@ static void setup_handedness(void) { #ifdef EE_HANDS isLeftHand = eeprom_read_byte(EECONFIG_HANDEDNESS); #else - #ifdef I2C_MASTER_RIGHT + // I2C_MASTER_RIGHT is deprecated use MASTER_RIGHT instead since this works for both serial and i2c + #if defined(I2C_MASTER_RIGHT) || defined(MASTER_RIGHT) isLeftHand = !has_usb(); #else isLeftHand = has_usb();