]> git.donarmstrong.com Git - qmk_firmware.git/log
qmk_firmware.git
7 years agochanged hotkey cluster to accomodate awkward software
Callum Oakley [Thu, 30 Mar 2017 12:22:16 +0000 (13:22 +0100)]
changed hotkey cluster to accomodate awkward software

7 years agoAdd RN42 Bluetooth module support
Travis La Marr [Thu, 30 Mar 2017 03:03:04 +0000 (23:03 -0400)]
Add RN42 Bluetooth module support

Added support for sending HID keycodes over the RN42/reflashed HC05 module. Tested on OS X and iOS.

7 years agoUpdate to match QMK keymap
Osamu Aoki [Sat, 11 Mar 2017 17:41:47 +0000 (02:41 +0900)]
Update to match QMK keymap

7 years agoTypo fix
Osamu Aoki [Mon, 13 Mar 2017 17:11:05 +0000 (17:11 +0000)]
Typo fix

7 years agoMerge branch 'master' into to_push
Zay950 [Wed, 29 Mar 2017 19:00:38 +0000 (12:00 -0700)]
Merge branch 'master' into to_push

7 years agoMerge pull request #1183 from Rovanion/real-master
Jack Humbert [Wed, 29 Mar 2017 13:45:22 +0000 (09:45 -0400)]
Merge pull request #1183 from Rovanion/real-master

Added instructions for how to build and flash the firmware with teensy_cli

7 years agoAdded link to the teensy linux page.
Rovanion Luckey [Wed, 29 Mar 2017 07:34:20 +0000 (09:34 +0200)]
Added link to the teensy linux page.

