]> git.donarmstrong.com Git - qmk_firmware.git/log
qmk_firmware.git
7 years agoMerge pull request #932 from climbalima/master
Jack Humbert [Sun, 4 Dec 2016 18:53:25 +0000 (13:53 -0500)]
Merge pull request #932 from climbalima/master

Added ponoko svg for lets split

7 years agoMerge pull request #933 from priyadi/ps2_mouse_init_user2
Jack Humbert [Sun, 4 Dec 2016 18:52:17 +0000 (13:52 -0500)]
Merge pull request #933 from priyadi/ps2_mouse_init_user2

Implemented weak ps2_mouse_init_user()

7 years agosyntax error fix
Priyadi Iman Nurcahyo [Sun, 4 Dec 2016 18:22:40 +0000 (01:22 +0700)]
syntax error fix

7 years agoImplemented weak ps2_mouse_init_user()
Priyadi Iman Nurcahyo [Sun, 4 Dec 2016 18:07:12 +0000 (01:07 +0700)]
Implemented weak ps2_mouse_init_user()

There are a lot of PS/2 commands, some are vendor/device specific, so we
provide a weak ps2_mouse_init_user() to be implemented in each keyboard
that need it.

7 years agohaving trouble with conflicts
climbalima [Sat, 3 Dec 2016 22:37:41 +0000 (17:37 -0500)]
having trouble with conflicts

7 years agocleaned up personal projects
climbalima [Sat, 3 Dec 2016 22:30:40 +0000 (17:30 -0500)]
cleaned up personal projects

7 years agoMerge https://github.com/climbalima/qmk_firmware
climbalima [Sat, 3 Dec 2016 22:15:22 +0000 (17:15 -0500)]
Merge https://github.com/climbalima/qmk_firmware

7 years agoadded plate files for lets split
climbalima [Sat, 3 Dec 2016 22:09:11 +0000 (17:09 -0500)]
added plate files for lets split

7 years agoMerge branch 'master' of https://github.com/jackhumbert/qmk_firmware
climbalima [Sat, 3 Dec 2016 22:01:26 +0000 (17:01 -0500)]
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware

7 years agocleans-up formatting of readme
Jack Humbert [Sat, 3 Dec 2016 19:36:39 +0000 (14:36 -0500)]
cleans-up formatting of readme

7 years agoMerge pull request #931 from OferPlesser/feature/improve-ps2-mouse
Jack Humbert [Sat, 3 Dec 2016 15:13:11 +0000 (10:13 -0500)]
Merge pull request #931 from OferPlesser/feature/improve-ps2-mouse

Improving ps/2 mouse

7 years agoMerge pull request #916 from wez/ble_4
Jack Humbert [Sat, 3 Dec 2016 15:12:38 +0000 (10:12 -0500)]
Merge pull request #916 from wez/ble_4

Connect the adafruit ble code to the lufa main loop

7 years agoForgot to use define in delay instead of hardcoded number
Ofer Plesser [Sat, 3 Dec 2016 11:41:56 +0000 (13:41 +0200)]
Forgot to use define in delay instead of hardcoded number

7 years agoUpdated ps2 mouse documentation in readme
Ofer Plesser [Sat, 3 Dec 2016 11:11:37 +0000 (13:11 +0200)]
Updated ps2 mouse documentation in readme

7 years agoAdded back PS2_MOUSE_INIT_DELAY define
Ofer Plesser [Sat, 3 Dec 2016 11:09:42 +0000 (13:09 +0200)]
Added back PS2_MOUSE_INIT_DELAY define

7 years agoRefactored and improved ps2 mouse feature
ofples [Sat, 3 Dec 2016 11:05:02 +0000 (13:05 +0200)]
Refactored and improved ps2 mouse feature

7 years agoConnect the adafruit ble code to the lufa main loop
Wez Furlong [Mon, 28 Nov 2016 06:51:30 +0000 (22:51 -0800)]
Connect the adafruit ble code to the lufa main loop

There are now 3 potential locations to send HID reports:

