Commit Graph

4798 Commits (5ba228b684a32c1099efc6207842a56ff102961a)

Author SHA1 Message Date
Ole Anders 62faa20ef6 Merge remote-tracking branch 'refs/remotes/qmk/master' 2017-03-28 15:55:33 +02:00
Ole Anders d5ee0194ab fixed #1139 issues
A fix described by jackhumbert has been sorted out now.
2017-03-28 15:43:04 +02:00
Jack Humbert 5e4daf1c6d Merge pull request #1174 from nooges/atreus50
Add Atreus50 keyboard
2017-03-28 09:34:26 -04:00
Jack Humbert 7e37daa2ce Merge pull request #1112 from newsboytko/newsboytko/midi-keycodes
Flesh out MIDI support
2017-03-28 09:26:54 -04:00
Jack Humbert 216f669276 Merge pull request #1098 from lambdalisue/tapping-force-hold
Add TAPPING_FORCE_HOLD to regulate behaviour
2017-03-28 09:24:22 -04:00
Jack Humbert cc2fb56ed8 Merge pull request #1167 from smt/smt/satan
Add smt keymap for Satan 'GH60'
2017-03-28 09:18:55 -04:00
Jack Humbert fa09189195 Merge pull request #1162 from Khord/master
My customized keymap + some tunes for the song list
2017-03-28 09:17:16 -04:00
Danny Nguyen 71857ebc3f Move Atreus50 to hardwired directory and update README 2017-03-28 09:17:09 -04:00
Jack Humbert 6e688ad5c2 Merge pull request #1172 from nooges/hexwire-fixes
Let's Split hexwire keymap fixes
2017-03-28 09:16:47 -04:00
Jack Humbert 99b7b50130 Merge pull request #1157 from jtbarrett/tada68_default
Update readme and default layout for TADA68
2017-03-28 09:15:57 -04:00
Jack Humbert c948404739 Merge pull request #1180 from mattdibi/master
Italian layout for ergodox keyboard
2017-03-28 09:14:03 -04:00
Jack Humbert 8a0cf32cf5 Merge pull request #1171 from ishtob/master
SSD1306 I2C OLED display support for let's split
2017-03-28 09:13:41 -04:00
Jack Humbert 0f986a1951 Merge pull request #1168 from newsboytko/newsboytko/frosty-flake
Support Frosty Flake Controller (CM Storm QFR)
2017-03-28 09:10:55 -04:00
Jack Humbert a7811781c5 Merge pull request #1178 from cheesemacfly/master
XD60 different layout
2017-03-28 09:10:02 -04:00
Jack Humbert 417202109b Merge pull request #1163 from jprMesh/atreus62_KC_KEYMAP
Added KC_KEYMAP macro for old style keymaps in Atreus62
2017-03-28 09:09:35 -04:00
Jack Humbert ee6fbaaad8 Merge pull request #1177 from exiva/bluetooth_refactor
Refactor Bluetooth Handling
2017-03-28 09:08:10 -04:00
mattdibi 2104900030 Removed images from ergodox ez italian layout 2017-03-28 10:19:25 +02:00
mattdibi 221b27c508 Fixed layout title in ergodox ez italian keymap 2017-03-28 10:15:18 +02:00
mattdibi b9b9a59f22 Fixed italian kymap readme 2017-03-28 10:13:29 +02:00
mattdibi 512eb5e1d5 Updated readme 2017-03-28 10:10:24 +02:00
mattdibi b6b85ed413 Added italian layout 2017-03-28 09:56:07 +02:00
Nicolas Guelpa a32436d5a1 Create README.md 2017-03-26 15:20:44 -04:00
Nicolas Guelpa a89ee25db8 Add files via upload 2017-03-26 15:16:55 -04:00
Nicolas Guelpa c0a6c5f806 fixing layout 2017-03-26 15:07:19 -04:00
Nicolas Guelpa 739249ff0d Adding different layer 2017-03-24 20:18:59 -04:00
Travis La Marr 43eee52cba Add BLE and EZKey module defines.
Also restored serial init back to original location. Was getting junk data.
2017-03-24 17:14:57 -04:00
Travis La Marr b4ac0598fa Readd bluetooth output direction on standard key input. 2017-03-24 15:55:02 -04:00
Hugh Enxing 25f2295ba8 Swapped placement of `Ctrl` and `Alt` keys to match Technomancy's
default layout
2017-03-24 14:31:02 -04:00
Travis La Marr ddc036b69e Refactor Bluetooth Handling
Refactored Bluetooth support to make adding new Bluetooth modules
easier in the future.

* Remove `OUT_BLE` key from QMK's keymap. `OUT_BT` is all we need now
as there's no difference anymore.
* Made BLUETOOTH_ENABLE build option legacy as not to break existing
keymaps (Falls back to existing EZ Key support if on)
* Removed `ADAFRUIT_BLE_ENABLE` build option
* Created new build option `BLUETOOTH` with module option (Currently
`AdafruitEZKey` & `AdafruitBLE`)
* Moved all LUFA bluetooth key/mouse events under `BLUETOOTH_ENABLE`
ifdef with selected modules output.
2017-03-24 12:53:55 -04:00
Danny Nguyen 8775a13658 Add RGB support 2017-03-23 14:46:58 -04:00
Danny Nguyen 63e47a6425 Add RGB support for Let’s Split v1 2017-03-23 12:23:20 -04:00
Danny Nguyen 0520341ce4 Cleanup keymap 2017-03-23 11:31:07 -04:00
Danny Nguyen edfb50ea56 Initial commit for Atreus50 with working audio 2017-03-23 09:42:32 -04:00
Danny Nguyen e5c5902e95 Move keymap into config file 2017-03-23 08:51:29 -04:00
Danny Nguyen f3e3ff29a3 Add Makefile in keymap dir 2017-03-23 08:46:35 -04:00
Danny Nguyen 91776772fd Remove line for hands selection via EEPROM, reduce tap duration from 200ms to 150ms 2017-03-23 08:46:35 -04:00
ishtob 2573e581a5 Update readme.md 2017-03-22 15:56:45 -04:00
ishtob d5f56e91e4 Update i2c.c 2017-03-22 15:50:52 -04:00
ishtob bb413383ee Update i2c.c 2017-03-22 15:50:18 -04:00
ishtob 092416325b Update i2c.c 2017-03-22 15:49:21 -04:00
ishtob be0cfbb97e Update i2c.c 2017-03-22 15:48:56 -04:00
ishtob 732a7f2be9 Update matrix.c 2017-03-22 15:47:53 -04:00
ishtob ebb46694e5 Update split_util.c 2017-03-22 15:45:45 -04:00
ishtob 1f7b8a0343 Update matrix.c 2017-03-22 15:45:15 -04:00
ishtob d1865db599 OLED code cleanup 2017-03-22 15:19:01 -04:00
ishtob 80270a2791 Add files via upload 2017-03-22 15:14:33 -04:00
ishtob 30f4507492 OLED code cleanup 2017-03-22 15:11:03 -04:00
ishtob 65317a3a02 Added OLED SSD1306 support to I2C 2017-03-22 15:04:11 -04:00
ishtob 423c68c210 Merged Fliphalf, now defined in config, added OLED
Can now use the following in the keymap config.h to call the flipped matrix

```
#define FLIPHALF
```
2017-03-22 15:02:49 -04:00
ishtob 3a7083d810 Delete rules.mk 2017-03-22 15:00:00 -04:00