From 826417bfc001377719c9034fe273d1596ba62c9c Mon Sep 17 00:00:00 2001 From: IBNobody Date: Tue, 18 Oct 2016 16:45:45 -0500 Subject: [PATCH 01/25] Updating Vision keyboard files --- .../vision_division/keymaps/default/Makefile | 4 +- .../vision_division/keymaps/default/keymap.c | 211 ++++++++++-------- 2 files changed, 116 insertions(+), 99 deletions(-) diff --git a/keyboards/vision_division/keymaps/default/Makefile b/keyboards/vision_division/keymaps/default/Makefile index 5a930e85..28060947 100644 --- a/keyboards/vision_division/keymaps/default/Makefile +++ b/keyboards/vision_division/keymaps/default/Makefile @@ -2,7 +2,7 @@ # 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 = yes # Virtual DIP switch configuration(+1000) +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 = yes # Console for debug(+400) @@ -18,4 +18,4 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend ifndef QUANTUM_DIR include ../../../../Makefile -endif \ No newline at end of file +endif diff --git a/keyboards/vision_division/keymaps/default/keymap.c b/keyboards/vision_division/keymaps/default/keymap.c index 64118abd..8622ee52 100644 --- a/keyboards/vision_division/keymaps/default/keymap.c +++ b/keyboards/vision_division/keymaps/default/keymap.c @@ -121,6 +121,7 @@ enum keyboard_macros { #define M_CP_CT M(MACRO_COPY_CUT) +#define M_COPY KC_FN1 #define SC_UNDO LCTL(KC_Z) #define SC_REDO LCTL(KC_Y) @@ -145,31 +146,31 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* LAYER = LAYER_QWERTY .-----------------------------------. .-----------------------------------------------------------------------------------------------------------------------------. .-----------------------------------. - | FN | PRINT | SCR LK | PAUSE | | F1 | F2 | F3 | F4 | XXXXXX | F5 | F6 | F7 | F8 | XXXXXX | F9 | F10 | F11 | F12 | | VOL DN | MUTE | VOL UP | BACKLT | + | VOL DN | MUTE | VOL UP | BACKLT | | F1 | F2 | F3 | F4 | XXXXXX | F5 | F6 | F7 | F8 | XXXXXX | F9 | F10 | F11 | F12 | | PRINT | SCR LK | PAUSE | FN | '-----------------------------------' '-----------------------------------------------------------------------------------------------------------------------------' '-----------------------------------' .-----------------------------------. .-----------------------------------------------------------------------------------------------------------------------------. .-----------------------------------. - | M1 | INS | HOME | PG UP | | ESC | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | = | BACKSP | | NUM LK | KP / | KP * | KP - | + | NUM LK | KP / | KP * | KP - | | ESC | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | = | BACKSP | | INS | HOME | PG UP | M1 | |--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |--------|--------|--------+--------| - | M2 | DEL | END | PG DN | | TAB | TAB | Q | W | E | R | T | Y | U | I | O | P | - | \ | | KP 7 | KP 8 | KP 9 | KP + | + | KP 7 | KP 8 | KP 9 | KP + | | TAB | TAB | Q | W | E | R | T | Y | U | I | O | P | - | \ | | DEL | END | PG DN | M2 | |--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| o |--------|--------|--------+--------| - | M3 | UL | UP | UR | | CAP LK | BACKSP | A | S | D | F | G | H | J | K | L | ; | ' | ENTER | o | KP 4 | KP 5 | KP 6 | KP + | + | KP 4 | KP 5 | KP 6 | KP + | | CAP LK | BACKSP | A | S | D | F | G | H | J | K | L | ; | ' | ENTER | o | CP/CT | UNDO | PASTE | M3 | |--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| o |--------|--------|--------+--------| - | M4 | LEFT | CP/CT | RIGHT | | LSHIFT | LSHIFT | Z | X | C | V | B | N | M | , | . | / | RSHIFT | RSHIFT | | KP 1 | KP 2 | KP 3 | KP Ent | + | KP 1 | KP 2 | KP 3 | KP Ent | | LSHIFT | LSHIFT | Z | X | C | V | B | N | M | , | . | / | RSHIFT | RSHIFT | | XXXXXX | UP | XXXXXX | M4 | |--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |--------|--------|--------+--------| - | M5 | DL | DOWN | DR | | LCTRL | XXXXXX | XXXXXX | LWIN | LALT | LOWER | SPACE . SPACE | UPPER | OSHIFT | RALT | APP | XXXXXX | RCTRL | | KP 0 | KP , | KP . | KP Ent | + | KP 0 | KP , | KP . | KP Ent | | LCTRL | XXXXXX | LWIN | XXXXXX | LALT | UPPER | SPACE . SPACE | LOWER | OSHIFT | RALT | APP | XXXXXX | RCTRL | | LEFT | DOWN | RIGHT | M5 | '-----------------------------------' '-----------------------------------------------------------------------------------------------------------------------------' '-----------------------------------' */ KEYMAP(LAYER_QWERTY, \ - M_HELP , KC_PSCR, KC_SLCK, KC_PAUS, KC_F1 , KC_F2 , KC_F3 , KC_F4 , XXXXXXX, KC_F5 , KC_F6 , KC_F7 , KC_F8 , XXXXXXX, KC_F9 , KC_F10 , KC_F11 , KC_F12 , KC_VOLD, KC_MUTE, KC_VOLU, M_BACKL, \ - M_M1 , KC_INS , KC_HOME, KC_PGUP, KC_ESC , KC_GRV , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_EQL , KC_BSPC, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, \ - M_M2 , KC_DEL , KC_END , KC_PGDN, KC_TAB , KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_MINS, KC_BSLS, KC_KP_7, KC_KP_8, KC_KP_9, KC_PPLS, \ - M_M3 , M_UL , KC_UP , M_UR , KC_CAPS, 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_ENT , KC_KP_4, KC_KP_5, KC_KP_6, KC_PPLS, \ - M_M4 , KC_LEFT, M_CP_CT, KC_RGHT, KC_LSFT, 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_RSFT, KC_KP_1, KC_KP_2, KC_KP_3, KC_PENT, \ - M_M5 , M_DL , KC_DOWN, M_DR , KC_LCTL, XXXXXXX, XXXXXXX, KC_LGUI, KC_LALT, M_LOWER, KC_SPC , KC_SPC , M_UPPER, OS_SHFT, KC_RALT, KC_APP , XXXXXXX, KC_RCTL, KC_KP_0, KC_PCMM, KC_PDOT, KC_PENT \ + KC_VOLD, KC_MUTE, KC_VOLU, M_BACKL, KC_F1 , KC_F2 , KC_F3 , KC_F4 , XXXXXXX, KC_F5 , KC_F6 , KC_F7 , KC_F8 , XXXXXXX, KC_F9 , KC_F10 , KC_F11 , KC_F12 , KC_PSCR, KC_SLCK, KC_PAUS, M_HELP , \ + KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, KC_ESC , KC_GRV , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_EQL , KC_BSPC, KC_INS , KC_HOME, KC_PGUP, M_M1 , \ + KC_KP_7, KC_KP_8, KC_KP_9, KC_PPLS, KC_TAB , KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_MINS, KC_BSLS, KC_DEL , KC_END , KC_PGDN, M_M2 , \ + KC_KP_4, KC_KP_5, KC_KP_6, KC_PPLS, KC_CAPS, 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_ENT , M_CP_CT, SC_UNDO, SC_PSTE, M_M3 , \ + KC_KP_1, KC_KP_2, KC_KP_3, KC_PENT, KC_LSFT, 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_RSFT, XXXXXXX, KC_UP , XXXXXXX, M_M4 , \ + KC_KP_0, KC_PCMM, KC_PDOT, KC_PENT, KC_LCTL, XXXXXXX, KC_LGUI, XXXXXXX, KC_LALT, M_UPPER, KC_SPC , KC_SPC , M_LOWER, OS_SHFT, KC_RALT, KC_APP , XXXXXXX, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, M_M5 \ ), /* LAYER = LAYER_LOWER .-----------------------------------. .-----------------------------------------------------------------------------------------------------------------------------. .-----------------------------------. - | ______ | ______ | ______ | ______ | | F13 | F14 | F15 | F16 | XXXXXX | F17 | F18 | F19 | F20 | XXXXXX | F21 | F22 | F23 | F24 | | ______ | MUTE A | ______ | ______ | + | ______ | MUTE A | ______ | ______ | | F13 | F14 | F15 | F16 | XXXXXX | F17 | F18 | F19 | F20 | XXXXXX | F21 | F22 | F23 | F24 | | ______ | ______ | ______ | ______ | '-----------------------------------' '-----------------------------------------------------------------------------------------------------------------------------' '-----------------------------------' .-----------------------------------. .-----------------------------------------------------------------------------------------------------------------------------. .-----------------------------------. | ______ | ______ | ______ | ______ | | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | | ______ | ______ | ______ | ______ | @@ -180,20 +181,20 @@ KEYMAP(LAYER_QWERTY, \ |--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| o |--------|--------|--------+--------| | ______ | ______ | ______ | ______ | | ______ | ______ | | | & | ! | ~ | ; | : | = | < | > | ? | ______ | ______ | | ______ | ______ | ______ | ______ | |--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |--------|--------|--------+--------| - | ______ | ______ | ______ | ______ | | ______ | XXXXXX | XXXXXX | ______ | ______ | ______ | ______ . ______ | LOWER | ______ | ______ | ______ | XXXXXX | ______ | | ______ | ______ | ______ | ______ | + | ______ | ______ | ______ | ______ | | ______ | ______ | ______ | ______ | ______ | ______ | ______ . ______ | LOWER | ______ | ______ | ______ | XXXXXX | ______ | | ______ | ______ | ______ | ______ | '-----------------------------------' '-----------------------------------------------------------------------------------------------------------------------------' '-----------------------------------' */ KEYMAP(LAYER_LOWER, \ - _______, _______, _______, _______, KC_F13 , KC_F14 , KC_F15 , KC_F16 , XXXXXXX, KC_F17 , KC_F18 , KC_F19 , KC_F20 , XXXXXXX, KC_F21 , KC_F22 , KC_F23 , KC_F24 , _______, M_MUTEA, _______, _______, \ + _______, M_MUTEA, _______, _______, KC_F13 , KC_F14 , KC_F15 , KC_F16 , XXXXXXX, KC_F17 , KC_F18 , KC_F19 , KC_F20 , XXXXXXX, KC_F21 , KC_F22 , KC_F23 , KC_F24 , _______, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, KC_DLR , KC_LCBR, KC_LBRC, KC_LPRN, KC_PERC, KC_HASH, KC_RPRN, KC_RBRC, KC_RCBR, KC_AT , _______, _______, _______, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, KC_CIRC, KC_ASTR, KC_PLUS, KC_MINS, KC_SLSH, KC_BSLS, KC_UNDS, KC_QUOT, KC_DQT , KC_GRV , _______, _______, _______, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, KC_PIPE, KC_AMPR, KC_EXLM, KC_TILD, KC_SCLN, KC_COLN, KC_EQL , KC_LT , KC_GT , KC_QUES, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, XXXXXXX, XXXXXXX, _______, _______, _______, _______, _______, M_LOWER, _______, _______, _______, XXXXXXX, _______, _______, _______, _______, _______ \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, M_LOWER, _______, _______, _______, XXXXXXX, _______, _______, _______, _______, _______ \ ), /* LAYER = LAYER_UPPER .-----------------------------------. .-----------------------------------------------------------------------------------------------------------------------------. .-----------------------------------. - | ______ | ______ | ______ | ______ | | F13 | F14 | F15 | F16 | XXXXXX | F17 | F18 | F19 | F20 | XXXXXX | F21 | F22 | F23 | F24 | | ______ | MUTE A | ______ | ______ | + | ______ | MUTE A | ______ | ______ | | F13 | F14 | F15 | F16 | XXXXXX | F17 | F18 | F19 | F20 | XXXXXX | F21 | F22 | F23 | F24 | | ______ | ______ | ______ | ______ | '-----------------------------------' '-----------------------------------------------------------------------------------------------------------------------------' '-----------------------------------' .-----------------------------------. .-----------------------------------------------------------------------------------------------------------------------------. .-----------------------------------. | ______ | ______ | ______ | ______ | | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | | ______ | ______ | ______ | ______ | @@ -204,44 +205,44 @@ KEYMAP(LAYER_LOWER, \ |--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| o |--------|--------|--------+--------| | ______ | ______ | ______ | ______ | | ______ | ______ | F9 | F10 | F11 | F12 | SCR LK | KP 0 | KP 1 | KP 2 | KP 3 | KP Ent | ______ | ______ | | ______ | ______ | ______ | ______ | |--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |--------|--------|--------+--------| - | ______ | ______ | ______ | ______ | | ______ | XXXXXX | XXXXXX | ______ | ______ | UPPER | KP 0 . KP 0 | ______ | RALT | KP . | KP Ent | XXXXXX | ______ | | ______ | ______ | ______ | ______ | + | ______ | ______ | ______ | ______ | | ______ | ______ | ______ | ______ | ______ | UPPER | KP 0 . KP 0 | ______ | RALT | KP . | KP Ent | XXXXXX | ______ | | ______ | ______ | ______ | ______ | '-----------------------------------' '-----------------------------------------------------------------------------------------------------------------------------' '-----------------------------------' */ KEYMAP(LAYER_UPPER, \ - _______, _______, _______, _______, KC_F13 , KC_F14 , KC_F15 , KC_F16 , XXXXXXX, KC_F17 , KC_F18 , KC_F19 , KC_F20 , XXXXXXX, KC_F21 , KC_F22 , KC_F23 , KC_F24 , _______, M_MUTEA, _______, _______, \ + _______, M_MUTEA, _______, _______, KC_F13 , KC_F14 , KC_F15 , KC_F16 , XXXXXXX, KC_F17 , KC_F18 , KC_F19 , KC_F20 , XXXXXXX, KC_F21 , KC_F22 , KC_F23 , KC_F24 , _______, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_NLCK, KC_PSLS, KC_KP_7, KC_KP_8, KC_KP_9, KC_PMNS, _______, _______, _______, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_CAPS, KC_PAST, KC_KP_4, KC_KP_5, KC_KP_6, KC_PPLS, _______, _______, _______, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, KC_F9 , KC_F10 , KC_F11 , KC_F12 , KC_SLCK, KC_KP_0, KC_KP_1, KC_KP_2, KC_KP_3, KC_PENT, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, XXXXXXX, XXXXXXX, _______, _______, M_UPPER, KC_KP_0, KC_KP_0, _______, KC_RALT, KC_PDOT, KC_PENT, XXXXXXX, _______, _______, _______, _______, _______ \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, M_UPPER, KC_KP_0, KC_KP_0, _______, KC_RALT, KC_PDOT, KC_PENT, XXXXXXX, _______, _______, _______, _______, _______ \ ), /* LAYER = LAYER_MOUSE .-----------------------------------. .-----------------------------------------------------------------------------------------------------------------------------. .-----------------------------------. | ______ | ______ | ______ | ______ | | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | | ______ | ______ | ______ | ______ | '-----------------------------------' '-----------------------------------------------------------------------------------------------------------------------------' '-----------------------------------' .-----------------------------------. .-----------------------------------------------------------------------------------------------------------------------------. .-----------------------------------. - | MS BT1 | MS AC0 | MS WHU | MS AC2 | | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | | ______ | ______ | ______ | ______ | + | ______ | ______ | ______ | ______ | | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | | MS AC0 | MS WHU | MS AC2 | MS BT1 | |--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |--------|--------|--------+--------| - | MS BT2 | MS WHL | MS WHD | MS WHU | | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | | ______ | ______ | ______ | ______ | + | ______ | ______ | ______ | ______ | | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | | MS WHL | MS WHD | MS WHU | MS BT2 | |--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| o |--------|--------|--------+--------| - | MS BT3 | MS UL | MS U | MS UR | | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | o | ______ | ______ | ______ | ______ | + | ______ | ______ | ______ | ______ | | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | o | MS BT1 | MS BT2 | MS BT3 | MS BT3 | |--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| o |--------|--------|--------+--------| - | MS BT4 | MS L | MS BT1 | MS R | | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | | ______ | ______ | ______ | ______ | + | ______ | ______ | ______ | ______ | | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | | XXXXXX | MS U | XXXXXX | MS BT4 | |--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |--------|--------|--------+--------| - | MS BT5 | MS DL | MS D | MS DR | | ______ | ______ | ______ | ______ | ______ | ______ | ______ . ______ | ______ | ______ | ______ | ______ | ______ | ______ | | ______ | ______ | ______ | ______ | + | ______ | ______ | ______ | ______ | | ______ | ______ | ______ | ______ | ______ | ______ | ______ . ______ | ______ | ______ | ______ | ______ | ______ | ______ | | MS L | MS D | MS R | MS BT5 | '-----------------------------------' '-----------------------------------------------------------------------------------------------------------------------------' '-----------------------------------' */ KEYMAP(LAYER_MOUSE, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - KC_BTN1, KC_ACL0, KC_WH_U, KC_ACL2, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - KC_BTN2, KC_WH_L, KC_WH_D, KC_WH_U, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - KC_BTN3, M_MS_UL, KC_MS_U, M_MS_UR, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - KC_BTN4, KC_MS_L, KC_BTN1, KC_MS_R, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - KC_BTN5, M_MS_DL, KC_MS_D, M_MS_DR, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_ACL0, KC_WH_U, KC_ACL2, KC_BTN1, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_WH_L, KC_WH_D, KC_WH_U, KC_BTN2, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BTN1, KC_BTN2, KC_BTN3, KC_BTN3, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, KC_MS_U, XXXXXXX, KC_BTN4, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_BTN5 \ ), /* LAYER = LAYER_ADJUST .-----------------------------------. .-----------------------------------------------------------------------------------------------------------------------------. .-----------------------------------. - | XXXXXX | XXXXXX | XXXXXX | XXXXXX | | HELP 1 | HELP 2 | HELP 3 | HELP 4 | XXXXXX | HELP 5 | HELP 6 | HELP 7 | HELP 8 | XXXXXX | HELP 9 | HELP 0 | XXXXXX | XXXXXX | | VOICE- | AUDIO | VOICE+ | MUSIC | + | VOICE- | AUDIO | VOICE+ | MUSIC | | HELP 1 | HELP 2 | HELP 3 | HELP 4 | XXXXXX | HELP 5 | HELP 6 | HELP 7 | HELP 8 | XXXXXX | HELP 9 | HELP 0 | XXXXXX | XXXXXX | | XXXXXX | XXXXXX | XXXXXX | XXXXXX | '-----------------------------------' '-----------------------------------------------------------------------------------------------------------------------------' '-----------------------------------' .-----------------------------------. .-----------------------------------------------------------------------------------------------------------------------------. .-----------------------------------. | XXXXXX | XXXXXX | XXXXXX | XXXXXX | | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | | XXXXXX | XXXXXX | XXXXXX | XXXXXX | @@ -256,14 +257,13 @@ KEYMAP(LAYER_MOUSE, \ '-----------------------------------' '-----------------------------------------------------------------------------------------------------------------------------' '-----------------------------------' */ KEYMAP(LAYER_ADJUST, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, M_HELP1, M_HELP2, M_HELP3, M_HELP4, XXXXXXX, M_HELP5, M_HELP6, M_HELP7, M_HELP8, XXXXXXX, M_HELP9, M_HELP0, XXXXXXX, XXXXXXX, MUV_DE , AU_TOG , MUV_IN , MU_TOG , \ + MUV_DE , AU_TOG , MUV_IN , MU_TOG , M_HELP1, M_HELP2, M_HELP3, M_HELP4, XXXXXXX, M_HELP5, M_HELP6, M_HELP7, M_HELP8, XXXXXXX, M_HELP9, M_HELP0, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET , XXXXXXX, M_MOUSE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, M_UPPER, XXXXXXX, XXXXXXX, M_LOWER, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ ), - }; #ifdef AUDIO_ENABLE @@ -296,6 +296,7 @@ void persistant_default_layer_set(uint16_t default_layer) const uint16_t PROGMEM fn_actions[] = { [0] = ACTION_MODS_ONESHOT(MOD_LSFT), + [1] = ACTION_MACRO_TAP(MACRO_COPY_CUT), }; const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) @@ -305,68 +306,84 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) switch(id) { - case MACRO_HELP_1: - if (record->event.pressed) - { - uprint("H1"); - } - break; - - case MACRO_HELP_2: - if (record->event.pressed) - { - uprint("H2"); - } - break; - - case MACRO_HELP_3: - if (record->event.pressed) - { - uprint("H3"); - } - break; - - case MACRO_HELP_4: - if (record->event.pressed) - { - uprint("H4"); - } - break; - - case MACRO_HELP_5: - if (record->event.pressed) - { - uprint("H5"); - } - break; - - case MACRO_HELP_6: - if (record->event.pressed) - { - uprint("H6"); - } - break; - - case MACRO_HELP_7: - if (record->event.pressed) - { - uprint("H7"); - } - break; - - case MACRO_HELP_8: - if (record->event.pressed) - { - uprint("H8"); - } - break; - - case MACRO_HELP_9: - if (record->event.pressed) - { - uprint("H9"); - } - break; + case MACRO_COPY_CUT: + if (record->event.pressed) { + register_code(KC_LCTL); + if (record->tap.count == 1) { + register_code(KC_C); + unregister_code(KC_C); + } + else if (record->tap.count == 2) { + register_code(KC_X); + unregister_code(KC_X); + } + unregister_code(KC_LCTL); + } + break; + + + // case MACRO_HELP_1: + // if (record->event.pressed) + // { + // uprint("H1"); + // } + // break; + + // case MACRO_HELP_2: + // if (record->event.pressed) + // { + // uprint("H2"); + // } + // break; + + // case MACRO_HELP_3: + // if (record->event.pressed) + // { + // uprint("H3"); + // } + // break; + + // case MACRO_HELP_4: + // if (record->event.pressed) + // { + // uprint("H4"); + // } + // break; + + // case MACRO_HELP_5: + // if (record->event.pressed) + // { + // uprint("H5"); + // } + // break; + + // case MACRO_HELP_6: + // if (record->event.pressed) + // { + // uprint("H6"); + // } + // break; + + // case MACRO_HELP_7: + // if (record->event.pressed) + // { + // uprint("H7"); + // } + // break; + + // case MACRO_HELP_8: + // if (record->event.pressed) + // { + // uprint("H8"); + // } + // break; + + // case MACRO_HELP_9: + // if (record->event.pressed) + // { + // uprint("H9"); + // } + // break; case MACRO_BREATH_TOGGLE: if (record->event.pressed) @@ -566,12 +583,12 @@ void led_set_user(uint8_t usb_led) void startup_user() { _delay_ms(10); // gets rid of tick - PLAY_NOTE_ARRAY(tone_my_startup, false, STACCATO); + // PLAY_NOTE_ARRAY(tone_my_startup, false, STACCATO); } void shutdown_user() { - PLAY_NOTE_ARRAY(tone_my_goodbye, false, STACCATO); + // PLAY_NOTE_ARRAY(tone_my_goodbye, false, STACCATO); _delay_ms(2000); stop_all_notes(); } From 17170ba76d3c94edcf1ab263520238fdb0384774 Mon Sep 17 00:00:00 2001 From: IBNobody Date: Sun, 23 Oct 2016 23:00:43 -0500 Subject: [PATCH 02/25] Fixed some large keyboard bugs Fixed some bugs relating to keyboards with more than 16 columns. Also added the ability to mask off keyboard matrix bits. --- keyboards/vision_division/config.h | 2 + .../vision_division/keymaps/default/keymap.c | 11 ++++++ quantum/matrix.c | 37 +++++++++++++++++-- readme.md | 1 + tmk_core/common/command.c | 6 +-- 5 files changed, 50 insertions(+), 7 deletions(-) diff --git a/keyboards/vision_division/config.h b/keyboards/vision_division/config.h index 1f8466a5..93c96067 100644 --- a/keyboards/vision_division/config.h +++ b/keyboards/vision_division/config.h @@ -33,6 +33,8 @@ along with this program. If not, see . /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ #define DEBOUNCING_DELAY 5 +#define MATRIX_MASKED + /* define if matrix has ghost (lacks anti-ghosting diodes) */ //#define MATRIX_HAS_GHOST diff --git a/keyboards/vision_division/keymaps/default/keymap.c b/keyboards/vision_division/keymaps/default/keymap.c index 8622ee52..3282761c 100644 --- a/keyboards/vision_division/keymaps/default/keymap.c +++ b/keyboards/vision_division/keymaps/default/keymap.c @@ -142,6 +142,17 @@ enum keyboard_macros { #define ________________ _______, _______ #define XXXXXXXXXXXXXXXX XXXXXXX, XXXXXXX +const matrix_row_t matrix_mask[MATRIX_ROWS] = +{ +// 1098765432109876543210987654321 + 0b0000000001111111101111011111111, + 0b0000000001111111111111111111111, + 0b0000000001111111111111111111111, + 0b0000000001111111111111111111111, + 0b0000000001010111111111111111111, + 0b0000000001111101111111101011111, +}; + const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* LAYER = LAYER_QWERTY diff --git a/quantum/matrix.c b/quantum/matrix.c index 3174e073..ac81794e 100644 --- a/quantum/matrix.c +++ b/quantum/matrix.c @@ -26,6 +26,10 @@ along with this program. If not, see . #include "util.h" #include "matrix.h" +#ifdef MATRIX_MASKED +extern const matrix_row_t matrix_mask[]; +#endif + /* Set 0 if debouncing isn't needed */ #ifndef DEBOUNCING_DELAY @@ -218,15 +222,34 @@ bool matrix_is_on(uint8_t row, uint8_t col) inline matrix_row_t matrix_get_row(uint8_t row) { + // Matrix mask lets you disable switches in the returned matrix data. For example, if you have a + // switch blocker installed and the switch is always pressed. +#ifdef MATRIX_MASKED + return matrix[row] & matrix_mask[row]; +#else return matrix[row]; +#endif } void matrix_print(void) { +#if (MATRIX_COLS <= 8) + print("\nr/c 01234567\n"); +#elif (MATRIX_COLS <= 16) print("\nr/c 0123456789ABCDEF\n"); +#elif (MATRIX_COLS <= 32) + print("\nr/c 0123456789ABCDEF0123456789ABCDEF\n"); +#endif + for (uint8_t row = 0; row < MATRIX_ROWS; row++) { phex(row); print(": "); - pbin_reverse16(matrix_get_row(row)); +#if (MATRIX_COLS <= 8) + print_bin_reverse8(matrix_get_row(row)); +#elif (MATRIX_COLS <= 16) + print_bin_reverse16(matrix_get_row(row)); +#elif (MATRIX_COLS <= 32) + print_bin_reverse32(matrix_get_row(row)); +#endif print("\n"); } } @@ -235,7 +258,13 @@ uint8_t matrix_key_count(void) { uint8_t count = 0; for (uint8_t i = 0; i < MATRIX_ROWS; i++) { +#if (MATRIX_COLS <= 8) + count += bitpop(matrix[i]); +#elif (MATRIX_COLS <= 16) count += bitpop16(matrix[i]); +#elif (MATRIX_COLS <= 32) + count += bitpop32(matrix[i]); +#endif } return count; } @@ -259,7 +288,7 @@ static matrix_row_t read_cols(void) matrix_row_t result = 0; #if DIODE_DIRECTION == COL2ROW - for(int x = 0; x < MATRIX_COLS; x++) { + for(int x = 0; x < MATRIX_COLS; x++) { int pin = col_pins[x]; #else for(int x = 0; x < MATRIX_ROWS; x++) { @@ -273,10 +302,10 @@ static matrix_row_t read_cols(void) static void unselect_rows(void) { #if DIODE_DIRECTION == COL2ROW - for(int x = 0; x < MATRIX_ROWS; x++) { + for(int x = 0; x < MATRIX_ROWS; x++) { int pin = row_pins[x]; #else - for(int x = 0; x < MATRIX_COLS; x++) { + for(int x = 0; x < MATRIX_COLS; x++) { int pin = col_pins[x]; #endif _SFR_IO8((pin >> 4) + 1) &= ~_BV(pin & 0xF); diff --git a/readme.md b/readme.md index 62d479ff..c460933a 100644 --- a/readme.md +++ b/readme.md @@ -241,6 +241,7 @@ You can also add extra options at the end of the make command line, after the ta * `make COLOR=false` - turns off color output * `make SILENT=true` - turns off output besides errors/warnings * `make VERBOSE=true` - outputs all of the gcc stuff (not interesting, unless you need to debug) +* `make EXTRAFLAGS=-E` - Preprocess the code without doing any compiling (useful if you are trying to debug #define commands) The make command itself also has some additional options, type `make --help` for more information. The most useful is probably `-jx`, which specifies that you want to compile using more than one CPU, the `x` represents the number of CPUs that you want to use. Setting that can greatly reduce the compile times, especially if you are compiling many keyboards/keymaps. I usually set it to one less than the number of CPUs that I have, so that I have some left for doing other things while it's compiling. Note that not all operating systems and make versions supports that option. diff --git a/tmk_core/common/command.c b/tmk_core/common/command.c index f3e1bf62..5f29bc0b 100644 --- a/tmk_core/common/command.c +++ b/tmk_core/common/command.c @@ -379,11 +379,11 @@ static bool command_common(uint8_t code) debug_enable = !debug_enable; if (debug_enable) { print("\ndebug: on\n"); - debug_matrix = true; - debug_keyboard = true; - debug_mouse = true; } else { print("\ndebug: off\n"); + debug_matrix = false; + debug_keyboard = false; + debug_mouse = false; } break; From ef8f6180272c3e112f97a6beb9dd90bece3c2131 Mon Sep 17 00:00:00 2001 From: IBNobody Date: Sun, 23 Oct 2016 23:03:26 -0500 Subject: [PATCH 03/25] Fixing Line Terminations --- .../keymaps/win10_writers-block/config.h | 72 +- .../keymaps/win10_writers-block/keymap.c | 648 +++++++++--------- .../keymaps/win10_writers-block/readme.md | 224 +++--- 3 files changed, 472 insertions(+), 472 deletions(-) diff --git a/keyboards/ergodox/keymaps/win10_writers-block/config.h b/keyboards/ergodox/keymaps/win10_writers-block/config.h index 568a711a..43259db0 100644 --- a/keyboards/ergodox/keymaps/win10_writers-block/config.h +++ b/keyboards/ergodox/keymaps/win10_writers-block/config.h @@ -1,36 +1,36 @@ -#ifndef KEYBOARDS_ERGODOX_CONFIG_H_ -#define KEYBOARDS_ERGODOX_CONFIG_H_ - -#define MOUSEKEY_DELAY 100 -#define MOUSEKEY_INTERVAL 20 -#define MOUSEKEY_MAX_SPEED 3 -#define MOUSEKEY_TIME_TO_MAX 10 - -#define TAPPING_TOGGLE 1 - -/* define if matrix has ghost */ -//#define MATRIX_HAS_GHOST - -#define TAPPING_TERM 300 -#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.) - -/* 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_LCTL) | MOD_BIT(KC_RCTL)) || \ - keyboard_report->mods == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \ -) - -#ifdef SUBPROJECT_ez - #include "ez/config.h" -#endif -#ifdef SUBPROJECT_infinity - #include "infinity/config.h" -#endif - - -#endif /* KEYBOARDS_ERGODOX_CONFIG_H_ */ +#ifndef KEYBOARDS_ERGODOX_CONFIG_H_ +#define KEYBOARDS_ERGODOX_CONFIG_H_ + +#define MOUSEKEY_DELAY 100 +#define MOUSEKEY_INTERVAL 20 +#define MOUSEKEY_MAX_SPEED 3 +#define MOUSEKEY_TIME_TO_MAX 10 + +#define TAPPING_TOGGLE 1 + +/* define if matrix has ghost */ +//#define MATRIX_HAS_GHOST + +#define TAPPING_TERM 300 +#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.) + +/* 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_LCTL) | MOD_BIT(KC_RCTL)) || \ + keyboard_report->mods == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \ +) + +#ifdef SUBPROJECT_ez + #include "ez/config.h" +#endif +#ifdef SUBPROJECT_infinity + #include "infinity/config.h" +#endif + + +#endif /* KEYBOARDS_ERGODOX_CONFIG_H_ */ diff --git a/keyboards/ergodox/keymaps/win10_writers-block/keymap.c b/keyboards/ergodox/keymaps/win10_writers-block/keymap.c index ea640ee9..3106b337 100644 --- a/keyboards/ergodox/keymaps/win10_writers-block/keymap.c +++ b/keyboards/ergodox/keymaps/win10_writers-block/keymap.c @@ -1,324 +1,324 @@ -#include "ergodox.h" -#include "debug.h" -#include "action_layer.h" -#include "version.h" -#include "wait.h" - -#define BASE 0 // default layer - helpful for writing in Office-style word processors. -#define SYMB 1 // symbol layer - NumPad, etc. - same as Ergodox EZ default but no EEPROM or Version key -#define RIMW 2 // rimworld layer - made for the game RimWorld, by Tynan Sylvester | feel free to remap for your favorite game! -#define MDIA 3 // media layer - mouse and music - close to Ergodox EZ default media layer - -#define CO_PA M(0) // hold copy, tap paste - -#define W_CUT LCTL(KC_X) // C-x Cut -#define W_COPY LCTL(KC_C) // C-c Copy -#define W_PASTE LCTL(KC_V) // C-v Paste -#define W_UNDO LCTL(KC_Z) // C-z Undo -#define W_FIND LCTL(KC_F) // C-v Find -#define W_CAD LCTL(LALT(KC_DEL)) // one-tap ctrl-alt-del - - - -//Tap Dance Declarations -enum { - CAKEWARP, - CTRLALTMDIA, -}; - -void cake_count (qk_tap_dance_state_t *state, void *user_data) { - if (state->count == 2) { - layer_on (SYMB); //define double tap here - layer_off (MDIA); - } - else { - layer_off (SYMB); //define single tap or hold here - layer_off (MDIA); - } - if (state->count == 3) { - layer_on (RIMW); //define triple tap here - layer_off (MDIA); - } - else { - layer_off (RIMW); //define single tap or hold here - layer_off (MDIA); - reset_tap_dance (state); - } -} - -void dance_cad_mdia_fin (qk_tap_dance_state_t *state, void *user_data) { - if (state->count == 1) { - register_code (KC_LCTL); - register_code (KC_LALT); - register_code (KC_DEL); - } else { - layer_on (MDIA); - } -} - -void dance_cad_mdia_reset (qk_tap_dance_state_t *state, void *user_data) { - if (state->count == 1) { - unregister_code (KC_DEL); - unregister_code (KC_LALT); - unregister_code (KC_LCTL); - } else { - ; - } -} - -//Tap Dance Definitions -qk_tap_dance_action_t tap_dance_actions[] = { - // tap for Layer 0, tap twice to switch to symbol layer, and tap three times to switch to rimworld layer. - [CAKEWARP] = ACTION_TAP_DANCE_FN(cake_count) - // tap for ctrl-alt-del, tap twice for media layer - ,[CTRLALTMDIA] = ACTION_TAP_DANCE_FN_ADVANCED (NULL, dance_cad_mdia_fin, dance_cad_mdia_reset) - // Other declarations would go here, separated by commas, if you have them -}; - -//In Layer declaration, add tap dance item in place of a key code - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -/* Keymap 0: Basic layer - TD(one_tap, two_taps, three_taps...) - * - * ,--------------------------------------------------. ,--------------------------------------------------. - * | ` | 1 | 2 | 3 | 4 | 5 | 6 | | 7 | 7 | 8 | 9 | 0 | - | = | - * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| - * | F12/L1 | Q | W | E | R | T | {/[ | |TD(L0 | Y | U | I | O | P | \ | - * |--------+------+------+------+------+------| | |L1 L2)|------+------+------+------+------+--------| - * |Caps/Win| A | S | D | F | G |------| |------| H | J | K | L | ; | ' | - * |--------+------+------+------+------+------| }/] | TD(ctrl|------+------+------+------+------+--------| - * |LShift/(|Z/Ctrl| X | C | V | B | | |altdel| N | M | , | . | / |RShift/)| - * `--------+------+------+------+------+-------------' |L3) |------+------+------+------+------+--------' - * | Undo | Cut |CopyPa| Meh | LGui | '------| | Enter| Left | Up | Down | Right | - * `----------------------------------' `----------------------------------' - * ,-------------. ,-------------. - * | Esc | VolUp| | F4 | Mute | - * ,------|------|------| |------+--------+------. - * | | | VolDn| | F5 | | | - * |Backsp|Delete|------| |------| Tab / |Space | - * |ace | | Find | | Alt | CTRL | | - * `--------------------' `----------------------' - */ -// If it accepts an argument (i.e, is a function), it doesn't need KC_. -// Otherwise, it needs KC_* -[BASE] = KEYMAP( // layer 0 : default - // left hand - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, -LT(SYMB, KC_F12), KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LBRC, - GUI_T(KC_CAPS), KC_A, KC_S, KC_D, KC_F, KC_G, - KC_LSPO, CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_RBRC, - W_UNDO, W_CUT, CO_PA, MEH_T(KC_NO), KC_LGUI, - KC_ESC, KC_VOLU, - KC_VOLD, - KC_BSPC, KC_DELETE, W_FIND, - // right hand - KC_7, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, - TD(CAKEWARP), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, - KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, - TD(CTRLALTMDIA), KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, - KC_ENT, KC_LEFT, KC_UP, KC_DOWN, KC_RIGHT, - KC_F4, KC_MUTE, - KC_F5, - KC_RALT, CTL_T(KC_TAB), KC_SPC - ), - -/* Keymap 1: Symbol Layer | No EEPROM Or Version keys - * - * ,--------------------------------------------------. ,--------------------------------------------------. - * | | F1 | F2 | F3 | F4 | F5 | xx | | xx | F6 | F7 | F8 | F9 | F10 | F11 | - * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| - * | | ! | @ | { | } | | | | |TD(L0 | Up | 7 | 8 | 9 | * | F12 | - * |--------+------+------+------+------+------| | |L1 L2)|------+------+------+------+------+--------| - * | | # | $ | ( | ) | ` |------| |------| Down | 4 | 5 | 6 | + | - | - * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | | % | ^ | [ | ] | ~ | | | | & | 1 | 2 | 3 | \ | | - * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' - * | | | | | | | | . | 0 | = | | - * `----------------------------------' `----------------------------------' - * ,-------------. ,-------------. - * | | | | | | - * ,------|------|------| |------+------+------. - * | | | | | | | | - * | | |------| |------| | | - * | | | | | | | | - * `--------------------' `--------------------' - */ -// SYMBOLS -[SYMB] = KEYMAP( - // left hand - KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_NO, - KC_TRNS,KC_EXLM,KC_AT, KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS, - KC_TRNS,KC_HASH,KC_DLR, KC_LPRN,KC_RPRN,KC_GRV, - KC_TRNS,KC_PERC,KC_CIRC,KC_LBRC,KC_RBRC,KC_TILD,KC_TRNS, - KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, - KC_TRNS,KC_TRNS, - KC_TRNS, - KC_TRNS,KC_TRNS,KC_TRNS, - // right hand - KC_NO, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, - KC_TRNS, KC_UP, KC_7, KC_8, KC_9, KC_ASTR, KC_F12, - KC_DOWN, KC_4, KC_5, KC_6, KC_PLUS, KC_MINS, - KC_TRNS, KC_AMPR, KC_1, KC_2, KC_3, KC_BSLS, KC_TRNS, - KC_TRNS,KC_DOT, KC_0, KC_EQL, KC_NO, - KC_TRNS, KC_TRNS, - KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS -), - -/* Keymap 2: RimWorld Layer - * - * ,--------------------------------------------------. ,--------------------------------------------------. - * | ESC | 1 | 2 | 3 | 4 | 5 | 6 | | 7 | 7 | 8 | 9 | 0 | - | = | - * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| - * | TAB | C | ,< | W | >. | R | | |TD(L0 | U | B | N | J | M | PGUP | - * |--------+------+------+------+------+------| F10 | |L1 L2)|------+------+------+------+------+--------| - * | I | F | A | S | D | 8 |------| |------| X | L | P | Y | H | ENTER | - * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | K | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 | PGDN | - * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' - * | | | | | | | F | | | | | - * `----------------------------------' `----------------------------------' - * ,-------------. ,-------------. - * | | | | | | - * ,------|------|------| |------+------+------. - * | | | | | | | | - * |SPACE | C |------| |------| E |SPACE | - * | | | Q | | | | | - * `--------------------' `--------------------' - */ -// RIMWORLD -[RIMW] = KEYMAP( - // left hand - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, - KC_TAB, KC_C, KC_COMM, KC_W, KC_DOT, KC_R, KC_F10, - KC_I, KC_F, KC_A, KC_S, KC_D, KC_8, - KC_K, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, - KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS,KC_TRNS, - KC_TRNS, - KC_C,KC_Q,KC_TRNS, - // right hand - KC_7, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, - KC_TRNS, KC_U, KC_B, KC_N, KC_J, KC_M, KC_PGUP, - KC_X, KC_L, SFT_T(KC_P), KC_Y, KC_H, KC_ENT, - KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PGDN, - KC_F, KC_LEFT, KC_UP, KC_DOWN,KC_RIGHT, - KC_TRNS, KC_TRNS, - KC_TRNS, - KC_TRNS, KC_E, KC_TRNS -), -/* Keymap 3: Media and mouse keys - * - * ,--------------------------------------------------. ,--------------------------------------------------. - * | | | | | | | | | | | | | | | | - * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| - * | | | | MsUp | | | | | | | | | | | | - * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | | |MsLeft|MsDown|MsRght| |------| |------| | | | | | Play | - * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | | | | | | | | | | | | Prev | Next | | | - * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' - * | | | | Lclk | Rclk | |VolUp |VolDn | Mute | | | - * `----------------------------------' `----------------------------------' - * ,-------------. ,-------------. - * | | | | | | - * ,------|------|------| |------+------+------. - * | | | | | | |Brwser| - * | Lclk | Rclk |------| |------| |Back | - * | | | | | | | | - * `--------------------' `--------------------' - */ -// MEDIA AND MOUSE -[MDIA] = KEYMAP( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2, - KC_TRNS, KC_TRNS, - KC_TRNS, - KC_BTN1, KC_BTN2, KC_TRNS, - // right hand - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, - KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS, - KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, - KC_TRNS, - KC_TRNS, KC_TRNS, KC_WBAK -), -}; - -static uint16_t key_timer; - -const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) -{ - switch(id) { - case 0: { - if (record->event.pressed) { - key_timer = timer_read(); // if the key is being pressed, we start the timer. - } - else { // this means the key was just released, so we can figure out how long it was pressed for (tap or "held down"). - if (timer_elapsed(key_timer) > 150) { // 150 being 150ms, the threshhold we pick for counting something as a tap. - return MACRO( D(LCTL), T(C), U(LCTL), END ); - } - else { - return MACRO( D(LCTL), T(V), U(LCTL), END ); - } - } - break; - } - } - return MACRO_NONE; -}; - -// Anything you want to do once when the keyboard initializes. -// Tests LED function when the keyboard initializes. -void matrix_init_user(void) { - - wait_ms(500); - ergodox_board_led_on(); - wait_ms(200); - ergodox_right_led_1_on(); - wait_ms(200); - ergodox_right_led_2_on(); - wait_ms(200); - ergodox_right_led_3_on(); - wait_ms(200); - ergodox_board_led_off(); - wait_ms(200); - ergodox_right_led_1_off(); - wait_ms(200); - ergodox_right_led_2_off(); - wait_ms(200); - ergodox_right_led_3_off(); - -}; - - -// Runs constantly in the background, in a loop. -void matrix_scan_user(void) { - - uint8_t layer = biton32(layer_state); - - ergodox_board_led_off(); - ergodox_right_led_1_off(); - ergodox_right_led_2_off(); - ergodox_right_led_3_off(); - switch (layer) { - case 1: - ergodox_right_led_1_on(); - break; - case 2: - ergodox_right_led_2_on(); - break; - case 3: - ergodox_right_led_3_on(); - break; - default: - // none - break; - } - -}; +#include "ergodox.h" +#include "debug.h" +#include "action_layer.h" +#include "version.h" +#include "wait.h" + +#define BASE 0 // default layer - helpful for writing in Office-style word processors. +#define SYMB 1 // symbol layer - NumPad, etc. - same as Ergodox EZ default but no EEPROM or Version key +#define RIMW 2 // rimworld layer - made for the game RimWorld, by Tynan Sylvester | feel free to remap for your favorite game! +#define MDIA 3 // media layer - mouse and music - close to Ergodox EZ default media layer + +#define CO_PA M(0) // hold copy, tap paste + +#define W_CUT LCTL(KC_X) // C-x Cut +#define W_COPY LCTL(KC_C) // C-c Copy +#define W_PASTE LCTL(KC_V) // C-v Paste +#define W_UNDO LCTL(KC_Z) // C-z Undo +#define W_FIND LCTL(KC_F) // C-v Find +#define W_CAD LCTL(LALT(KC_DEL)) // one-tap ctrl-alt-del + + + +//Tap Dance Declarations +enum { + CAKEWARP, + CTRLALTMDIA, +}; + +void cake_count (qk_tap_dance_state_t *state, void *user_data) { + if (state->count == 2) { + layer_on (SYMB); //define double tap here + layer_off (MDIA); + } + else { + layer_off (SYMB); //define single tap or hold here + layer_off (MDIA); + } + if (state->count == 3) { + layer_on (RIMW); //define triple tap here + layer_off (MDIA); + } + else { + layer_off (RIMW); //define single tap or hold here + layer_off (MDIA); + reset_tap_dance (state); + } +} + +void dance_cad_mdia_fin (qk_tap_dance_state_t *state, void *user_data) { + if (state->count == 1) { + register_code (KC_LCTL); + register_code (KC_LALT); + register_code (KC_DEL); + } else { + layer_on (MDIA); + } +} + +void dance_cad_mdia_reset (qk_tap_dance_state_t *state, void *user_data) { + if (state->count == 1) { + unregister_code (KC_DEL); + unregister_code (KC_LALT); + unregister_code (KC_LCTL); + } else { + ; + } +} + +//Tap Dance Definitions +qk_tap_dance_action_t tap_dance_actions[] = { + // tap for Layer 0, tap twice to switch to symbol layer, and tap three times to switch to rimworld layer. + [CAKEWARP] = ACTION_TAP_DANCE_FN(cake_count) + // tap for ctrl-alt-del, tap twice for media layer + ,[CTRLALTMDIA] = ACTION_TAP_DANCE_FN_ADVANCED (NULL, dance_cad_mdia_fin, dance_cad_mdia_reset) + // Other declarations would go here, separated by commas, if you have them +}; + +//In Layer declaration, add tap dance item in place of a key code + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +/* Keymap 0: Basic layer - TD(one_tap, two_taps, three_taps...) + * + * ,--------------------------------------------------. ,--------------------------------------------------. + * | ` | 1 | 2 | 3 | 4 | 5 | 6 | | 7 | 7 | 8 | 9 | 0 | - | = | + * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| + * | F12/L1 | Q | W | E | R | T | {/[ | |TD(L0 | Y | U | I | O | P | \ | + * |--------+------+------+------+------+------| | |L1 L2)|------+------+------+------+------+--------| + * |Caps/Win| A | S | D | F | G |------| |------| H | J | K | L | ; | ' | + * |--------+------+------+------+------+------| }/] | TD(ctrl|------+------+------+------+------+--------| + * |LShift/(|Z/Ctrl| X | C | V | B | | |altdel| N | M | , | . | / |RShift/)| + * `--------+------+------+------+------+-------------' |L3) |------+------+------+------+------+--------' + * | Undo | Cut |CopyPa| Meh | LGui | '------| | Enter| Left | Up | Down | Right | + * `----------------------------------' `----------------------------------' + * ,-------------. ,-------------. + * | Esc | VolUp| | F4 | Mute | + * ,------|------|------| |------+--------+------. + * | | | VolDn| | F5 | | | + * |Backsp|Delete|------| |------| Tab / |Space | + * |ace | | Find | | Alt | CTRL | | + * `--------------------' `----------------------' + */ +// If it accepts an argument (i.e, is a function), it doesn't need KC_. +// Otherwise, it needs KC_* +[BASE] = KEYMAP( // layer 0 : default + // left hand + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, +LT(SYMB, KC_F12), KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LBRC, + GUI_T(KC_CAPS), KC_A, KC_S, KC_D, KC_F, KC_G, + KC_LSPO, CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_RBRC, + W_UNDO, W_CUT, CO_PA, MEH_T(KC_NO), KC_LGUI, + KC_ESC, KC_VOLU, + KC_VOLD, + KC_BSPC, KC_DELETE, W_FIND, + // right hand + KC_7, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, + TD(CAKEWARP), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, + KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + TD(CTRLALTMDIA), KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, + KC_ENT, KC_LEFT, KC_UP, KC_DOWN, KC_RIGHT, + KC_F4, KC_MUTE, + KC_F5, + KC_RALT, CTL_T(KC_TAB), KC_SPC + ), + +/* Keymap 1: Symbol Layer | No EEPROM Or Version keys + * + * ,--------------------------------------------------. ,--------------------------------------------------. + * | | F1 | F2 | F3 | F4 | F5 | xx | | xx | F6 | F7 | F8 | F9 | F10 | F11 | + * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| + * | | ! | @ | { | } | | | | |TD(L0 | Up | 7 | 8 | 9 | * | F12 | + * |--------+------+------+------+------+------| | |L1 L2)|------+------+------+------+------+--------| + * | | # | $ | ( | ) | ` |------| |------| Down | 4 | 5 | 6 | + | - | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | % | ^ | [ | ] | ~ | | | | & | 1 | 2 | 3 | \ | | + * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' + * | | | | | | | | . | 0 | = | | + * `----------------------------------' `----------------------------------' + * ,-------------. ,-------------. + * | | | | | | + * ,------|------|------| |------+------+------. + * | | | | | | | | + * | | |------| |------| | | + * | | | | | | | | + * `--------------------' `--------------------' + */ +// SYMBOLS +[SYMB] = KEYMAP( + // left hand + KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_NO, + KC_TRNS,KC_EXLM,KC_AT, KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS, + KC_TRNS,KC_HASH,KC_DLR, KC_LPRN,KC_RPRN,KC_GRV, + KC_TRNS,KC_PERC,KC_CIRC,KC_LBRC,KC_RBRC,KC_TILD,KC_TRNS, + KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, + KC_TRNS,KC_TRNS, + KC_TRNS, + KC_TRNS,KC_TRNS,KC_TRNS, + // right hand + KC_NO, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, + KC_TRNS, KC_UP, KC_7, KC_8, KC_9, KC_ASTR, KC_F12, + KC_DOWN, KC_4, KC_5, KC_6, KC_PLUS, KC_MINS, + KC_TRNS, KC_AMPR, KC_1, KC_2, KC_3, KC_BSLS, KC_TRNS, + KC_TRNS,KC_DOT, KC_0, KC_EQL, KC_NO, + KC_TRNS, KC_TRNS, + KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS +), + +/* Keymap 2: RimWorld Layer + * + * ,--------------------------------------------------. ,--------------------------------------------------. + * | ESC | 1 | 2 | 3 | 4 | 5 | 6 | | 7 | 7 | 8 | 9 | 0 | - | = | + * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| + * | TAB | C | ,< | W | >. | R | | |TD(L0 | U | B | N | J | M | PGUP | + * |--------+------+------+------+------+------| F10 | |L1 L2)|------+------+------+------+------+--------| + * | I | F | A | S | D | 8 |------| |------| X | L | P | Y | H | ENTER | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | K | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 | PGDN | + * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' + * | | | | | | | F | | | | | + * `----------------------------------' `----------------------------------' + * ,-------------. ,-------------. + * | | | | | | + * ,------|------|------| |------+------+------. + * | | | | | | | | + * |SPACE | C |------| |------| E |SPACE | + * | | | Q | | | | | + * `--------------------' `--------------------' + */ +// RIMWORLD +[RIMW] = KEYMAP( + // left hand + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, + KC_TAB, KC_C, KC_COMM, KC_W, KC_DOT, KC_R, KC_F10, + KC_I, KC_F, KC_A, KC_S, KC_D, KC_8, + KC_K, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, + KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS,KC_TRNS, + KC_TRNS, + KC_C,KC_Q,KC_TRNS, + // right hand + KC_7, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, + KC_TRNS, KC_U, KC_B, KC_N, KC_J, KC_M, KC_PGUP, + KC_X, KC_L, SFT_T(KC_P), KC_Y, KC_H, KC_ENT, + KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PGDN, + KC_F, KC_LEFT, KC_UP, KC_DOWN,KC_RIGHT, + KC_TRNS, KC_TRNS, + KC_TRNS, + KC_TRNS, KC_E, KC_TRNS +), +/* Keymap 3: Media and mouse keys + * + * ,--------------------------------------------------. ,--------------------------------------------------. + * | | | | | | | | | | | | | | | | + * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| + * | | | | MsUp | | | | | | | | | | | | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | |MsLeft|MsDown|MsRght| |------| |------| | | | | | Play | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | | | | | | | | | | | Prev | Next | | | + * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' + * | | | | Lclk | Rclk | |VolUp |VolDn | Mute | | | + * `----------------------------------' `----------------------------------' + * ,-------------. ,-------------. + * | | | | | | + * ,------|------|------| |------+------+------. + * | | | | | | |Brwser| + * | Lclk | Rclk |------| |------| |Back | + * | | | | | | | | + * `--------------------' `--------------------' + */ +// MEDIA AND MOUSE +[MDIA] = KEYMAP( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2, + KC_TRNS, KC_TRNS, + KC_TRNS, + KC_BTN1, KC_BTN2, KC_TRNS, + // right hand + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, + KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS, + KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, + KC_TRNS, + KC_TRNS, KC_TRNS, KC_WBAK +), +}; + +static uint16_t key_timer; + +const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) +{ + switch(id) { + case 0: { + if (record->event.pressed) { + key_timer = timer_read(); // if the key is being pressed, we start the timer. + } + else { // this means the key was just released, so we can figure out how long it was pressed for (tap or "held down"). + if (timer_elapsed(key_timer) > 150) { // 150 being 150ms, the threshhold we pick for counting something as a tap. + return MACRO( D(LCTL), T(C), U(LCTL), END ); + } + else { + return MACRO( D(LCTL), T(V), U(LCTL), END ); + } + } + break; + } + } + return MACRO_NONE; +}; + +// Anything you want to do once when the keyboard initializes. +// Tests LED function when the keyboard initializes. +void matrix_init_user(void) { + + wait_ms(500); + ergodox_board_led_on(); + wait_ms(200); + ergodox_right_led_1_on(); + wait_ms(200); + ergodox_right_led_2_on(); + wait_ms(200); + ergodox_right_led_3_on(); + wait_ms(200); + ergodox_board_led_off(); + wait_ms(200); + ergodox_right_led_1_off(); + wait_ms(200); + ergodox_right_led_2_off(); + wait_ms(200); + ergodox_right_led_3_off(); + +}; + + +// Runs constantly in the background, in a loop. +void matrix_scan_user(void) { + + uint8_t layer = biton32(layer_state); + + ergodox_board_led_off(); + ergodox_right_led_1_off(); + ergodox_right_led_2_off(); + ergodox_right_led_3_off(); + switch (layer) { + case 1: + ergodox_right_led_1_on(); + break; + case 2: + ergodox_right_led_2_on(); + break; + case 3: + ergodox_right_led_3_on(); + break; + default: + // none + break; + } + +}; diff --git a/keyboards/ergodox/keymaps/win10_writers-block/readme.md b/keyboards/ergodox/keymaps/win10_writers-block/readme.md index 66b1aaf4..e51e3c48 100644 --- a/keyboards/ergodox/keymaps/win10_writers-block/readme.md +++ b/keyboards/ergodox/keymaps/win10_writers-block/readme.md @@ -1,113 +1,113 @@ - - -Win10 Writer's Block ErgoDox - v1.0 - -======================= - -This is a QWERTY layout for QMK. It's designed to work well in MS Office-like environments. It's tested on Windows 7 and 10. - -Professional writers may find this layout useful -- copywriters, technical writers, novelists, etc. - -I use my ErgoDox with this keymap as a daily driver at my office. - -A gaming layer is unobtrusively built into this layout. I use that layer to play RimWorld. - -Feel free to modify the gaming layer to your personal taste. - -## Table of Contents - -* [Layouts](#layouts) - - [Base layer](#base-layer) - - [Symbol layer](#symbol-layer) - - [Gaming layer](#rimworld-layer) - - [Media layer](#media-layer) -* [Tools](#tools) - - [Layer notification](#layer-notification) -* [Building](#building) - - [Using on Windows](#using-on-windows) -* [License](#license) -* [Special Thanks](#special-thanks) - -# Layouts - -* TapDance will teleport you to the layer you want: -* One Tap for the Base layer -* Two Taps for the Symbol layer -* Three Taps for the Rimworld/Gaming layer - -* Where the "Meh" key is located on the Ergodox EZ default layout, I've changed it to another tap dance key: -* One Tap for CTRL-ALT-DEL -* Two Taps for the Media/Mouse layer - -## Base layer - -[![Base layer](images/base-layer.png)](http://www.keyboard-layout-editor.com/#/gists/8fd9bbdd3a23bbb5a8779de3624a3be1) - -This is a QWERTY layout with some quirks. - -* Enter is located on a key that won't cause as much thumb fatigue. -* Copy and Paste work from the same key. Just hold the key to copy and tap the key to paste! -* Undo, Find and Cut are also one-touch keys. -* F12 is where you would normally find TAB on standard layouts. Quickly save in Word, safely. -* You'll find bracket keys below the "6" key. - -* The Meh Key is a single-button CTRL+ALT+SHIFT modifier. - -* Space Cadet Shift: Tap L Shift for "(" and R Shift for ")" -- holding either shift works like a normal shift. -* Tap "Z" or Tab to use either normally. Hold them for CTRL. -* Tap Caps Lock to use it normally. Hold it for Win key combinations (Win+D to minimize all programs, etc). - -## Symbol layer - -[![Symbol layer](images/symbol-layer.png)](http://www.keyboard-layout-editor.com/#/gists/04eb6458b8b17882e472f64d482f12b4) - -Your standard Ergodox EZ symbol + numpad layout, minus the Version and EEPROM keys. - -* From the base layer, hold the F12 Key to temporarily access this layer (use for quick access to numpad) -* Release F12 to return to the base layer. - -## Rimworld layer - -[![Rimworld / Gaming Layer](images/rimworld-layer.png)](http://www.keyboard-layout-editor.com/#/gists/d53af8391e6e443ed0a98ccfbdb4eace) - -This layer was made to play RimWorld, a Sci-Fi Colony Survival Game by Tynan Sylvester and Ludeon Studios, available on Steam. - -* Have fun! - -## Media layer - -[![Media layer](images/media-layer.png)](http://www.keyboard-layout-editor.com/#/gists/3209d09ed4bd997e4f49f28c6ada2ab3) - -This is the standard Ergodox EZ media layout with more options for mouseclick buttons. - -* In this layer, your "space" key changes into a back button for your browser. - -## LED states - -Your LEDs will change to indicate your layer. You'll know you are in the base layer if all LEDs are off. - -# Building - -To build, you will need the [QMK][qmk] firmware checked out. from there, dive into `keyboards/ergodox/keymaps/win10_writers-block/` - -[qmk]: https://github.com/jackhumbert/qmk_firmware - -``` -$ make keyboard=ergodox keymap=win10_writers-block -``` - -## Using on Windows - -This layout is tested in Windows 7 Pro and Windows 10 Home environments. - -# License - -GPL 3+ - -# Special Thanks - -* To algernon for his coding help. I'm a novice but I still made this work (and figured out tap dance) with his help. - -* To /r/MechanicalKeyboards for being an all-around great community. - + + +Win10 Writer's Block ErgoDox - v1.0 + +======================= + +This is a QWERTY layout for QMK. It's designed to work well in MS Office-like environments. It's tested on Windows 7 and 10. + +Professional writers may find this layout useful -- copywriters, technical writers, novelists, etc. + +I use my ErgoDox with this keymap as a daily driver at my office. + +A gaming layer is unobtrusively built into this layout. I use that layer to play RimWorld. + +Feel free to modify the gaming layer to your personal taste. + +## Table of Contents + +* [Layouts](#layouts) + - [Base layer](#base-layer) + - [Symbol layer](#symbol-layer) + - [Gaming layer](#rimworld-layer) + - [Media layer](#media-layer) +* [Tools](#tools) + - [Layer notification](#layer-notification) +* [Building](#building) + - [Using on Windows](#using-on-windows) +* [License](#license) +* [Special Thanks](#special-thanks) + +# Layouts + +* TapDance will teleport you to the layer you want: +* One Tap for the Base layer +* Two Taps for the Symbol layer +* Three Taps for the Rimworld/Gaming layer + +* Where the "Meh" key is located on the Ergodox EZ default layout, I've changed it to another tap dance key: +* One Tap for CTRL-ALT-DEL +* Two Taps for the Media/Mouse layer + +## Base layer + +[![Base layer](images/base-layer.png)](http://www.keyboard-layout-editor.com/#/gists/8fd9bbdd3a23bbb5a8779de3624a3be1) + +This is a QWERTY layout with some quirks. + +* Enter is located on a key that won't cause as much thumb fatigue. +* Copy and Paste work from the same key. Just hold the key to copy and tap the key to paste! +* Undo, Find and Cut are also one-touch keys. +* F12 is where you would normally find TAB on standard layouts. Quickly save in Word, safely. +* You'll find bracket keys below the "6" key. + +* The Meh Key is a single-button CTRL+ALT+SHIFT modifier. + +* Space Cadet Shift: Tap L Shift for "(" and R Shift for ")" -- holding either shift works like a normal shift. +* Tap "Z" or Tab to use either normally. Hold them for CTRL. +* Tap Caps Lock to use it normally. Hold it for Win key combinations (Win+D to minimize all programs, etc). + +## Symbol layer + +[![Symbol layer](images/symbol-layer.png)](http://www.keyboard-layout-editor.com/#/gists/04eb6458b8b17882e472f64d482f12b4) + +Your standard Ergodox EZ symbol + numpad layout, minus the Version and EEPROM keys. + +* From the base layer, hold the F12 Key to temporarily access this layer (use for quick access to numpad) +* Release F12 to return to the base layer. + +## Rimworld layer + +[![Rimworld / Gaming Layer](images/rimworld-layer.png)](http://www.keyboard-layout-editor.com/#/gists/d53af8391e6e443ed0a98ccfbdb4eace) + +This layer was made to play RimWorld, a Sci-Fi Colony Survival Game by Tynan Sylvester and Ludeon Studios, available on Steam. + +* Have fun! + +## Media layer + +[![Media layer](images/media-layer.png)](http://www.keyboard-layout-editor.com/#/gists/3209d09ed4bd997e4f49f28c6ada2ab3) + +This is the standard Ergodox EZ media layout with more options for mouseclick buttons. + +* In this layer, your "space" key changes into a back button for your browser. + +## LED states + +Your LEDs will change to indicate your layer. You'll know you are in the base layer if all LEDs are off. + +# Building + +To build, you will need the [QMK][qmk] firmware checked out. from there, dive into `keyboards/ergodox/keymaps/win10_writers-block/` + +[qmk]: https://github.com/jackhumbert/qmk_firmware + +``` +$ make keyboard=ergodox keymap=win10_writers-block +``` + +## Using on Windows + +This layout is tested in Windows 7 Pro and Windows 10 Home environments. + +# License + +GPL 3+ + +# Special Thanks + +* To algernon for his coding help. I'm a novice but I still made this work (and figured out tap dance) with his help. + +* To /r/MechanicalKeyboards for being an all-around great community. + * To /u/profet23 for his amazing custom Ergodox boards. \ No newline at end of file From 2082c6f11076dd8232aea65ed178dea27d3a4109 Mon Sep 17 00:00:00 2001 From: dbroqua Date: Wed, 26 Oct 2016 22:24:26 +0200 Subject: [PATCH 04/25] - Fixed typo in gh60/dbroqua layout --- keyboards/kc60/keymaps/dbroqua/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/kc60/keymaps/dbroqua/keymap.c b/keyboards/kc60/keymaps/dbroqua/keymap.c index 1b645ea9..8b5efd0c 100644 --- a/keyboards/kc60/keymaps/dbroqua/keymap.c +++ b/keyboards/kc60/keymaps/dbroqua/keymap.c @@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |-----------------------------------------------------------------------------------------+ * | | | | | | | | Psc | | | | | | * |-----------------------------------------------------------------------------------------+ - * | | Led | Led-| Led+| | Mute| Vol+| Vol-| | | | Play | | + * | | Led | Led+| Led-| | Mute| Vol+| Vol-| | | | Play | | * |-----------------------------------------------------------------------------------------+ * | | | | | | Prev | Stop | Next | * `-----------------------------------------------------------------------------------------' From 508eddf8ba8548d3f71e1c09a404839beb49f45c Mon Sep 17 00:00:00 2001 From: IBNobody Date: Fri, 28 Oct 2016 14:21:38 -0500 Subject: [PATCH 05/25] Fixing Debounce - WIP --- keyboards/vision_division/config.h | 2 +- quantum/matrix.c | 246 +++++++++++++++++++---------- tmk_core/common/matrix.h | 10 ++ 3 files changed, 174 insertions(+), 84 deletions(-) diff --git a/keyboards/vision_division/config.h b/keyboards/vision_division/config.h index 93c96067..5798d91a 100644 --- a/keyboards/vision_division/config.h +++ b/keyboards/vision_division/config.h @@ -31,7 +31,7 @@ along with this program. If not, see . #define BACKLIGHT_LEVELS 3 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCING_DELAY 5 +#define DEBOUNCING_DELAY 0 #define MATRIX_MASKED diff --git a/quantum/matrix.c b/quantum/matrix.c index ac81794e..a7dab098 100644 --- a/quantum/matrix.c +++ b/quantum/matrix.c @@ -26,6 +26,33 @@ along with this program. If not, see . #include "util.h" #include "matrix.h" +#if (MATRIX_COLS <= 8) +# define print_matrix_header() print("\nr/c 01234567\n") +# define print_matrix_row(row) print_bin_reverse8(matrix_get_row(row)) +# define matrix_bitpop(i) bitpop(matrix[i]) +# define ROW_SHIFTER ((uint8_t)1) +#elif (MATRIX_COLS <= 16) +# define print_matrix_header() print("\nr/c 0123456789ABCDEF\n") +# define print_matrix_row(row) print_bin_reverse16(matrix_get_row(row)) +# define matrix_bitpop(i) bitpop16(matrix[i]) +# define ROW_SHIFTER ((uint16_t)1) +#elif (MATRIX_COLS <= 32) +# define print_matrix_header() print("\nr/c 0123456789ABCDEF0123456789ABCDEF\n") +# define print_matrix_row(row) print_bin_reverse32(matrix_get_row(row)) +# define matrix_bitpop(i) bitpop32(matrix[i]) +# define ROW_SHIFTER ((uint32_t)1) +#endif + +#if (MATRIX_ROWS <= 8) +# define COL_SHIFTER ((uint8_t)1) +#elif (MATRIX_ROWS <= 16) +# define COL_SHIFTER ((uint16_t)1) +#elif (MATRIX_ROWS <= 32) +# define COL_SHIFTER ((uint32_t)1) +#endif + + + #ifdef MATRIX_MASKED extern const matrix_row_t matrix_mask[]; #endif @@ -42,24 +69,28 @@ 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_debouncing[MATRIX_ROWS]; -#if DIODE_DIRECTION == ROW2COL - static matrix_row_t matrix_reversed[MATRIX_COLS]; - static matrix_row_t matrix_reversed_debouncing[MATRIX_COLS]; +#if DIODE_DIRECTION == COL2ROW + static matrix_row_t matrix_debouncing[MATRIX_ROWS]; +#else // ROW2COL + static matrix_col_t matrix_transposed[MATRIX_COLS]; + static matrix_col_t matrix_transposed_debouncing[MATRIX_COLS]; #endif -#if MATRIX_COLS > 16 - #define SHIFTER 1UL -#else - #define SHIFTER 1 +#if (DIODE_DIRECTION == COL2ROW) + static void init_cols(void); + static matrix_row_t read_cols(void); + static void unselect_rows(void); + static void select_row(uint8_t row); + static void unselect_row(uint8_t row); +#else // ROW2COL + static void init_rows(void); + static matrix_col_t read_rows(void); + static void unselect_cols(void); + static void unselect_col(uint8_t col); + static void select_col(uint8_t col); #endif -static matrix_row_t read_cols(void); -static void init_cols(void); -static void unselect_rows(void); -static void select_row(uint8_t row); - __attribute__ ((weak)) void matrix_init_quantum(void) { matrix_init_kb(); @@ -99,7 +130,7 @@ uint8_t matrix_cols(void) { } // void matrix_power_up(void) { -// #if DIODE_DIRECTION == COL2ROW +// #if (DIODE_DIRECTION == COL2ROW) // for (int8_t r = MATRIX_ROWS - 1; r >= 0; --r) { // /* DDRxn */ // _SFR_IO8((row_pins[r] >> 4) + 1) |= _BV(row_pins[r] & 0xF); @@ -123,13 +154,15 @@ uint8_t matrix_cols(void) { // } void matrix_init(void) { + // To use PORTF disable JTAG with writing JTD bit twice within four cycles. - #ifdef __AVR_ATmega32U4__ + #if (defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB1287__) || defined(__AVR_ATmega32U4__)) MCUCR |= _BV(JTD); MCUCR |= _BV(JTD); #endif // initialize row and col +#if (DIODE_DIRECTION == COL2ROW) unselect_rows(); init_cols(); @@ -139,25 +172,43 @@ void matrix_init(void) { matrix_debouncing[i] = 0; } +#else // ROW2COL + unselect_cols(); + init_rows(); + + // initialize matrix state: all keys off + for (uint8_t i=0; i < MATRIX_ROWS; i++) { + matrix[i] = 0; + } + + // initialize matrix state: all keys off + for (uint8_t i=0; i < MATRIX_COLS; i++) { + matrix_transposed_debouncing[i] = 0; + } +#endif + matrix_init_quantum(); } uint8_t matrix_scan(void) { -#if DIODE_DIRECTION == COL2ROW +#if (DIODE_DIRECTION == COL2ROW) + + // Set row, read cols + for (uint8_t i = 0; i < MATRIX_ROWS; i++) { select_row(i); wait_us(30); // without this wait read unstable value. - matrix_row_t cols = read_cols(); - if (matrix_debouncing[i] != cols) { - matrix_debouncing[i] = cols; + matrix_row_t current_row = read_cols(); + if (matrix_debouncing[i] != current_row) { + matrix_debouncing[i] = current_row; if (debouncing) { debug("bounce!: "); debug_hex(debouncing); debug("\n"); } debouncing = DEBOUNCING_DELAY; } - unselect_rows(); + unselect_row(i); } if (debouncing) { @@ -169,19 +220,23 @@ uint8_t matrix_scan(void) } } } -#else + +#else // ROW2COL + + // Set col, read rows + for (uint8_t i = 0; i < MATRIX_COLS; i++) { - select_row(i); + select_col(i); wait_us(30); // without this wait read unstable value. - matrix_row_t rows = read_cols(); - if (matrix_reversed_debouncing[i] != rows) { - matrix_reversed_debouncing[i] = rows; + matrix_col_t current_col = read_rows(); + if (matrix_transposed_debouncing[i] != current_col) { + matrix_transposed_debouncing[i] = current_col; if (debouncing) { debug("bounce!: "); debug_hex(debouncing); debug("\n"); } debouncing = DEBOUNCING_DELAY; } - unselect_rows(); + unselect_col(i); } if (debouncing) { @@ -189,17 +244,20 @@ uint8_t matrix_scan(void) wait_ms(1); } else { for (uint8_t i = 0; i < MATRIX_COLS; i++) { - matrix_reversed[i] = matrix_reversed_debouncing[i]; + matrix_transposed[i] = matrix_transposed_debouncing[i]; } } } + + // Untranspose matrix for (uint8_t y = 0; y < MATRIX_ROWS; y++) { matrix_row_t row = 0; for (uint8_t x = 0; x < MATRIX_COLS; x++) { - row |= ((matrix_reversed[x] & (1<> y) << x; + row |= ((matrix_transposed[x] & (1<> y) << x; } matrix[y] = row; } + #endif matrix_scan_quantum(); @@ -233,23 +291,11 @@ matrix_row_t matrix_get_row(uint8_t row) void matrix_print(void) { -#if (MATRIX_COLS <= 8) - print("\nr/c 01234567\n"); -#elif (MATRIX_COLS <= 16) - print("\nr/c 0123456789ABCDEF\n"); -#elif (MATRIX_COLS <= 32) - print("\nr/c 0123456789ABCDEF0123456789ABCDEF\n"); -#endif + print_matrix_header(); for (uint8_t row = 0; row < MATRIX_ROWS; row++) { phex(row); print(": "); -#if (MATRIX_COLS <= 8) - print_bin_reverse8(matrix_get_row(row)); -#elif (MATRIX_COLS <= 16) - print_bin_reverse16(matrix_get_row(row)); -#elif (MATRIX_COLS <= 32) - print_bin_reverse32(matrix_get_row(row)); -#endif + print_matrix_row(row); print("\n"); } } @@ -258,28 +304,21 @@ uint8_t matrix_key_count(void) { uint8_t count = 0; for (uint8_t i = 0; i < MATRIX_ROWS; i++) { -#if (MATRIX_COLS <= 8) - count += bitpop(matrix[i]); -#elif (MATRIX_COLS <= 16) - count += bitpop16(matrix[i]); -#elif (MATRIX_COLS <= 32) - count += bitpop32(matrix[i]); -#endif + count += matrix_bitpop(i); } return count; } + + +#if (DIODE_DIRECTION == COL2ROW) + static void init_cols(void) { -#if DIODE_DIRECTION == COL2ROW - for(int x = 0; x < MATRIX_COLS; x++) { - int pin = col_pins[x]; -#else - for(int x = 0; x < MATRIX_ROWS; x++) { - int pin = row_pins[x]; -#endif - _SFR_IO8((pin >> 4) + 1) &= ~_BV(pin & 0xF); - _SFR_IO8((pin >> 4) + 2) |= _BV(pin & 0xF); + for(uint8_t x = 0; x < MATRIX_COLS; x++) { + uint8_t pin = col_pins[x]; + _SFR_IO8((pin >> 4) + 1) &= ~_BV(pin & 0xF); // IN + _SFR_IO8((pin >> 4) + 2) |= _BV(pin & 0xF); // HI } } @@ -287,40 +326,81 @@ static matrix_row_t read_cols(void) { matrix_row_t result = 0; -#if DIODE_DIRECTION == COL2ROW - for(int x = 0; x < MATRIX_COLS; x++) { - int pin = col_pins[x]; -#else - for(int x = 0; x < MATRIX_ROWS; x++) { - int pin = row_pins[x]; -#endif - result |= (_SFR_IO8(pin >> 4) & _BV(pin & 0xF)) ? 0 : (SHIFTER << x); + for(uint8_t x = 0; x < MATRIX_COLS; x++) { + uint8_t pin = col_pins[x]; + result |= (_SFR_IO8(pin >> 4) & _BV(pin & 0xF)) ? 0 : (ROW_SHIFTER << x); } + return result; } +static void select_row(uint8_t row) +{ + uint8_t pin = row_pins[row]; + _SFR_IO8((pin >> 4) + 1) |= _BV(pin & 0xF); // OUT + _SFR_IO8((pin >> 4) + 2) &= ~_BV(pin & 0xF); // LOW +} + +static void unselect_row(uint8_t row) +{ + uint8_t pin = row_pins[row]; + _SFR_IO8((pin >> 4) + 1) &= ~_BV(pin & 0xF); // IN + _SFR_IO8((pin >> 4) + 2) |= _BV(pin & 0xF); // HI +} + static void unselect_rows(void) { -#if DIODE_DIRECTION == COL2ROW - for(int x = 0; x < MATRIX_ROWS; x++) { - int pin = row_pins[x]; -#else - for(int x = 0; x < MATRIX_COLS; x++) { - int pin = col_pins[x]; -#endif - _SFR_IO8((pin >> 4) + 1) &= ~_BV(pin & 0xF); - _SFR_IO8((pin >> 4) + 2) |= _BV(pin & 0xF); + for(uint8_t x = 0; x < MATRIX_ROWS; x++) { + uint8_t pin = row_pins[x]; + _SFR_IO8((pin >> 4) + 1) &= ~_BV(pin & 0xF); // IN + _SFR_IO8((pin >> 4) + 2) |= _BV(pin & 0xF); // HI } } -static void select_row(uint8_t row) +#else // ROW2COL + +static void init_rows(void) { + for(uint8_t x = 0; x < MATRIX_ROWS; x++) { + uint8_t pin = row_pins[x]; + _SFR_IO8((pin >> 4) + 1) &= ~_BV(pin & 0xF); // IN + _SFR_IO8((pin >> 4) + 2) |= _BV(pin & 0xF); // HI + } +} -#if DIODE_DIRECTION == COL2ROW - int pin = row_pins[row]; -#else - int pin = col_pins[row]; -#endif - _SFR_IO8((pin >> 4) + 1) |= _BV(pin & 0xF); - _SFR_IO8((pin >> 4) + 2) &= ~_BV(pin & 0xF); +static matrix_col_t read_rows(void) +{ + matrix_col_t result = 0; + + for(uint8_t x = 0; x < MATRIX_ROWS; x++) { + uint8_t pin = row_pins[x]; + result |= (_SFR_IO8(pin >> 4) & _BV(pin & 0xF)) ? 0 : (COL_SHIFTER << x); + } + + return result; +} + +static void select_col(uint8_t col) +{ + uint8_t pin = col_pins[col]; + _SFR_IO8((pin >> 4) + 1) |= _BV(pin & 0xF); // OUT + _SFR_IO8((pin >> 4) + 2) &= ~_BV(pin & 0xF); // LOW +} + +static void unselect_col(uint8_t col) +{ + uint8_t pin = col_pins[col]; + _SFR_IO8((pin >> 4) + 1) &= ~_BV(pin & 0xF); // IN + _SFR_IO8((pin >> 4) + 2) |= _BV(pin & 0xF); // HI } + +static void unselect_cols(void) +{ + for(uint8_t x = 0; x < MATRIX_COLS; x++) { + uint8_t pin = col_pins[x]; + _SFR_IO8((pin >> 4) + 1) &= ~_BV(pin & 0xF); // IN + _SFR_IO8((pin >> 4) + 2) |= _BV(pin & 0xF); // HI + } +} + +#endif diff --git a/tmk_core/common/matrix.h b/tmk_core/common/matrix.h index cee3593e..84e066c6 100644 --- a/tmk_core/common/matrix.h +++ b/tmk_core/common/matrix.h @@ -31,6 +31,16 @@ typedef uint32_t matrix_row_t; #error "MATRIX_COLS: invalid value" #endif +#if (MATRIX_ROWS <= 8) +typedef uint8_t matrix_col_t; +#elif (MATRIX_ROWS <= 16) +typedef uint16_t matrix_col_t; +#elif (MATRIX_ROWS <= 32) +typedef uint32_t matrix_col_t; +#else +#error "MATRIX_COLS: invalid value" +#endif + #define MATRIX_IS_ON(row, col) (matrix_get_row(row) && (1< Date: Fri, 28 Oct 2016 16:24:20 -0500 Subject: [PATCH 06/25] Refactoring Matrix scanning --- quantum/matrix.c | 173 +++++++++++++++++++++------------------ tmk_core/common/matrix.h | 10 --- 2 files changed, 95 insertions(+), 88 deletions(-) diff --git a/quantum/matrix.c b/quantum/matrix.c index a7dab098..1bacea1b 100644 --- a/quantum/matrix.c +++ b/quantum/matrix.c @@ -43,16 +43,6 @@ along with this program. If not, see . # define ROW_SHIFTER ((uint32_t)1) #endif -#if (MATRIX_ROWS <= 8) -# define COL_SHIFTER ((uint8_t)1) -#elif (MATRIX_ROWS <= 16) -# define COL_SHIFTER ((uint16_t)1) -#elif (MATRIX_ROWS <= 32) -# define COL_SHIFTER ((uint32_t)1) -#endif - - - #ifdef MATRIX_MASKED extern const matrix_row_t matrix_mask[]; #endif @@ -70,6 +60,9 @@ 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]; + + #if DIODE_DIRECTION == COL2ROW static matrix_row_t matrix_debouncing[MATRIX_ROWS]; #else // ROW2COL @@ -79,13 +72,13 @@ static matrix_row_t matrix[MATRIX_ROWS]; #if (DIODE_DIRECTION == COL2ROW) static void init_cols(void); - static matrix_row_t read_cols(void); + static void read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) static void unselect_rows(void); static void select_row(uint8_t row); static void unselect_row(uint8_t row); #else // ROW2COL static void init_rows(void); - static matrix_col_t read_rows(void); + static void read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) static void unselect_cols(void); static void unselect_col(uint8_t col); static void select_col(uint8_t col); @@ -169,6 +162,7 @@ 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; } @@ -178,6 +172,7 @@ void matrix_init(void) { // initialize matrix state: all keys off for (uint8_t i=0; i < MATRIX_ROWS; i++) { + matrix_raw[i] = 0; matrix[i] = 0; } @@ -196,67 +191,73 @@ uint8_t matrix_scan(void) #if (DIODE_DIRECTION == COL2ROW) // Set row, read cols - - for (uint8_t i = 0; i < MATRIX_ROWS; i++) { - select_row(i); - wait_us(30); // without this wait read unstable value. - matrix_row_t current_row = read_cols(); - if (matrix_debouncing[i] != current_row) { - matrix_debouncing[i] = current_row; - if (debouncing) { - debug("bounce!: "); debug_hex(debouncing); debug("\n"); - } - debouncing = DEBOUNCING_DELAY; - } - unselect_row(i); + for (uint8_t current_row = 0; current_row < MATRIX_ROWS; current_row++) { + read_cols_on_row(matrix, current_row); } - if (debouncing) { - if (--debouncing) { - wait_ms(1); - } else { - for (uint8_t i = 0; i < MATRIX_ROWS; i++) { - matrix[i] = matrix_debouncing[i]; - } - } - } + // select_row(i); + // wait_us(30); // without this wait read unstable value. + // matrix_row_t current_row = read_cols(); + // if (matrix_debouncing[i] != current_row) { + // matrix_debouncing[i] = current_row; + // if (debouncing) { + // debug("bounce!: "); debug_hex(debouncing); debug("\n"); + // } + // debouncing = DEBOUNCING_DELAY; + // } + // unselect_row(i); + // } + + // if (debouncing) { + // if (--debouncing) { + // wait_ms(1); + // } else { + // for (uint8_t i = 0; i < MATRIX_ROWS; i++) { + // matrix[i] = matrix_debouncing[i]; + // } + // } + // } #else // ROW2COL // Set col, read rows - - for (uint8_t i = 0; i < MATRIX_COLS; i++) { - select_col(i); - wait_us(30); // without this wait read unstable value. - matrix_col_t current_col = read_rows(); - if (matrix_transposed_debouncing[i] != current_col) { - matrix_transposed_debouncing[i] = current_col; - if (debouncing) { - debug("bounce!: "); debug_hex(debouncing); debug("\n"); - } - debouncing = DEBOUNCING_DELAY; - } - unselect_col(i); + for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++) { + read_rows_on_col(matrix, current_col); } - if (debouncing) { - if (--debouncing) { - wait_ms(1); - } else { - for (uint8_t i = 0; i < MATRIX_COLS; i++) { - matrix_transposed[i] = matrix_transposed_debouncing[i]; - } - } - } - // Untranspose matrix - for (uint8_t y = 0; y < MATRIX_ROWS; y++) { - matrix_row_t row = 0; - for (uint8_t x = 0; x < MATRIX_COLS; x++) { - row |= ((matrix_transposed[x] & (1<> y) << x; - } - matrix[y] = row; - } + // for (uint8_t i = 0; i < MATRIX_COLS; i++) { + // select_col(i); + // wait_us(30); // without this wait read unstable value. + // matrix_col_t current_col = read_rows(); + // if (matrix_transposed_debouncing[i] != current_col) { + // matrix_transposed_debouncing[i] = current_col; + // if (debouncing) { + // debug("bounce!: "); debug_hex(debouncing); debug("\n"); + // } + // debouncing = DEBOUNCING_DELAY; + // } + // unselect_col(i); + // } + + // if (debouncing) { + // if (--debouncing) { + // wait_ms(1); + // } else { + // for (uint8_t i = 0; i < MATRIX_COLS; i++) { + // matrix_transposed[i] = matrix_transposed_debouncing[i]; + // } + // } + // } + + // // Untranspose matrix + // for (uint8_t y = 0; y < MATRIX_ROWS; y++) { + // matrix_row_t row = 0; + // for (uint8_t x = 0; x < MATRIX_COLS; x++) { + // row |= ((matrix_transposed[x] & (1<> y) << x; + // } + // matrix[y] = row; + // } #endif @@ -322,16 +323,25 @@ static void init_cols(void) } } -static matrix_row_t read_cols(void) +static void read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) { - matrix_row_t result = 0; + // Clear data in matrix row + current_matrix[current_row] = 0; - for(uint8_t x = 0; x < MATRIX_COLS; x++) { - uint8_t pin = col_pins[x]; - result |= (_SFR_IO8(pin >> 4) & _BV(pin & 0xF)) ? 0 : (ROW_SHIFTER << x); - } + // Select row and wait for row selecton to stabilize + select_row(current_row); + wait_us(30); - return result; + // For each col... + for(uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) { + + // Select the col pin to read (active low) + uint8_t pin = col_pins[col_index]; + uint8_t pin_state = (_SFR_IO8(pin >> 4) & _BV(pin & 0xF)); + + // Populate the matrix row with the state of the col pin + current_matrix[current_row] |= pin_state ? 0 : (ROW_SHIFTER << col_index); + } } static void select_row(uint8_t row) @@ -368,16 +378,23 @@ static void init_rows(void) } } -static matrix_col_t read_rows(void) +static void read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) { - matrix_col_t result = 0; - for(uint8_t x = 0; x < MATRIX_ROWS; x++) { - uint8_t pin = row_pins[x]; - result |= (_SFR_IO8(pin >> 4) & _BV(pin & 0xF)) ? 0 : (COL_SHIFTER << x); - } + // Select col and wait for col selecton to stabilize + select_col(current_col); + wait_us(30); - return result; + // For each row... + for(uint8_t row_index = 0; row_index < MATRIX_ROWS; row_index++) { + + // Select the row pin to read (active low) + uint8_t pin = row_pins[row_index]; + uint8_t pin_state = (_SFR_IO8(pin >> 4) & _BV(pin & 0xF)); + + // Populate the matrix row with the state of the col pin + current_matrix[row_index] &= pin_state ? ~(ROW_SHIFTER << current_col) : 0; + } } static void select_col(uint8_t col) diff --git a/tmk_core/common/matrix.h b/tmk_core/common/matrix.h index 84e066c6..cee3593e 100644 --- a/tmk_core/common/matrix.h +++ b/tmk_core/common/matrix.h @@ -31,16 +31,6 @@ typedef uint32_t matrix_row_t; #error "MATRIX_COLS: invalid value" #endif -#if (MATRIX_ROWS <= 8) -typedef uint8_t matrix_col_t; -#elif (MATRIX_ROWS <= 16) -typedef uint16_t matrix_col_t; -#elif (MATRIX_ROWS <= 32) -typedef uint32_t matrix_col_t; -#else -#error "MATRIX_COLS: invalid value" -#endif - #define MATRIX_IS_ON(row, col) (matrix_get_row(row) && (1< Date: Sat, 29 Oct 2016 10:39:03 -0500 Subject: [PATCH 07/25] Made scanning more efficient --- quantum/matrix.c | 55 +++++++++++++++++++++--------------------------- 1 file changed, 24 insertions(+), 31 deletions(-) diff --git a/quantum/matrix.c b/quantum/matrix.c index 1bacea1b..f45b251e 100644 --- a/quantum/matrix.c +++ b/quantum/matrix.c @@ -61,24 +61,18 @@ static const uint8_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; static matrix_row_t matrix[MATRIX_ROWS]; static matrix_row_t matrix_raw[MATRIX_ROWS]; +static matrix_row_t matrix_debouncing[MATRIX_ROWS]; -#if DIODE_DIRECTION == COL2ROW - static matrix_row_t matrix_debouncing[MATRIX_ROWS]; -#else // ROW2COL - static matrix_col_t matrix_transposed[MATRIX_COLS]; - static matrix_col_t matrix_transposed_debouncing[MATRIX_COLS]; -#endif - #if (DIODE_DIRECTION == COL2ROW) static void init_cols(void); - static void read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) + static void read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row); static void unselect_rows(void); static void select_row(uint8_t row); static void unselect_row(uint8_t row); #else // ROW2COL static void init_rows(void); - static void read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) + static void read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col); static void unselect_cols(void); static void unselect_col(uint8_t col); static void select_col(uint8_t col); @@ -158,30 +152,18 @@ void matrix_init(void) { #if (DIODE_DIRECTION == COL2ROW) unselect_rows(); init_cols(); - - // 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; - } - #else // ROW2COL unselect_cols(); init_rows(); +#endif // initialize matrix state: all keys off for (uint8_t i=0; i < MATRIX_ROWS; i++) { - matrix_raw[i] = 0; matrix[i] = 0; + matrix_raw[i] = 0; + matrix_debouncing[i] = 0; } - // initialize matrix state: all keys off - for (uint8_t i=0; i < MATRIX_COLS; i++) { - matrix_transposed_debouncing[i] = 0; - } -#endif - matrix_init_quantum(); } @@ -262,7 +244,7 @@ uint8_t matrix_scan(void) #endif matrix_scan_quantum(); - +// matrix_print(); return 1; } @@ -342,6 +324,9 @@ static void read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) // Populate the matrix row with the state of the col pin current_matrix[current_row] |= pin_state ? 0 : (ROW_SHIFTER << col_index); } + + // Unselect row + unselect_row(current_row); } static void select_row(uint8_t row) @@ -388,13 +373,21 @@ static void read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) // For each row... for(uint8_t row_index = 0; row_index < MATRIX_ROWS; row_index++) { - // Select the row pin to read (active low) - uint8_t pin = row_pins[row_index]; - uint8_t pin_state = (_SFR_IO8(pin >> 4) & _BV(pin & 0xF)); - - // Populate the matrix row with the state of the col pin - current_matrix[row_index] &= pin_state ? ~(ROW_SHIFTER << current_col) : 0; + // Check row pin state + if ((_SFR_IO8(row_pins[row_index] >> 4) & _BV(row_pins[row_index] & 0xF)) == 0) + { + // Pin LO, set col bit + current_matrix[row_index] |= (ROW_SHIFTER << current_col); + } + else + { + // Pin HI, clear col bit + current_matrix[row_index] &= ~(ROW_SHIFTER << current_col); + } } + + // Unselect col + unselect_col(current_col); } static void select_col(uint8_t col) From f4030289744fc6dc82dd85c955070c0845813cc5 Mon Sep 17 00:00:00 2001 From: IBNobody Date: Sat, 29 Oct 2016 16:12:58 -0500 Subject: [PATCH 08/25] added fixed debounce code --- quantum/matrix.c | 143 +++++++++++++++++++++++------------------------ 1 file changed, 70 insertions(+), 73 deletions(-) diff --git a/quantum/matrix.c b/quantum/matrix.c index f45b251e..3c488b41 100644 --- a/quantum/matrix.c +++ b/quantum/matrix.c @@ -25,6 +25,19 @@ along with this program. If not, see . #include "debug.h" #include "util.h" #include "matrix.h" +#include "timer.h" + + +/* Set 0 if debouncing isn't needed */ + +#ifndef DEBOUNCING_DELAY +# define DEBOUNCING_DELAY 5 +#endif + +#if (DEBOUNCING_DELAY > 0) + static uint16_t debouncing_time; + static bool debouncing = false; +#endif #if (MATRIX_COLS <= 8) # define print_matrix_header() print("\nr/c 01234567\n") @@ -44,15 +57,8 @@ along with this program. If not, see . #endif #ifdef MATRIX_MASKED -extern const matrix_row_t matrix_mask[]; -#endif - -/* Set 0 if debouncing isn't needed */ - -#ifndef DEBOUNCING_DELAY -# define DEBOUNCING_DELAY 5 + extern const matrix_row_t matrix_mask[]; #endif -static uint8_t debouncing = DEBOUNCING_DELAY; static const uint8_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS; static const uint8_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; @@ -66,13 +72,13 @@ static matrix_row_t matrix_debouncing[MATRIX_ROWS]; #if (DIODE_DIRECTION == COL2ROW) static void init_cols(void); - static void read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row); + static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row); static void unselect_rows(void); static void select_row(uint8_t row); static void unselect_row(uint8_t row); #else // ROW2COL static void init_rows(void); - static void read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col); + static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col); static void unselect_cols(void); static void unselect_col(uint8_t col); static void select_col(uint8_t col); @@ -174,83 +180,56 @@ uint8_t matrix_scan(void) // Set row, read cols for (uint8_t current_row = 0; current_row < MATRIX_ROWS; current_row++) { - read_cols_on_row(matrix, current_row); - } +# if (DEBOUNCING_DELAY > 0) + bool matrix_changed = read_cols_on_row(matrix_debouncing, current_row); - // select_row(i); - // wait_us(30); // without this wait read unstable value. - // matrix_row_t current_row = read_cols(); - // if (matrix_debouncing[i] != current_row) { - // matrix_debouncing[i] = current_row; - // if (debouncing) { - // debug("bounce!: "); debug_hex(debouncing); debug("\n"); - // } - // debouncing = DEBOUNCING_DELAY; - // } - // unselect_row(i); - // } - - // if (debouncing) { - // if (--debouncing) { - // wait_ms(1); - // } else { - // for (uint8_t i = 0; i < MATRIX_ROWS; i++) { - // matrix[i] = matrix_debouncing[i]; - // } - // } - // } + if (matrix_changed) { + debouncing = true; + debouncing_time = timer_read(); + } + +# else + read_cols_on_row(matrix, current_row); +# endif + + } #else // ROW2COL // Set col, read rows for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++) { - read_rows_on_col(matrix, current_col); - } +# if (DEBOUNCING_DELAY > 0) + bool matrix_changed = read_rows_on_col(matrix_debouncing, current_col); + if (matrix_changed) { + debouncing = true; + debouncing_time = timer_read(); + } +# else + read_rows_on_col(matrix, current_col); +# endif - - // for (uint8_t i = 0; i < MATRIX_COLS; i++) { - // select_col(i); - // wait_us(30); // without this wait read unstable value. - // matrix_col_t current_col = read_rows(); - // if (matrix_transposed_debouncing[i] != current_col) { - // matrix_transposed_debouncing[i] = current_col; - // if (debouncing) { - // debug("bounce!: "); debug_hex(debouncing); debug("\n"); - // } - // debouncing = DEBOUNCING_DELAY; - // } - // unselect_col(i); - // } - - // if (debouncing) { - // if (--debouncing) { - // wait_ms(1); - // } else { - // for (uint8_t i = 0; i < MATRIX_COLS; i++) { - // matrix_transposed[i] = matrix_transposed_debouncing[i]; - // } - // } - // } - - // // Untranspose matrix - // for (uint8_t y = 0; y < MATRIX_ROWS; y++) { - // matrix_row_t row = 0; - // for (uint8_t x = 0; x < MATRIX_COLS; x++) { - // row |= ((matrix_transposed[x] & (1<> y) << x; - // } - // matrix[y] = row; - // } + } #endif +# if (DEBOUNCING_DELAY > 0) + if (debouncing && (timer_elapsed(debouncing_time) > DEBOUNCING_DELAY)) { + for (uint8_t i = 0; i < MATRIX_ROWS; i++) { + matrix[i] = matrix_debouncing[i]; + } + debouncing = false; + } +# endif + matrix_scan_quantum(); -// matrix_print(); return 1; } bool matrix_is_modified(void) { +#if (DEBOUNCING_DELAY > 0) if (debouncing) return false; +#endif return true; } @@ -305,8 +284,11 @@ static void init_cols(void) } } -static void read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) +static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) { + // Store last value of row prior to reading + matrix_row_t last_row_value = current_matrix[current_row]; + // Clear data in matrix row current_matrix[current_row] = 0; @@ -327,6 +309,8 @@ static void read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) // Unselect row unselect_row(current_row); + + return (last_row_value == current_matrix[current_row]); } static void select_row(uint8_t row) @@ -363,15 +347,20 @@ static void init_rows(void) } } -static void read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) +static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) { + bool matrix_changed = false; // Select col and wait for col selecton to stabilize select_col(current_col); wait_us(30); // For each row... - for(uint8_t row_index = 0; row_index < MATRIX_ROWS; row_index++) { + for(uint8_t row_index = 0; row_index < MATRIX_ROWS; row_index++) + { + + // Store last value of row prior to reading + matrix_row_t last_row_value = current_matrix[row_index]; // Check row pin state if ((_SFR_IO8(row_pins[row_index] >> 4) & _BV(row_pins[row_index] & 0xF)) == 0) @@ -384,10 +373,18 @@ static void read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) // Pin HI, clear col bit current_matrix[row_index] &= ~(ROW_SHIFTER << current_col); } + + // Determine if the matrix changed state + if ((last_row_value != current_matrix[row_index]) && !(matrix_changed)) + { + matrix_changed = true; + } } // Unselect col unselect_col(current_col); + + return matrix_changed; } static void select_col(uint8_t col) From 78976d8f7a7702eb4e94819af40fb3b32ac6825f Mon Sep 17 00:00:00 2001 From: IBNobody Date: Tue, 1 Nov 2016 11:52:58 -0500 Subject: [PATCH 09/25] Adding SKIP_GIT to speed up compiles. --- Makefile | 57 ++++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 39 insertions(+), 18 deletions(-) diff --git a/Makefile b/Makefile index 66c0ff30..aa33c40f 100644 --- a/Makefile +++ b/Makefile @@ -38,7 +38,7 @@ ERROR_FILE := $(BUILD_DIR)/error_occured MAKEFILE_INCLUDED=yes -# Helper function to process the newt element of a space separated path +# Helper function to process the newt element of a space separated path # It works a bit like the traditional functional head tail # so the CURRENT_PATH_ELEMENT will beome the new head # and the PATH_ELEMENTS are the rest that are still unprocessed @@ -47,16 +47,16 @@ define NEXT_PATH_ELEMENT $$(eval PATH_ELEMENTS := $$(wordlist 2,9999,$$(PATH_ELEMENTS))) endef -# We change the / to spaces so that we more easily can work with the elements +# We change the / to spaces so that we more easily can work with the elements # separately PATH_ELEMENTS := $(subst /, ,$(STARTING_DIR)) # Initialize the path elements list for further processing $(eval $(call NEXT_PATH_ELEMENT)) -# This function sets the KEYBOARD; KEYMAP and SUBPROJECT to the correct +# This function sets the KEYBOARD; KEYMAP and SUBPROJECT to the correct # variables depending on which directory you stand in. -# It's really a very simple if else chain, if you squint enough, -# but the makefile syntax makes it very verbose. +# It's really a very simple if else chain, if you squint enough, +# but the makefile syntax makes it very verbose. # If we are in a subfolder of keyboards ifeq ($(CURRENT_PATH_ELEMENT),keyboards) $(eval $(call NEXT_PATH_ELEMENT)) @@ -111,7 +111,7 @@ endif .DEFAULT_GOAL := all ifneq ($(KEYMAP),) ifeq ($(SUBPROJECT),) - # Inside a keymap folder, just build the keymap, with the + # Inside a keymap folder, just build the keymap, with the # default subproject .DEFAULT_GOAL := $(KEYBOARD)-$(KEYMAP) else @@ -163,7 +163,7 @@ define TRY_TO_MATCH_RULE_FROM_LIST_HELPER3 ifneq ($1,) ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,$$(firstword $1)),true) MATCHED_ITEM := $$(firstword $1) - else + else $$(eval $$(call TRY_TO_MATCH_RULE_FROM_LIST_HELPER3,$$(wordlist 2,9999,$1))) endif endif @@ -171,10 +171,10 @@ endef # A recursive helper function for finding the longest match # $1 The list to be checed -# It works by always removing the currently matched item from the list +# It works by always removing the currently matched item from the list # and call itself recursively, until a match is found define TRY_TO_MATCH_RULE_FROM_LIST_HELPER2 - # Stop the recursion when the list is empty + # Stop the recursion when the list is empty ifneq ($1,) RULE_BEFORE := $$(RULE) $$(eval $$(call TRY_TO_MATCH_RULE_FROM_LIST_HELPER3,$1)) @@ -270,7 +270,7 @@ define PARSE_KEYBOARD $$(eval $$(call PARSE_SUBPROJECT,$$(SUBPROJECT))) # If there's no matching subproject, we assume it's the default # This will allow you to leave the subproject part of the target out - else + else $$(eval $$(call PARSE_SUBPROJECT,)) endif endef @@ -285,7 +285,7 @@ endef # When entering this, the keyboard and subproject are known, so now we need # to determine which keymaps are going to get compiled define PARSE_SUBPROJECT - # If we want to compile the default subproject, then we need to + # If we want to compile the default subproject, then we need to # include the correct makefile to determine the actual name of it CURRENT_SP := $1 ifeq ($$(CURRENT_SP),) @@ -304,7 +304,7 @@ define PARSE_SUBPROJECT endif endif # The special allsp is handled later - ifneq ($$(CURRENT_SP),allsp) + ifneq ($$(CURRENT_SP),allsp) # get a list of all keymaps KEYMAPS := $$(notdir $$(patsubst %/.,%,$$(wildcard $(ROOT_DIR)/keyboards/$$(CURRENT_KB)/keymaps/*/.))) ifneq ($$(CURRENT_SP),) @@ -343,7 +343,7 @@ define PARSE_SUBPROJECT endif endef -# If we want to parse all subprojects, but the keyboard doesn't have any, +# If we want to parse all subprojects, but the keyboard doesn't have any, # then use defaultsp instead define PARSE_ALL_SUBPROJECTS ifeq ($$(SUBPROJECTS),) @@ -448,7 +448,7 @@ endef # Set the silent mode depending on if we are trying to compile multiple keyboards or not -# By default it's on in that case, but it can be overriden by specifying silent=false +# By default it's on in that case, but it can be overriden by specifying silent=false # from the command line define SET_SILENT_MODE ifdef SUB_IS_SILENT @@ -481,11 +481,12 @@ endef # Allow specifying just the subproject, in the keyboard directory, which will compile all keymaps SUBPROJECTS := $(notdir $(patsubst %/Makefile,%,$(wildcard ./*/Makefile))) .PHONY: $(SUBPROJECTS) -$(SUBPROJECTS): %: %-allkm +$(SUBPROJECTS): %: %-allkm # Let's match everything, we handle all the rule parsing ourselves .PHONY: % -%: +ifndef SKIP_GIT +%: # Check if we have the CMP tool installed cmp --version >/dev/null 2>&1; if [ $$? -gt 0 ]; then printf "$(MSG_NO_CMP)"; exit 1; fi; # Check if the submodules are dirty, and display a warning if they are @@ -505,8 +506,24 @@ $(SUBPROJECTS): %: %-allkm # But we return the error code at the end, to trigger travis failures $(foreach COMMAND,$(COMMANDS),$(RUN_COMMAND)) if [ -f $(ERROR_FILE) ]; then printf "$(MSG_ERRORS)" & exit 1; fi; - $(foreach TEST,$(TESTS),$(RUN_TEST)) + $(foreach TEST,$(TESTS),$(RUN_TEST)) + if [ -f $(ERROR_FILE) ]; then printf "$(MSG_ERRORS)" & exit 1; fi; +else +%: + # Check if we have the CMP tool installed + cmp --version >/dev/null 2>&1; if [ $$? -gt 0 ]; then printf "$(MSG_NO_CMP)"; exit 1; fi; + rm -f $(ERROR_FILE) > /dev/null 2>&1 + $(eval $(call PARSE_RULE,$@)) + $(eval $(call SET_SILENT_MODE)) + # Run all the commands in the same shell, notice the + at the first line + # it has to be there to allow parallel execution of the submake + # This always tries to compile everything, even if error occurs in the middle + # But we return the error code at the end, to trigger travis failures + $(foreach COMMAND,$(COMMANDS),$(RUN_COMMAND)) + if [ -f $(ERROR_FILE) ]; then printf "$(MSG_ERRORS)" & exit 1; fi; + $(foreach TEST,$(TESTS),$(RUN_TEST)) if [ -f $(ERROR_FILE) ]; then printf "$(MSG_ERRORS)" & exit 1; fi; +endif # All should compile everything .PHONY: all @@ -526,7 +543,11 @@ test: test-all test-clean: test-all-clean # Generate the version.h file -GIT_VERSION := $(shell git describe --abbrev=6 --dirty --always --tags 2>/dev/null || date +"%Y-%m-%d-%H:%M:%S") +ifndef SKIP_GIT + GIT_VERSION := $(shell git describe --abbrev=6 --dirty --always --tags 2>/dev/null || date +"%Y-%m-%d-%H:%M:%S") +else + GIT_VERSION := NA +endif BUILD_DATE := $(shell date +"%Y-%m-%d-%H:%M:%S") $(shell echo '#define QMK_VERSION "$(GIT_VERSION)"' > $(ROOT_DIR)/quantum/version.h) $(shell echo '#define QMK_BUILDDATE "$(BUILD_DATE)"' >> $(ROOT_DIR)/quantum/version.h) From c06e2486abda43205a490fc6b233f72f34667857 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sat, 5 Nov 2016 22:45:21 +0200 Subject: [PATCH 10/25] Increase the infinity60 system tick frequency --- keyboards/infinity60/chconf.h | 2 +- keyboards/infinity60/matrix.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/keyboards/infinity60/chconf.h b/keyboards/infinity60/chconf.h index 43c84573..d9114ec8 100644 --- a/keyboards/infinity60/chconf.h +++ b/keyboards/infinity60/chconf.h @@ -48,7 +48,7 @@ * @details Frequency of the system timer that drives the system ticks. This * setting also defines the system tick time unit. */ -#define CH_CFG_ST_FREQUENCY 1000 +#define CH_CFG_ST_FREQUENCY 100000 /** * @brief Time delta constant for the tick-less mode. diff --git a/keyboards/infinity60/matrix.c b/keyboards/infinity60/matrix.c index 62c165aa..d2f18528 100644 --- a/keyboards/infinity60/matrix.c +++ b/keyboards/infinity60/matrix.c @@ -96,7 +96,12 @@ uint8_t matrix_scan(void) } #endif - wait_us(1); // need wait to settle pin state + // need wait to settle pin state + // if you wait too short, or have a too high update rate + // the keyboard might freeze, or there might not be enough + // processing power to update the LCD screen properly. + // 20us, or two ticks at 100000Hz seems to be OK + wait_us(20); // read col data data = (palReadPort(GPIOD)>>1); From 6e27f6fbde47804035d508eb84690ed7ee9acee7 Mon Sep 17 00:00:00 2001 From: climbalima Date: Thu, 10 Nov 2016 18:19:13 -0500 Subject: [PATCH 11/25] Changes to be committed: new file: keyboards/lets_splitv2/Makefile new file: keyboards/lets_splitv2/config.h new file: keyboards/lets_splitv2/i2c.c new file: keyboards/lets_splitv2/i2c.h new file: keyboards/lets_splitv2/imgs/split-keyboard-i2c-schematic.png new file: keyboards/lets_splitv2/imgs/split-keyboard-serial-schematic.png new file: keyboards/lets_splitv2/keymaps/default/keymap.c new file: keyboards/lets_splitv2/lets_split.c new file: keyboards/lets_splitv2/lets_split.h new file: keyboards/lets_splitv2/matrix.c new file: keyboards/lets_splitv2/pro_micro.h new file: keyboards/lets_splitv2/readme.md new file: keyboards/lets_splitv2/serial.c new file: keyboards/lets_splitv2/serial.h new file: keyboards/lets_splitv2/split_util.c new file: keyboards/lets_splitv2/split_util.h new file: keyboards/maxipad/Makefile new file: keyboards/maxipad/config.h new file: keyboards/maxipad/keymaps/default/Makefile new file: keyboards/maxipad/keymaps/default/config.h new file: keyboards/maxipad/keymaps/default/keymap.c new file: keyboards/maxipad/keymaps/default/readme.md new file: keyboards/maxipad/maxipad.c new file: keyboards/maxipad/maxipad.h new file: keyboards/maxipad/readme.md --- keyboards/lets_split/Makefile | 2 +- keyboards/lets_split/config.h | 6 +- keyboards/lets_split/keymaps/default/keymap.c | 65 +--- keyboards/lets_split/lets_split.h | 8 +- keyboards/lets_splitv2/Makefile | 78 ++++ keyboards/lets_splitv2/config.h | 98 +++++ keyboards/lets_splitv2/i2c.c | 159 ++++++++ keyboards/lets_splitv2/i2c.h | 31 ++ .../imgs/split-keyboard-i2c-schematic.png | Bin 0 -> 26565 bytes .../imgs/split-keyboard-serial-schematic.png | Bin 0 -> 19487 bytes .../lets_splitv2/keymaps/default/keymap.c | 159 ++++++++ keyboards/lets_splitv2/lets_split.c | 30 ++ keyboards/lets_splitv2/lets_split.h | 25 ++ keyboards/lets_splitv2/matrix.c | 311 +++++++++++++++ keyboards/lets_splitv2/pro_micro.h | 362 ++++++++++++++++++ keyboards/lets_splitv2/readme.md | 102 +++++ keyboards/lets_splitv2/serial.c | 225 +++++++++++ keyboards/lets_splitv2/serial.h | 26 ++ keyboards/lets_splitv2/split_util.c | 76 ++++ keyboards/lets_splitv2/split_util.h | 22 ++ keyboards/maxipad/Makefile | 75 ++++ keyboards/maxipad/config.h | 162 ++++++++ keyboards/maxipad/keymaps/default/Makefile | 21 + keyboards/maxipad/keymaps/default/config.h | 8 + keyboards/maxipad/keymaps/default/keymap.c | 54 +++ keyboards/maxipad/keymaps/default/readme.md | 1 + keyboards/maxipad/maxipad.c | 28 ++ keyboards/maxipad/maxipad.h | 25 ++ keyboards/maxipad/readme.md | 28 ++ 29 files changed, 2119 insertions(+), 68 deletions(-) create mode 100644 keyboards/lets_splitv2/Makefile create mode 100644 keyboards/lets_splitv2/config.h create mode 100644 keyboards/lets_splitv2/i2c.c create mode 100644 keyboards/lets_splitv2/i2c.h create mode 100644 keyboards/lets_splitv2/imgs/split-keyboard-i2c-schematic.png create mode 100644 keyboards/lets_splitv2/imgs/split-keyboard-serial-schematic.png create mode 100644 keyboards/lets_splitv2/keymaps/default/keymap.c create mode 100644 keyboards/lets_splitv2/lets_split.c create mode 100644 keyboards/lets_splitv2/lets_split.h create mode 100644 keyboards/lets_splitv2/matrix.c create mode 100644 keyboards/lets_splitv2/pro_micro.h create mode 100644 keyboards/lets_splitv2/readme.md create mode 100644 keyboards/lets_splitv2/serial.c create mode 100644 keyboards/lets_splitv2/serial.h create mode 100644 keyboards/lets_splitv2/split_util.c create mode 100644 keyboards/lets_splitv2/split_util.h create mode 100644 keyboards/maxipad/Makefile create mode 100644 keyboards/maxipad/config.h create mode 100644 keyboards/maxipad/keymaps/default/Makefile create mode 100644 keyboards/maxipad/keymaps/default/config.h create mode 100644 keyboards/maxipad/keymaps/default/keymap.c create mode 100644 keyboards/maxipad/keymaps/default/readme.md create mode 100644 keyboards/maxipad/maxipad.c create mode 100644 keyboards/maxipad/maxipad.h create mode 100644 keyboards/maxipad/readme.md diff --git a/keyboards/lets_split/Makefile b/keyboards/lets_split/Makefile index b9f07636..982cfc59 100644 --- a/keyboards/lets_split/Makefile +++ b/keyboards/lets_split/Makefile @@ -67,7 +67,7 @@ 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. - +USE_I2C ?= yes # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend diff --git a/keyboards/lets_split/config.h b/keyboards/lets_split/config.h index 6f90997a..bf618704 100644 --- a/keyboards/lets_split/config.h +++ b/keyboards/lets_split/config.h @@ -25,7 +25,7 @@ along with this program. If not, see . #define PRODUCT_ID 0x3060 #define DEVICE_VER 0x0001 #define MANUFACTURER Wootpatoot -#define PRODUCT Lets Split +#define PRODUCT Lets Split v2 #define DESCRIPTION A split keyboard for the cheap makers /* key matrix size */ @@ -34,8 +34,8 @@ along with this program. If not, see . #define MATRIX_COLS 6 // wiring of each half -#define MATRIX_ROW_PINS { B5, B4, E6, D7 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 } +#define MATRIX_ROW_PINS { D7, E6, B4, B5 } +#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 } #define CATERINA_BOOTLOADER diff --git a/keyboards/lets_split/keymaps/default/keymap.c b/keyboards/lets_split/keymaps/default/keymap.c index 0d2d94b6..8c8466eb 100644 --- a/keyboards/lets_split/keymaps/default/keymap.c +++ b/keyboards/lets_split/keymaps/default/keymap.c @@ -42,64 +42,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------------------------------------------------' */ [_QWERTY] = KEYMAP( \ - 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_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ + 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_ENT , \ - ADJUST, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ + KC_LCTL, _LOWER, KC_LGUI, KC_LALT, MO(_LOWER), KC_SPC, KC_LSFT, MO(_RAISE), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ ), -/* Colemak - * ,-----------------------------------------------------------------------------------. - * | Tab | Q | W | F | P | G | J | L | U | Y | ; | Bksp | - * |------+------+------+------+------+-------------+------+------+------+------+------| - * | Esc | A | R | S | T | D | H | N | E | I | O | " | - * |------+------+------+------+------+------|------+------+------+------+------+------| - * | Shift| Z | X | C | V | B | K | M | , | . | / |Enter | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * |Adjust| Ctrl | Alt | GUI |Lower |Space |Space |Raise | Left | Down | Up |Right | - * `-----------------------------------------------------------------------------------' - */ -[_COLEMAK] = KEYMAP( \ - 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_ESC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, \ - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT , \ - ADJUST, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ -), - -/* 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 | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * |Adjust| Ctrl | Alt | GUI |Lower |Space |Space |Raise | Left | Down | Up |Right | - * `-----------------------------------------------------------------------------------' - */ -[_DVORAK] = KEYMAP( \ - 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_SLSH, \ - KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_ENT , \ - ADJUST, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ -), - -/* Lower - * ,-----------------------------------------------------------------------------------. - * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Bksp | - * |------+------+------+------+------+-------------+------+------+------+------+------| - * | Del | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | | \ | | | - * |------+------+------+------+------+------|------+------+------+------+------+------| - * | | F7 | F8 | F9 | F10 | F11 | F12 |ISO ~ |ISO | | | |Enter | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | Next | Vol- | Vol+ | Play | - * `-----------------------------------------------------------------------------------' - */ [_LOWER] = KEYMAP( \ KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, \ KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \ _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),_______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ + _______, _______, _______, _______, _______, KC_BSPC, KC_BSPC, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ ), /* Raise @@ -117,7 +70,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, \ _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ + _______, _______, _______, _______, _______, KC_ENT, KC_ENT, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ ), /* Adjust (Lower + Raise) @@ -131,14 +84,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | | | | | | | | | * `-----------------------------------------------------------------------------------' */ -[_ADJUST] = KEYMAP( \ - _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \ - _______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ -) - - }; #ifdef AUDIO_ENABLE diff --git a/keyboards/lets_split/lets_split.h b/keyboards/lets_split/lets_split.h index fe7ae076..04844ed6 100644 --- a/keyboards/lets_split/lets_split.h +++ b/keyboards/lets_split/lets_split.h @@ -6,10 +6,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_splitv2/Makefile b/keyboards/lets_splitv2/Makefile new file mode 100644 index 00000000..982cfc59 --- /dev/null +++ b/keyboards/lets_splitv2/Makefile @@ -0,0 +1,78 @@ +SRC += matrix.c \ + i2c.c \ + split_util.c \ + serial.c + +# MCU name +#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 + +# +# 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) + +# Interrupt driven control endpoint task(+60) +OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT + + +# 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 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 ?= no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +BACKLIGHT_ENABLE ?= no # 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. +USE_I2C ?= yes +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend + +CUSTOM_MATRIX = yes + +ifndef QUANTUM_DIR + include ../../Makefile +endif \ No newline at end of file diff --git a/keyboards/lets_splitv2/config.h b/keyboards/lets_splitv2/config.h new file mode 100644 index 00000000..bf618704 --- /dev/null +++ b/keyboards/lets_splitv2/config.h @@ -0,0 +1,98 @@ +/* +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 CATERINA_BOOTLOADER + +// #define USE_I2C + +// #define EE_HANDS + +#define I2C_MASTER_LEFT +// #define I2C_MASTER_RIGHT + +/* 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 ws2812_PORTREG PORTD +#define ws2812_DDRREG DDRD +#define ws2812_pin PD1 +#define RGBLED_NUM 28 // Number of LEDs +#define RGBLIGHT_HUE_STEP 10 +#define RGBLIGHT_SAT_STEP 17 +#define RGBLIGHT_VAL_STEP 17 + +/* + * 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_splitv2/i2c.c b/keyboards/lets_splitv2/i2c.c new file mode 100644 index 00000000..c7278940 --- /dev/null +++ b/keyboards/lets_splitv2/i2c.c @@ -0,0 +1,159 @@ +#include +#include +#include +#include +#include +#include +#include "i2c.h" + +// Limits the amount of we wait for any one i2c transaction. +// Since were running SCL line 100kHz (=> 10μs/bit), and each transactions is +// 9 bits, a single transaction will take around 90μs to complete. +// +// (F_CPU/SCL_CLOCK) => # of μC cycles to transfer a bit +// poll loop takes at least 8 clock cycles to execute +#define I2C_LOOP_TIMEOUT (9+1)*(F_CPU/SCL_CLOCK)/8 + +#define BUFFER_POS_INC() (slave_buffer_pos = (slave_buffer_pos+1)%SLAVE_BUFFER_SIZE) + +volatile uint8_t i2c_slave_buffer[SLAVE_BUFFER_SIZE]; + +static volatile uint8_t slave_buffer_pos; +static volatile bool slave_has_register_set = false; + +// Wait for an i2c operation to finish +inline static +void i2c_delay(void) { + uint16_t lim = 0; + while(!(TWCR & (1<10. + // Check datasheets for more info. + TWBR = ((F_CPU/SCL_CLOCK)-16)/2; +} + +// Start a transaction with the given i2c slave address. The direction of the +// transfer is set with I2C_READ and I2C_WRITE. +// returns: 0 => success +// 1 => error +uint8_t i2c_master_start(uint8_t address) { + TWCR = (1< slave ACK +// 1 => slave NACK +uint8_t i2c_master_write(uint8_t data) { + TWDR = data; + TWCR = (1<= SLAVE_BUFFER_SIZE ) { + ack = 0; + slave_buffer_pos = 0; + } + slave_has_register_set = true; + } else { + i2c_slave_buffer[slave_buffer_pos] = TWDR; + BUFFER_POS_INC(); + } + break; + + case TW_ST_SLA_ACK: + case TW_ST_DATA_ACK: + // master has addressed this device as a slave transmitter and is + // requesting data. + TWDR = i2c_slave_buffer[slave_buffer_pos]; + BUFFER_POS_INC(); + break; + + case TW_BUS_ERROR: // something went wrong, reset twi state + TWCR = 0; + default: + break; + } + // Reset everything, so we are ready for the next TWI interrupt + TWCR |= (1< + +#ifndef F_CPU +#define F_CPU 16000000UL +#endif + +#define I2C_READ 1 +#define I2C_WRITE 0 + +#define I2C_ACK 1 +#define I2C_NACK 0 + +#define SLAVE_BUFFER_SIZE 0x10 + +// i2c SCL clock frequency +#define SCL_CLOCK 100000L + +extern volatile uint8_t i2c_slave_buffer[SLAVE_BUFFER_SIZE]; + +void i2c_master_init(void); +uint8_t i2c_master_start(uint8_t address); +void i2c_master_stop(void); +uint8_t i2c_master_write(uint8_t data); +uint8_t i2c_master_read(int); +void i2c_reset_state(void); +void i2c_slave_init(uint8_t address); + +#endif diff --git a/keyboards/lets_splitv2/imgs/split-keyboard-i2c-schematic.png b/keyboards/lets_splitv2/imgs/split-keyboard-i2c-schematic.png new file mode 100644 index 0000000000000000000000000000000000000000..8882947187b15ae4c0cf70c90725d67fb2386d87 GIT binary patch literal 26565 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 Yy9>onw)Hgg6Sq#eBqNc0;l{oH1LK2XbN~PV literal 0 HcmV?d00001 diff --git a/keyboards/lets_splitv2/keymaps/default/keymap.c b/keyboards/lets_splitv2/keymaps/default/keymap.c new file mode 100644 index 00000000..8c8466eb --- /dev/null +++ b/keyboards/lets_splitv2/keymaps/default/keymap.c @@ -0,0 +1,159 @@ +#include "lets_split.h" +#include "action_layer.h" +#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 _QWERTY 0 +#define _COLEMAK 1 +#define _DVORAK 2 +#define _LOWER 3 +#define _RAISE 4 +#define _ADJUST 16 + +enum custom_keycodes { + QWERTY = SAFE_RANGE, + COLEMAK, + DVORAK, + LOWER, + RAISE, + ADJUST, +}; + +// Fillers to make layering more clear +#define _______ KC_TRNS +#define XXXXXXX KC_NO + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +/* 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 | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * |Adjust| Ctrl | Alt | GUI |Lower |Space |Space |Raise | Left | Down | Up |Right | + * `-----------------------------------------------------------------------------------' + */ +[_QWERTY] = KEYMAP( \ + KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ + 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_ENT , \ + KC_LCTL, _LOWER, KC_LGUI, KC_LALT, MO(_LOWER), KC_SPC, KC_LSFT, MO(_RAISE), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ +), + +[_LOWER] = KEYMAP( \ + KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, \ + KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \ + _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),_______, _______, _______, \ + _______, _______, _______, _______, _______, KC_BSPC, KC_BSPC, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ +), + +/* Raise + * ,-----------------------------------------------------------------------------------. + * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | Del | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | \ | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | | F7 | F8 | F9 | F10 | F11 | F12 |ISO # |ISO / | | |Enter | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | Next | Vol- | Vol+ | Play | + * `-----------------------------------------------------------------------------------' + */ +[_RAISE] = KEYMAP( \ + 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_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, \ + _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, _______, _______, _______, \ + _______, _______, _______, _______, _______, KC_ENT, KC_ENT, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ +), + +/* Adjust (Lower + Raise) + * ,-----------------------------------------------------------------------------------. + * | | Reset| | | | | | | | | | Del | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | | | |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak| | | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | | | | | | | | | | | | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | + * `-----------------------------------------------------------------------------------' + */ +}; + +#ifdef AUDIO_ENABLE +float tone_qwerty[][2] = SONG(QWERTY_SOUND); +float tone_dvorak[][2] = SONG(DVORAK_SOUND); +float tone_colemak[][2] = SONG(COLEMAK_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 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 COLEMAK: + if (record->event.pressed) { + #ifdef AUDIO_ENABLE + PLAY_NOTE_ARRAY(tone_colemak, false, 0); + #endif + persistant_default_layer_set(1UL<<_COLEMAK); + } + return false; + break; + 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 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 ADJUST: + if (record->event.pressed) { + layer_on(_ADJUST); + } else { + layer_off(_ADJUST); + } + return false; + break; + } + return true; +} \ No newline at end of file diff --git a/keyboards/lets_splitv2/lets_split.c b/keyboards/lets_splitv2/lets_split.c new file mode 100644 index 00000000..574c116a --- /dev/null +++ b/keyboards/lets_splitv2/lets_split.c @@ -0,0 +1,30 @@ +#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) { + PLAY_NOTE_ARRAY(tone_goodbye, false, 0); + _delay_ms(150); + stop_all_notes(); +} diff --git a/keyboards/lets_splitv2/lets_split.h b/keyboards/lets_splitv2/lets_split.h new file mode 100644 index 00000000..04844ed6 --- /dev/null +++ b/keyboards/lets_splitv2/lets_split.h @@ -0,0 +1,25 @@ +#ifndef LETS_SPLIT_H +#define LETS_SPLIT_H + +#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_splitv2/matrix.c b/keyboards/lets_splitv2/matrix.c new file mode 100644 index 00000000..1d768c59 --- /dev/null +++ b/keyboards/lets_splitv2/matrix.c @@ -0,0 +1,311 @@ +/* +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 . +*/ + +/* + * scan matrix + */ +#include +#include +#include +#include +#include +#include +#include "print.h" +#include "debug.h" +#include "util.h" +#include "matrix.h" +#include "i2c.h" +#include "serial.h" +#include "split_util.h" +#include "pro_micro.h" +#include "config.h" + +#ifndef DEBOUNCE +# define DEBOUNCE 5 +#endif + +#define ERROR_DISCONNECT_COUNT 5 + +static uint8_t debouncing = DEBOUNCE; +static const int ROWS_PER_HAND = MATRIX_ROWS/2; +static uint8_t error_count = 0; + +static const uint8_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS; +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_debouncing[MATRIX_ROWS]; + +static matrix_row_t read_cols(void); +static void init_cols(void); +static void unselect_rows(void); +static void select_row(uint8_t row); + +__attribute__ ((weak)) +void matrix_init_quantum(void) { + matrix_init_kb(); +} + +__attribute__ ((weak)) +void matrix_scan_quantum(void) { + matrix_scan_kb(); +} + +__attribute__ ((weak)) +void matrix_init_kb(void) { + matrix_init_user(); +} + +__attribute__ ((weak)) +void matrix_scan_kb(void) { + matrix_scan_user(); +} + +__attribute__ ((weak)) +void matrix_init_user(void) { +} + +__attribute__ ((weak)) +void matrix_scan_user(void) { +} + +inline +uint8_t matrix_rows(void) +{ + return MATRIX_ROWS; +} + +inline +uint8_t matrix_cols(void) +{ + return MATRIX_COLS; +} + +void matrix_init(void) +{ + debug_enable = true; + debug_matrix = true; + debug_mouse = true; + // initialize row and col + unselect_rows(); + init_cols(); + + TX_RX_LED_INIT; + + // initialize matrix state: all keys off + for (uint8_t i=0; i < MATRIX_ROWS; i++) { + matrix[i] = 0; + matrix_debouncing[i] = 0; + } + + matrix_init_quantum(); +} + +uint8_t _matrix_scan(void) +{ + // Right hand is stored after the left in the matirx so, we need to offset it + int offset = isLeftHand ? 0 : (ROWS_PER_HAND); + + for (uint8_t i = 0; i < ROWS_PER_HAND; i++) { + select_row(i); + _delay_us(30); // without this wait read unstable value. + matrix_row_t cols = read_cols(); + if (matrix_debouncing[i+offset] != cols) { + matrix_debouncing[i+offset] = cols; + debouncing = DEBOUNCE; + } + unselect_rows(); + } + + if (debouncing) { + if (--debouncing) { + _delay_ms(1); + } else { + for (uint8_t i = 0; i < ROWS_PER_HAND; i++) { + matrix[i+offset] = matrix_debouncing[i+offset]; + } + } + } + + return 1; +} + +// Get rows from other half over i2c +int i2c_transaction(void) { + int slaveOffset = (isLeftHand) ? (ROWS_PER_HAND) : 0; + + int err = i2c_master_start(SLAVE_I2C_ADDRESS + I2C_WRITE); + if (err) goto i2c_error; + + // start of matrix stored at 0x00 + err = i2c_master_write(0x00); + if (err) goto i2c_error; + + // Start read + err = i2c_master_start(SLAVE_I2C_ADDRESS + I2C_READ); + if (err) goto i2c_error; + + if (!err) { + int i; + for (i = 0; i < ROWS_PER_HAND-1; ++i) { + matrix[slaveOffset+i] = i2c_master_read(I2C_ACK); + } + matrix[slaveOffset+i] = i2c_master_read(I2C_NACK); + i2c_master_stop(); + } else { +i2c_error: // the cable is disconnceted, or something else went wrong + i2c_reset_state(); + return err; + } + + return 0; +} + +#ifndef USE_I2C +int serial_transaction(void) { + int slaveOffset = (isLeftHand) ? (ROWS_PER_HAND) : 0; + + if (serial_update_buffers()) { + return 1; + } + + for (int i = 0; i < ROWS_PER_HAND; ++i) { + matrix[slaveOffset+i] = serial_slave_buffer[i]; + } + return 0; +} +#endif + +uint8_t matrix_scan(void) +{ + int ret = _matrix_scan(); + + + +#ifdef USE_I2C + if( i2c_transaction() ) { +#else + if( serial_transaction() ) { +#endif + // turn on the indicator led when halves are disconnected + TXLED1; + + error_count++; + + if (error_count > ERROR_DISCONNECT_COUNT) { + // reset other half if disconnected + int slaveOffset = (isLeftHand) ? (ROWS_PER_HAND) : 0; + for (int i = 0; i < ROWS_PER_HAND; ++i) { + matrix[slaveOffset+i] = 0; + } + } + } else { + // turn off the indicator led on no error + TXLED0; + error_count = 0; + } + + matrix_scan_quantum(); + + return ret; +} + +void matrix_slave_scan(void) { + _matrix_scan(); + + int offset = (isLeftHand) ? 0 : (MATRIX_ROWS / 2); + +#ifdef USE_I2C + for (int i = 0; i < ROWS_PER_HAND; ++i) { + /* i2c_slave_buffer[i] = matrix[offset+i]; */ + i2c_slave_buffer[i] = matrix[offset+i]; + } +#else + for (int i = 0; i < ROWS_PER_HAND; ++i) { + serial_slave_buffer[i] = matrix[offset+i]; + } +#endif +} + +bool matrix_is_modified(void) +{ + if (debouncing) return false; + return true; +} + +inline +bool matrix_is_on(uint8_t row, uint8_t col) +{ + return (matrix[row] & ((matrix_row_t)1<> 4) + 1) &= ~_BV(col_pins[x] & 0xF); + _SFR_IO8((col_pins[x] >> 4) + 2) |= _BV(col_pins[x] & 0xF); + } +} + +static matrix_row_t read_cols(void) +{ + matrix_row_t result = 0; + for(int x = 0; x < MATRIX_COLS; x++) { + result |= (_SFR_IO8(col_pins[x] >> 4) & _BV(col_pins[x] & 0xF)) ? 0 : (1 << x); + } + return result; +} + +static void unselect_rows(void) +{ + for(int x = 0; x < ROWS_PER_HAND; x++) { + _SFR_IO8((row_pins[x] >> 4) + 1) &= ~_BV(row_pins[x] & 0xF); + _SFR_IO8((row_pins[x] >> 4) + 2) |= _BV(row_pins[x] & 0xF); + } +} + +static void select_row(uint8_t row) +{ + _SFR_IO8((row_pins[row] >> 4) + 1) |= _BV(row_pins[row] & 0xF); + _SFR_IO8((row_pins[row] >> 4) + 2) &= ~_BV(row_pins[row] & 0xF); +} diff --git a/keyboards/lets_splitv2/pro_micro.h b/keyboards/lets_splitv2/pro_micro.h new file mode 100644 index 00000000..09e219b7 --- /dev/null +++ b/keyboards/lets_splitv2/pro_micro.h @@ -0,0 +1,362 @@ +/* + pins_arduino.h - Pin definition functions for Arduino + Part of Arduino - http://www.arduino.cc/ + + Copyright (c) 2007 David A. Mellis + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General + Public License along with this library; if not, write to the + Free Software Foundation, Inc., 59 Temple Place, Suite 330, + Boston, MA 02111-1307 USA + + $Id: wiring.h 249 2007-02-03 16:52:51Z mellis $ +*/ + +#ifndef Pins_Arduino_h +#define Pins_Arduino_h + +#include + +// Workaround for wrong definitions in "iom32u4.h". +// This should be fixed in the AVR toolchain. +#undef UHCON +#undef UHINT +#undef UHIEN +#undef UHADDR +#undef UHFNUM +#undef UHFNUML +#undef UHFNUMH +#undef UHFLEN +#undef UPINRQX +#undef UPINTX +#undef UPNUM +#undef UPRST +#undef UPCONX +#undef UPCFG0X +#undef UPCFG1X +#undef UPSTAX +#undef UPCFG2X +#undef UPIENX +#undef UPDATX +#undef TCCR2A +#undef WGM20 +#undef WGM21 +#undef COM2B0 +#undef COM2B1 +#undef COM2A0 +#undef COM2A1 +#undef TCCR2B +#undef CS20 +#undef CS21 +#undef CS22 +#undef WGM22 +#undef FOC2B +#undef FOC2A +#undef TCNT2 +#undef TCNT2_0 +#undef TCNT2_1 +#undef TCNT2_2 +#undef TCNT2_3 +#undef TCNT2_4 +#undef TCNT2_5 +#undef TCNT2_6 +#undef TCNT2_7 +#undef OCR2A +#undef OCR2_0 +#undef OCR2_1 +#undef OCR2_2 +#undef OCR2_3 +#undef OCR2_4 +#undef OCR2_5 +#undef OCR2_6 +#undef OCR2_7 +#undef OCR2B +#undef OCR2_0 +#undef OCR2_1 +#undef OCR2_2 +#undef OCR2_3 +#undef OCR2_4 +#undef OCR2_5 +#undef OCR2_6 +#undef OCR2_7 + +#define NUM_DIGITAL_PINS 30 +#define NUM_ANALOG_INPUTS 12 + +#define TX_RX_LED_INIT DDRD |= (1<<5), DDRB |= (1<<0) +#define TXLED0 PORTD |= (1<<5) +#define TXLED1 PORTD &= ~(1<<5) +#define RXLED0 PORTB |= (1<<0) +#define RXLED1 PORTB &= ~(1<<0) + +static const uint8_t SDA = 2; +static const uint8_t SCL = 3; +#define LED_BUILTIN 13 + +// Map SPI port to 'new' pins D14..D17 +static const uint8_t SS = 17; +static const uint8_t MOSI = 16; +static const uint8_t MISO = 14; +static const uint8_t SCK = 15; + +// Mapping of analog pins as digital I/O +// A6-A11 share with digital pins +static const uint8_t A0 = 18; +static const uint8_t A1 = 19; +static const uint8_t A2 = 20; +static const uint8_t A3 = 21; +static const uint8_t A4 = 22; +static const uint8_t A5 = 23; +static const uint8_t A6 = 24; // D4 +static const uint8_t A7 = 25; // D6 +static const uint8_t A8 = 26; // D8 +static const uint8_t A9 = 27; // D9 +static const uint8_t A10 = 28; // D10 +static const uint8_t A11 = 29; // D12 + +#define digitalPinToPCICR(p) ((((p) >= 8 && (p) <= 11) || ((p) >= 14 && (p) <= 17) || ((p) >= A8 && (p) <= A10)) ? (&PCICR) : ((uint8_t *)0)) +#define digitalPinToPCICRbit(p) 0 +#define digitalPinToPCMSK(p) ((((p) >= 8 && (p) <= 11) || ((p) >= 14 && (p) <= 17) || ((p) >= A8 && (p) <= A10)) ? (&PCMSK0) : ((uint8_t *)0)) +#define digitalPinToPCMSKbit(p) ( ((p) >= 8 && (p) <= 11) ? (p) - 4 : ((p) == 14 ? 3 : ((p) == 15 ? 1 : ((p) == 16 ? 2 : ((p) == 17 ? 0 : (p - A8 + 4)))))) + +// __AVR_ATmega32U4__ has an unusual mapping of pins to channels +extern const uint8_t PROGMEM analog_pin_to_channel_PGM[]; +#define analogPinToChannel(P) ( pgm_read_byte( analog_pin_to_channel_PGM + (P) ) ) + +#define digitalPinToInterrupt(p) ((p) == 0 ? 2 : ((p) == 1 ? 3 : ((p) == 2 ? 1 : ((p) == 3 ? 0 : ((p) == 7 ? 4 : NOT_AN_INTERRUPT))))) + +#ifdef ARDUINO_MAIN + +// On the Arduino board, digital pins are also used +// for the analog output (software PWM). Analog input +// pins are a separate set. + +// ATMEL ATMEGA32U4 / ARDUINO LEONARDO +// +// D0 PD2 RXD1/INT2 +// D1 PD3 TXD1/INT3 +// D2 PD1 SDA SDA/INT1 +// D3# PD0 PWM8/SCL OC0B/SCL/INT0 +// D4 A6 PD4 ADC8 +// D5# PC6 ??? OC3A/#OC4A +// D6# A7 PD7 FastPWM #OC4D/ADC10 +// D7 PE6 INT6/AIN0 +// +// D8 A8 PB4 ADC11/PCINT4 +// D9# A9 PB5 PWM16 OC1A/#OC4B/ADC12/PCINT5 +// D10# A10 PB6 PWM16 OC1B/0c4B/ADC13/PCINT6 +// D11# PB7 PWM8/16 0C0A/OC1C/#RTS/PCINT7 +// D12 A11 PD6 T1/#OC4D/ADC9 +// D13# PC7 PWM10 CLK0/OC4A +// +// A0 D18 PF7 ADC7 +// A1 D19 PF6 ADC6 +// A2 D20 PF5 ADC5 +// A3 D21 PF4 ADC4 +// A4 D22 PF1 ADC1 +// A5 D23 PF0 ADC0 +// +// New pins D14..D17 to map SPI port to digital pins +// +// MISO D14 PB3 MISO,PCINT3 +// SCK D15 PB1 SCK,PCINT1 +// MOSI D16 PB2 MOSI,PCINT2 +// SS D17 PB0 RXLED,SS/PCINT0 +// +// Connected LEDs on board for TX and RX +// TXLED D24 PD5 XCK1 +// RXLED D17 PB0 +// HWB PE2 HWB + +// these arrays map port names (e.g. port B) to the +// appropriate addresses for various functions (e.g. reading +// and writing) +const uint16_t PROGMEM port_to_mode_PGM[] = { + NOT_A_PORT, + NOT_A_PORT, + (uint16_t) &DDRB, + (uint16_t) &DDRC, + (uint16_t) &DDRD, + (uint16_t) &DDRE, + (uint16_t) &DDRF, +}; + +const uint16_t PROGMEM port_to_output_PGM[] = { + NOT_A_PORT, + NOT_A_PORT, + (uint16_t) &PORTB, + (uint16_t) &PORTC, + (uint16_t) &PORTD, + (uint16_t) &PORTE, + (uint16_t) &PORTF, +}; + +const uint16_t PROGMEM port_to_input_PGM[] = { + NOT_A_PORT, + NOT_A_PORT, + (uint16_t) &PINB, + (uint16_t) &PINC, + (uint16_t) &PIND, + (uint16_t) &PINE, + (uint16_t) &PINF, +}; + +const uint8_t PROGMEM digital_pin_to_port_PGM[] = { + PD, // D0 - PD2 + PD, // D1 - PD3 + PD, // D2 - PD1 + PD, // D3 - PD0 + PD, // D4 - PD4 + PC, // D5 - PC6 + PD, // D6 - PD7 + PE, // D7 - PE6 + + PB, // D8 - PB4 + PB, // D9 - PB5 + PB, // D10 - PB6 + PB, // D11 - PB7 + PD, // D12 - PD6 + PC, // D13 - PC7 + + PB, // D14 - MISO - PB3 + PB, // D15 - SCK - PB1 + PB, // D16 - MOSI - PB2 + PB, // D17 - SS - PB0 + + PF, // D18 - A0 - PF7 + PF, // D19 - A1 - PF6 + PF, // D20 - A2 - PF5 + PF, // D21 - A3 - PF4 + PF, // D22 - A4 - PF1 + PF, // D23 - A5 - PF0 + + PD, // D24 - PD5 + PD, // D25 / D6 - A7 - PD7 + PB, // D26 / D8 - A8 - PB4 + PB, // D27 / D9 - A9 - PB5 + PB, // D28 / D10 - A10 - PB6 + PD, // D29 / D12 - A11 - PD6 +}; + +const uint8_t PROGMEM digital_pin_to_bit_mask_PGM[] = { + _BV(2), // D0 - PD2 + _BV(3), // D1 - PD3 + _BV(1), // D2 - PD1 + _BV(0), // D3 - PD0 + _BV(4), // D4 - PD4 + _BV(6), // D5 - PC6 + _BV(7), // D6 - PD7 + _BV(6), // D7 - PE6 + + _BV(4), // D8 - PB4 + _BV(5), // D9 - PB5 + _BV(6), // D10 - PB6 + _BV(7), // D11 - PB7 + _BV(6), // D12 - PD6 + _BV(7), // D13 - PC7 + + _BV(3), // D14 - MISO - PB3 + _BV(1), // D15 - SCK - PB1 + _BV(2), // D16 - MOSI - PB2 + _BV(0), // D17 - SS - PB0 + + _BV(7), // D18 - A0 - PF7 + _BV(6), // D19 - A1 - PF6 + _BV(5), // D20 - A2 - PF5 + _BV(4), // D21 - A3 - PF4 + _BV(1), // D22 - A4 - PF1 + _BV(0), // D23 - A5 - PF0 + + _BV(5), // D24 - PD5 + _BV(7), // D25 / D6 - A7 - PD7 + _BV(4), // D26 / D8 - A8 - PB4 + _BV(5), // D27 / D9 - A9 - PB5 + _BV(6), // D28 / D10 - A10 - PB6 + _BV(6), // D29 / D12 - A11 - PD6 +}; + +const uint8_t PROGMEM digital_pin_to_timer_PGM[] = { + NOT_ON_TIMER, + NOT_ON_TIMER, + NOT_ON_TIMER, + TIMER0B, /* 3 */ + NOT_ON_TIMER, + TIMER3A, /* 5 */ + TIMER4D, /* 6 */ + NOT_ON_TIMER, + + NOT_ON_TIMER, + TIMER1A, /* 9 */ + TIMER1B, /* 10 */ + TIMER0A, /* 11 */ + + NOT_ON_TIMER, + TIMER4A, /* 13 */ + + NOT_ON_TIMER, + NOT_ON_TIMER, + NOT_ON_TIMER, + NOT_ON_TIMER, + NOT_ON_TIMER, + NOT_ON_TIMER, + + NOT_ON_TIMER, + NOT_ON_TIMER, + NOT_ON_TIMER, + NOT_ON_TIMER, + NOT_ON_TIMER, + NOT_ON_TIMER, + NOT_ON_TIMER, + NOT_ON_TIMER, + NOT_ON_TIMER, + NOT_ON_TIMER, +}; + +const uint8_t PROGMEM analog_pin_to_channel_PGM[] = { + 7, // A0 PF7 ADC7 + 6, // A1 PF6 ADC6 + 5, // A2 PF5 ADC5 + 4, // A3 PF4 ADC4 + 1, // A4 PF1 ADC1 + 0, // A5 PF0 ADC0 + 8, // A6 D4 PD4 ADC8 + 10, // A7 D6 PD7 ADC10 + 11, // A8 D8 PB4 ADC11 + 12, // A9 D9 PB5 ADC12 + 13, // A10 D10 PB6 ADC13 + 9 // A11 D12 PD6 ADC9 +}; + +#endif /* ARDUINO_MAIN */ + +// These serial port names are intended to allow libraries and architecture-neutral +// sketches to automatically default to the correct port name for a particular type +// of use. For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN, +// the first hardware serial port whose RX/TX pins are not dedicated to another use. +// +// SERIAL_PORT_MONITOR Port which normally prints to the Arduino Serial Monitor +// +// SERIAL_PORT_USBVIRTUAL Port which is USB virtual serial +// +// SERIAL_PORT_LINUXBRIDGE Port which connects to a Linux system via Bridge library +// +// SERIAL_PORT_HARDWARE Hardware serial port, physical RX & TX pins. +// +// SERIAL_PORT_HARDWARE_OPEN Hardware serial ports which are open for use. Their RX & TX +// pins are NOT connected to anything by default. +#define SERIAL_PORT_MONITOR Serial +#define SERIAL_PORT_USBVIRTUAL Serial +#define SERIAL_PORT_HARDWARE Serial1 +#define SERIAL_PORT_HARDWARE_OPEN Serial1 + +#endif /* Pins_Arduino_h */ diff --git a/keyboards/lets_splitv2/readme.md b/keyboards/lets_splitv2/readme.md new file mode 100644 index 00000000..73fdb0f7 --- /dev/null +++ b/keyboards/lets_splitv2/readme.md @@ -0,0 +1,102 @@ +Let's Split +====== + +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. + +Features +-------- + +Some features supported by the firmware: + +* Either half can connect to the computer via USB, or both halves can be used + independently. +* You only need 3 wires to connect the two halves. Two for VCC and GND and one + for serial communication. +* Optional support for I2C connection between the two halves if for some + reason you require a faster connection between the two halves. Note this + requires an extra wire between halves and pull-up resistors on the data lines. + +Required Hardware +----------------- + +Apart from diodes and key switches for the keyboard matrix in each half, you +will need: + +* 2 Arduino Pro Micro's. You can find theses on aliexpress for ≈3.50USD each. +* 2 TRS sockets +* 1 TRS cable. + +Alternatively, you can use any sort of cable and socket that has at least 3 +wires. If you want to use I2C to communicate between halves, you will need a +cable with at least 4 wires and 2x 4.7kΩ pull-up resistors + +Optional Hardware +----------------- + +A speaker can be hooked-up to either side to the `5` (`C6`) pin and `GND`, and turned on via `AUDIO_ENABLE`. + +Wiring +------ + +The 3 wires of the TRS cable need to connect GND, VCC, and digital pin 3 (i.e. +PD0 on the ATmega32u4) between the two Pro Micros. + +Then wire your key matrix to any of the remaining 17 IO pins of the pro micro +and modify the `matrix.c` accordingly. + +The wiring for serial: + +![serial wiring](imgs/split-keyboard-serial-schematic.png) + +The wiring for i2c: + +![i2c wiring](imgs/split-keyboard-i2c-schematic.png) + +The pull-up resistors may be placed on either half. It is also possible +to use 4 resistors and have the pull-ups in both halves, but this is +unnecessary in simple use cases. + +Notes on Software Configuration +------------------------------- + +Configuring the firmware is similar to any other TMK 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`. + +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 +-------- + +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 +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 +``` +and similarly for right half +``` +make eeprom-right +``` + +After you have flashed the EEPROM for the first time, you then need to program +the flash memory: +``` +make program +``` +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 +right half is connected. + + diff --git a/keyboards/lets_splitv2/serial.c b/keyboards/lets_splitv2/serial.c new file mode 100644 index 00000000..f439c2f2 --- /dev/null +++ b/keyboards/lets_splitv2/serial.c @@ -0,0 +1,225 @@ +/* + * WARNING: be careful changing this code, it is very timing dependent + */ + +#ifndef F_CPU +#define F_CPU 16000000 +#endif + +#include +#include +#include +#include + +#include "serial.h" + +// Serial pulse period in microseconds. Its probably a bad idea to lower this +// value. +#define SERIAL_DELAY 24 + +uint8_t volatile serial_slave_buffer[SERIAL_SLAVE_BUFFER_LENGTH] = {0}; +uint8_t volatile serial_master_buffer[SERIAL_MASTER_BUFFER_LENGTH] = {0}; + +#define SLAVE_DATA_CORRUPT (1<<0) +volatile uint8_t status = 0; + +inline static +void serial_delay(void) { + _delay_us(SERIAL_DELAY); +} + +inline static +void serial_output(void) { + SERIAL_PIN_DDR |= SERIAL_PIN_MASK; +} + +// make the serial pin an input with pull-up resistor +inline static +void serial_input(void) { + SERIAL_PIN_DDR &= ~SERIAL_PIN_MASK; + SERIAL_PIN_PORT |= SERIAL_PIN_MASK; +} + +inline static +uint8_t serial_read_pin(void) { + return !!(SERIAL_PIN_INPUT & SERIAL_PIN_MASK); +} + +inline static +void serial_low(void) { + SERIAL_PIN_PORT &= ~SERIAL_PIN_MASK; +} + +inline static +void serial_high(void) { + SERIAL_PIN_PORT |= SERIAL_PIN_MASK; +} + +void serial_master_init(void) { + serial_output(); + serial_high(); +} + +void serial_slave_init(void) { + serial_input(); + + // Enable INT0 + EIMSK |= _BV(INT0); + // Trigger on falling edge of INT0 + EICRA &= ~(_BV(ISC00) | _BV(ISC01)); +} + +// Used by the master to synchronize timing with the slave. +static +void sync_recv(void) { + serial_input(); + // This shouldn't hang if the slave disconnects because the + // serial line will float to high if the slave does disconnect. + while (!serial_read_pin()); + serial_delay(); +} + +// Used by the slave to send a synchronization signal to the master. +static +void sync_send(void) { + serial_output(); + + serial_low(); + serial_delay(); + + serial_high(); +} + +// Reads a byte from the serial line +static +uint8_t serial_read_byte(void) { + uint8_t byte = 0; + serial_input(); + for ( uint8_t i = 0; i < 8; ++i) { + byte = (byte << 1) | serial_read_pin(); + serial_delay(); + _delay_us(1); + } + + return byte; +} + +// Sends a byte with MSB ordering +static +void serial_write_byte(uint8_t data) { + uint8_t b = 8; + serial_output(); + while( b-- ) { + if(data & (1 << b)) { + serial_high(); + } else { + serial_low(); + } + serial_delay(); + } +} + +// interrupt handle to be used by the slave device +ISR(SERIAL_PIN_INTERRUPT) { + sync_send(); + + uint8_t checksum = 0; + for (int i = 0; i < SERIAL_SLAVE_BUFFER_LENGTH; ++i) { + serial_write_byte(serial_slave_buffer[i]); + sync_send(); + checksum += serial_slave_buffer[i]; + } + serial_write_byte(checksum); + sync_send(); + + // wait for the sync to finish sending + serial_delay(); + + // read the middle of pulses + _delay_us(SERIAL_DELAY/2); + + uint8_t checksum_computed = 0; + for (int i = 0; i < SERIAL_MASTER_BUFFER_LENGTH; ++i) { + serial_master_buffer[i] = serial_read_byte(); + sync_send(); + checksum_computed += serial_master_buffer[i]; + } + uint8_t checksum_received = serial_read_byte(); + sync_send(); + + serial_input(); // end transaction + + if ( checksum_computed != checksum_received ) { + status |= SLAVE_DATA_CORRUPT; + } else { + status &= ~SLAVE_DATA_CORRUPT; + } +} + +inline +bool serial_slave_DATA_CORRUPT(void) { + return status & SLAVE_DATA_CORRUPT; +} + +// Copies the serial_slave_buffer to the master and sends the +// serial_master_buffer to the slave. +// +// Returns: +// 0 => no error +// 1 => slave did not respond +int serial_update_buffers(void) { + // this code is very time dependent, so we need to disable interrupts + cli(); + + // signal to the slave that we want to start a transaction + serial_output(); + serial_low(); + _delay_us(1); + + // wait for the slaves response + serial_input(); + serial_high(); + _delay_us(SERIAL_DELAY); + + // check if the slave is present + if (serial_read_pin()) { + // slave failed to pull the line low, assume not present + sei(); + return 1; + } + + // if the slave is present syncronize with it + sync_recv(); + + uint8_t checksum_computed = 0; + // receive data from the slave + for (int i = 0; i < SERIAL_SLAVE_BUFFER_LENGTH; ++i) { + serial_slave_buffer[i] = serial_read_byte(); + sync_recv(); + checksum_computed += serial_slave_buffer[i]; + } + uint8_t checksum_received = serial_read_byte(); + sync_recv(); + + if (checksum_computed != checksum_received) { + sei(); + return 1; + } + + uint8_t checksum = 0; + // send data to the slave + for (int i = 0; i < SERIAL_MASTER_BUFFER_LENGTH; ++i) { + serial_write_byte(serial_master_buffer[i]); + sync_recv(); + checksum += serial_master_buffer[i]; + } + serial_write_byte(checksum); + sync_recv(); + + // always, release the line when not in use + serial_output(); + serial_high(); + + sei(); + return 0; +} diff --git a/keyboards/lets_splitv2/serial.h b/keyboards/lets_splitv2/serial.h new file mode 100644 index 00000000..15fe4db7 --- /dev/null +++ b/keyboards/lets_splitv2/serial.h @@ -0,0 +1,26 @@ +#ifndef MY_SERIAL_H +#define MY_SERIAL_H + +#include "config.h" +#include + +/* TODO: some defines for interrupt setup */ +#define SERIAL_PIN_DDR DDRD +#define SERIAL_PIN_PORT PORTD +#define SERIAL_PIN_INPUT PIND +#define SERIAL_PIN_MASK _BV(PD0) +#define SERIAL_PIN_INTERRUPT INT0_vect + +#define SERIAL_SLAVE_BUFFER_LENGTH MATRIX_ROWS/2 +#define SERIAL_MASTER_BUFFER_LENGTH 1 + +// Buffers for master - slave communication +extern volatile uint8_t serial_slave_buffer[SERIAL_SLAVE_BUFFER_LENGTH]; +extern volatile uint8_t serial_master_buffer[SERIAL_MASTER_BUFFER_LENGTH]; + +void serial_master_init(void); +void serial_slave_init(void); +int serial_update_buffers(void); +bool serial_slave_data_corrupt(void); + +#endif diff --git a/keyboards/lets_splitv2/split_util.c b/keyboards/lets_splitv2/split_util.c new file mode 100644 index 00000000..65003a71 --- /dev/null +++ b/keyboards/lets_splitv2/split_util.c @@ -0,0 +1,76 @@ +#include +#include +#include +#include +#include +#include +#include "split_util.h" +#include "matrix.h" +#include "i2c.h" +#include "serial.h" +#include "keyboard.h" +#include "config.h" + +volatile bool isLeftHand = true; + +static void setup_handedness(void) { + #ifdef EE_HANDS + isLeftHand = eeprom_read_byte(EECONFIG_HANDEDNESS); + #else + #ifdef I2C_MASTER_RIGHT + isLeftHand = !has_usb(); + #else + isLeftHand = has_usb(); + #endif + #endif +} + +static void keyboard_master_setup(void) { +#ifdef USE_I2C + i2c_master_init(); +#else + serial_master_init(); +#endif +} + +static void keyboard_slave_setup(void) { +#ifdef USE_I2C + i2c_slave_init(SLAVE_I2C_ADDRESS); +#else + serial_slave_init(); +#endif +} + +bool has_usb(void) { + USBCON |= (1 << OTGPADE); //enables VBUS pad + _delay_us(5); + return (USBSTA & (1< + +#ifdef EE_HANDS + #define EECONFIG_BOOTMAGIC_END (uint8_t *)10 + #define EECONFIG_HANDEDNESS EECONFIG_BOOTMAGIC_END +#endif + +#define SLAVE_I2C_ADDRESS 0x32 + +extern volatile bool isLeftHand; + +// slave version of matix scan, defined in matrix.c +void matrix_slave_scan(void); + +void split_keyboard_setup(void); +bool has_usb(void); +void keyboard_slave_loop(void); + +#endif diff --git a/keyboards/maxipad/Makefile b/keyboards/maxipad/Makefile new file mode 100644 index 00000000..3f6d133c --- /dev/null +++ b/keyboards/maxipad/Makefile @@ -0,0 +1,75 @@ + + +# MCU name +#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 + + +# +# 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) + +# Interrupt driven control endpoint task(+60) +OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT + + +# Boot Section Size in *bytes* +# Teensy halfKay 512 +# Teensy++ halfKay 1024 +# Atmel DFU loader 4096 +# LUFA bootloader 4096 +# USBaspLoader 2048 +OPT_DEFS += -DBOOTLOADER_SIZE=512 + + +# 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 ?= yes # Console for debug(+400) +COMMAND_ENABLE ?= yes # 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 + + diff --git a/keyboards/maxipad/config.h b/keyboards/maxipad/config.h new file mode 100644 index 00000000..59b8cebe --- /dev/null +++ b/keyboards/maxipad/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 Wootpatoot +#define PRODUCT maxipad +#define DESCRIPTION g8ming keeb + +/* key matrix size */ +#define MATRIX_ROWS 5 +#define MATRIX_COLS 6 + +/* + * 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 { B6, F7, B2, B3, B1 } +#define MATRIX_COL_PINS { F6, C6, D7, F5, B4, B5 } +#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 + +/* number of backlight levels */ + +/* 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/maxipad/keymaps/default/Makefile b/keyboards/maxipad/keymaps/default/Makefile new file mode 100644 index 00000000..f4671a9d --- /dev/null +++ b/keyboards/maxipad/keymaps/default/Makefile @@ -0,0 +1,21 @@ +# 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 = no # 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. +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/maxipad/keymaps/default/config.h b/keyboards/maxipad/keymaps/default/config.h new file mode 100644 index 00000000..df06a262 --- /dev/null +++ b/keyboards/maxipad/keymaps/default/config.h @@ -0,0 +1,8 @@ +#ifndef CONFIG_USER_H +#define CONFIG_USER_H + +#include "../../config.h" + +// place overrides here + +#endif \ No newline at end of file diff --git a/keyboards/maxipad/keymaps/default/keymap.c b/keyboards/maxipad/keymaps/default/keymap.c new file mode 100644 index 00000000..7ca127fe --- /dev/null +++ b/keyboards/maxipad/keymaps/default/keymap.c @@ -0,0 +1,54 @@ +#include "maxipad.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +[0] = KEYMAP( /* Base */ + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, \ + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, \ + MO(1), KC_A, KC_S, KC_D, KC_F, KC_G, \ + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, \ + KC_LCTL, KC_LALT, MO(1), KC_ENT,KC_GRV,KC_SPC \ +), +[1] = KEYMAP( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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); + } else { + unregister_code(KC_RSFT); + } + break; + } + return MACRO_NONE; +}; + + +void matrix_init_user(void) { + +} + +void matrix_scan_user(void) { + +} + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + return true; +} + +void led_set_user(uint8_t usb_led) { + +} \ No newline at end of file diff --git a/keyboards/maxipad/keymaps/default/readme.md b/keyboards/maxipad/keymaps/default/readme.md new file mode 100644 index 00000000..a6c0d4a3 --- /dev/null +++ b/keyboards/maxipad/keymaps/default/readme.md @@ -0,0 +1 @@ +# The default keymap for maxipad \ No newline at end of file diff --git a/keyboards/maxipad/maxipad.c b/keyboards/maxipad/maxipad.c new file mode 100644 index 00000000..879ae86a --- /dev/null +++ b/keyboards/maxipad/maxipad.c @@ -0,0 +1,28 @@ +#include "maxipad.h" + +void matrix_init_kb(void) { + // put your keyboard start-up code here + // runs once when the firmware starts up + + matrix_init_user(); +} + +void matrix_scan_kb(void) { + // put your looping keyboard code here + // runs every cycle (a lot) + + matrix_scan_user(); +} + +bool process_record_kb(uint16_t keycode, keyrecord_t *record) { + // put your per-action keyboard code here + // runs for every action, just before processing by the firmware + + return process_record_user(keycode, record); +} + +void led_set_kb(uint8_t usb_led) { + // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here + + led_set_user(usb_led); +} diff --git a/keyboards/maxipad/maxipad.h b/keyboards/maxipad/maxipad.h new file mode 100644 index 00000000..eee1309d --- /dev/null +++ b/keyboards/maxipad/maxipad.h @@ -0,0 +1,25 @@ +#ifndef MAXIPAD_H +#define MAXIPAD_H + +#include "quantum.h" + +// This a shortcut to help you visually see your layout. +// The following is an example using the Planck MIT layout +// The first section contains all of the arguements +// The second converts the arguments into a two-dimensional array +#define KEYMAP( \ + 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 \ +) \ +{ \ + { 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} \ +} + +#endif diff --git a/keyboards/maxipad/readme.md b/keyboards/maxipad/readme.md new file mode 100644 index 00000000..964212b8 --- /dev/null +++ b/keyboards/maxipad/readme.md @@ -0,0 +1,28 @@ +maxipad keyboard firmware +====================== + +## Quantum MK Firmware + +For the full Quantum feature list, see [the parent readme.md](/doc/readme.md). + +## Building + +Download or clone the whole firmware and navigate to the keyboards/maxipad 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 a folder with the name of your keymap in the keymaps folder, and see keymap documentation (you can find in top readme.md) and existant 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 **__keymap.c__** and are stored in folders in the `keymaps` folder, eg `keymaps/my_keymap/` \ No newline at end of file From 79f82d3d80a24483d14b078d325bb0f45af58e3d Mon Sep 17 00:00:00 2001 From: climbalima Date: Thu, 10 Nov 2016 18:43:31 -0500 Subject: [PATCH 12/25] returned to o --- keyboards/lets_split/config.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/lets_split/config.h b/keyboards/lets_split/config.h index bf618704..05439fac 100644 --- a/keyboards/lets_split/config.h +++ b/keyboards/lets_split/config.h @@ -25,7 +25,7 @@ along with this program. If not, see . #define PRODUCT_ID 0x3060 #define DEVICE_VER 0x0001 #define MANUFACTURER Wootpatoot -#define PRODUCT Lets Split v2 +#define PRODUCT Lets Split #define DESCRIPTION A split keyboard for the cheap makers /* key matrix size */ @@ -34,8 +34,8 @@ along with this program. If not, see . #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_ROW_PINS { B5, B4, E6, D7 } +#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 } #define CATERINA_BOOTLOADER @@ -95,4 +95,4 @@ along with this program. If not, see . //#define NO_ACTION_MACRO //#define NO_ACTION_FUNCTION -#endif \ No newline at end of file +#endif From b5cecb4cc9df2d541050a9a95f48c1d5fb796ae4 Mon Sep 17 00:00:00 2001 From: climbalima Date: Thu, 10 Nov 2016 20:03:24 -0500 Subject: [PATCH 13/25] Added both revisions into one folder --- keyboards/lets_split/Makefile | 2 +- keyboards/lets_split/config.h | 16 ++- keyboards/lets_split/keymaps/default/keymap.c | 51 ++-------- keyboards/lets_split/lets_split.c | 27 ----- keyboards/lets_split/lets_split.h | 26 ++--- keyboards/lets_split/rev1/config.h | 98 +++++++++++++++++++ keyboards/lets_split/rev1/rev1.c | 30 ++++++ keyboards/lets_split/rev1/rev1.h | 25 +++++ keyboards/lets_split/rev2/config.h | 98 +++++++++++++++++++ keyboards/lets_split/rev2/rev2.c | 30 ++++++ keyboards/lets_split/rev2/rev2.h | 25 +++++ 11 files changed, 327 insertions(+), 101 deletions(-) create mode 100644 keyboards/lets_split/rev1/config.h create mode 100644 keyboards/lets_split/rev1/rev1.c create mode 100644 keyboards/lets_split/rev1/rev1.h create mode 100644 keyboards/lets_split/rev2/config.h create mode 100644 keyboards/lets_split/rev2/rev2.c create mode 100644 keyboards/lets_split/rev2/rev2.h diff --git a/keyboards/lets_split/Makefile b/keyboards/lets_split/Makefile index 982cfc59..396d5155 100644 --- a/keyboards/lets_split/Makefile +++ b/keyboards/lets_split/Makefile @@ -72,7 +72,7 @@ USE_I2C ?= yes SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend CUSTOM_MATRIX = yes - +SUBPROJECT_DEFAULT = rev2 ifndef QUANTUM_DIR include ../../Makefile endif \ No newline at end of file diff --git a/keyboards/lets_split/config.h b/keyboards/lets_split/config.h index bf618704..245529ae 100644 --- a/keyboards/lets_split/config.h +++ b/keyboards/lets_split/config.h @@ -28,15 +28,6 @@ along with this program. If not, see . #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 CATERINA_BOOTLOADER // #define USE_I2C @@ -94,5 +85,10 @@ along with this program. If not, see . //#define NO_ACTION_ONESHOT //#define NO_ACTION_MACRO //#define NO_ACTION_FUNCTION - +#ifdef SUBPROJECT_rev1 + #include "rev1/config.h" +#endif +#ifdef SUBPROJECT_rev2 + #include "rev2/config.h" +#endif #endif \ No newline at end of file diff --git a/keyboards/lets_split/keymaps/default/keymap.c b/keyboards/lets_split/keymaps/default/keymap.c index 8c8466eb..d9406381 100644 --- a/keyboards/lets_split/keymaps/default/keymap.c +++ b/keyboards/lets_split/keymaps/default/keymap.c @@ -29,61 +29,24 @@ enum custom_keycodes { #define XXXXXXX KC_NO const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - -/* 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 | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * |Adjust| Ctrl | Alt | GUI |Lower |Space |Space |Raise | Left | Down | Up |Right | - * `-----------------------------------------------------------------------------------' - */ -[_QWERTY] = KEYMAP( \ - KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ +[0] = KEYMAP( \ + KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, \ 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_ENT , \ - KC_LCTL, _LOWER, KC_LGUI, KC_LALT, MO(_LOWER), KC_SPC, KC_LSFT, MO(_RAISE), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ + KC_LCTL, _LOWER, KC_LGUI, KC_LALT, MO(_LOWER), KC_SPC, KC_SPC, MO(_RAISE), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ ), - -[_LOWER] = KEYMAP( \ - KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, \ +[3] = KEYMAP( \ + 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_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \ _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),_______, _______, _______, \ _______, _______, _______, _______, _______, KC_BSPC, KC_BSPC, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ ), - -/* Raise - * ,-----------------------------------------------------------------------------------. - * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp | - * |------+------+------+------+------+-------------+------+------+------+------+------| - * | Del | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | \ | - * |------+------+------+------+------+------|------+------+------+------+------+------| - * | | F7 | F8 | F9 | F10 | F11 | F12 |ISO # |ISO / | | |Enter | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | Next | Vol- | Vol+ | Play | - * `-----------------------------------------------------------------------------------' - */ -[_RAISE] = KEYMAP( \ - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \ +[4] = KEYMAP( \ + 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_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, \ _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, _______, _______, _______, \ _______, _______, _______, _______, _______, KC_ENT, KC_ENT, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ ), - -/* Adjust (Lower + Raise) - * ,-----------------------------------------------------------------------------------. - * | | Reset| | | | | | | | | | Del | - * |------+------+------+------+------+-------------+------+------+------+------+------| - * | | | |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak| | | - * |------+------+------+------+------+------|------+------+------+------+------+------| - * | | | | | | | | | | | | | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | - * `-----------------------------------------------------------------------------------' - */ }; #ifdef AUDIO_ENABLE diff --git a/keyboards/lets_split/lets_split.c b/keyboards/lets_split/lets_split.c index 574c116a..fe2d4bc1 100644 --- a/keyboards/lets_split/lets_split.c +++ b/keyboards/lets_split/lets_split.c @@ -1,30 +1,3 @@ #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) { - PLAY_NOTE_ARRAY(tone_goodbye, false, 0); - _delay_ms(150); - stop_all_notes(); -} diff --git a/keyboards/lets_split/lets_split.h b/keyboards/lets_split/lets_split.h index 04844ed6..2cdfb061 100644 --- a/keyboards/lets_split/lets_split.h +++ b/keyboards/lets_split/lets_split.h @@ -1,25 +1,13 @@ #ifndef LETS_SPLIT_H #define LETS_SPLIT_H -#include "quantum.h" - -void promicro_bootloader_jmp(bool program); +#ifdef SUBPROJECT_rev1 + #include "rev1.h" +#endif +#ifdef SUBPROJECT_rev2 + #include "rev2.h" +#endif -#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 } \ - } +#include "quantum.h" #endif \ No newline at end of file diff --git a/keyboards/lets_split/rev1/config.h b/keyboards/lets_split/rev1/config.h new file mode 100644 index 00000000..b609ada0 --- /dev/null +++ b/keyboards/lets_split/rev1/config.h @@ -0,0 +1,98 @@ +/* +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 v1 +#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 { B5, B4, E6, D7 } +#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 } + +#define CATERINA_BOOTLOADER + +// #define USE_I2C + +// #define EE_HANDS + +#define I2C_MASTER_LEFT +// #define I2C_MASTER_RIGHT + +/* 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 ws2812_PORTREG PORTD +#define ws2812_DDRREG DDRD +#define ws2812_pin PD1 +#define RGBLED_NUM 28 // Number of LEDs +#define RGBLIGHT_HUE_STEP 10 +#define RGBLIGHT_SAT_STEP 17 +#define RGBLIGHT_VAL_STEP 17 + +/* + * 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/rev1/rev1.c b/keyboards/lets_split/rev1/rev1.c new file mode 100644 index 00000000..574c116a --- /dev/null +++ b/keyboards/lets_split/rev1/rev1.c @@ -0,0 +1,30 @@ +#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) { + PLAY_NOTE_ARRAY(tone_goodbye, false, 0); + _delay_ms(150); + stop_all_notes(); +} diff --git a/keyboards/lets_split/rev1/rev1.h b/keyboards/lets_split/rev1/rev1.h new file mode 100644 index 00000000..04fe0dde --- /dev/null +++ b/keyboards/lets_split/rev1/rev1.h @@ -0,0 +1,25 @@ +#ifndef REV1_H +#define REV1_H + +#include "quantum.h" + +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 }, \ + { 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/rev2/config.h b/keyboards/lets_split/rev2/config.h new file mode 100644 index 00000000..bf618704 --- /dev/null +++ b/keyboards/lets_split/rev2/config.h @@ -0,0 +1,98 @@ +/* +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 CATERINA_BOOTLOADER + +// #define USE_I2C + +// #define EE_HANDS + +#define I2C_MASTER_LEFT +// #define I2C_MASTER_RIGHT + +/* 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 ws2812_PORTREG PORTD +#define ws2812_DDRREG DDRD +#define ws2812_pin PD1 +#define RGBLED_NUM 28 // Number of LEDs +#define RGBLIGHT_HUE_STEP 10 +#define RGBLIGHT_SAT_STEP 17 +#define RGBLIGHT_VAL_STEP 17 + +/* + * 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/rev2/rev2.c b/keyboards/lets_split/rev2/rev2.c new file mode 100644 index 00000000..574c116a --- /dev/null +++ b/keyboards/lets_split/rev2/rev2.c @@ -0,0 +1,30 @@ +#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) { + PLAY_NOTE_ARRAY(tone_goodbye, false, 0); + _delay_ms(150); + stop_all_notes(); +} diff --git a/keyboards/lets_split/rev2/rev2.h b/keyboards/lets_split/rev2/rev2.h new file mode 100644 index 00000000..2a2246f0 --- /dev/null +++ b/keyboards/lets_split/rev2/rev2.h @@ -0,0 +1,25 @@ +#ifndef REV2_H +#define REV2_H + +#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 From 19ebf6161f174902a33816bdab4ea3a209e4113e Mon Sep 17 00:00:00 2001 From: dbroqua Date: Sat, 12 Nov 2016 19:23:38 +0100 Subject: [PATCH 14/25] - Added dbroqua_hhkb layout for Satan PCB --- keyboards/satan/keymaps/dbroqua_hhkb/keymap.c | 110 ++++++++++++++++++ .../satan/keymaps/dbroqua_hhkb/readme.md | 9 ++ 2 files changed, 119 insertions(+) create mode 100644 keyboards/satan/keymaps/dbroqua_hhkb/keymap.c create mode 100644 keyboards/satan/keymaps/dbroqua_hhkb/readme.md diff --git a/keyboards/satan/keymaps/dbroqua_hhkb/keymap.c b/keyboards/satan/keymaps/dbroqua_hhkb/keymap.c new file mode 100644 index 00000000..98a298e7 --- /dev/null +++ b/keyboards/satan/keymaps/dbroqua_hhkb/keymap.c @@ -0,0 +1,110 @@ +// 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 "satan.h" + +#define _DEFAULT 0 +#define _ALTDISP 1 +#define _FN 2 + +enum planck_keycodes { + DEFAULT = SAFE_RANGE, + ALTDISP +}; + +// Fillers to make layering more clear +#define ______ KC_TRNS + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +/* Qwerty alt/gui/space/gui/alt + * ,-----------------------------------------------------------------------------------------. + * | Esc | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | \ | ` | + * |-----------------------------------------------------------------------------------------+ + * | Tab | Q | W | E | R | T | Y | U | I | O | P | [ | ] | Bksp | + * |-----------------------------------------------------------------------------------------+ + * | Ctrl | A | S | D | F | G | H | J | K | L | ; | ' | Enter | + * |-----------------------------------------------------------------------------------------+ + * | Shift | Z | X | C | V | B | N | M | , | . | / | RShift | FN | + * |-----------------------------------------------------------------------------------------+ + * | LAlt| LGUI | Space | RGUI | RAlt | + * `-----------------------------------------------------------------' + */ + [_DEFAULT] = KEYMAP_HHKB( /* Basic QWERTY */ + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV, \ + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, \ + KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \ + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(_FN), \ + ______, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_RALT, ______, ______ \ + ), + +/* Qwerty gui/alt/space/alt/gui + * ,-----------------------------------------------------------------------------------------. + * | Esc | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | \ | ` | + * |-----------------------------------------------------------------------------------------+ + * | Tab | Q | W | E | R | T | Y | U | I | O | P | [ | ] | Bksp | + * |-----------------------------------------------------------------------------------------+ + * | Ctrl | A | S | D | F | G | H | J | K | L | ; | ' | Enter | + * |-----------------------------------------------------------------------------------------+ + * | Shift | Z | X | C | V | B | N | M | , | . | / | RShift | FN | + * |-----------------------------------------------------------------------------------------+ + * |LGUI | LAlt | Space | RAlt |RGUI | + * `-----------------------------------------------------------------' + */ + [_ALTDISP] = KEYMAP_HHKB( /* Basic QWERTY */ + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV, \ + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, \ + KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \ + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(_FN), \ + ______, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, ______, ______ \ + ), + +/* FN Layer + * ,-----------------------------------------------------------------------------------------. + * | | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | Ins | Del | + * |-----------------------------------------------------------------------------------------+ + * | CAPS | BL- | BL+ | BL | | | | | Psc | Slck| Paus| Up | | | + * |-----------------------------------------------------------------------------------------+ + * | | Vol-| Vol+| Mute| | | * | / | Home| PgUp| Left|Right| | + * |-----------------------------------------------------------------------------------------+ + * | | Prev| Play| Next| | | + | - | End |PgDn| Down| | | + * |-----------------------------------------------------------------------------------------+ + * | | | | Stop | | + * `-----------------------------------------------------------------' + */ + [_FN] = KEYMAP_HHKB( /* Layer 1 */ + ______, 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_INS, KC_DEL, \ + KC_CAPS, BL_DEC, BL_INC, BL_TOGG, ______, ______, ______, ______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, ______, ______, \ + ______, KC_VOLD, KC_VOLU, KC_MUTE, ______, ______, KC_PAST, KC_PSLS,KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, ______, \ + ______, KC_MPRV, KC_MPLY, KC_MNXT,______,______,KC_PPLS,KC_PMNS,KC_END, KC_PGDN, KC_DOWN, ______,______, \ + ______, DEFAULT, ALTDISP, ______, KC_MSTP, ______, ______, ______ \ + ) +}; + +const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) +{ + // MACRODOWN only works in this function + return MACRO_NONE; +}; + +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 DEFAULT: + if (record->event.pressed) { + persistant_default_layer_set(1UL<<_DEFAULT); + } + return false; + break; + case ALTDISP: + if (record->event.pressed) { + persistant_default_layer_set(1UL<<_ALTDISP); + } + return false; + break; + } + return true; +} \ No newline at end of file diff --git a/keyboards/satan/keymaps/dbroqua_hhkb/readme.md b/keyboards/satan/keymaps/dbroqua_hhkb/readme.md new file mode 100644 index 00000000..39e71bee --- /dev/null +++ b/keyboards/satan/keymaps/dbroqua_hhkb/readme.md @@ -0,0 +1,9 @@ +# Dbroqua HHKB like Layout + +Like the HHKB but with a Satan GH60 PCB :D. + +# Programming Instructions: +Enter into programming mode and run the following command. +``` +$ sudo KEYMAP=dbroqua_hhkb make dfu +``` \ No newline at end of file From 28249498bc621cd8e766a501de0e0c18e525d3f1 Mon Sep 17 00:00:00 2001 From: Seth Chandler Date: Sat, 12 Nov 2016 23:56:57 -0500 Subject: [PATCH 15/25] update sethbc keymap --- keyboards/satan/keymaps/sethbc/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/satan/keymaps/sethbc/keymap.c b/keyboards/satan/keymaps/sethbc/keymap.c index 82c77908..b59efd1d 100644 --- a/keyboards/satan/keymaps/sethbc/keymap.c +++ b/keyboards/satan/keymaps/sethbc/keymap.c @@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, \ KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(_FL), \ - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_MENU, KC_RCTL), + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_RALT, KC_MENU, KC_RCTL), [_FL] = KEYMAP_HHKB( #ifdef RGBLIGHT_ENABLE From 34bf8558cdfa3baa46db704299ef66b79b2d0a15 Mon Sep 17 00:00:00 2001 From: Seth Chandler Date: Sun, 13 Nov 2016 00:56:46 -0500 Subject: [PATCH 16/25] update sethbc ergodox keymap --- keyboards/ergodox/keymaps/sethbc/Makefile | 11 ----------- keyboards/ergodox/keymaps/sethbc/keymap.c | 2 +- keyboards/ergodox/keymaps/sethbc/readme.md | 3 ++- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/keyboards/ergodox/keymaps/sethbc/Makefile b/keyboards/ergodox/keymaps/sethbc/Makefile index 8c4ff878..457a3d01 100644 --- a/keyboards/ergodox/keymaps/sethbc/Makefile +++ b/keyboards/ergodox/keymaps/sethbc/Makefile @@ -1,14 +1,3 @@ -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 -CUSTOM_MATRIX = yes # Custom matrix file for the ErgoDox EZ -SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend -NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -MIDI_ENABLE = no # MIDI controls -UNICODE_ENABLE = yes # Unicode - ifndef QUANTUM_DIR include ../../../../Makefile endif diff --git a/keyboards/ergodox/keymaps/sethbc/keymap.c b/keyboards/ergodox/keymaps/sethbc/keymap.c index 6846c4d5..8816ad63 100644 --- a/keyboards/ergodox/keymaps/sethbc/keymap.c +++ b/keyboards/ergodox/keymaps/sethbc/keymap.c @@ -15,7 +15,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LGUI, KC_GRV, KC_BSLS, KC_LEFT, KC_RGHT, KC_LCTL, KC_LALT, KC_HOME, - KC_SPC, KC_BSPC, KC_END, + KC_BSPC, KC_DEL, KC_END, // right hand MO(FN2), KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_LBRC, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_RBRC, diff --git a/keyboards/ergodox/keymaps/sethbc/readme.md b/keyboards/ergodox/keymaps/sethbc/readme.md index 510b2f99..57b5d0ec 100644 --- a/keyboards/ergodox/keymaps/sethbc/readme.md +++ b/keyboards/ergodox/keymaps/sethbc/readme.md @@ -1,3 +1,4 @@ # sethbc's Ergodox EZ keymap -Largely based on the Ergodox Infinity default keymap +Largely based on the Ergodox Infinity default keymap, but layer locking has been +removed in favor of momentary layer activation From aa76425395028d304e223d43e76145343850f0db Mon Sep 17 00:00:00 2001 From: Seth Chandler Date: Sun, 13 Nov 2016 01:04:10 -0500 Subject: [PATCH 17/25] oops, fixed inverted if statement --- keyboards/satan/keymaps/sethbc/keymap.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/keyboards/satan/keymaps/sethbc/keymap.c b/keyboards/satan/keymaps/sethbc/keymap.c index b59efd1d..93610258 100644 --- a/keyboards/satan/keymaps/sethbc/keymap.c +++ b/keyboards/satan/keymaps/sethbc/keymap.c @@ -37,16 +37,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FL] = KEYMAP_HHKB( #ifdef RGBLIGHT_ENABLE KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, RESET, \ - KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______, KC_DEL, \ - _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_PENT, \ - _______, _______, _______, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______), - #else - KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, RESET, \ KC_CAPS, _______, RGB_TOG,RGB_MOD,RGB_HUI, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______, KC_DEL, \ _______, KC_VOLD, RGB_HUD,RGB_SAI,RGB_SAD, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_PENT, \ _______, RGB_VAI,RGB_VAD,_______, _______, _______, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______), + #else + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, RESET, \ + KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______, KC_DEL, \ + _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_PENT, \ + _______, _______, _______, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______), #endif }; From 162f603b1c36c63aa170170998b361a86413767f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Elleg=C3=A5rd?= Date: Sat, 29 Oct 2016 20:31:12 +0200 Subject: [PATCH 18/25] Added keymap "videck", an ErgoDox keymap for Vi(m) users. --- keyboards/ergodox/keymaps/videck/Makefile | 19 + keyboards/ergodox/keymaps/videck/config.h | 13 + keyboards/ergodox/keymaps/videck/keymap.c | 179 ++++++++ keyboards/ergodox/keymaps/videck/readme.md | 24 + keyboards/ergodox/keymaps/videck/videck.json | 443 +++++++++++++++++++ keyboards/ergodox/keymaps/videck/videck.png | Bin 0 -> 106851 bytes 6 files changed, 678 insertions(+) create mode 100644 keyboards/ergodox/keymaps/videck/Makefile create mode 100644 keyboards/ergodox/keymaps/videck/config.h create mode 100644 keyboards/ergodox/keymaps/videck/keymap.c create mode 100644 keyboards/ergodox/keymaps/videck/readme.md create mode 100644 keyboards/ergodox/keymaps/videck/videck.json create mode 100644 keyboards/ergodox/keymaps/videck/videck.png diff --git a/keyboards/ergodox/keymaps/videck/Makefile b/keyboards/ergodox/keymaps/videck/Makefile new file mode 100644 index 00000000..5c7d21f2 --- /dev/null +++ b/keyboards/ergodox/keymaps/videck/Makefile @@ -0,0 +1,19 @@ +AUDIO_ENABLE:=no +BACKLIGHT_ENABLE:=no +BLUETOOTH_ENABLE:=no +BOOTMAGIC_ENABLE:=no +COMMAND_ENABLE:=no +CONSOLE_ENABLE:=no +EXTRAKEY_ENABLE:=yes +MIDI_ENABLE:=no +MOUSEKEY_ENABLE:=yes +NKRO_ENABLE:=no +RGBLIGHT_ENABLE:=no +SLEEP_LED_ENABLE:=no +TAP_DANCE_ENABLE:=yes +UNICODEMAP_ENABLE:=no +UNICODE_ENABLE:=no + +ifndef QUANTUM_DIR + include ../../../../Makefile +endif diff --git a/keyboards/ergodox/keymaps/videck/config.h b/keyboards/ergodox/keymaps/videck/config.h new file mode 100644 index 00000000..d89aabe7 --- /dev/null +++ b/keyboards/ergodox/keymaps/videck/config.h @@ -0,0 +1,13 @@ +#ifndef CONFIG_USER_H +#define CONFIG_USER_H + +#include "../../config.h" + +#ifndef NO_DEBUG + #define NO_DEBUG +#endif +#ifndef NO_PRINT + #define NO_PRINT +#endif + +#endif diff --git a/keyboards/ergodox/keymaps/videck/keymap.c b/keyboards/ergodox/keymaps/videck/keymap.c new file mode 100644 index 00000000..7bd6274e --- /dev/null +++ b/keyboards/ergodox/keymaps/videck/keymap.c @@ -0,0 +1,179 @@ +#include + +#include "ergodox.h" +#include "action_layer.h" + +enum { + BASE = 0, // Default layer + ARROWS = 1, // Arrows and Fx keys layer + MOUSE = 2, // Mouse movement and buttons layer + PARENS = 3, // Parenthesis easy access layer + + TD_L = 0, // Tap dance index for left shift + TD_R = 1 // Tap dance index for right shift +}; + +// See the videck.png image for a visualization of the layout. +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [BASE] = KEYMAP( + // left hand + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_HOME, + KC_EQL, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_END, + MO(PARENS), KC_A, KC_S, KC_D, KC_F, KC_G, + TD(TD_L), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_BSPC, + KC_LCTL, KC_LALT, KC_VOLD, KC_VOLU, KC_MUTE, + KC_ESC, KC_LGUI, + TG(MOUSE), + KC_SPC, KC_TAB, TG(ARROWS), + // right hand + KC_PGUP, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, + KC_PGDN, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, + KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + KC_DELT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, TD(TD_R), + KC_LBRC, KC_RBRC, KC_EQL, KC_RALT, KC_RCTL, + KC_APP, KC_ESC, + KC_INS, + KC_SLCK, KC_ENT, KC_SPC + ), + [ARROWS] = KEYMAP( + // left hand + KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, + KC_NO, + KC_TRNS, KC_TRNS, KC_TRNS, + // right hand + KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F12, + KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, + KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS + ), + [MOUSE] = KEYMAP( + // left hand + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_BTN3, KC_TRNS, + KC_TRNS, + KC_BTN1, KC_BTN2, KC_NO, + // right hand + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, + KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS + ), + [PARENS] = KEYMAP( + // left hand + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, + KC_NO, + KC_TRNS, KC_TRNS, KC_NO, + // right hand + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LCBR, KC_RCBR, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_LPRN, KC_RPRN, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, + KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS + ) +}; + +typedef void (*videck_tap_dance_trigger_t) (const uint16_t kc); + +typedef struct +{ + uint16_t kc1; + uint16_t kc2; + videck_tap_dance_trigger_t trigger; +} videck_tap_dance_tuple_t; + +static void videck_tap_dance_finished (qk_tap_dance_state_t *state, void *user_data) { + videck_tap_dance_tuple_t *const tuple = (videck_tap_dance_tuple_t *)user_data; + + if (state->count == 1) { + register_code16 (tuple->kc1); + } else if (state->count == 2) { + register_code16 (tuple->kc2); + } +} + +static void videck_tap_dance_reset (qk_tap_dance_state_t *state, void *user_data) { + videck_tap_dance_tuple_t *const tuple = (videck_tap_dance_tuple_t *)user_data; + + if (state->count == 1) { + unregister_code16 (tuple->kc1); + } else if (state->count == 2) { + unregister_code16 (tuple->kc2); + tuple->trigger(tuple->kc2); + } +} + +static bool caps_lock_is_on; + +// Toggles caps lock status. +static void videck_caps_trigger (const uint16_t kc) { + caps_lock_is_on ^= true; +} + +#define ACTION_TAP_DANCE_DOUBLE_TRIGGER(kc1, kc2, double_trigger) { \ + .fn = { NULL, videck_tap_dance_finished, videck_tap_dance_reset }, \ + .user_data = (void *)&((videck_tap_dance_tuple_t) { kc1, kc2, double_trigger }), \ + } + +qk_tap_dance_action_t tap_dance_actions[] = { + [TD_L] = ACTION_TAP_DANCE_DOUBLE_TRIGGER(KC_LSFT, KC_CAPS, videck_caps_trigger), + [TD_R] = ACTION_TAP_DANCE_DOUBLE_TRIGGER(KC_RSFT, KC_CAPS, videck_caps_trigger) +}; + +// Runs just one time when the keyboard initializes. +void matrix_init_user(void) { + ergodox_led_all_set(LED_BRIGHTNESS_LO); + caps_lock_is_on = false; +}; + +static void indicate_using_led(const uint8_t led, const bool enabled) { + if (enabled) { + ergodox_right_led_on(led); + } else { + ergodox_right_led_off(led); + } +} + +static inline void indicate_caps_lock_state(const bool enabled) { + indicate_using_led(1, enabled); +} + +static inline void indicate_arrows_layer_state(const bool enabled) { + indicate_using_led(2, enabled); +} + +static inline void indicate_mouse_layer_state(const bool enabled) { + indicate_using_led(3, enabled); +} + +// Runs constantly in the background, in a loop. +void matrix_scan_user(void) { + // Check if we have shift locked. + indicate_caps_lock_state(caps_lock_is_on); + indicate_arrows_layer_state(IS_LAYER_ON(ARROWS)); + indicate_mouse_layer_state(IS_LAYER_ON(MOUSE)); +}; diff --git a/keyboards/ergodox/keymaps/videck/readme.md b/keyboards/ergodox/keymaps/videck/readme.md new file mode 100644 index 00000000..759e81ba --- /dev/null +++ b/keyboards/ergodox/keymaps/videck/readme.md @@ -0,0 +1,24 @@ +ViDeck keymap for ErgoDox +========================= + +This is a QWERTY layout based on the US layout, where Vi functionality has been +especially considered. + +# Features +* Mouse movements using the Vi movement keys. +* Vi movement keys doubling as arrow keys. +* Shift lock using double tap. +* A coder's modifier key for easy input of parenthesis. +* Acess to the escape key using either thumb. +* Reasonably accessible Scroll Lock key (useful if you, like me, want to switch + to a non-US layout once in a while in X). + +# Missing keys +* Caps Lock (shift lock is used instead). +* Pause/Break. +* Print Screen. + +# LEDs +* Shift lock is indicated using first LED. +* Arrow keys layer is indicated using second LED. +* Mouse keys layer is indicated using third LED. diff --git a/keyboards/ergodox/keymaps/videck/videck.json b/keyboards/ergodox/keymaps/videck/videck.json new file mode 100644 index 00000000..7068cf54 --- /dev/null +++ b/keyboards/ergodox/keymaps/videck/videck.json @@ -0,0 +1,443 @@ +[ + { + "backcolor": "#333333", + "background": { + "name": "PBT Black", + "style": "background-image: url('/bg/plastic/pbt-black.png');" + }, + "switchMount": "cherry", + "switchBrand": "gateron", + "switchType": "KS-3-Red" + }, + [ + { + "x": 3.5, + "c": "#323232", + "t": "#ffffff\n\n\n#ac97d8" + }, + "#\n3\n\nF3", + { + "x": 10.5 + }, + "*\n8\n\nF8" + ], + [ + { + "y": -0.875, + "x": 2.5 + }, + "@\n2\n\nF2", + { + "x": 1 + }, + "$\n4\n\nF4", + { + "x": 8.5 + }, + "&\n7\n\nF7", + { + "x": 1, + "t": "#ffffff\n\n\n#ac97d8\n\n\n\n#555454" + }, + "(\n9\n\nF9" + ], + [ + { + "y": -0.875, + "x": 5.5, + "t": "#ffffff\n\n\n#ac97d8" + }, + "%\n5\n\nF5", + { + "t": "#ffffff" + }, + "home", + { + "x": 4.5 + }, + "pgup", + { + "t": "#ffffff\n\n\n#ac97d8" + }, + "^\n6\n\nF6" + ], + [ + { + "y": -0.875, + "t": "#ffffff", + "w": 1.5 + }, + "~\n`", + { + "t": "#ffffff\n\n\n#ac97d8" + }, + "!\n1\n\nF1", + { + "x": 14.5 + }, + ")\n0\n\nF10", + { + "w": 1.5 + }, + "_\n-\n\nF11" + ], + [ + { + "y": -0.375, + "x": 3.5, + "t": "#ffffff" + }, + "E", + { + "x": 10.5 + }, + "I" + ], + [ + { + "y": -0.875, + "x": 2.5 + }, + "W", + { + "x": 1 + }, + "R", + { + "x": 8.5 + }, + "U", + { + "x": 1, + "t": "#ffffff\n\n\n\n\n\n\n\n\n#f8d615" + }, + "O\n\n\n\n\n\n\n\n\n{" + ], + [ + { + "y": -0.875, + "x": 5.5, + "t": "#ffffff" + }, + "T", + { + "h": 1.5 + }, + "end", + { + "x": 4.5, + "h": 1.5 + }, + "pgdn", + "Y" + ], + [ + { + "y": -0.875, + "w": 1.5 + }, + "+\n=", + "Q", + { + "x": 14.5, + "t": "#ffffff\n\n\n\n\n\n\n\n\n#f8d615" + }, + "P\n\n\n\n\n\n\n\n\n}", + { + "t": "#ffffff\n\n\n#ac97d8", + "w": 1.5 + }, + "|\n\\\n\nF12" + ], + [ + { + "y": -0.375, + "x": 3.5, + "t": "#ffffff" + }, + "D", + { + "x": 10.5, + "t": "#ffffff\n\n#5eb1e7\n#ac97d8" + }, + "K\n\n\n" + ], + [ + { + "y": -0.875, + "x": 2.5, + "t": "#ffffff" + }, + "S", + { + "x": 1, + "n": true + }, + "F", + { + "x": 8.5, + "t": "#ffffff\n\n#5eb1e7\n#ac97d8", + "n": true + }, + "J\n\n\n", + { + "x": 1, + "t": "#ffffff\n\n#5eb1e7\n#ac97d8\n\n\n\n\n\n#f8d615" + }, + "L\n\n\n\n\n\n\n\n\n(" + ], + [ + { + "y": -0.875, + "x": 5.5, + "t": "#ffffff" + }, + "G", + { + "x": 6.5, + "t": "#ffffff\n\n#5eb1e7\n#ac97d8" + }, + "H\n\n\n" + ], + [ + { + "y": -0.875, + "t": "#f8d615", + "a": 6, + "w": 1.5 + }, + "( ) [ ] { }", + { + "t": "#ffffff", + "a": 4 + }, + "A", + { + "x": 14.5, + "t": "#ffffff\n\n\n\n\n\n\n#60605b\n\n#f8d615" + }, + ":\n;\n\n\n\n\n\nÖ\n\n)", + { + "t": "#ffffff\n\n\n\n\n\n\n#60605b", + "w": 1.5 + }, + "\"\n'\n\n\n\n\n\nÄ" + ], + [ + { + "y": -0.625, + "x": 6.5, + "t": "#ffffff", + "h": 1.5 + }, + "", + { + "x": 4.5, + "h": 1.5 + }, + "" + ], + [ + { + "y": -0.75, + "x": 3.5 + }, + "C", + { + "x": 10.5 + }, + "<\n," + ], + [ + { + "y": -0.875, + "x": 2.5 + }, + "X", + { + "x": 1 + }, + "V", + { + "x": 8.5 + }, + "M", + { + "x": 1, + "t": "#ffffff\n\n\n\n\n\n\n\n\n#f8d615" + }, + ">\n.\n\n\n\n\n\n\n\n[" + ], + [ + { + "y": -0.875, + "x": 5.5, + "t": "#ffffff" + }, + "B", + { + "x": 6.5 + }, + "N" + ], + [ + { + "y": -0.875, + "t": "#ffffff\n\n#f67f00", + "a": 6, + "fa": [ + 5 + ], + "w": 1.5 + }, + "⇑\n\n2-tap
locks", + { + "t": "#ffffff", + "a": 4, + "f": 3 + }, + "Z", + { + "x": 14.5, + "t": "#ffffff\n\n\n\n\n\n\n\n\n#f8d615", + "f": 3 + }, + "?\n/\n\n\n\n\n\n\n\n]", + { + "t": "#ffffff\n\n#f67f00", + "a": 6, + "f": 3, + "w": 1.5 + }, + "⇑\n\n2-tap
locks" + ], + [ + { + "y": -0.375, + "x": 3.5, + "t": "#ffffff", + "a": 4 + }, + "\n", + { + "x": 10.5, + "f": 3 + }, + "}\n]" + ], + [ + { + "y": -0.875, + "x": 2.5 + }, + "\n", + { + "x": 1 + }, + "\n", + { + "x": 8.5, + "t": "#ffffff\n\n\n\n\n\n\n#60605b", + "f": 3 + }, + "{\n[\n\n\n\n\n\nÅ", + { + "x": 1, + "t": "#ffffff", + "f": 3 + }, + "+\n=" + ], + [ + { + "y": -0.75, + "x": 0.5, + "f": 3 + }, + "ctrl", + { + "f": 3 + }, + "alt", + { + "x": 14.5, + "f": 3 + }, + "altgr", + { + "f": 3 + }, + "ctrl" + ], + [ + { + "r": 30, + "rx": 6.5, + "ry": 4.25, + "y": -1, + "x": 1, + "t": "#ffffff\n\n\n\n\n\n\n\n\n\n#5eb1e7", + "f": 3 + }, + "esc\n\n\n\n\n\n\n\n\n\nM", + { + "t": "#ffffff", + "f": 7 + }, + "" + ], + [ + { + "t": "#ffffff\n\n\n\n\n\n\n\n\n\n#5eb1e7", + "f": 3, + "h": 2 + }, + "space\n\n\n\n\n\n\n\n\n\nL", + { + "h": 2 + }, + "\n\n\n\n\n\n\n\n\n\nR", + { + "t": "#5eb1e7" + }, + "" + ], + [ + { + "x": 2, + "t": "#ac97d8" + }, + "" + ], + [ + { + "r": -30, + "rx": 13, + "y": -1, + "x": -3, + "t": "#ffffff" + }, + "", + "esc" + ], + [ + { + "x": -3 + }, + "ins", + { + "h": 2 + }, + "", + { + "h": 2 + }, + "space" + ], + [ + { + "x": -3 + }, + "scroll
lock" + ] +] \ No newline at end of file diff --git a/keyboards/ergodox/keymaps/videck/videck.png b/keyboards/ergodox/keymaps/videck/videck.png new file mode 100644 index 0000000000000000000000000000000000000000..c99323f53b1849872b261310a197addba435fe41 GIT binary patch literal 106851 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≀ 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
TIFo+ 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 YuxYDeoyiEX0B?ra?}hhlagQMX2g$;JBLDyZ literal 0 HcmV?d00001 From dd22c787b8b417df109d2136c76ce496dd7b93e3 Mon Sep 17 00:00:00 2001 From: climbalima Date: Mon, 14 Nov 2016 23:05:37 -0500 Subject: [PATCH 19/25] fixed extra paste --- keyboards/lets_split/config.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/keyboards/lets_split/config.h b/keyboards/lets_split/config.h index a5394c5e..bf047311 100644 --- a/keyboards/lets_split/config.h +++ b/keyboards/lets_split/config.h @@ -105,7 +105,6 @@ along with this program. If not, see . #include "rev2/config.h" #endif #endif -======= -#endif ->>>>>>> 79f82d3d80a24483d14b078d325bb0f45af58e3d + + From bce6e52391da7c5f620c96a91857940f0dee19df Mon Sep 17 00:00:00 2001 From: climbalima Date: Mon, 14 Nov 2016 23:08:10 -0500 Subject: [PATCH 20/25] fixed conflict --- keyboards/lets_split/config.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/keyboards/lets_split/config.h b/keyboards/lets_split/config.h index bf047311..059d45b0 100644 --- a/keyboards/lets_split/config.h +++ b/keyboards/lets_split/config.h @@ -28,8 +28,6 @@ along with this program. If not, see . #define PRODUCT Lets Split #define DESCRIPTION A split keyboard for the cheap makers -<<<<<<< HEAD -======= /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 8 @@ -39,7 +37,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { B5, B4, E6, D7 } #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 } ->>>>>>> 79f82d3d80a24483d14b078d325bb0f45af58e3d #define CATERINA_BOOTLOADER // #define USE_I2C From 4da698fda3b7e08d7baa6849243716fb8765679a Mon Sep 17 00:00:00 2001 From: Seebs Date: Wed, 16 Nov 2016 15:44:26 -0600 Subject: [PATCH 21/25] dvorak/plover keyboard layout Plover's steno support likes quasi-qwerty, and gaming likes qwerty, and I like dvorak, so... what if I could have it all? Signed-off-by: seebs --- .../ergodox/keymaps/dvorak_plover/README.md | 14 ++ .../ergodox/keymaps/dvorak_plover/keymap.c | 230 ++++++++++++++++++ 2 files changed, 244 insertions(+) create mode 100644 keyboards/ergodox/keymaps/dvorak_plover/README.md create mode 100644 keyboards/ergodox/keymaps/dvorak_plover/keymap.c diff --git a/keyboards/ergodox/keymaps/dvorak_plover/README.md b/keyboards/ergodox/keymaps/dvorak_plover/README.md new file mode 100644 index 00000000..c8287b01 --- /dev/null +++ b/keyboards/ergodox/keymaps/dvorak_plover/README.md @@ -0,0 +1,14 @@ +Dvorak support, plover support, gaming support + +I'm used to the Kinesis, so originally I was just going to patch up +the thumb keys to be more familiar. But the ergodox is really well +suited to NKRO support in Plover, so I added a layer for that, and +then I remembered that dvorak can be really annoying for video +games (try to reach WASD), so I added a layer for that. + +The result is probably a bit idiosyncratic, but it works for me. + +(I also don't have any press/hold distinction keys, because that +confuses my fuzzy little brain.) + +Contributed by seebs (seebs@seebs.net) diff --git a/keyboards/ergodox/keymaps/dvorak_plover/keymap.c b/keyboards/ergodox/keymaps/dvorak_plover/keymap.c new file mode 100644 index 00000000..d0505609 --- /dev/null +++ b/keyboards/ergodox/keymaps/dvorak_plover/keymap.c @@ -0,0 +1,230 @@ +#include "ergodox.h" +#include "debug.h" +#include "action_layer.h" + +#define BASE 0 // default layer +#define SYMB 1 // symbols +#define PLVR 2 // media keys +#define QWRT 3 // qwerty layer for gaming + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +/* Keymap 0: Basic layer + * + * ,--------------------------------------------------. ,--------------------------------------------------. + * | = | 1 | 2 | 3 | 4 | 5 | Esc | | Esc | 6 | 7 | 8 | 9 | 0 | \ | + * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| + * | Tab | ' | , | . | P | Y | L1 | | L2 | F | G | C | R | L | / | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | LGui | A | O | E | U | I |------| |------| D | H | T | N | S | - | + * |--------+------+------+------+------+------| Esc | | L3 |------+------+------+------+------+--------| + * | LShift | ; | Q | J | K | X | | | | B | M | W | V | Z | RShift | + * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' + * |Lalt | Grv | | Left | Right| | Up | Down | [ | ] | RAlt | + * `----------------------------------' `----------------------------------' + * ,-------------. ,---------------. + * | LCtrl| Alt | | LGui | RCtrl | + * ,------|------|------| |------+--------+------. + * | | | Home | | PgUp | | | + * |Backsp|Delete|------| |------| Enter |Space | + * | ace| | End | | PgDn | | | + * `--------------------' `----------------------' + */ +// If it accepts an argument (i.e, is a function), it doesn't need KC_. +// Otherwise, it needs KC_* +[BASE] = KEYMAP( // layer 0 : default + // left hand + KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_ESC, + KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, MO(SYMB), + KC_LGUI, KC_A, KC_O, KC_E, KC_U, KC_I, + KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_ESC, + KC_LALT, KC_GRV, KC_ESC, KC_LEFT,KC_RGHT, + KC_LCTL, KC_LALT, + KC_HOME, + KC_BSPC,KC_DEL,KC_END, + // right hand + KC_ESC, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS, + TG(PLVR), KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, + KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, + TG(QWRT),KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT, + KC_UP, KC_DOWN,KC_LBRC,KC_RBRC, KC_RALT, + KC_LGUI, KC_RCTL, + KC_PGUP, + KC_PGDN,KC_ENT, KC_SPC + ), +/* Keymap 1: Symbol Layer + * + * ,--------------------------------------------------. ,--------------------------------------------------. + * | | F1 | F2 | F3 | F4 | F5 | | | | F6 | F7 | F8 | F9 | F10 | F11 | + * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| + * | | ! | @ | { | } | | | | | | Up | KP7 | KP8 | KP9 | KP* | F12 | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | # | $ | ( | ) | ` |------| |------| Down | KP4 | KP5 | KP6 | KP+ | | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | % | ^ | [ | ] | ~ | | | | & | KP1 | KP2 | KP3 | KP/ | | + * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' + * | | | | | | | | KP. | KP0 | KP= | | + * `----------------------------------' `----------------------------------' + * ,-------------. ,-------------. + * | | | | | | + * ,------|------|------| |------+------+------. + * | | | | | | | | + * | | |------| |------| | | + * | | | | | | | | + * `--------------------' `--------------------' + */ +// SYMBOLS +[SYMB] = KEYMAP( + // left hand + KC_TRNS,KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS, + KC_TRNS,KC_EXLM,KC_AT, KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS, + KC_TRNS,KC_HASH,KC_DLR, KC_LPRN,KC_RPRN,KC_GRV, + KC_TRNS,KC_PERC,KC_CIRC,KC_LBRC,KC_RBRC,KC_TILD,KC_TRNS, + KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, + KC_TRNS,KC_TRNS, + KC_TRNS, + KC_TRNS,KC_TRNS,KC_TRNS, + // right hand + KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, + KC_TRNS, KC_UP, KC_P7, KC_P8, KC_P9, KC_PAST, KC_F12, + KC_DOWN, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_TRNS, + KC_TRNS, KC_AMPR, KC_P1, KC_P2, KC_P3, KC_PSLS, KC_TRNS, + KC_TRNS,KC_PDOT, KC_P0, KC_PEQL, KC_TRNS, + KC_TRNS, KC_TRNS, + KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS +), +/* Keymap 2: Steno for Plover from https://github.com/shayneholmes/tmk_keyboard/commit/11290f8489013018f778627db725160c745e75bd + * + * ,--------------------------------------------------. ,--------------------------------------------------. + * | | | | | | | | | | | | | | | | + * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| + * | | 1 | 2 | 3 | 4 | 5 | | | L2 | 6 | 7 | 8 | 9 | 0 | | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | q | w | e | r | t |------| |------| y | u | i | o | p | [ | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | a | s | d | f | g | | | | h | j | k | l | ; | ' | + * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' + * | | | | | | | | | | | | + * `----------------------------------' `----------------------------------' + * ,-------------. ,-------------. + * | | | | | | + * ,------|------|------| |------+------+------. + * | | | | | | | | + * | c | v |------| |------| n | m | + * | | | | | | | | + * `--------------------' `--------------------' + */ + +[PLVR] = KEYMAP( // layout: layer 2: Steno for Plover + // left hand + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_1, KC_2, KC_3, KC_4, KC_5, KC_TRNS, + KC_NO, KC_Q, KC_W, KC_E, KC_R, KC_T, + KC_NO, KC_A, KC_S, KC_D, KC_F, KC_G, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_FN4, KC_NO, + KC_NO, + KC_C, KC_V, KC_NO, + // right hand + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, + TG(2), KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS, + KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, + KC_NO, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO, + KC_TRNS, KC_TRNS, + KC_TRNS, + KC_NO, KC_N, KC_M +), +/* Keymap 3: qwerty-ish + * + * ,--------------------------------------------------. ,--------------------------------------------------. + * | = | 1 | 2 | 3 | 4 | 5 | Esc | | Esc | 6 | 7 | 8 | 9 | 0 | - | + * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| + * | Tab | Q | W | E | R | T | | | | Y | U | I | O | P | \ | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | LGui | A | S | D | F | G |------| |------| H | J | K | L | ; | LGui | + * |--------+------+------+------+------+------| Spc | | L3 |------+------+------+------+------+--------| + * | LShift | Z | X | C | V | B | | | | N | M | , | . | / | RShift | + * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' + * | Lalt | Grv | '" | Left | Right| | Up | Down | [ | ] | RAlt | + * `----------------------------------' `----------------------------------' + * ,-------------. ,---------------. + * | LCtrl| LAlt | | LGui | RCtrl | + * ,------|------|------| |------+--------+------. + * | | | Home | | PgUp | | | + * |Backsp|Delete|------| |------| Enter |Space | + * | ace| | End | | PgDn | | | + * `--------------------' `----------------------' + */ +[QWRT] = KEYMAP( // layer 3: qwerty for gaming + // left hand + KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_ESC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, TG(SYMB), + KC_LGUI, KC_A, KC_S, KC_D, KC_F, KC_G, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_SPACE, + KC_LALT, KC_GRV, KC_QUOT, KC_LEFT,KC_RGHT, + KC_LCTL, KC_LALT, + KC_HOME, + KC_BSPC,KC_DEL,KC_END, + // right hand + KC_ESC, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, + KC_NO, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, + KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + TG(QWRT), KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH, KC_RSFT, + KC_UP, KC_DOWN,KC_LBRC,KC_RBRC, KC_RALT, + KC_LGUI, KC_RCTL, + KC_PGUP, + KC_PGDN,KC_ENT, KC_SPC + ), +}; + +const uint16_t PROGMEM fn_actions[] = { + [1] = ACTION_LAYER_TAP_TOGGLE(SYMB) // FN1 - Momentary Layer 1 (Symbols) +}; + +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); + } else { + unregister_code(KC_RSFT); + } + break; + } + return MACRO_NONE; +}; + +// Runs just one time when the keyboard initializes. +void matrix_init_user(void) { + +}; + +// Runs constantly in the background, in a loop. +void matrix_scan_user(void) { + + uint8_t layer = biton32(layer_state); + + ergodox_board_led_off(); + ergodox_right_led_1_off(); + ergodox_right_led_2_off(); + ergodox_right_led_3_off(); + switch (layer) { + // TODO: Make this relevant to the ErgoDox EZ. + case 1: + ergodox_right_led_1_on(); + break; + case 2: + ergodox_right_led_2_on(); + break; + case 3: + ergodox_right_led_3_on(); + break; + default: + // none + break; + } + +}; From 1dd6ceb45dfcf5f0991b84fea5a761a35df7fcda Mon Sep 17 00:00:00 2001 From: climbalima Date: Wed, 16 Nov 2016 19:18:54 -0500 Subject: [PATCH 22/25] Updated my repo to current qmk --- keyboards/lets_split/config.h | 48 +----- keyboards/lets_split/keymaps/default/keymap.c | 12 +- keyboards/lets_split/lets_split.c | 30 ---- keyboards/lets_split/lets_split.h | 26 +-- keyboards/lets_split/rev1/Makefile | 3 + keyboards/lets_split/rev1/config.h | 102 +++++++++++ keyboards/lets_split/rev1/rev1.c | 32 ++++ keyboards/lets_split/rev1/rev1.h | 25 +++ keyboards/lets_split/rev1/rules.mk | 5 + keyboards/lets_split/rev2/Makefile | 3 + keyboards/lets_split/rev2/config.h | 102 +++++++++++ keyboards/lets_split/rev2/rev2.c | 32 ++++ keyboards/lets_split/rev2/rev2.h | 25 +++ keyboards/lets_split/rev2/rules.mk | 5 + keyboards/lets_split/rules.mk | 7 +- keyboards/maxipad/Makefile | 3 + keyboards/maxipad/config.h | 162 ++++++++++++++++++ keyboards/maxipad/keymaps/default/Makefile | 21 +++ keyboards/maxipad/keymaps/default/config.h | 8 + keyboards/maxipad/keymaps/default/keymap.c | 54 ++++++ keyboards/maxipad/keymaps/default/readme.md | 1 + keyboards/maxipad/maxipad.c | 28 +++ keyboards/maxipad/maxipad.h | 25 +++ keyboards/maxipad/readme.md | 28 +++ keyboards/maxipad/rules.mk | 67 ++++++++ 25 files changed, 756 insertions(+), 98 deletions(-) create mode 100644 keyboards/lets_split/rev1/Makefile create mode 100644 keyboards/lets_split/rev1/config.h create mode 100644 keyboards/lets_split/rev1/rev1.c create mode 100644 keyboards/lets_split/rev1/rev1.h create mode 100644 keyboards/lets_split/rev1/rules.mk create mode 100644 keyboards/lets_split/rev2/Makefile create mode 100644 keyboards/lets_split/rev2/config.h create mode 100644 keyboards/lets_split/rev2/rev2.c create mode 100644 keyboards/lets_split/rev2/rev2.h create mode 100644 keyboards/lets_split/rev2/rules.mk create mode 100644 keyboards/maxipad/Makefile create mode 100644 keyboards/maxipad/config.h create mode 100644 keyboards/maxipad/keymaps/default/Makefile create mode 100644 keyboards/maxipad/keymaps/default/config.h create mode 100644 keyboards/maxipad/keymaps/default/keymap.c create mode 100644 keyboards/maxipad/keymaps/default/readme.md create mode 100644 keyboards/maxipad/maxipad.c create mode 100644 keyboards/maxipad/maxipad.h create mode 100644 keyboards/maxipad/readme.md create mode 100644 keyboards/maxipad/rules.mk diff --git a/keyboards/lets_split/config.h b/keyboards/lets_split/config.h index f4d900ac..5bee5531 100644 --- a/keyboards/lets_split/config.h +++ b/keyboards/lets_split/config.h @@ -28,29 +28,6 @@ along with this program. If not, see . #define PRODUCT Lets Split #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 { B5, B4, E6, D7 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 } - -#define CATERINA_BOOTLOADER - -// #define USE_I2C - -// Use serial if not using I2C -#ifndef USE_I2C -# define USE_SERIAL -#endif - -// #define EE_HANDS - -#define I2C_MASTER_LEFT -// #define I2C_MASTER_RIGHT - /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW @@ -72,25 +49,11 @@ along with this program. If not, see . #define IS_COMMAND() ( \ keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ ) - -/* ws2812 RGB LED */ -#define RGB_DI_PIN D4 -#define RGBLIGHT_TIMER -#define RGBLED_NUM 8 // Number of LEDs -#define RGBLIGHT_HUE_STEP 10 -#define RGBLIGHT_SAT_STEP 17 -#define RGBLIGHT_VAL_STEP 17 - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - /* disable debug print */ -// #define NO_DEBUG +//#define NO_DEBUG /* disable print */ -// #define NO_PRINT +//#define NO_PRINT /* disable action features */ //#define NO_ACTION_LAYER @@ -98,5 +61,10 @@ along with this program. If not, see . //#define NO_ACTION_ONESHOT //#define NO_ACTION_MACRO //#define NO_ACTION_FUNCTION - +#ifdef SUBPROJECT_rev1 + #include "rev1/config.h" +#endif +#ifdef SUBPROJECT_rev2 + #include "rev2/config.h" +#endif #endif diff --git a/keyboards/lets_split/keymaps/default/keymap.c b/keyboards/lets_split/keymaps/default/keymap.c index 0d2d94b6..fc41c01f 100644 --- a/keyboards/lets_split/keymaps/default/keymap.c +++ b/keyboards/lets_split/keymaps/default/keymap.c @@ -42,10 +42,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------------------------------------------------' */ [_QWERTY] = KEYMAP( \ - 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_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ + 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_ENT , \ - ADJUST, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ + KC_LCTL, ADJUST, KC_LALT, KC_LGUI, LOWER, KC_SPC, MT(MOD_LSFT, KC_SPC), RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ ), /* Colemak @@ -99,7 +99,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, \ KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \ _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),_______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ + _______, _______, _______, _______, _______, KC_BSPC, MT(MOD_LSFT, KC_BSPC), _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ ), /* Raise @@ -117,7 +117,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, \ _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ + _______, _______, _______, _______, _______, KC_ENT, MT(MOD_LSFT, KC_ENT), _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ ), /* Adjust (Lower + Raise) @@ -134,7 +134,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = KEYMAP( \ _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \ _______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, RGB_TOG,RGB_MOD,RGB_HUI,RGB_HUD,RGB_SAI,RGB_SAD,RGB_VAI,RGB_VAD, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ ) diff --git a/keyboards/lets_split/lets_split.c b/keyboards/lets_split/lets_split.c index c505d3a6..851299aa 100644 --- a/keyboards/lets_split/lets_split.c +++ b/keyboards/lets_split/lets_split.c @@ -1,32 +1,2 @@ #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/lets_split.h b/keyboards/lets_split/lets_split.h index fe7ae076..2cdfb061 100644 --- a/keyboards/lets_split/lets_split.h +++ b/keyboards/lets_split/lets_split.h @@ -1,25 +1,13 @@ #ifndef LETS_SPLIT_H #define LETS_SPLIT_H -#include "quantum.h" - -void promicro_bootloader_jmp(bool program); +#ifdef SUBPROJECT_rev1 + #include "rev1.h" +#endif +#ifdef SUBPROJECT_rev2 + #include "rev2.h" +#endif -#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 }, \ - { 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 } \ - } +#include "quantum.h" #endif \ No newline at end of file diff --git a/keyboards/lets_split/rev1/Makefile b/keyboards/lets_split/rev1/Makefile new file mode 100644 index 00000000..4e2a6f00 --- /dev/null +++ b/keyboards/lets_split/rev1/Makefile @@ -0,0 +1,3 @@ +ifndef MAKEFILE_INCLUDED + include ../../Makefile +endif \ No newline at end of file diff --git a/keyboards/lets_split/rev1/config.h b/keyboards/lets_split/rev1/config.h new file mode 100644 index 00000000..f4d900ac --- /dev/null +++ b/keyboards/lets_split/rev1/config.h @@ -0,0 +1,102 @@ +/* +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 +#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 { B5, B4, E6, D7 } +#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 } + +#define CATERINA_BOOTLOADER + +// #define USE_I2C + +// Use serial if not using I2C +#ifndef USE_I2C +# define USE_SERIAL +#endif + +// #define EE_HANDS + +#define I2C_MASTER_LEFT +// #define I2C_MASTER_RIGHT + +/* 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 D4 +#define RGBLIGHT_TIMER +#define RGBLED_NUM 8 // Number of LEDs +#define RGBLIGHT_HUE_STEP 10 +#define RGBLIGHT_SAT_STEP 17 +#define RGBLIGHT_VAL_STEP 17 + +/* + * 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/lets_split/rev1/rev1.c b/keyboards/lets_split/rev1/rev1.c new file mode 100644 index 00000000..c505d3a6 --- /dev/null +++ b/keyboards/lets_split/rev1/rev1.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/rev1/rev1.h b/keyboards/lets_split/rev1/rev1.h new file mode 100644 index 00000000..50bda031 --- /dev/null +++ b/keyboards/lets_split/rev1/rev1.h @@ -0,0 +1,25 @@ +#ifndef REV1_H +#define REV1_H + +#include "../lets_split.h" + +//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 }, \ + { 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/rev1/rules.mk b/keyboards/lets_split/rev1/rules.mk new file mode 100644 index 00000000..a0825b4e --- /dev/null +++ b/keyboards/lets_split/rev1/rules.mk @@ -0,0 +1,5 @@ +BACKLIGHT_ENABLE = no + +ifndef QUANTUM_DIR + include ../../../Makefile +endif \ No newline at end of file diff --git a/keyboards/lets_split/rev2/Makefile b/keyboards/lets_split/rev2/Makefile new file mode 100644 index 00000000..4e2a6f00 --- /dev/null +++ b/keyboards/lets_split/rev2/Makefile @@ -0,0 +1,3 @@ +ifndef MAKEFILE_INCLUDED + include ../../Makefile +endif \ No newline at end of file diff --git a/keyboards/lets_split/rev2/config.h b/keyboards/lets_split/rev2/config.h new file mode 100644 index 00000000..cd152e33 --- /dev/null +++ b/keyboards/lets_split/rev2/config.h @@ -0,0 +1,102 @@ +/* +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 CATERINA_BOOTLOADER + +// #define USE_I2C + +// Use serial if not using I2C +#ifndef USE_I2C +# define USE_SERIAL +#endif + +// #define EE_HANDS + +#define I2C_MASTER_LEFT +// #define I2C_MASTER_RIGHT + +/* 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 RGBLIGHT_HUE_STEP 10 +#define RGBLIGHT_SAT_STEP 17 +#define RGBLIGHT_VAL_STEP 17 + +/* + * 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/lets_split/rev2/rev2.c b/keyboards/lets_split/rev2/rev2.c new file mode 100644 index 00000000..c505d3a6 --- /dev/null +++ b/keyboards/lets_split/rev2/rev2.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/rev2/rev2.h b/keyboards/lets_split/rev2/rev2.h new file mode 100644 index 00000000..a8b0f0f4 --- /dev/null +++ b/keyboards/lets_split/rev2/rev2.h @@ -0,0 +1,25 @@ +#ifndef REV2_H +#define REV2_H + +#include "../lets_split.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/rev2/rules.mk b/keyboards/lets_split/rev2/rules.mk new file mode 100644 index 00000000..80a942d0 --- /dev/null +++ b/keyboards/lets_split/rev2/rules.mk @@ -0,0 +1,5 @@ +BACKLIGHT_ENABLE = no + +ifndef QUANTUM_DIR + include ../../../Makefile +endif diff --git a/keyboards/lets_split/rules.mk b/keyboards/lets_split/rules.mk index 6fde8a44..1aee5313 100644 --- a/keyboards/lets_split/rules.mk +++ b/keyboards/lets_split/rules.mk @@ -63,11 +63,12 @@ COMMAND_ENABLE ?= yes # Commands for debug and configuration NKRO_ENABLE ?= no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work BACKLIGHT_ENABLE ?= no # Enable keyboard backlight functionality MIDI_ENABLE ?= no # MIDI controls -AUDIO_ENABLE ?= yes # Audio output on port C6 +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. - +RGBLIGHT_ENABLE ?= no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. +SUBPROJECT_rev1 ?= yes +USE_I2C ?= yes # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend diff --git a/keyboards/maxipad/Makefile b/keyboards/maxipad/Makefile new file mode 100644 index 00000000..4e2a6f00 --- /dev/null +++ b/keyboards/maxipad/Makefile @@ -0,0 +1,3 @@ +ifndef MAKEFILE_INCLUDED + include ../../Makefile +endif \ No newline at end of file diff --git a/keyboards/maxipad/config.h b/keyboards/maxipad/config.h new file mode 100644 index 00000000..2462a5cf --- /dev/null +++ b/keyboards/maxipad/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 You +#define PRODUCT maxipad +#define DESCRIPTION A custom keyboard + +/* key matrix size */ +#define MATRIX_ROWS 5 +#define MATRIX_COLS 6 + +/* + * 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 { B6, F7, B2, B3, B1 } +#define MATRIX_COL_PINS { F6, C6, D7, F5, B4, B5 } +#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 + +/* number of backlight levels */ + +/* 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/maxipad/keymaps/default/Makefile b/keyboards/maxipad/keymaps/default/Makefile new file mode 100644 index 00000000..f4671a9d --- /dev/null +++ b/keyboards/maxipad/keymaps/default/Makefile @@ -0,0 +1,21 @@ +# 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 = no # 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. +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/maxipad/keymaps/default/config.h b/keyboards/maxipad/keymaps/default/config.h new file mode 100644 index 00000000..df06a262 --- /dev/null +++ b/keyboards/maxipad/keymaps/default/config.h @@ -0,0 +1,8 @@ +#ifndef CONFIG_USER_H +#define CONFIG_USER_H + +#include "../../config.h" + +// place overrides here + +#endif \ No newline at end of file diff --git a/keyboards/maxipad/keymaps/default/keymap.c b/keyboards/maxipad/keymaps/default/keymap.c new file mode 100644 index 00000000..8a9bc4f0 --- /dev/null +++ b/keyboards/maxipad/keymaps/default/keymap.c @@ -0,0 +1,54 @@ +#include "maxipad.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +[0] = KEYMAP( /* Base */ + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, \ + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, \ + MO(1), KC_A, KC_S, KC_D, KC_F, KC_G, \ + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, \ + KC_LCTL, KC_LALT, MO(1), KC_ENT,KC_GRV,KC_SPC \ +), +[1] = KEYMAP( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, \ + KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, \ + KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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); + } else { + unregister_code(KC_RSFT); + } + break; + } + return MACRO_NONE; +}; + + +void matrix_init_user(void) { + +} + +void matrix_scan_user(void) { + +} + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + return true; +} + +void led_set_user(uint8_t usb_led) { + +} \ No newline at end of file diff --git a/keyboards/maxipad/keymaps/default/readme.md b/keyboards/maxipad/keymaps/default/readme.md new file mode 100644 index 00000000..a6c0d4a3 --- /dev/null +++ b/keyboards/maxipad/keymaps/default/readme.md @@ -0,0 +1 @@ +# The default keymap for maxipad \ No newline at end of file diff --git a/keyboards/maxipad/maxipad.c b/keyboards/maxipad/maxipad.c new file mode 100644 index 00000000..879ae86a --- /dev/null +++ b/keyboards/maxipad/maxipad.c @@ -0,0 +1,28 @@ +#include "maxipad.h" + +void matrix_init_kb(void) { + // put your keyboard start-up code here + // runs once when the firmware starts up + + matrix_init_user(); +} + +void matrix_scan_kb(void) { + // put your looping keyboard code here + // runs every cycle (a lot) + + matrix_scan_user(); +} + +bool process_record_kb(uint16_t keycode, keyrecord_t *record) { + // put your per-action keyboard code here + // runs for every action, just before processing by the firmware + + return process_record_user(keycode, record); +} + +void led_set_kb(uint8_t usb_led) { + // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here + + led_set_user(usb_led); +} diff --git a/keyboards/maxipad/maxipad.h b/keyboards/maxipad/maxipad.h new file mode 100644 index 00000000..eee1309d --- /dev/null +++ b/keyboards/maxipad/maxipad.h @@ -0,0 +1,25 @@ +#ifndef MAXIPAD_H +#define MAXIPAD_H + +#include "quantum.h" + +// This a shortcut to help you visually see your layout. +// The following is an example using the Planck MIT layout +// The first section contains all of the arguements +// The second converts the arguments into a two-dimensional array +#define KEYMAP( \ + 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 \ +) \ +{ \ + { 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} \ +} + +#endif diff --git a/keyboards/maxipad/readme.md b/keyboards/maxipad/readme.md new file mode 100644 index 00000000..e722b660 --- /dev/null +++ b/keyboards/maxipad/readme.md @@ -0,0 +1,28 @@ +maxipad keyboard firmware +====================== + +## Quantum MK Firmware + +For the full Quantum feature list, see [the parent readme](/). + +## Building + +Download or clone the whole firmware and navigate to the keyboards/maxipad 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 default`. + +### 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 a folder with the name of your keymap in the keymaps folder, and see keymap documentation (you can find in top readme.md) and existant keymap files. + +To build the firmware binary hex file with a keymap just do `make` with a keymap like this: + +``` +$ make [default|jack|] +``` + +Keymaps follow the format **__\.c__** and are stored in the `keymaps` folder. diff --git a/keyboards/maxipad/rules.mk b/keyboards/maxipad/rules.mk new file mode 100644 index 00000000..55898147 --- /dev/null +++ b/keyboards/maxipad/rules.mk @@ -0,0 +1,67 @@ +# MCU name +#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 + + +# +# 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) + +# Interrupt driven control endpoint task(+60) +OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT + + +# Boot Section Size in *bytes* +# Teensy halfKay 512 +# Teensy++ halfKay 1024 +# Atmel DFU loader 4096 +# LUFA bootloader 4096 +# USBaspLoader 2048 +OPT_DEFS += -DBOOTLOADER_SIZE=512 + + +# 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 ?= yes # Console for debug(+400) +COMMAND_ENABLE ?= yes # 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 From 21b6b4e6c4d6872164a13e8d31e3e0a9f146ea60 Mon Sep 17 00:00:00 2001 From: climbalima Date: Wed, 16 Nov 2016 19:49:38 -0500 Subject: [PATCH 23/25] should have fixed conflixed --- keyboards/lets_split/Makefile | 79 ------------------- keyboards/lets_split/config.h | 13 +-- keyboards/lets_split/keymaps/default/keymap.c | 19 ----- keyboards/lets_split/lets_split.c | 7 +- keyboards/lets_split/rev1/config.h | 26 ------ keyboards/lets_split/rev1/rev1.c | 6 -- keyboards/lets_split/rev1/rev1.h | 5 +- keyboards/lets_split/rev2/config.h | 18 +---- keyboards/lets_split/rev2/rev2.c | 6 -- keyboards/lets_split/rev2/rev2.h | 5 +- keyboards/maxipad/Makefile | 78 ------------------ keyboards/maxipad/config.h | 9 +-- keyboards/maxipad/keymaps/default/keymap.c | 7 +- 13 files changed, 10 insertions(+), 268 deletions(-) diff --git a/keyboards/lets_split/Makefile b/keyboards/lets_split/Makefile index 6ce6e437..4e2a6f00 100644 --- a/keyboards/lets_split/Makefile +++ b/keyboards/lets_split/Makefile @@ -1,82 +1,3 @@ -<<<<<<< HEAD ifndef MAKEFILE_INCLUDED -======= -SRC += matrix.c \ - i2c.c \ - split_util.c \ - serial.c - -# MCU name -#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 - -# -# 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) - -# Interrupt driven control endpoint task(+60) -OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT - - -# 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 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 ?= no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -BACKLIGHT_ENABLE ?= no # 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. -USE_I2C ?= yes -# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend - -CUSTOM_MATRIX = yes -SUBPROJECT_DEFAULT = rev2 -ifndef QUANTUM_DIR ->>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df include ../../Makefile endif \ No newline at end of file diff --git a/keyboards/lets_split/config.h b/keyboards/lets_split/config.h index 91b11f03..1b7bbcbb 100644 --- a/keyboards/lets_split/config.h +++ b/keyboards/lets_split/config.h @@ -61,20 +61,11 @@ along with this program. If not, see . //#define NO_ACTION_ONESHOT //#define NO_ACTION_MACRO //#define NO_ACTION_FUNCTION -<<<<<<< HEAD -======= -<<<<<<< HEAD ->>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df + #ifdef SUBPROJECT_rev1 #include "rev1/config.h" #endif #ifdef SUBPROJECT_rev2 #include "rev2/config.h" #endif -#endif -<<<<<<< HEAD -======= - - - ->>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df +#endif \ No newline at end of file diff --git a/keyboards/lets_split/keymaps/default/keymap.c b/keyboards/lets_split/keymaps/default/keymap.c index 41b9b8d8..6f1f71f5 100644 --- a/keyboards/lets_split/keymaps/default/keymap.c +++ b/keyboards/lets_split/keymaps/default/keymap.c @@ -29,7 +29,6 @@ enum custom_keycodes { #define XXXXXXX KC_NO const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -<<<<<<< HEAD /* Qwerty * ,-----------------------------------------------------------------------------------. @@ -83,29 +82,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH, \ KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_ENT , \ ADJUST, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ -======= -[0] = KEYMAP( \ - KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, \ - 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_ENT , \ - KC_LCTL, _LOWER, KC_LGUI, KC_LALT, MO(_LOWER), KC_SPC, KC_SPC, MO(_RAISE), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ ->>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df ), [3] = KEYMAP( \ 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_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \ _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),_______, _______, _______, \ -<<<<<<< HEAD _______, _______, _______, _______, _______, KC_BSPC, MT(MOD_LSFT, KC_BSPC), _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ -======= - _______, _______, _______, _______, _______, KC_BSPC, KC_BSPC, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ ->>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df ), [4] = KEYMAP( \ 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_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, \ _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, _______, _______, _______, \ -<<<<<<< HEAD _______, _______, _______, _______, _______, KC_ENT, MT(MOD_LSFT, KC_ENT), _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ ), @@ -126,12 +113,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, RGB_TOG,RGB_MOD,RGB_HUI,RGB_HUD,RGB_SAI,RGB_SAD,RGB_VAI,RGB_VAD, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ ) - - -======= - _______, _______, _______, _______, _______, KC_ENT, KC_ENT, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ -), ->>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df }; #ifdef AUDIO_ENABLE diff --git a/keyboards/lets_split/lets_split.c b/keyboards/lets_split/lets_split.c index 8bb33f95..117b727a 100644 --- a/keyboards/lets_split/lets_split.c +++ b/keyboards/lets_split/lets_split.c @@ -1,6 +1 @@ -#include "lets_split.h" - -<<<<<<< HEAD -======= - ->>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df +#include "lets_split.h" \ No newline at end of file diff --git a/keyboards/lets_split/rev1/config.h b/keyboards/lets_split/rev1/config.h index da5b4767..825e5ec2 100644 --- a/keyboards/lets_split/rev1/config.h +++ b/keyboards/lets_split/rev1/config.h @@ -25,11 +25,8 @@ along with this program. If not, see . #define PRODUCT_ID 0x3060 #define DEVICE_VER 0x0001 #define MANUFACTURER Wootpatoot -<<<<<<< HEAD #define PRODUCT Lets Split -======= #define PRODUCT Lets Split v1 ->>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df #define DESCRIPTION A split keyboard for the cheap makers /* key matrix size */ @@ -44,15 +41,11 @@ along with this program. If not, see . #define CATERINA_BOOTLOADER // #define USE_I2C - -<<<<<<< HEAD // Use serial if not using I2C #ifndef USE_I2C # define USE_SERIAL #endif -======= ->>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df // #define EE_HANDS #define I2C_MASTER_LEFT @@ -80,21 +73,6 @@ along with this program. If not, see . keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ ) -/* ws2812 RGB LED */ -<<<<<<< HEAD -#define RGB_DI_PIN D4 -#define RGBLIGHT_TIMER -#define RGBLED_NUM 8 // Number of LEDs -======= -#define ws2812_PORTREG PORTD -#define ws2812_DDRREG DDRD -#define ws2812_pin PD1 -#define RGBLED_NUM 28 // Number of LEDs ->>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df -#define RGBLIGHT_HUE_STEP 10 -#define RGBLIGHT_SAT_STEP 17 -#define RGBLIGHT_VAL_STEP 17 - /* * Feature disable options * These options are also useful to firmware size reduction. @@ -113,8 +91,4 @@ along with this program. If not, see . //#define NO_ACTION_MACRO //#define NO_ACTION_FUNCTION -<<<<<<< HEAD -#endif -======= #endif ->>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df diff --git a/keyboards/lets_split/rev1/rev1.c b/keyboards/lets_split/rev1/rev1.c index 41dd1e35..c505d3a6 100644 --- a/keyboards/lets_split/rev1/rev1.c +++ b/keyboards/lets_split/rev1/rev1.c @@ -24,15 +24,9 @@ void matrix_init_kb(void) { }; void shutdown_user(void) { -<<<<<<< HEAD #ifdef AUDIO_ENABLE PLAY_NOTE_ARRAY(tone_goodbye, false, 0); _delay_ms(150); stop_all_notes(); #endif -======= - PLAY_NOTE_ARRAY(tone_goodbye, false, 0); - _delay_ms(150); - stop_all_notes(); ->>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df } diff --git a/keyboards/lets_split/rev1/rev1.h b/keyboards/lets_split/rev1/rev1.h index 998b2be7..4667c9fb 100644 --- a/keyboards/lets_split/rev1/rev1.h +++ b/keyboards/lets_split/rev1/rev1.h @@ -1,15 +1,12 @@ #ifndef REV1_H #define REV1_H -<<<<<<< HEAD #include "../lets_split.h" //void promicro_bootloader_jmp(bool program); -======= #include "quantum.h" -void promicro_bootloader_jmp(bool program); ->>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df +//void promicro_bootloader_jmp(bool program); #define KEYMAP( \ k00, k01, k02, k03, k04, k05, k40, k41, k42, k43, k44, k45, \ diff --git a/keyboards/lets_split/rev2/config.h b/keyboards/lets_split/rev2/config.h index 19c137e5..e9689d77 100644 --- a/keyboards/lets_split/rev2/config.h +++ b/keyboards/lets_split/rev2/config.h @@ -41,14 +41,11 @@ along with this program. If not, see . // #define USE_I2C -<<<<<<< HEAD // Use serial if not using I2C #ifndef USE_I2C # define USE_SERIAL #endif -======= ->>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df // #define EE_HANDS #define I2C_MASTER_LEFT @@ -77,19 +74,11 @@ along with this program. If not, see . ) /* ws2812 RGB LED */ -<<<<<<< HEAD #define RGB_DI_PIN D3 #define RGBLIGHT_TIMER #define RGBLED_NUM 12 // Number of LEDs -======= #define ws2812_PORTREG PORTD #define ws2812_DDRREG DDRD -#define ws2812_pin PD1 -#define RGBLED_NUM 28 // Number of LEDs ->>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df -#define RGBLIGHT_HUE_STEP 10 -#define RGBLIGHT_SAT_STEP 17 -#define RGBLIGHT_VAL_STEP 17 /* * Feature disable options @@ -109,8 +98,5 @@ along with this program. If not, see . //#define NO_ACTION_MACRO //#define NO_ACTION_FUNCTION -<<<<<<< HEAD -#endif -======= -#endif ->>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df + +#endif \ No newline at end of file diff --git a/keyboards/lets_split/rev2/rev2.c b/keyboards/lets_split/rev2/rev2.c index 41dd1e35..c505d3a6 100644 --- a/keyboards/lets_split/rev2/rev2.c +++ b/keyboards/lets_split/rev2/rev2.c @@ -24,15 +24,9 @@ void matrix_init_kb(void) { }; void shutdown_user(void) { -<<<<<<< HEAD #ifdef AUDIO_ENABLE PLAY_NOTE_ARRAY(tone_goodbye, false, 0); _delay_ms(150); stop_all_notes(); #endif -======= - PLAY_NOTE_ARRAY(tone_goodbye, false, 0); - _delay_ms(150); - stop_all_notes(); ->>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df } diff --git a/keyboards/lets_split/rev2/rev2.h b/keyboards/lets_split/rev2/rev2.h index 9e251ca5..990976de 100644 --- a/keyboards/lets_split/rev2/rev2.h +++ b/keyboards/lets_split/rev2/rev2.h @@ -1,15 +1,12 @@ #ifndef REV2_H #define REV2_H -<<<<<<< HEAD #include "../lets_split.h" //void promicro_bootloader_jmp(bool program); -======= #include "quantum.h" -void promicro_bootloader_jmp(bool program); ->>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df +//void promicro_bootloader_jmp(bool program); #define KEYMAP( \ k00, k01, k02, k03, k04, k05, k45, k44, k43, k42, k41, k40, \ diff --git a/keyboards/maxipad/Makefile b/keyboards/maxipad/Makefile index c6566514..57b2ef62 100644 --- a/keyboards/maxipad/Makefile +++ b/keyboards/maxipad/Makefile @@ -1,81 +1,3 @@ -<<<<<<< HEAD ifndef MAKEFILE_INCLUDED include ../../Makefile endif -======= - - -# MCU name -#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 - - -# -# 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) - -# Interrupt driven control endpoint task(+60) -OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT - - -# Boot Section Size in *bytes* -# Teensy halfKay 512 -# Teensy++ halfKay 1024 -# Atmel DFU loader 4096 -# LUFA bootloader 4096 -# USBaspLoader 2048 -OPT_DEFS += -DBOOTLOADER_SIZE=512 - - -# 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 ?= yes # Console for debug(+400) -COMMAND_ENABLE ?= yes # 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 - - ->>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df diff --git a/keyboards/maxipad/config.h b/keyboards/maxipad/config.h index 4a942aae..fbe64a5b 100644 --- a/keyboards/maxipad/config.h +++ b/keyboards/maxipad/config.h @@ -24,15 +24,10 @@ along with this program. If not, see . #define VENDOR_ID 0xFEED #define PRODUCT_ID 0x6060 #define DEVICE_VER 0x0001 -<<<<<<< HEAD -#define MANUFACTURER You -#define PRODUCT maxipad -#define DESCRIPTION A custom keyboard -======= #define MANUFACTURER Wootpatoot #define PRODUCT maxipad -#define DESCRIPTION g8ming keeb ->>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df +#define DESCRIPTION A custom keyboard + /* key matrix size */ #define MATRIX_ROWS 5 diff --git a/keyboards/maxipad/keymaps/default/keymap.c b/keyboards/maxipad/keymaps/default/keymap.c index 5e3a594c..43ace324 100644 --- a/keyboards/maxipad/keymaps/default/keymap.c +++ b/keyboards/maxipad/keymaps/default/keymap.c @@ -10,15 +10,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = KEYMAP( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, \ -<<<<<<< HEAD KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, \ KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, \ -======= KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ ->>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS \ ), }; From b085a34506bc981a7c7cdb270b7786d6a4cbf985 Mon Sep 17 00:00:00 2001 From: climbalima Date: Wed, 16 Nov 2016 20:44:49 -0500 Subject: [PATCH 24/25] fixed readme conflicts --- keyboards/maxipad/readme.md | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/keyboards/maxipad/readme.md b/keyboards/maxipad/readme.md index 1971ce1f..ab7b122f 100644 --- a/keyboards/maxipad/readme.md +++ b/keyboards/maxipad/readme.md @@ -1,13 +1,7 @@ -maxipad keyboard firmware -====================== - ## Quantum MK Firmware -<<<<<<< HEAD For the full Quantum feature list, see [the parent readme](/). -======= -For the full Quantum feature list, see [the parent readme.md](/doc/readme.md). ->>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df + ## Building @@ -17,17 +11,13 @@ Depending on which keymap you would like to use, you will have to compile slight ### Default -<<<<<<< HEAD -To build with the default keymap, simply run `make default`. -======= To build with the default keymap, simply run `make`. ->>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df + ### 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 a folder with the name of your keymap in the keymaps folder, and see keymap documentation (you can find in top readme.md) and existant keymap files. -<<<<<<< HEAD To build the firmware binary hex file with a keymap just do `make` with a keymap like this: ``` @@ -35,12 +25,4 @@ $ make [default|jack|] ``` Keymaps follow the format **__\.c__** and are stored in the `keymaps` folder. -======= -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 **__keymap.c__** and are stored in folders in the `keymaps` folder, eg `keymaps/my_keymap/` ->>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df From a06115df19a74d39b08758472b221e630c3680d3 Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Fri, 18 Nov 2016 23:20:07 -0500 Subject: [PATCH 25/25] don't always detect a matrix change (fixes debounce) --- quantum/matrix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quantum/matrix.c b/quantum/matrix.c index 3c488b41..07eb87bc 100644 --- a/quantum/matrix.c +++ b/quantum/matrix.c @@ -310,7 +310,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) // Unselect row unselect_row(current_row); - return (last_row_value == current_matrix[current_row]); + return (last_row_value != current_matrix[current_row]); } static void select_row(uint8_t row)