1. USB
2. The bluefruit easy key
3. Adafruit BLE

Generally speaking, if USB is connected then we should prefer to
send the reports there; it is generally the best channel for this.

The bluefruit module has no feedback about bluetooth connectivity
so the code must speculatively send reports over both USB and bluetooth.

The BLE module has connectivity feedback.  In general we want to
prefer to send HID reports over USB while connected there, even
if BLE is connected.  Except that it is convenient to force them
over BLE while testing the implementation.

This policy has been extracted out into a where_to_send function
which returns a bitmask of which of the channels should be used.

7 years agoMerge pull request #930 from cbbrowne/master
Jack Humbert [Fri, 2 Dec 2016 20:21:04 +0000 (15:21 -0500)]
Merge pull request #930 from cbbrowne/master

Adds warnings to Planck keymaps that exceed 0x7000 bytes in size #929

7 years agoMerge pull request #929 from jackhumbert/hf/size-warnings
Jack Humbert [Fri, 2 Dec 2016 20:20:44 +0000 (15:20 -0500)]
Merge pull request #929 from jackhumbert/hf/size-warnings

Adds warnings to Planck keymaps that exceed 0x7000 bytes in size

7 years agoAdds warnings to Planck keymaps that exceed 0x7000 bytes in size #929
cbbrowne [Fri, 2 Dec 2016 19:12:55 +0000 (14:12 -0500)]
Adds warnings to Planck keymaps that exceed 0x7000 bytes in size #929

7 years agoadds warnings to 4 keymaps
Jack Humbert [Fri, 2 Dec 2016 18:32:50 +0000 (13:32 -0500)]
adds warnings to 4 keymaps

7 years agoMerge pull request #881 from NoahAndrews/patch-1
Jack Humbert [Fri, 2 Dec 2016 18:22:03 +0000 (13:22 -0500)]
Merge pull request #881 from NoahAndrews/patch-1

Recommend WSL on Windows 10 [Discussion]

7 years agoMerge pull request #915 from wez/ble_3
Jack Humbert [Fri, 2 Dec 2016 18:14:04 +0000 (13:14 -0500)]
Merge pull request #915 from wez/ble_3

Add support for Adafruit BLE modules

7 years agoMerge pull request #914 from wez/ble_2
Jack Humbert [Fri, 2 Dec 2016 18:12:56 +0000 (13:12 -0500)]
Merge pull request #914 from wez/ble_2

Add arduino-alike GPIO pin control helpers

7 years agoMerge pull request #913 from wez/ble_1
Jack Humbert [Fri, 2 Dec 2016 18:12:19 +0000 (13:12 -0500)]
Merge pull request #913 from wez/ble_1

Tidy up atomicity in timer.c and ring_buffer.h

7 years agoMerge pull request #924 from cbbrowne/master
Jack Humbert [Fri, 2 Dec 2016 18:06:31 +0000 (13:06 -0500)]
Merge pull request #924 from cbbrowne/master

Keymapping revs, revisions to documentation on API_SYSEX_ENABLE

7 years agoAnnotates nordic
Erez Zukerman [Fri, 2 Dec 2016 18:03:51 +0000 (13:03 -0500)]
Annotates nordic

7 years agoTweaks Kristian's layout again
Erez Zukerman [Fri, 2 Dec 2016 18:03:39 +0000 (13:03 -0500)]
Tweaks Kristian's layout again

7 years agoKristian's keymap
Erez Zukerman [Fri, 2 Dec 2016 17:53:18 +0000 (12:53 -0500)]
Kristian's keymap

7 years agoI also want page-down/page-up on UPPER layer
cbbrowne [Fri, 2 Dec 2016 17:35:03 +0000 (12:35 -0500)]
I also want page-down/page-up on UPPER layer

7 years agoI want page-down/page-up - put those on LOWER-Left/Right near bottom corner
cbbrowne [Fri, 2 Dec 2016 17:31:43 +0000 (12:31 -0500)]
I want page-down/page-up - put those on LOWER-Left/Right near bottom corner

