]>
git.donarmstrong.com Git - qmk_firmware.git/log
Jack Humbert [Thu, 1 Jun 2017 16:18:36 +0000 (12:18 -0400)]
Merge pull request #1294 from shieldsd/master
Prevent the recording of looping dynamic macros.
Daniel Shields [Thu, 11 May 2017 08:46:11 +0000 (09:46 +0100)]
Prevent the recording of looping dynamic macros.
If a macro play key is inadvertently recorded in a dynamic macro
a loop is created and the macro will not terminate when played.
This should be prevented.
Jack Humbert [Thu, 1 Jun 2017 15:19:40 +0000 (11:19 -0400)]
Merge pull request #1350 from originerd/add-originerd-planck-keymap
Add originerd planck keymap
Jack Humbert [Thu, 1 Jun 2017 15:19:20 +0000 (11:19 -0400)]
Merge pull request #1351 from Alfrheim/fixing_dvorak_layout
replacing one R for a T
Jack Humbert [Thu, 1 Jun 2017 15:18:56 +0000 (11:18 -0400)]
Merge pull request #1353 from 333fred/333fred-layout
ergodox/333fred layout
Jack Humbert [Thu, 1 Jun 2017 15:18:28 +0000 (11:18 -0400)]
Merge pull request #1354 from shieldsd/tweaks
Tweak reported power consumption to work with iOS
Daniel Shields [Thu, 25 May 2017 10:08:17 +0000 (11:08 +0100)]
Tweak reported power consumption to work with iOS
Fredric Silberberg [Thu, 1 Jun 2017 01:07:02 +0000 (18:07 -0700)]
Update licensing on visualizer.c
Fredric Silberberg [Thu, 1 Jun 2017 00:57:38 +0000 (17:57 -0700)]
Updated readme
Fredric Silberberg [Thu, 1 Jun 2017 00:42:50 +0000 (17:42 -0700)]
Added several new macros
Fredric Silberberg [Wed, 31 May 2017 17:27:39 +0000 (10:27 -0700)]
Fixed numpad 0 layout
Alfrheim [Wed, 31 May 2017 13:19:37 +0000 (15:19 +0200)]
replacing one R for a T
Jitae Kim [Wed, 31 May 2017 13:00:44 +0000 (22:00 +0900)]
Add originerd planck keymap
Fredric Silberberg [Wed, 31 May 2017 06:56:28 +0000 (23:56 -0700)]
Use code blocks for keyboard layouts
Fredric Silberberg [Wed, 31 May 2017 06:52:20 +0000 (23:52 -0700)]
Completed iteration 1 of my layout
Jack Humbert [Wed, 31 May 2017 03:12:11 +0000 (23:12 -0400)]
Merge pull request #1348 from Dbroqua/master
Added DK60 keyboard
Fredric Silberberg [Wed, 31 May 2017 01:01:09 +0000 (18:01 -0700)]
Added initial keymap files
dbroqua [Tue, 30 May 2017 21:10:14 +0000 (23:10 +0200)]
Merge remote-tracking branch 'origin/feature/DK60'
dbroqua [Tue, 30 May 2017 21:09:39 +0000 (23:09 +0200)]
- Updated copyright
Damien Broqua [Tue, 30 May 2017 20:17:20 +0000 (22:17 +0200)]
Merge remote-tracking branch 'origin/feature/DK60'
Damien Broqua [Tue, 30 May 2017 20:17:03 +0000 (22:17 +0200)]
- Updated readme
Damien Broqua [Tue, 30 May 2017 20:15:07 +0000 (22:15 +0200)]
Merge remote-tracking branch 'origin/feature/DK60'
Damien Broqua [Tue, 30 May 2017 20:13:34 +0000 (22:13 +0200)]
- Added Capslock/Esc led
Jack Humbert [Tue, 30 May 2017 19:38:22 +0000 (15:38 -0400)]
Merge pull request #1323 from nikchi/master
Variable tapping terms
Nick Choi [Tue, 30 May 2017 18:19:57 +0000 (14:19 -0400)]
hmm?
Nick Choi [Tue, 30 May 2017 18:17:48 +0000 (14:17 -0400)]
Merge pull request #2 from qmk/master
pull in new qmk changes
Jack Humbert [Tue, 30 May 2017 16:49:38 +0000 (12:49 -0400)]
Merge branch 'master' of https://github.com/qmk/qmk_firmware
Jack Humbert [Tue, 30 May 2017 16:49:26 +0000 (12:49 -0400)]
make qmk bot do the hard work
Jack Humbert [Tue, 30 May 2017 16:10:45 +0000 (12:10 -0400)]
Merge pull request #1342 from priyadi/adafruit-mouse-buttons
Adafruit Feather BLE / BLE Friend mouse buttons support
Jack Humbert [Tue, 30 May 2017 15:46:34 +0000 (11:46 -0400)]
Merge branch 'master' of https://github.com/qmk/qmk_firmware
Jack Humbert [Tue, 30 May 2017 15:46:25 +0000 (11:46 -0400)]
exclude PRs
Damien Broqua [Tue, 30 May 2017 14:59:56 +0000 (16:59 +0200)]
- Some changes on DK60
Nick Choi [Tue, 30 May 2017 01:25:50 +0000 (21:25 -0400)]
switched to uint8 and 16
Jack Humbert [Mon, 29 May 2017 19:17:38 +0000 (15:17 -0400)]
Merge pull request #1344 from qmk/jackhumbert-patch-1
Re-enable mouse buttons from #1327
Jack Humbert [Mon, 29 May 2017 17:21:38 +0000 (13:21 -0400)]
Re-enable mouse buttons
Jack Humbert [Mon, 29 May 2017 16:49:25 +0000 (12:49 -0400)]
no master needed on push maybe
Jack Humbert [Mon, 29 May 2017 16:15:03 +0000 (12:15 -0400)]
Merge branch 'master' of https://github.com/qmk/qmk_firmware
Jack Humbert [Mon, 29 May 2017 16:14:49 +0000 (12:14 -0400)]
push to git url
Priyadi Iman Nurcahyo [Mon, 29 May 2017 16:10:34 +0000 (23:10 +0700)]
Jokrik's Clueboard layout (#1340)
Jack Humbert [Mon, 29 May 2017 15:58:08 +0000 (11:58 -0400)]
Merge pull request #1343 from Maartenwut/patch-1
Added SEND_STRING(); to the documentation.
Jack Humbert [Mon, 29 May 2017 15:56:54 +0000 (11:56 -0400)]
Merge pull request #1337 from fredizzimo/wsl_setup
Add script for setting up Windows Subsystem for Linux
Maarten Dekkers [Mon, 29 May 2017 15:53:39 +0000 (17:53 +0200)]
Added SEND_STRING(); to the documentation.
Jack Humbert [Mon, 29 May 2017 15:37:33 +0000 (11:37 -0400)]
Merge branch 'master' of https://github.com/qmk/qmk_firmware
Jack Humbert [Mon, 29 May 2017 15:37:20 +0000 (11:37 -0400)]
get rid of folders in tar
Jack Humbert [Mon, 29 May 2017 14:55:32 +0000 (10:55 -0400)]
Merge pull request #1341 from Dbroqua/patch-3
Update Differences-from-TMK.md
Jack Humbert [Mon, 29 May 2017 14:54:56 +0000 (10:54 -0400)]
Merge branch 'master' of https://github.com/qmk/qmk_firmware
Jack Humbert [Mon, 29 May 2017 14:54:46 +0000 (10:54 -0400)]
more than one en-file, and actually ignore docs
Damien [Mon, 29 May 2017 11:17:23 +0000 (13:17 +0200)]
Update Differences-from-TMK.md
Removed fn_actions.
According this [comment](https://github.com/qmk/qmk_firmware/pull/1336#issuecomment-
304634633)
Priyadi Iman Nurcahyo [Mon, 29 May 2017 11:17:21 +0000 (18:17 +0700)]
Adafruit Feather BLE / BLE Friend mouse buttons support
Erez Zukerman [Mon, 29 May 2017 00:14:36 +0000 (20:14 -0400)]
Merge pull request #1338 from qmk/hf/prevent_stuck_mods
Adds prevent stuck modifiers to EZ default
Erez Zukerman [Mon, 29 May 2017 00:05:37 +0000 (20:05 -0400)]
Adds prevent stuck modifiers to EZ default
Jack Humbert [Sun, 28 May 2017 20:16:56 +0000 (16:16 -0400)]
ignore docs, fix tag/hex pushing
Fred Sundvik [Sun, 28 May 2017 19:35:45 +0000 (22:35 +0300)]
Update windows 10 instructions
Jack Humbert [Sun, 28 May 2017 18:47:57 +0000 (14:47 -0400)]
Merge pull request #1336 from Dbroqua/patch-2
Update Differences-from-TMK.md
Fred Sundvik [Sun, 28 May 2017 18:38:14 +0000 (21:38 +0300)]
Create a symlink to qmk if requested
Fred Sundvik [Sun, 28 May 2017 18:28:18 +0000 (21:28 +0300)]
Add activate_wsl to .bashrc
Fred Sundvik [Sun, 28 May 2017 17:49:42 +0000 (20:49 +0300)]
Fix symlink creation
Fred Sundvik [Sun, 28 May 2017 17:43:16 +0000 (20:43 +0300)]
Use unzip instead of 7zip
Fred Sundvik [Sun, 28 May 2017 17:36:27 +0000 (20:36 +0300)]
Actually install flip instead of just extracting
Fred Sundvik [Sun, 28 May 2017 17:11:56 +0000 (20:11 +0300)]
Make symlink to utils and export programmer variables
Fred Sundvik [Sun, 28 May 2017 15:26:38 +0000 (18:26 +0300)]
Add install dependencies
Fred Sundvik [Sun, 28 May 2017 11:49:58 +0000 (14:49 +0300)]
Add prompt for re-downloading the utils
Fred Sundvik [Sun, 28 May 2017 11:42:02 +0000 (14:42 +0300)]
Add driver installation
Fred Sundvik [Sun, 28 May 2017 10:30:53 +0000 (13:30 +0300)]
Add checks for cloning to the right dir
Fred Sundvik [Sun, 28 May 2017 09:24:05 +0000 (12:24 +0300)]
Download windows flashing utils and driver_installer
Damien [Sun, 28 May 2017 17:17:22 +0000 (19:17 +0200)]
Update Differences-from-TMK.md
Hello,
I'm not sure but it seems to be uint8_t for TMK/fn_actions (cf. https://github.com/tmk/tmk_keyboard/blob/master/README.md ).
Regards,
Damien
Jack Humbert [Sun, 28 May 2017 16:12:47 +0000 (12:12 -0400)]
Merge pull request #1334 from fredizzimo/fix_faq_lineending
Fix line endings in FAQ.md
Fred Sundvik [Sun, 28 May 2017 09:28:02 +0000 (12:28 +0300)]
Fix line endings in FAQ.md
Jack Humbert [Sat, 27 May 2017 22:24:53 +0000 (22:24 +0000)]
Updates book.json
Auto commit by GitBook Editor
Jack Humbert [Sat, 27 May 2017 22:23:09 +0000 (22:23 +0000)]
Updates book.json
Auto commit by GitBook Editor
Jack Humbert [Sat, 27 May 2017 22:21:58 +0000 (22:21 +0000)]
Updates book.json
Auto commit by GitBook Editor
Jack Humbert [Sat, 27 May 2017 22:20:46 +0000 (18:20 -0400)]
move book for gitbook
Jack Humbert [Sat, 27 May 2017 22:19:38 +0000 (22:19 +0000)]
Updates docs/book.json
Auto commit by GitBook Editor
Jack Humbert [Sat, 27 May 2017 22:14:21 +0000 (18:14 -0400)]
move old doc to docs
Jack Humbert [Sat, 27 May 2017 22:09:52 +0000 (18:09 -0400)]
subtree docs
Jack Humbert [Sat, 27 May 2017 15:03:34 +0000 (11:03 -0400)]
Merge pull request #5 from Maartenwut/patch-1
Mention that TT needs 5 taps by default.
Jack Humbert [Sat, 27 May 2017 14:56:13 +0000 (14:56 +0000)]
Updates book.json
Auto commit by GitBook Editor
Maarten Dekkers [Sat, 27 May 2017 10:34:16 +0000 (12:34 +0200)]
Mention that TT needs 5 taps by default.
Also gave an example of defining the amount of taps needed.
Jack Humbert [Fri, 26 May 2017 22:33:25 +0000 (18:33 -0400)]
Merge pull request #1319 from Johannes-Larsson/master
Add planck/johannes layout
Jack Humbert [Fri, 26 May 2017 22:32:43 +0000 (18:32 -0400)]
Merge pull request #1327 from Dbroqua/master
Added Integration of IBM Trackpoint
Jack Humbert [Fri, 26 May 2017 22:31:23 +0000 (18:31 -0400)]
Merge pull request #1328 from yiancar/qmk_usb_startup_disable
Use variable to disable usb check at startup
Jack Humbert [Fri, 26 May 2017 22:30:41 +0000 (18:30 -0400)]
Merge pull request #4 from Dbroqua/master
Update Modding-your-keyboard.md
yiancar [Fri, 26 May 2017 20:58:43 +0000 (21:58 +0100)]
Use variable to disable usb check at startup
Adds a define variable which when defined disables the usb startup
check. Modified the makefile to separate above define from bluetooth
dependancy
Damien [Fri, 26 May 2017 20:16:09 +0000 (22:16 +0200)]
Merge pull request #1 from Dbroqua/patch-1
Update Modding-your-keyboard.md
Nick Choi [Fri, 26 May 2017 19:59:34 +0000 (15:59 -0400)]
clarified tap
dbroqua [Fri, 26 May 2017 19:27:11 +0000 (21:27 +0200)]
- Added schematic for Trackpoint demonstration
dbroqua [Fri, 26 May 2017 18:35:31 +0000 (20:35 +0200)]
- Added integration of IBM Trackpoint
Damien [Fri, 26 May 2017 14:00:48 +0000 (16:00 +0200)]
Update Modding-your-keyboard.md
Updated `USART version` chapter.
I think there were 2 `#endif` too .
Damien [Fri, 26 May 2017 13:57:08 +0000 (15:57 +0200)]
Merge pull request #22 from qmk/master
Merge from QMK
Nick Choi [Fri, 26 May 2017 04:19:12 +0000 (00:19 -0400)]
-
Nick Choi [Fri, 26 May 2017 04:18:59 +0000 (00:18 -0400)]
tenative readme for variable timing tap
Nick Choi [Thu, 25 May 2017 20:38:06 +0000 (16:38 -0400)]
removed need to set customtapping term 0. defaults to 0 already
Nick Choi [Thu, 25 May 2017 20:29:57 +0000 (16:29 -0400)]
changed -1 to 0 can't have negative unsigned ints 🤔
Nick Choi [Thu, 25 May 2017 20:26:30 +0000 (16:26 -0400)]
moved specific tap term to its own function
included custom_tapping_term in action struct
Nick Choi [Thu, 25 May 2017 04:41:00 +0000 (00:41 -0400)]
Added per case tapping term, updated FF-nikchi keymap.
Jack Humbert [Thu, 25 May 2017 03:43:34 +0000 (23:43 -0400)]
Merge pull request #3 from fieldju/patch-1
Fix typo in Macro.md in dynamic macro section.
Nick Choi [Thu, 25 May 2017 03:43:02 +0000 (23:43 -0400)]
Tapping Term and Memes TD for FF
Justin Field [Thu, 25 May 2017 03:13:03 +0000 (20:13 -0700)]
Fix typo in Macro.md in dynamic macro section.
Johannes Larsson [Wed, 24 May 2017 19:35:31 +0000 (21:35 +0200)]
readme, media keys fix
Johannes Larsson [Wed, 24 May 2017 19:24:13 +0000 (21:24 +0200)]
revert changes to config.h