7 years agoClarify the quantum license (#1042)
skullydazed [Tue, 28 Mar 2017 22:20:36 +0000 (15:20 -0700)]
Clarify the quantum license (#1042)

* Clarify the license for files we have signoff on

* Update against the currently signed off files

* Remove unused and not clearly licensed headers

* Replace an #endif I accidentally removed while resolving merge conflicts

7 years agoMerge pull request #1182 from henxing/default_atreus_layout
Jack Humbert [Tue, 28 Mar 2017 18:12:41 +0000 (14:12 -0400)]
Merge pull request #1182 from henxing/default_atreus_layout

Default atreus layout

7 years agoMerge pull request #1139 from Swoy/master
Jack Humbert [Tue, 28 Mar 2017 18:12:21 +0000 (14:12 -0400)]
Merge pull request #1139 from Swoy/master

Satan Board "Admiral Strokers" keymap and config

7 years agotypo removed {3 ...
Ole Anders [Tue, 28 Mar 2017 16:45:26 +0000 (18:45 +0200)]
typo removed {3 ...

7 years agofixed capitalization issue (checkTime => checktime)
Ole Anders [Tue, 28 Mar 2017 16:41:04 +0000 (18:41 +0200)]
fixed capitalization issue (checkTime => checktime)

7 years agoMerge branch 'master' into default_atreus_layout
Hugh Enxing [Tue, 28 Mar 2017 16:11:49 +0000 (12:11 -0400)]
Merge branch 'master' into default_atreus_layout

7 years agomoved checktime out of function
Ole Anders [Tue, 28 Mar 2017 15:30:15 +0000 (17:30 +0200)]
moved checktime out of function

7 years agodeclaring checktime before the function it is used in.
Ole Anders [Tue, 28 Mar 2017 15:17:08 +0000 (17:17 +0200)]
declaring checktime before the function it is used in.

7 years agofixed function to not accept any arguments.
Ole Anders [Tue, 28 Mar 2017 15:08:01 +0000 (17:08 +0200)]
fixed function to not accept any arguments.

As per Pramod's comment on stack overflow:

In C int foo() and int foo(void) are different functions. int foo()
accepts an arbitrary number of arguments, while int foo(void) accepts 0
arguments. In C++ they mean the same thing. I suggest that you use void
consistently when you mean no arguments.

7 years agoremoved varable trace option from makefile
Ole Anders [Tue, 28 Mar 2017 14:55:25 +0000 (16:55 +0200)]
removed varable trace option from makefile

7 years agoslight cleanup as per recommendation
Ole Anders [Tue, 28 Mar 2017 14:52:56 +0000 (16:52 +0200)]
slight cleanup as per recommendation

7 years agoMoved key_timer out of function.
Ole Anders [Tue, 28 Mar 2017 14:50:44 +0000 (16:50 +0200)]
Moved key_timer out of function.

7 years agoremoved a carriage return
Ole Anders [Tue, 28 Mar 2017 13:58:46 +0000 (15:58 +0200)]
removed a carriage return

7 years agoMerge remote-tracking branch 'refs/remotes/qmk/master'
Ole Anders [Tue, 28 Mar 2017 13:55:33 +0000 (15:55 +0200)]
Merge remote-tracking branch 'refs/remotes/qmk/master'

7 years agofixed #1139 issues
Ole Anders [Tue, 28 Mar 2017 13:43:04 +0000 (15:43 +0200)]
fixed #1139 issues

A fix described by jackhumbert has been sorted out now.

7 years agoMerge pull request #1174 from nooges/atreus50
Jack Humbert [Tue, 28 Mar 2017 13:34:26 +0000 (09:34 -0400)]
Merge pull request #1174 from nooges/atreus50

Add Atreus50 keyboard

7 years agoMerge pull request #1112 from newsboytko/newsboytko/midi-keycodes
Jack Humbert [Tue, 28 Mar 2017 13:26:54 +0000 (09:26 -0400)]
Merge pull request #1112 from newsboytko/newsboytko/midi-keycodes

Flesh out MIDI support

7 years agoMerge pull request #1098 from lambdalisue/tapping-force-hold
Jack Humbert [Tue, 28 Mar 2017 13:24:22 +0000 (09:24 -0400)]
Merge pull request #1098 from lambdalisue/tapping-force-hold

Add TAPPING_FORCE_HOLD to regulate behaviour

7 years agoMerge pull request #1167 from smt/smt/satan
Jack Humbert [Tue, 28 Mar 2017 13:18:55 +0000 (09:18 -0400)]
Merge pull request #1167 from smt/smt/satan

Add smt keymap for Satan 'GH60'

7 years agoMerge pull request #1162 from Khord/master
Jack Humbert [Tue, 28 Mar 2017 13:17:16 +0000 (09:17 -0400)]
Merge pull request #1162 from Khord/master

My customized keymap + some tunes for the song list

7 years agoMove Atreus50 to hardwired directory and update README
Danny Nguyen [Tue, 28 Mar 2017 13:17:09 +0000 (09:17 -0400)]
Move Atreus50 to hardwired directory and update README

7 years agoMerge pull request #1172 from nooges/hexwire-fixes
Jack Humbert [Tue, 28 Mar 2017 13:16:47 +0000 (09:16 -0400)]
Merge pull request #1172 from nooges/hexwire-fixes

Let's Split hexwire keymap fixes

7 years agoMerge pull request #1157 from jtbarrett/tada68_default
Jack Humbert [Tue, 28 Mar 2017 13:15:57 +0000 (09:15 -0400)]
Merge pull request #1157 from jtbarrett/tada68_default

Update readme and default layout for TADA68

7 years agoMerge pull request #1180 from mattdibi/master
Jack Humbert [Tue, 28 Mar 2017 13:14:03 +0000 (09:14 -0400)]
Merge pull request #1180 from mattdibi/master

Italian layout for ergodox keyboard

7 years agoMerge pull request #1171 from ishtob/master
Jack Humbert [Tue, 28 Mar 2017 13:13:41 +0000 (09:13 -0400)]
Merge pull request #1171 from ishtob/master

SSD1306 I2C OLED display support for let's split

7 years agoMerge pull request #1168 from newsboytko/newsboytko/frosty-flake
Jack Humbert [Tue, 28 Mar 2017 13:10:55 +0000 (09:10 -0400)]
Merge pull request #1168 from newsboytko/newsboytko/frosty-flake

Support Frosty Flake Controller (CM Storm QFR)

7 years agoMerge pull request #1178 from cheesemacfly/master
Jack Humbert [Tue, 28 Mar 2017 13:10:02 +0000 (09:10 -0400)]
Merge pull request #1178 from cheesemacfly/master

XD60 different layout

7 years agoMerge pull request #1163 from jprMesh/atreus62_KC_KEYMAP
Jack Humbert [Tue, 28 Mar 2017 13:09:35 +0000 (09:09 -0400)]
Merge pull request #1163 from jprMesh/atreus62_KC_KEYMAP

Added KC_KEYMAP macro for old style keymaps in Atreus62

7 years agoMerge pull request #1177 from exiva/bluetooth_refactor
Jack Humbert [Tue, 28 Mar 2017 13:08:10 +0000 (09:08 -0400)]
Merge pull request #1177 from exiva/bluetooth_refactor

Refactor Bluetooth Handling

7 years agoRemoved images from ergodox ez italian layout
mattdibi [Tue, 28 Mar 2017 08:19:25 +0000 (10:19 +0200)]
Removed images from ergodox ez italian layout

7 years agoFixed layout title in ergodox ez italian keymap
mattdibi [Tue, 28 Mar 2017 08:15:18 +0000 (10:15 +0200)]
Fixed layout title in ergodox ez italian keymap

7 years agoFixed italian kymap readme
mattdibi [Tue, 28 Mar 2017 08:13:29 +0000 (10:13 +0200)]
Fixed italian kymap readme

7 years agoUpdated readme
mattdibi [Tue, 28 Mar 2017 08:10:24 +0000 (10:10 +0200)]
Updated readme

7 years agoAdded italian layout
mattdibi [Tue, 28 Mar 2017 07:56:07 +0000 (09:56 +0200)]
Added italian layout

7 years agoCreate README.md
Nicolas Guelpa [Sun, 26 Mar 2017 19:20:44 +0000 (15:20 -0400)]
Create README.md

7 years agoAdd files via upload
Nicolas Guelpa [Sun, 26 Mar 2017 19:16:55 +0000 (15:16 -0400)]
Add files via upload

7 years agofixing layout
Nicolas Guelpa [Sun, 26 Mar 2017 19:07:19 +0000 (15:07 -0400)]
fixing layout

7 years agoAdding different layer
Nicolas Guelpa [Sat, 25 Mar 2017 00:18:59 +0000 (20:18 -0400)]
Adding different layer

7 years agoAdd BLE and EZKey module defines.
Travis La Marr [Fri, 24 Mar 2017 21:14:57 +0000 (17:14 -0400)]
Add BLE and EZKey module defines.

Also restored serial init back to original location. Was getting junk data.

7 years agoReadd bluetooth output direction on standard key input.
Travis La Marr [Fri, 24 Mar 2017 19:55:02 +0000 (15:55 -0400)]
Readd bluetooth output direction on standard key input.

7 years agoSwapped placement of `Ctrl` and `Alt` keys to match Technomancy's
Hugh Enxing [Fri, 24 Mar 2017 18:31:02 +0000 (14:31 -0400)]
Swapped placement of `Ctrl` and `Alt` keys to match Technomancy's
default layout

7 years agoRefactor Bluetooth Handling
Travis La Marr [Fri, 24 Mar 2017 16:53:55 +0000 (12:53 -0400)]
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.

7 years agoAdd RGB support
Danny Nguyen [Thu, 23 Mar 2017 18:46:58 +0000 (14:46 -0400)]
Add RGB support

7 years agoAdd RGB support for Let’s Split v1
Danny Nguyen [Thu, 23 Mar 2017 16:23:20 +0000 (12:23 -0400)]
Add RGB support for Let’s Split v1

7 years agoCleanup keymap
Danny Nguyen [Thu, 23 Mar 2017 15:25:21 +0000 (11:25 -0400)]
Cleanup keymap

7 years agoInitial commit for Atreus50 with working audio
Danny Nguyen [Thu, 23 Mar 2017 13:42:32 +0000 (09:42 -0400)]
Initial commit for Atreus50 with working audio

7 years agoMove keymap into config file
Danny Nguyen [Thu, 23 Mar 2017 12:46:10 +0000 (08:46 -0400)]
Move keymap into config file

7 years agoAdd Makefile in keymap dir
Danny Nguyen [Wed, 15 Mar 2017 20:34:57 +0000 (16:34 -0400)]
Add Makefile in keymap dir

7 years agoRemove line for hands selection via EEPROM, reduce tap duration from 200ms to 150ms
Danny Nguyen [Wed, 15 Mar 2017 20:34:10 +0000 (16:34 -0400)]
Remove line for hands selection via EEPROM, reduce tap duration from 200ms to 150ms

7 years agoUpdate readme.md
ishtob [Wed, 22 Mar 2017 19:56:45 +0000 (15:56 -0400)]
Update readme.md

7 years agoUpdate i2c.c
ishtob [Wed, 22 Mar 2017 19:50:52 +0000 (15:50 -0400)]
Update i2c.c

7 years agoUpdate i2c.c
ishtob [Wed, 22 Mar 2017 19:50:18 +0000 (15:50 -0400)]
Update i2c.c

7 years agoUpdate i2c.c
ishtob [Wed, 22 Mar 2017 19:49:21 +0000 (15:49 -0400)]
Update i2c.c

7 years agoUpdate i2c.c
ishtob [Wed, 22 Mar 2017 19:48:56 +0000 (15:48 -0400)]
Update i2c.c

7 years agoUpdate matrix.c
ishtob [Wed, 22 Mar 2017 19:47:53 +0000 (15:47 -0400)]
Update matrix.c

7 years agoUpdate split_util.c
ishtob [Wed, 22 Mar 2017 19:45:45 +0000 (15:45 -0400)]
Update split_util.c

7 years agoUpdate matrix.c
ishtob [Wed, 22 Mar 2017 19:45:15 +0000 (15:45 -0400)]
Update matrix.c

7 years agoOLED code cleanup
ishtob [Wed, 22 Mar 2017 19:19:01 +0000 (15:19 -0400)]
OLED code cleanup

7 years agoAdd files via upload
ishtob [Wed, 22 Mar 2017 19:14:33 +0000 (15:14 -0400)]
Add files via upload

7 years agoOLED code cleanup
ishtob [Wed, 22 Mar 2017 19:11:03 +0000 (15:11 -0400)]
OLED code cleanup

7 years agoAdded OLED SSD1306 support to I2C
ishtob [Wed, 22 Mar 2017 19:04:11 +0000 (15:04 -0400)]
Added OLED SSD1306 support to I2C

7 years agoMerged Fliphalf, now defined in config, added OLED
ishtob [Wed, 22 Mar 2017 19:02:49 +0000 (15:02 -0400)]
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
```

7 years agoDelete rules.mk
ishtob [Wed, 22 Mar 2017 19:00:00 +0000 (15:00 -0400)]
Delete rules.mk

7 years agoDelete rev2fliphalf.h
ishtob [Wed, 22 Mar 2017 18:59:54 +0000 (14:59 -0400)]
Delete rev2fliphalf.h

7 years agoDelete rev2fliphalf.c
ishtob [Wed, 22 Mar 2017 18:59:42 +0000 (14:59 -0400)]
Delete rev2fliphalf.c

7 years agoDelete config.h
ishtob [Wed, 22 Mar 2017 18:59:32 +0000 (14:59 -0400)]
Delete config.h

7 years agoDelete Makefile
ishtob [Wed, 22 Mar 2017 18:59:20 +0000 (14:59 -0400)]
Delete Makefile

7 years agoAdd files via upload
ishtob [Wed, 22 Mar 2017 18:55:13 +0000 (14:55 -0400)]
Add files via upload

7 years agoFix a typo
skullY [Wed, 22 Mar 2017 05:24:34 +0000 (22:24 -0700)]
Fix a typo

7 years agoAdd #1170 to all the clueboard keymaps
skullY [Wed, 22 Mar 2017 05:06:47 +0000 (22:06 -0700)]
Add #1170 to all the clueboard keymaps

7 years agoMerge pull request #1170 from tengg/master
skullydazed [Wed, 22 Mar 2017 04:54:24 +0000 (21:54 -0700)]
Merge pull request #1170 from tengg/master

fixed a bug related to mod + Grave with combined ESC/Grave key

7 years agotypo fixed
tengg [Wed, 22 Mar 2017 04:33:44 +0000 (00:33 -0400)]
typo fixed

7 years agofix typo
tengg [Wed, 22 Mar 2017 04:28:59 +0000 (00:28 -0400)]
fix typo

7 years agofixed a bug related to mod + Grave with combined ESC/Grave key
tengg [Wed, 22 Mar 2017 04:03:30 +0000 (00:03 -0400)]
fixed a bug related to mod + Grave with combined ESC/Grave key

This only applies to keymaps that has combined esc/grave. Here we call it theKEY.
Think about the motion when we do shift + theKEY (typing ~), or CMD + theKEY (switching window on MAC). Based on the original code, we must do following sequence:  press shift -> press theKEY -> release theKEY -> release shift. However, it is very possible and natural that we do this stroke sequence instead: press shift -> press theKEY -> release shift -> release theKEY.

If we do the 2nd stroke sequence, the code will del_key(ESC) instead of (GRV) when we release theKEY. This caused some inconvenient issues and ghost typing.

By adding a flag, this issue is eliminated and will not affect any other functions.

7 years agoUse single _FUNC layer. Move RESET and base layout-changing keys to _FUNC.
Stephen Tudor [Mon, 20 Mar 2017 18:12:43 +0000 (14:12 -0400)]
Use single _FUNC layer. Move RESET and base layout-changing keys to _FUNC.

7 years agoMerge branch 'master' of https://github.com/Khord/qmk_firmware
Dylan Khor [Mon, 20 Mar 2017 17:16:19 +0000 (13:16 -0400)]
Merge branch 'master' of https://github.com/Khord/qmk_firmware

7 years agoadd pgup, pgdn, home, end
Dylan Khor [Mon, 20 Mar 2017 17:14:48 +0000 (13:14 -0400)]
add pgup, pgdn, home, end

7 years agoRemove tap-dance. Raise will be accessed via holding shift while lower is active
Stephen Tudor [Mon, 20 Mar 2017 11:43:45 +0000 (07:43 -0400)]
Remove tap-dance. Raise will be accessed via holding shift while lower is active

7 years agoUse normal backtick in ESC spot - I've mapped ESC to caps lock
Stephen Tudor [Mon, 20 Mar 2017 11:43:24 +0000 (07:43 -0400)]
Use normal backtick in ESC spot - I've mapped ESC to caps lock

7 years agoFix shift tap-dance (can't use one-shot layer)
Stephen Tudor [Mon, 20 Mar 2017 11:26:28 +0000 (07:26 -0400)]
Fix shift tap-dance (can't use one-shot layer)

7 years agoclean up config
Gabriel Young [Mon, 20 Mar 2017 04:18:15 +0000 (21:18 -0700)]
clean up config

7 years agoclean up docs and provide defaults for keymap
Gabriel Young [Mon, 20 Mar 2017 04:11:17 +0000 (21:11 -0700)]
clean up docs and provide defaults for keymap

7 years agoupdate docs
Gabriel Young [Mon, 20 Mar 2017 03:56:45 +0000 (20:56 -0700)]
update docs

7 years agofix whitespace
Gabriel Young [Mon, 20 Mar 2017 03:46:56 +0000 (20:46 -0700)]
fix whitespace

7 years agosupport LEDs
Gabriel Young [Mon, 20 Mar 2017 03:45:10 +0000 (20:45 -0700)]
support LEDs

7 years agoSwap rows and columns to match the schematic
Gabriel Young [Mon, 20 Mar 2017 03:33:41 +0000 (20:33 -0700)]
Swap rows and columns to match the schematic

7 years agostart to define keymap; annoying because rows and columns are swapped from schematic
Gabriel Young [Mon, 20 Mar 2017 02:55:55 +0000 (19:55 -0700)]
start to define keymap; annoying because rows and columns are swapped from schematic

7 years agosuccessfully read data from the matrix
Gabriel Young [Sun, 19 Mar 2017 22:59:21 +0000 (15:59 -0700)]
successfully read data from the matrix

7 years agoMissing comma
Dylan Khor [Sun, 19 Mar 2017 00:14:43 +0000 (00:14 +0000)]
Missing comma

7 years agoDon't feel like tap dancing arrows anymore
Dylan Khor [Sun, 19 Mar 2017 00:07:48 +0000 (00:07 +0000)]
Don't feel like tap dancing arrows anymore

7 years agosketch out frosty flake matrix using custom matrix.c based on kitten paw
Gabriel Young [Sat, 18 Mar 2017 23:19:10 +0000 (16:19 -0700)]
sketch out frosty flake matrix using custom matrix.c based on kitten paw

7 years agoboilerplate project created with new_project.sh
Gabriel Young [Sat, 18 Mar 2017 22:38:03 +0000 (15:38 -0700)]
boilerplate project created with new_project.sh

7 years agoMerge branch 'qmk/master'
Gabriel Young [Sat, 18 Mar 2017 21:48:27 +0000 (14:48 -0700)]
Merge branch 'qmk/master'