7 years agoImprove docs on memory usage
cbbrowne [Thu, 1 Dec 2016 21:31:51 +0000 (16:31 -0500)]
Improve docs on memory usage

7 years agoImprove docs on SYSEX bit
cbbrowne [Thu, 1 Dec 2016 21:31:30 +0000 (16:31 -0500)]
Improve docs on SYSEX bit

7 years agoMore notes on .hex size protection
cbbrowne [Thu, 1 Dec 2016 21:24:03 +0000 (16:24 -0500)]
More notes on .hex size protection

7 years agoMake my builds smaller
cbbrowne [Thu, 1 Dec 2016 21:21:15 +0000 (16:21 -0500)]
Make my builds smaller

7 years agoMerge branch 'master' of https://github.com/jackhumbert/qmk_firmware
cbbrowne [Thu, 1 Dec 2016 17:54:16 +0000 (12:54 -0500)]
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware

7 years agoBetter layout
Erez Zukerman [Thu, 1 Dec 2016 03:22:57 +0000 (22:22 -0500)]
Better layout

7 years agoMerge branch 'master' of https://github.com/jackhumbert/qmk_firmware
cbbrowne [Tue, 29 Nov 2016 17:20:26 +0000 (12:20 -0500)]
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware

7 years agoMerge pull request #919 from jackhumbert/hf/robot_test_layout
Jack Humbert [Tue, 29 Nov 2016 16:22:31 +0000 (11:22 -0500)]
Merge pull request #919 from jackhumbert/hf/robot_test_layout

Test layout for ErgoDox EZ manufacturing robot

7 years agoTest layout for ErgoDox EZ manufacturing robot
Erez Zukerman [Tue, 29 Nov 2016 14:23:16 +0000 (09:23 -0500)]
Test layout for ErgoDox EZ manufacturing robot

7 years agoMerge pull request #918 from jackhumbert/wu5y7
Erez Zukerman [Tue, 29 Nov 2016 13:16:04 +0000 (08:16 -0500)]
Merge pull request #918 from jackhumbert/wu5y7

Adds Ergodox EZ RGB lights (both sides using I2C) and implements API base, Midi SysEx API

7 years agoMerge pull request #917 from gid0/master
Erez Zukerman [Tue, 29 Nov 2016 13:13:49 +0000 (08:13 -0500)]
Merge pull request #917 from gid0/master

keyboards/ergodox/keymaps/bepo : merge from author

7 years agoguess i didnt pull
Jack Humbert [Tue, 29 Nov 2016 05:11:11 +0000 (00:11 -0500)]
guess i didnt pull

7 years agoMerge branch 'wu5y7' of github.com:jackhumbert/qmk_firmware into wu5y7
Jack Humbert [Tue, 29 Nov 2016 05:10:06 +0000 (00:10 -0500)]
Merge branch 'wu5y7' of github.com:jackhumbert/qmk_firmware into wu5y7

7 years agoenable rgblight by default for ez
Jack Humbert [Tue, 29 Nov 2016 05:09:56 +0000 (00:09 -0500)]
enable rgblight by default for ez

7 years agoenable api sysex for ez
Jack Humbert [Tue, 29 Nov 2016 05:06:12 +0000 (00:06 -0500)]
enable api sysex for ez

7 years agoMerge branch 'master' of github.com:jackhumbert/qmk_firmware into wu5y7
Jack Humbert [Tue, 29 Nov 2016 04:51:07 +0000 (23:51 -0500)]
Merge branch 'master' of github.com:jackhumbert/qmk_firmware into wu5y7

7 years agoMerge branch 'master' of https://github.com/jackhumbert/qmk_firmware
cbbrowne [Mon, 28 Nov 2016 17:27:42 +0000 (12:27 -0500)]
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware

7 years agoAdd the AZERTY compatibility layer.
Olivier [Mon, 28 Nov 2016 15:38:03 +0000 (16:38 +0100)]
Add the AZERTY compatibility layer.

