Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed mitosis-mjt audio #1653

Merged
merged 39 commits into from
Aug 30, 2017
Merged

Fixed mitosis-mjt audio #1653

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
459f3e7
copied mjt keymaps from archive
mterhar Jul 6, 2017
4888f02
All mjt boards now compile
mterhar Jul 6, 2017
418c00d
fixed jd45-mjt breathing
mterhar Jul 6, 2017
4ffa609
Updates to fix SpaceFN but not tested yet.
mterhar Jul 6, 2017
5c0dbc0
Still missing either spacebar or an adjacent keypress.
mterhar Jul 6, 2017
b74b8a3
Debugging rigged up for use with hid_listen.
mterhar Jul 7, 2017
b3ac527
Reverted the default keymap to use tap_layer_key rather than custom. …
mterhar Jul 7, 2017
3382aec
Fixed the lower-left side of the keymap, which needed more spacers du…
mterhar Jul 7, 2017
4393058
Cleaned up JD45 keymap that uses tapkey.
mterhar Jul 7, 2017
7f1f446
Redid minivan keymap with numsym rather than raise/lower.
mterhar Aug 22, 2017
15239aa
Created my MJT keymap for HHKB
mterhar Aug 23, 2017
5ee0f69
Minor keymap fixes to make them compile without errors.
mterhar Aug 23, 2017
ea7b4d6
Added home/end to right arrow cluster on DYN layer.
mterhar Aug 23, 2017
3573d14
Added more keys to fn and dyn layers.
mterhar Aug 23, 2017
7e2c811
It wasn't using my custom layer last time somehow...? Now it will.
mterhar Aug 23, 2017
6fcefe9
Compiled and installed at end of day on 8/23
mterhar Aug 23, 2017
5e45c1c
Moved macros to FKEY layer because Adjust was too hard to get into an…
mterhar Aug 24, 2017
58e6f44
Fixed volume controls... were reversed and disabled.
mterhar Aug 24, 2017
ea4f448
Added F13-F15 back to fkeys layer in Minivan
mterhar Aug 24, 2017
e59e30d
Created new Planck Keymap that uses the NumSym and FKeys layer approa…
mterhar Aug 24, 2017
d829ceb
Removed DYN layer.
mterhar Aug 24, 2017
d820f86
Fixed diagram in planck numsym.
mterhar Aug 24, 2017
8d610c0
Merge pull request #1 from qmk/master
mterhar Aug 25, 2017
b2c2685
Merge pull request #1 from qmk/master
mterhar Aug 25, 2017
d7db968
Merge branch 'master' of https://github.com/mterhar/qmk_firmware
mterhar Aug 25, 2017
43605f0
Cleanup for pull request.
mterhar Aug 25, 2017
1983328
Roadkit flip phone warning.
mterhar Aug 25, 2017
9cbb932
Replaced PLAY_NOTES_ARRAY to PLAY_SONG
mterhar Aug 25, 2017
53a835f
Merge remote-tracking branch 'qmk/master'
mterhar Aug 26, 2017
b045dbd
reset the submodules
mterhar Aug 26, 2017
98cbd25
checked out specific commits for submodules
mterhar Aug 26, 2017
ae21fca
Removed debugging from JD45 shared config.h
mterhar Aug 26, 2017
ef07868
Moved custom rules.mk to apropriate keymap
mterhar Aug 26, 2017
3d3cc50
Trailing return issue in rules.mk
mterhar Aug 26, 2017
5e34f55
Merge branch 'qmk/master'
mterhar Aug 28, 2017
50e34a6
Mitosis music troubleshooting
mterhar Aug 28, 2017
7f2ac61
Fixed mitosis audio
mterhar Aug 28, 2017
c1338b1
Merge branch 'qmk/master'
mterhar Aug 28, 2017
251bc96
Put mitosis/rules.mk back to QMK master
mterhar Aug 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixed the lower-left side of the keymap, which needed more spacers du… 
…e to the matrix being directly put into the array rather than using the keymap function.
  • Loading branch information
