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

pulling from tmk #6

Merged
merged 47 commits into from
Mar 16, 2015
Merged

pulling from tmk #6

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
1a9cec9
Documentation: small mistake
cub-uanic Nov 20, 2014
60acd89
Fixing typo in console mode
bswinnerton Nov 30, 2014
a6d33e2
Added support for The Ghost Squid controller used for CM XT keyboard.
vovcacik Dec 28, 2014
02a9f8a
Update other_projects.md - added TMK/Ergodox
cub-uanic Jan 3, 2015
05795cb
Compensate timer during prower down
tmk Nov 26, 2014
9179246
Fix USB plug-in while BT mode falls to be enumerated
tmk Nov 26, 2014
20caf67
Fix lufa sendchar() infinite wait loop
tmk Nov 29, 2014
570bcb2
Add LUFA device state to command info
tmk Nov 29, 2014
de29f98
Update MEMO
tmk Nov 29, 2014
825be9d
Disable input buffer for ADC
tmk Dec 2, 2014
25aee43
Clean ADC code of battery_voltage()
tmk Dec 2, 2014
2d7973f
Fix: enable digital input for PF5
tmk Dec 2, 2014
86f82dd
Add wait for charging capacitance of ADC S/H
tmk Dec 3, 2014
ebe4373
Fix power saving while USB suspended
tmk Dec 3, 2014
160e02d
Change RN42 state display
tmk Dec 8, 2014
884c2ab
Update doc
tmk Dec 11, 2014
a679928
Fxi layer stuck of keymap_hasu
tmk Jan 5, 2015
4f121de
rn42: Add rn42_getc and rn42_gets
tmk Jan 10, 2015
1b95b3c
rn42: Add commands for RN-42
tmk Jan 10, 2015
3b3af3b
Increase buffer of rn42_gets() and change rn42_linked()
tmk Jan 11, 2015
2626a32
Use pgmspace for RN-42 commands
tmk Jan 11, 2015
517817b
rn42: Update doc
tmk Jan 15, 2015
65a2ce9
Merge branch 'rn42'
tmk Jan 15, 2015
3e88e8b
hhkb: Fix layer stuck of keymap_hasu
tmk Jan 15, 2015
ce66988
hhkb_rn42: Move doc
tmk Jan 15, 2015
099701d
hhkb: Integrate RN-42 support, remove hhkb_rn42
tmk Jan 16, 2015
c610bae
Merge branch 'rn42_integrate'
tmk Jan 16, 2015
f31cbc7
Changed hotkey for bootloader jump
xauser Nov 12, 2014
d9b5f51
Added NerD 60% support
xauser Nov 11, 2014
2d74020
Added NerD 80% (TKL) support
xauser Nov 23, 2014
07b54cb
Added missing keyboards to main README
xauser Dec 14, 2014
40fd75e
hhkb: Update RN-42 docs
tmk Jan 17, 2015
d32b955
Merge branch 'forhasu' of https://github.com/xauser/tmk_keyboard into…
tmk Jan 19, 2015
507e063
Revert "Changed hotkey for bootloader jump"
tmk Jan 19, 2015
8279226
Merge branch 'xauser-forhasu'
tmk Jan 19, 2015
1cda7b7
Fix typo 'keyobard' #166
tmk Jan 19, 2015
703ca9d
Merge pull request #164 from cub-uanic/patch-2
tmk Jan 19, 2015
a5122d5
Merge branch 'ghost_squid' of https://github.com/vovcacik/tmk_keyboar…
tmk Jan 19, 2015
2e75b13
Merge branch 'vovcacik-ghost_squid'
tmk Jan 19, 2015
aa95d6f
Merge pull request #151 from bswinnerton/typo-fix
tmk Jan 19, 2015
c1ac7f1
Merge pull request #148 from cub-uanic/patch-1
tmk Jan 19, 2015
771347c
Add external projects using tmk_keyboard
tmk Jan 19, 2015
012ec9e
NerD, turn BRK into PAUS to get bootloader jump back.
xauser Jan 19, 2015
e0f3274
Kitten Paw, fix main README link to project.
xauser Jan 20, 2015
e872dd2
Merge pull request #176 from xauser/forhasu
tmk Jan 25, 2015
abf482d
Fix call parameter of suspend_power_down()
tmk Jan 26, 2015
c35c428
infinity: For production model and add SpaceFn
tmk Mar 5, 2015
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
NerD, turn BRK into PAUS to get bootloader jump back.
  • Loading branch information
@xauser
xauser committed Jan 21, 2015
commit 012ec9e3794816e245acabac223c5be230ae67d3
2 changes: 1 addition & 1 deletion keyboard/nerd/keymap_60_ansi150.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
TRNS,TRNS,TRNS, FN1, TRNS,FN0, TRNS),
/* Layer 2: Functions */
KEYMAP_ANSI150(SLEP,F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, MUTE, \
TRNS,BTN1,MS_U,BTN3,PSCR,SLCK,BRK, HOME,INS, END, MPLY,VOLD,VOLU,FN3, \
TRNS,BTN1,MS_U,BTN3,PSCR,SLCK,PAUS,HOME,INS, END, MPLY,VOLD,VOLU,FN3, \
CAPS,MS_L,MS_D,MS_R,PGDN,TRNS,LEFT,DOWN,UP ,RGHT,MPRV,MNXT, FN2, \
UP, TRNS,DEL, TRNS,TRNS,PGUP,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
LEFT,DOWN,RGHT, TRNS, TRNS,TRNS,TRNS)
Expand Down
6 changes: 3 additions & 3 deletions keyboard/nerd/keymap_80_ansi150.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@

const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Layer 0: Default */
KEYMAP_ANSI150(ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR,SLCK, BRK, \
GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC, INS, HOME, PGUP, \
TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC,BSLS, DEL, END, PGDN, \
KEYMAP_ANSI150(ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR,SLCK,PAUS, \
GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC, INS, HOME,PGUP, \
TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC,BSLS, DEL, END, PGDN, \
CAPS,A, S, D, F, G, H, J, K, L, SCLN,QUOT, ENT, \
LSFT, Z, X, C, V, B, N, M, COMM,DOT, SLSH,RSFT, UP, \
LCTL,LGUI,LALT, SPC, RALT,FN0, RCTL, LEFT,DOWN,RGHT),
Expand Down