7 years agoChange layer names (cosmetic change) and reorder them so that the "shift" layer can...
Olivier [Mon, 28 Nov 2016 13:16:42 +0000 (14:16 +0100)]
Change layer names (cosmetic change) and reorder them so that the "shift" layer can be accessed from the "alt" layer when in QWERTY compat mode.

7 years agoTweaks position of TOG not to conflict with MO
Erez Zukerman [Mon, 28 Nov 2016 13:13:32 +0000 (08:13 -0500)]
Tweaks position of TOG not to conflict with MO

7 years agoA little cleanup, add some comments, change others.
Olivier [Mon, 28 Nov 2016 13:10:31 +0000 (14:10 +0100)]
A little cleanup, add some comments, change others.

7 years agoTweaks EZ Makefile
Erez Zukerman [Mon, 28 Nov 2016 12:59:01 +0000 (07:59 -0500)]
Tweaks EZ Makefile

7 years agoPulls LED config into common config for EZ
Erez Zukerman [Mon, 28 Nov 2016 12:55:02 +0000 (07:55 -0500)]
Pulls LED config into common config for EZ

7 years agoAdjust comment.
Olivier [Mon, 28 Nov 2016 10:21:23 +0000 (11:21 +0100)]
Adjust comment.

7 years agoReorganize the numeric keypad layer more like a traditional numeric keypad.
Olivier [Mon, 28 Nov 2016 10:20:00 +0000 (11:20 +0100)]
Reorganize the numeric keypad layer more like a traditional numeric keypad.

7 years agoAdd support for Adafruit BLE modules
Wez Furlong [Mon, 28 Nov 2016 06:48:04 +0000 (22:48 -0800)]
Add support for Adafruit BLE modules

This implements some helper functions that allow sending key reports
to an SPI based Bluetooth Low Energy module, such as the Adafruit
Feather 32u4 Bluefruit LE.

There is some plumbing required in lufa.c to enable this; that
is in a follow-on commit.

7 years agoAdd arduino-alike GPIO pin control helpers
Wez Furlong [Mon, 28 Nov 2016 06:43:11 +0000 (22:43 -0800)]
Add arduino-alike GPIO pin control helpers

Unlike the arduino functions, these don't take abstract pin numbers,
they take pin labels like `B0`.  Also, rather than taking very
generic parameter names, these take slightly more descriptive
enum values.

These improve the clarity of code that would otherwise be inscrutable
bit manipulation in tersely named port register names.

7 years agoTidy up atomicity in timer.c and ring_buffer.h
Wez Furlong [Mon, 28 Nov 2016 06:41:22 +0000 (22:41 -0800)]
Tidy up atomicity in timer.c and ring_buffer.h

Adopt the macros for saving/restoring the interrupt state
that are provided by the avr gcc environment.

Removing intialization of the timer value; this shaves off
a few bytes because globals are default initialized to zero.

7 years agoMerge https://github.com/jackhumbert/qmk_firmware
Olivier [Sun, 27 Nov 2016 22:23:21 +0000 (23:23 +0100)]
Merge https://github.com/jackhumbert/qmk_firmware

7 years agoseparated into api files/folder
Jack Humbert [Sat, 26 Nov 2016 20:37:46 +0000 (15:37 -0500)]
separated into api files/folder

7 years agoMerge pull request #908 from priyadi/promethium
Jack Humbert [Sat, 26 Nov 2016 18:40:42 +0000 (13:40 -0500)]
Merge pull request #908 from priyadi/promethium

My handwired keyboard firmware

7 years agoupdate docs
Priyadi Iman Nurcahyo [Sat, 26 Nov 2016 17:40:31 +0000 (00:40 +0700)]
update docs

7 years agoMerge pull request #907 from priyadi/unicode_docs
Jack Humbert [Sat, 26 Nov 2016 17:38:48 +0000 (12:38 -0500)]
Merge pull request #907 from priyadi/unicode_docs

Update Unicode documentation

7 years agoMerge pull request #906 from priyadi/unicode_map_fix_warning
Jack Humbert [Sat, 26 Nov 2016 17:38:10 +0000 (12:38 -0500)]
Merge pull request #906 from priyadi/unicode_map_fix_warning

