Code

pulling from tmk#6

Code

Merged

jackhumbert merged 47 commits intoqmk:masterqmk/qmk_firmware:masterfrom tmk:mastertmk/tmk_keyboard:masterCopy head branch name to clipboardMar 16, 2015

+2,626-1,805

Commits

Commits on Nov 20, 2014

• Documentation: small mistake

  Show description for 1a9cec9
  cub-uanic

  committed
  1a9cec9

  Copy full SHA for 1a9cec9

Commits on Nov 30, 2014

• Fixing typo in console mode

  bswinnerton

  committed
  60acd89

  Copy full SHA for 60acd89

Commits on Dec 28, 2014

• Added support for The Ghost Squid controller used for CM XT keyboard.

  Show description for a6d33e2
  vovcacik

  committed
  a6d33e2

  Copy full SHA for a6d33e2

Commits on Jan 3, 2015

• Update other_projects.md - added TMK/Ergodox

  cub-uanic

  committed
  02a9f8a

  Copy full SHA for 02a9f8a

Commits on Jan 15, 2015

• Compensate timer during prower down

  tmk

  committed
  05795cb

  Copy full SHA for 05795cb

• Fix USB plug-in while BT mode falls to be enumerated

  tmk

  committed
  9179246

  Copy full SHA for 9179246

• Fix lufa sendchar() infinite wait loop

  Show description for 20caf67
  tmk

  committed
  20caf67

  Copy full SHA for 20caf67

• Add LUFA device state to command info

  tmk

  committed
  570bcb2

  Copy full SHA for 570bcb2

• Update MEMO

  tmk

  committed
  de29f98

  Copy full SHA for de29f98

• Disable input buffer for ADC

  tmk

  committed
  825be9d

  Copy full SHA for 825be9d

• Clean ADC code of battery_voltage()

  tmk

  committed
  25aee43

  Copy full SHA for 25aee43

• Fix: enable digital input for PF5

  tmk

  committed
  2d7973f

  Copy full SHA for 2d7973f

• Add wait for charging capacitance of ADC S/H

  tmk

  committed
  86f82dd

  Copy full SHA for 86f82dd

• Fix power saving while USB suspended

  Show description for ebe4373
  tmk

  committed
  ebe4373

  Copy full SHA for ebe4373

• Change RN42 state display

  tmk

  committed
  160e02d

  Copy full SHA for 160e02d

• Update doc

  tmk

  committed
  884c2ab

  Copy full SHA for 884c2ab

• Fxi layer stuck of keymap_hasu

  Show description for a679928
  tmk

  committed
  a679928

  Copy full SHA for a679928

• rn42: Add rn42_getc and rn42_gets

  tmk

  committed
  4f121de

  Copy full SHA for 4f121de

• rn42: Add commands for RN-42

  tmk

  committed
  1b95b3c

  Copy full SHA for 1b95b3c

• Increase buffer of rn42_gets() and change rn42_linked()

  tmk

  committed
  3b3af3b

  Copy full SHA for 3b3af3b

• Use pgmspace for RN-42 commands

  tmk

  committed
  2626a32

  Copy full SHA for 2626a32

• rn42: Update doc

  tmk

  committed
  517817b

  Copy full SHA for 517817b

• Merge branch 'rn42'

  tmk

  committed
  65a2ce9

  Copy full SHA for 65a2ce9

• hhkb: Fix layer stuck of keymap_hasu

  Show description for 3e88e8b
  tmk

  committed
  3e88e8b

  Copy full SHA for 3e88e8b

• hhkb_rn42: Move doc

  tmk

  committed
  ce66988

  Copy full SHA for ce66988

Commits on Jan 16, 2015

• hhkb: Integrate RN-42 support, remove hhkb_rn42

  tmk

  committed
  099701d

  Copy full SHA for 099701d

• Merge branch 'rn42_integrate'

  tmk

  committed
  c610bae

  Copy full SHA for c610bae

Commits on Jan 18, 2015

• Changed hotkey for bootloader jump

  xauser

  committed
  f31cbc7

  Copy full SHA for f31cbc7

• Added NerD 60% support

  xauser

  committed
  d9b5f51

  Copy full SHA for d9b5f51

• Added NerD 80% (TKL) support

  xauser

  committed
  2d74020

  Copy full SHA for 2d74020

• Added missing keyboards to main README

  xauser

  committed
  07b54cb

  Copy full SHA for 07b54cb

Commits on Jan 19, 2015

• hhkb: Update RN-42 docs

  tmk

  committed
  40fd75e

  Copy full SHA for 40fd75e

• Merge branch 'forhasu' of https://github.com/xauser/tmk_keyboard into xauser-forhasu

  tmk

  committed
  d32b955

  Copy full SHA for d32b955

• Revert "Changed hotkey for bootloader jump"

  Show description for 507e063
  tmk

  committed
  507e063

  Copy full SHA for 507e063

• Merge branch 'xauser-forhasu'

  tmk

  committed
  8279226

  Copy full SHA for 8279226

• Fix typo 'keyobard' #166

  tmk

  committed
  1cda7b7

  Copy full SHA for 1cda7b7

• Merge pull request #164 from cub-uanic/patch-2

  Show description for 703ca9d
  tmk

  committed
  703ca9d

  Copy full SHA for 703ca9d

• Merge branch 'ghost_squid' of https://github.com/vovcacik/tmk_keyboard into vovcacik-ghost_squid

  Show description for a5122d5
  tmk

  committed
  a5122d5

  Copy full SHA for a5122d5

• Merge branch 'vovcacik-ghost_squid'

  tmk

  committed
  2e75b13

  Copy full SHA for 2e75b13

• Merge pull request #151 from bswinnerton/typo-fix

  Show description for aa95d6f
  tmk

  committed
  aa95d6f

  Copy full SHA for aa95d6f

• Merge pull request #148 from cub-uanic/patch-1

  Show description for c1ac7f1
  tmk

  committed
  c1ac7f1

  Copy full SHA for c1ac7f1

• Add external projects using tmk_keyboard

  tmk

  committed
  771347c

  Copy full SHA for 771347c

Commits on Jan 21, 2015

• NerD, turn BRK into PAUS to get bootloader jump back.

  xauser

  committed
  012ec9e

  Copy full SHA for 012ec9e

• Kitten Paw, fix main README link to project.

  xauser

  committed
  e0f3274

  Copy full SHA for e0f3274

Commits on Jan 25, 2015

• Merge pull request #176 from xauser/forhasu

  Show description for e872dd2
  tmk

  committed
  e872dd2

  Copy full SHA for e872dd2

Commits on Jan 26, 2015

• Fix call parameter of suspend_power_down()

  tmk

  committed
  abf482d

  Copy full SHA for abf482d

Commits on Mar 5, 2015

• infinity: For production model and add SpaceFn

  tmk

  committed
  c35c428

  Copy full SHA for c35c428