@mterhar
mterhar committed Jul 7, 2017
commit 3382aec611a2e8e1f1cfc30b60c187bbd270bdf4
14 changes: 7 additions & 7 deletions keyboards/jd45/keymaps/mjt6u/keymap-debug.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,43 +40,43 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
{FKEYTAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS, KC_BSPC},
{CTL_T(KC_ESC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, LT(2, KC_QUOT)},
{KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SFT_T(KC_ENT)},
{ XXXXXXX, KC_LALT, KC_LGUI, XXXXXXX, XXXXXXX, XXXXXXX, FNSPC, MO(_FUNCTION), MO(_ADJUST), XXXXXXX }
{ XXXXXXX, KC_LALT, KC_LGUI, XXXXXXX, XXXXXXX, XXXXXXX, FNSPC, XXXXXXX, XXXXXXX, MO(_FUNCTION), MO(_ADJUST), XXXXXXX }
},
[_QWERTYNUMMODS] = {
{ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
{ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
{ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
{XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX,_______, _______, _______, XXXXXXX }
{XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX,_______, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX }
},
[_NUMSYM] = {
{KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, KC_DEL},
{__MOD__, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, _______, _______},
{_______, _______, _______, _______, _______, KC_SPC, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, _______},
{XXXXXXX, __MOD__, __MOD__, XXXXXXX, XXXXXXX, XXXXXXX, _______, __MOD__, __MOD__, XXXXXXX}
{XXXXXXX, __MOD__, __MOD__, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, __MOD__, __MOD__, XXXXXXX}
},
[_FUNCTION] = {
{__MOD__, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12},
{__MOD__, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
{_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
{XXXXXXX, __MOD__, __MOD__, XXXXXXX, XXXXXXX, XXXXXXX, _______, __MOD__, __MOD__, XXXXXXX }
{XXXXXXX, __MOD__, __MOD__, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, __MOD__, __MOD__, XXXXXXX }
},
[_NUMPAD] = {
{KC_GRV, _______, KC_UP, _______, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_PSCR, KC_LBRC, KC_RBRC},
{_______, KC_LEFT, KC_DOWN, KC_RGHT, KC_4, KC_5, KC_6, KC_INS, KC_HOME, KC_PGUP, _______, _______},
{_______, _______, _______, _______, KC_1, KC_2, KC_3, KC_DEL, KC_END, KC_PGDN, _______, _______},
{XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, XXXXXXX }
{XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX }
},
[_FKEYNUMPAD] = {
{_______, _______, KC_VOLU, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, _______, _______},
{_______, KC_MPRV, KC_VOLD, KC_MNXT, KC_F4, KC_F5, KC_F6, KC_J, KC_K, KC_L, KC_SCLN, _______},
{_______, _______, _______, _______, KC_F1, KC_F2, KC_F3, KC_MUTE, KC_MPRV, KC_MNXT, KC_MSTP, _______},
{XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, __MOD__, KC_PAUS, XXXXXXX }
{XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, __MOD__, KC_PAUS, XXXXXXX }
},
[_ADJUST] = {
{_______, RESET, _______, _______, _______, _______, _______, DYN_REC_START1, DYN_REC_START2, _______, KC_PSCR, _______, _______},
{ _______, _______, _______, _______, USEFNMODS, _______, _______, DYN_MACRO_PLAY1, DYN_MACRO_PLAY2, MACSLEEP, _______, _______},
{ _______, _______, _______, _______, _______, _______, USENUMMODS, _______, _______, _______, _______, _______},
{XXXXXXX, _______, _______,XXXXXXX, XXXXXXX, XXXXXXX, _______, __MOD__, __MOD__, XXXXXXX}
{XXXXXXX, _______, _______,XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, __MOD__, __MOD__, XXXXXXX}
}
};

Expand Down
36 changes: 20 additions & 16 deletions keyboards/jd45/keymaps/mjt6u/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,56 +34,60 @@ enum jd45_keycodes
#define __MOD__ KC_TRNS
#define XXXXXXX KC_NO
#define F_FNSPC F(0)
#define F_NUMSPC F(1)
#define F_FNTAB F(2)

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_QWERTY] = {
{FKEYTAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS, KC_BSPC},
{CTL_T(KC_ESC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, LT(2, KC_QUOT)},
{F_FNTAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS, KC_BSPC},
{CTL_T(KC_ESC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, LT(_ADJUST, KC_QUOT)},
{KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SFT_T(KC_ENT)},
{ XXXXXXX, KC_LALT, KC_LGUI, XXXXXXX, XXXXXXX, XXXXXXX, F_FNSPC, MO(_FUNCTION), MO(_ADJUST), XXXXXXX }
{ XXXXXXX, KC_LALT, KC_LGUI, XXXXXXX, XXXXXXX, XXXXXXX, F_FNSPC, XXXXXXX, XXXXXXX, MO(_FUNCTION), MO(_ADJUST) }
},
[_QWERTYNUMMODS] = {
{ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
{ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
{ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
{XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX,_______, _______, _______, XXXXXXX }
{F_FNTAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS, KC_BSPC},
{CTL_T(KC_ESC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, LT(_ADJUST, KC_QUOT)},
{KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SFT_T(KC_ENT)},
{XXXXXXX, KC_LALT, KC_LGUI, XXXXXXX, XXXXXXX, XXXXXXX, F_NUMSPC, XXXXXXX, XXXXXXX, MO(_FKEYNUMPAD), MO(_ADJUST) }
},
[_NUMSYM] = {
{KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, KC_DEL},
{__MOD__, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, _______, _______},
{_______, _______, _______, _______, _______, KC_SPC, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, _______},
{XXXXXXX, __MOD__, __MOD__, XXXXXXX, XXXXXXX, XXXXXXX, _______, __MOD__, __MOD__, XXXXXXX}
{XXXXXXX, __MOD__, __MOD__, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, __MOD__, __MOD__}
},
[_FUNCTION] = {
{__MOD__, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12},
{__MOD__, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
{__MOD__, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT, _______, _______},
{_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
{XXXXXXX, __MOD__, __MOD__, XXXXXXX, XXXXXXX, XXXXXXX, _______, __MOD__, __MOD__, XXXXXXX }
{XXXXXXX, __MOD__, __MOD__, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, __MOD__ , __MOD__}
},
[_NUMPAD] = {
{KC_GRV, _______, KC_UP, _______, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_PSCR, KC_LBRC, KC_RBRC},
{_______, KC_LEFT, KC_DOWN, KC_RGHT, KC_4, KC_5, KC_6, KC_INS, KC_HOME, KC_PGUP, _______, _______},
{_______, _______, _______, _______, KC_1, KC_2, KC_3, KC_DEL, KC_END, KC_PGDN, _______, _______},
{XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, XXXXXXX }
{XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, __MOD__, __MOD__}
},
[_FKEYNUMPAD] = {
{_______, _______, KC_VOLU, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, _______, _______},
{_______, KC_MPRV, KC_VOLD, KC_MNXT, KC_F4, KC_F5, KC_F6, KC_J, KC_K, KC_L, KC_SCLN, _______},
{_______, _______, _______, _______, KC_F1, KC_F2, KC_F3, KC_MUTE, KC_MPRV, KC_MNXT, KC_MSTP, _______},
{XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, __MOD__, KC_PAUS, XXXXXXX }
{XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, __MOD__, __MOD__ }
},
[_ADJUST] = {
{_______, RESET, _______, _______, _______, _______, _______, DYN_REC_START1, DYN_REC_START2, _______, KC_PSCR, _______, _______},
{ _______, _______, _______, _______, USEFNMODS, _______, _______, DYN_MACRO_PLAY1, DYN_MACRO_PLAY2, MACSLEEP, _______, _______},
{ _______, _______, _______, _______, USEFNMODS, _______, _______, DYN_MACRO_PLAY1, DYN_MACRO_PLAY2, MACSLEEP, _______, _______},
{ _______, _______, _______, _______, _______, _______, USENUMMODS, _______, _______, _______, _______, _______},
{XXXXXXX, _______, _______,XXXXXXX, XXXXXXX, XXXXXXX, _______, __MOD__, __MOD__, XXXXXXX}
{XXXXXXX, _______, _______,XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, __MOD__, __MOD__}
}
};


const uint16_t PROGMEM fn_actions[] = {
[0] = ACTION_LAYER_TAP_KEY(_NUMSYM, KC_SPC)
};
[0] = ACTION_LAYER_TAP_KEY(_NUMSYM, KC_SPC),
[1] = ACTION_LAYER_TAP_KEY(_NUMPAD, KC_SPC),
[2] = ACTION_LAYER_TAP_KEY(_FUNCTION, KC_TAB),
};


static uint16_t function_layer = _NUMSYM;
Expand Down