fix strict-prototypes warning

7 years agoUpdate Unicode documentation
Priyadi Iman Nurcahyo [Sat, 26 Nov 2016 17:34:29 +0000 (00:34 +0700)]
Update Unicode documentation

7 years agofix strict-prototypes warning
Priyadi Iman Nurcahyo [Sat, 26 Nov 2016 16:53:15 +0000 (23:53 +0700)]
fix strict-prototypes warning

7 years agoMerge branch 'promethium' of github.com:priyadi/qmk_firmware into promethium
Priyadi Iman Nurcahyo [Sat, 26 Nov 2016 16:48:52 +0000 (23:48 +0700)]
Merge branch 'promethium' of github.com:priyadi/qmk_firmware into promethium

7 years agoremove ifdef on chip type
Priyadi Iman Nurcahyo [Sat, 26 Nov 2016 06:47:03 +0000 (13:47 +0700)]
remove ifdef on chip type

7 years agoprotocols.mk is already included in latest QMK
Priyadi Iman Nurcahyo [Sat, 26 Nov 2016 06:46:05 +0000 (13:46 +0700)]
protocols.mk is already included in latest QMK

7 years agochange init delay to 2000ms
Priyadi Iman Nurcahyo [Sat, 26 Nov 2016 06:44:50 +0000 (13:44 +0700)]
change init delay to 2000ms

7 years agoMy Promethium keyboard firmware
Priyadi Iman Nurcahyo [Sat, 26 Nov 2016 06:11:40 +0000 (13:11 +0700)]
My Promethium keyboard firmware

7 years agoMerge pull request #905 from priyadi/ps2_documentation
Jack Humbert [Sat, 26 Nov 2016 15:46:41 +0000 (10:46 -0500)]
Merge pull request #905 from priyadi/ps2_documentation

A few addition to PS2 documentation.

7 years agoMerge pull request #904 from priyadi/ps2_remove_hardcoded_pins
Jack Humbert [Sat, 26 Nov 2016 15:46:29 +0000 (10:46 -0500)]
Merge pull request #904 from priyadi/ps2_remove_hardcoded_pins

PS2 pins configuration belongs to each keyboards config.h

7 years agoremove define checks. didn't work because of include ordering.
Priyadi Iman Nurcahyo [Sat, 26 Nov 2016 08:57:48 +0000 (15:57 +0700)]
remove define checks. didn't work because of include ordering.

7 years agoadd macro error when a required define is missing
Priyadi Iman Nurcahyo [Sat, 26 Nov 2016 08:26:02 +0000 (15:26 +0700)]
add macro error when a required define is missing

7 years agoA few addition to PS2 documentation.
Priyadi Iman Nurcahyo [Sat, 26 Nov 2016 07:23:55 +0000 (14:23 +0700)]
A few addition to PS2 documentation.

7 years agoFix unterminated ifndef
Priyadi Iman Nurcahyo [Sat, 26 Nov 2016 07:02:38 +0000 (14:02 +0700)]
Fix unterminated ifndef

7 years agoPS2 pins configuration belongs to each keyboards config.h
Priyadi Iman Nurcahyo [Sat, 26 Nov 2016 06:55:41 +0000 (13:55 +0700)]
PS2 pins configuration belongs to each keyboards config.h

Each keyboard might have different pin configuration. And keeping this
here will trigger redefinition warning on keyboards that have PS2
defines.

7 years agoremove ifdef on chip type
Priyadi Iman Nurcahyo [Sat, 26 Nov 2016 06:47:03 +0000 (13:47 +0700)]
remove ifdef on chip type

7 years agoprotocols.mk is already included in latest QMK
Priyadi Iman Nurcahyo [Sat, 26 Nov 2016 06:46:05 +0000 (13:46 +0700)]
protocols.mk is already included in latest QMK

7 years agochange init delay to 2000ms
Priyadi Iman Nurcahyo [Sat, 26 Nov 2016 06:44:50 +0000 (13:44 +0700)]
change init delay to 2000ms

7 years agoMerge pull request #903 from priyadi/ps2_init_delay
Jack Humbert [Sat, 26 Nov 2016 06:34:49 +0000 (01:34 -0500)]
Merge pull request #903 from priyadi/ps2_init_delay

Make PS2 init delay configurable.

7 years agoMerge branch 'master' into promethium
Priyadi Iman Nurcahyo [Sat, 26 Nov 2016 06:31:17 +0000 (13:31 +0700)]
Merge branch 'master' into promethium

7 years agoMake PS2 init delay configurable. Some devices are not fully powered up
Priyadi Iman Nurcahyo [Sat, 26 Nov 2016 06:24:53 +0000 (13:24 +0700)]
Make PS2 init delay configurable. Some devices are not fully powered up
after 1s.

7 years agoMy Promethium keyboard firmware
Priyadi Iman Nurcahyo [Sat, 26 Nov 2016 06:11:40 +0000 (13:11 +0700)]
My Promethium keyboard firmware

7 years agoMerge branch 'master' of https://github.com/jackhumbert/qmk_firmware
cbbrowne [Fri, 25 Nov 2016 17:06:35 +0000 (12:06 -0500)]
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware

7 years agoMerge pull request #902 from OferPlesser/feature/ps2-mouse-support
Jack Humbert [Fri, 25 Nov 2016 16:22:44 +0000 (11:22 -0500)]
Merge pull request #902 from OferPlesser/feature/ps2-mouse-support

PS/2 mouse support

7 years agoAdded documentation for PS/2 mouse in readme
ofples [Fri, 25 Nov 2016 10:10:44 +0000 (12:10 +0200)]
Added documentation for PS/2 mouse in readme

7 years agoRemoved comment
ofples [Fri, 25 Nov 2016 07:20:41 +0000 (09:20 +0200)]
Removed comment

7 years agoAdded missing endif for ifdef __AVR_ATmega32U4__ and removed the unnecessary one...
ofples [Fri, 25 Nov 2016 07:17:40 +0000 (09:17 +0200)]
Added missing endif for ifdef __AVR_ATmega32U4__ and removed the unnecessary one at the end of the file

7 years agoAdded protocol.mk to build
ofples [Fri, 25 Nov 2016 07:15:12 +0000 (09:15 +0200)]
Added protocol.mk to build

7 years agoMerge pull request #899 from Wilba6582/suspend_fix
Jack Humbert [Fri, 25 Nov 2016 03:20:08 +0000 (22:20 -0500)]
Merge pull request #899 from Wilba6582/suspend_fix

Fixed NO_SUSPEND_POWER_DOWN handling

7 years agorgblight fixes
Jack Humbert [Thu, 24 Nov 2016 02:28:12 +0000 (21:28 -0500)]
rgblight fixes

7 years agotravis pls
Jack Humbert [Thu, 24 Nov 2016 01:16:38 +0000 (20:16 -0500)]
travis pls

7 years agoconverted to new format
Jack Humbert [Wed, 23 Nov 2016 23:52:02 +0000 (18:52 -0500)]
converted to new format

7 years agoMerge branch 'master' of https://github.com/jackhumbert/qmk_firmware
cbbrowne [Wed, 23 Nov 2016 22:47:16 +0000 (17:47 -0500)]
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware

7 years agoFixed NO_SUSPEND_POWER_DOWN handling
Wilba6582 [Wed, 23 Nov 2016 08:45:50 +0000 (19:45 +1100)]
Fixed NO_SUSPEND_POWER_DOWN handling

7 years agoconverted to 8bit messages
Jack Humbert [Wed, 23 Nov 2016 05:30:06 +0000 (00:30 -0500)]
converted to 8bit messages

7 years agoFixed NO_SUSPEND_POWER_DOWN handling
Wilba6582 [Wed, 23 Nov 2016 05:22:57 +0000 (16:22 +1100)]
Fixed NO_SUSPEND_POWER_DOWN handling