]> git.donarmstrong.com Git - qmk_firmware.git/log
qmk_firmware.git
7 years agoMerge remote-tracking branch 'upstream/master' into dev
Adam Lee [Sun, 7 May 2017 21:35:43 +0000 (14:35 -0700)]
Merge remote-tracking branch 'upstream/master' into dev

7 years agoMerge pull request #1272 from Thor77/ps2avrGB-keymap-kc-prefix
Jack Humbert [Thu, 4 May 2017 19:07:57 +0000 (15:07 -0400)]
Merge pull request #1272 from Thor77/ps2avrGB-keymap-kc-prefix

[ps2avrGB] Add KEYMAP without KC-prefix

7 years agoMerge pull request #1273 from Vifon/pr_1267_fix
Jack Humbert [Thu, 4 May 2017 19:07:04 +0000 (15:07 -0400)]
Merge pull request #1273 from Vifon/pr_1267_fix

Add DYN_REC_STOP to the dynamic macros, cleanup PR #1267

7 years agorevise HHKB bootloader_size to 4096 such that sw reset works (#1274)
tengg [Thu, 4 May 2017 17:27:35 +0000 (13:27 -0400)]
revise HHKB bootloader_size to 4096 such that sw reset works (#1274)

7 years agodynamic_macro.h: Fix an off-by-two error
Wojciech Siewierski [Wed, 3 May 2017 23:19:05 +0000 (01:19 +0200)]
dynamic_macro.h: Fix an off-by-two error

We need to check whether we just passed the after-the-end point of the
other macro. Instead we were checking whether we are going to reach it
now.

7 years agodynamic_macro.h: Always toggle the backlight twice as a notification
Wojciech Siewierski [Wed, 3 May 2017 22:58:01 +0000 (00:58 +0200)]
dynamic_macro.h: Always toggle the backlight twice as a notification

Apparently sometimes the backlight was toggled only once and it was left on.

7 years agodynamic_macro.h: Ignore all the initial key releases
Wojciech Siewierski [Wed, 3 May 2017 21:47:52 +0000 (23:47 +0200)]
dynamic_macro.h: Ignore all the initial key releases

Right after the user initiates the macro recording, they usually need
to release some keys used to access the DYN_REC_START layers. It makes
sense to ignore them.

Note: The keys used to access the DYN_REC_STOP key are *not* ignored.

7 years agoUse KC_KEYMAP for default-keymap
Thor77 [Wed, 3 May 2017 20:13:46 +0000 (22:13 +0200)]
Use KC_KEYMAP for default-keymap

and remove obsolete explicit line-separator "\"

7 years agoAdd KEYMAP without KC_##-prefix
Thor77 [Wed, 3 May 2017 20:01:02 +0000 (22:01 +0200)]
Add KEYMAP without KC_##-prefix

and rename old variant to KEYMAP_KC

7 years agoMerge pull request #1269 from ryanmaclean/patch-6
Jack Humbert [Mon, 1 May 2017 16:15:27 +0000 (12:15 -0400)]
Merge pull request #1269 from ryanmaclean/patch-6

Cleaning Up Dockerfile Layers Per Official Docs

7 years agoCleaning Up Dockerfile Layers Per Official Docs
Ryan MacLean [Sun, 30 Apr 2017 22:04:00 +0000 (15:04 -0700)]
Cleaning Up Dockerfile Layers Per Official Docs

From the official docs:

```
Note: The official Debian and Ubuntu images automatically run apt-get clean, so explicit invocation is not required.
```

Also added ` && rm -rf /var/lib/apt/lists/*` as part of the install line which probably does what was intended (no need to make a new layer).

Added apt-get update to the RUN payload, as it should be part of the same layer.

Both are documented here: https://docs.docker.com/engine/userguide/eng-image/dockerfile_best-practices/

7 years agoMerge pull request #1266 from ryanmaclean/patch-5
Jack Humbert [Sun, 30 Apr 2017 20:57:14 +0000 (16:57 -0400)]
Merge pull request #1266 from ryanmaclean/patch-5

Adding AMJ60 ANSI Maximized Layout

7 years agoMerge pull request #1268 from priyadi/promethium
Jack Humbert [Sun, 30 Apr 2017 15:18:54 +0000 (11:18 -0400)]
Merge pull request #1268 from priyadi/promethium

Promethium keymap update

7 years agoMerge pull request #1264 from fredizzimo/wsl_support
Jack Humbert [Sun, 30 Apr 2017 15:17:47 +0000 (11:17 -0400)]
Merge pull request #1264 from fredizzimo/wsl_support

Add possibility to override the command to execute when flashing

7 years agofixes s60_x keyboard
Jack Humbert [Sun, 30 Apr 2017 14:48:17 +0000 (10:48 -0400)]
fixes s60_x keyboard

7 years agoMerge pull request #1263 from Dbroqua/master
Jack Humbert [Sun, 30 Apr 2017 14:27:40 +0000 (10:27 -0400)]
Merge pull request #1263 from Dbroqua/master

Fixed bugs for S60-X RGB version

7 years agoSimple RGB backlight theming
Priyadi Iman Nurcahyo [Sun, 30 Apr 2017 11:04:58 +0000 (18:04 +0700)]
Simple RGB backlight theming

7 years agoSyntax fix
Priyadi Iman Nurcahyo [Sun, 30 Apr 2017 11:03:03 +0000 (18:03 +0700)]
Syntax fix

7 years agoUpdate vifon keymap to use `DYN_REC_STOP`
Weiyi Lou [Sun, 30 Apr 2017 08:36:43 +0000 (18:36 +1000)]
Update vifon keymap to use `DYN_REC_STOP`

7 years agoAdd cinaeco hhkb keymap
Weiyi Lou [Sat, 29 Apr 2017 12:05:31 +0000 (22:05 +1000)]
Add cinaeco hhkb keymap

7 years agoAdd `DYN_REC_STOP` to dynamic macros
Weiyi Lou [Sat, 29 Apr 2017 12:02:01 +0000 (22:02 +1000)]
Add `DYN_REC_STOP` to dynamic macros

Dynamic macro functionality is modified to check for `DYN_REC_STOP`, so
that macro recording can be stopped with a designated key combination
(e.g. `qs` or anything) instead of mandating the use of a `_DYN` layer.

`_DYN` layer stopping can still be done by passing `DYN_REC_STOP` within
`process_record_user()`:

    bool process_record_user(uint16_t keycode, keyrecord_t *record) {
      uint16_t macro_kc = (keycode == MO(_DYN) ? DYN_REC_STOP : keycode);
      if (!process_record_dynamic_macro(macro_kc, record)) {
        return false;
      }
      return true;
    }

7 years agoAddind Sample Maxed Out Keymap
Ryan MacLean [Sat, 29 Apr 2017 23:18:26 +0000 (16:18 -0700)]
Addind Sample Maxed Out Keymap

Keeping hold space for fn1, adding three other user-mappable keys.

7 years agoAdding Maximized Layout
Ryan MacLean [Sat, 29 Apr 2017 23:16:21 +0000 (16:16 -0700)]
Adding Maximized Layout

Both split shifts and HHKB split backspace.

7 years agoAdd possibility to override the command to execute when flashing
Fred Sundvik [Sat, 29 Apr 2017 20:45:27 +0000 (23:45 +0300)]
Add possibility to override the command to execute when flashing

7 years agoMerge branch 'master' of https://github.com/Dbroqua/qmk_firmware
dbroqua [Sat, 29 Apr 2017 13:04:01 +0000 (15:04 +0200)]
Merge branch 'master' of https://github.com/Dbroqua/qmk_firmware

7 years agoMerge pull request #21 from qmk/master
Damien [Sat, 29 Apr 2017 13:03:52 +0000 (15:03 +0200)]
Merge pull request #21 from qmk/master

Merge from QMK

7 years ago- Fixed bugs in rules.mk for S60-X
dbroqua [Sat, 29 Apr 2017 13:02:54 +0000 (15:02 +0200)]
- Fixed bugs in rules.mk for S60-X
- Updated dbroqua layout for S60-X (added backlight)

7 years agoPromethium update: demo LED, fix PS2 delay, fix LED ordering, change click frequency
Priyadi Iman Nurcahyo [Sat, 29 Apr 2017 06:21:27 +0000 (13:21 +0700)]
Promethium update: demo LED, fix PS2 delay, fix LED ordering, change click frequency

7 years agoModified ht_156 keymap
htang156 [Fri, 28 Apr 2017 06:12:43 +0000 (23:12 -0700)]
Modified ht_156 keymap

7 years agoMerge pull request #1259 from laelath/master
Jack Humbert [Wed, 26 Apr 2017 23:22:36 +0000 (19:22 -0400)]
Merge pull request #1259 from laelath/master

Added a proper README to the lae3 keymap

7 years agoExpanded lae3 keymap readme
laelath [Wed, 26 Apr 2017 20:56:01 +0000 (13:56 -0700)]
Expanded lae3 keymap readme

7 years agoMerge pull request #1258 from smt/smt/hhkb
Jack Humbert [Wed, 26 Apr 2017 19:30:36 +0000 (15:30 -0400)]
Merge pull request #1258 from smt/smt/hhkb

Add smt keymap for HHKB

7 years agoMerge pull request #1231 from Dbroqua/master
Jack Humbert [Tue, 25 Apr 2017 18:09:41 +0000 (14:09 -0400)]
Merge pull request #1231 from Dbroqua/master

S60-X RGB support

7 years agoMerge pull request #1253 from laelath/master
Jack Humbert [Tue, 25 Apr 2017 18:08:53 +0000 (14:08 -0400)]
Merge pull request #1253 from laelath/master

Added lae3 keymap

7 years agoMerge pull request #1255 from ryanmaclean/patch-4
Jack Humbert [Tue, 25 Apr 2017 18:08:16 +0000 (14:08 -0400)]
Merge pull request #1255 from ryanmaclean/patch-4

Initial Ortholinear Commit for AMJPad

7 years agoMerge pull request #1257 from MachineIndustries/keyboards/M10A
Jack Humbert [Tue, 25 Apr 2017 18:07:41 +0000 (14:07 -0400)]
Merge pull request #1257 from MachineIndustries/keyboards/M10A

Add RAMA x Machine Industries M10A to the keyboards directory

7 years agoAdd RAMA x Machine Industries M10A to the keyboards directory
Josh Black [Tue, 25 Apr 2017 17:51:45 +0000 (18:51 +0100)]
Add RAMA x Machine Industries M10A to the keyboards directory

7 years agoAdd smt keymap for HHKB
Stephen Tudor [Mon, 24 Apr 2017 15:16:14 +0000 (11:16 -0400)]
Add smt keymap for HHKB

7 years agoSwitched Alt and GUI key places
Justin Frank [Mon, 24 Apr 2017 02:38:40 +0000 (19:38 -0700)]
Switched Alt and GUI key places

7 years agoAdding Right Layout
Ryan MacLean [Sun, 23 Apr 2017 05:34:14 +0000 (22:34 -0700)]
Adding Right Layout

7 years agoUpdate keymap.c
Ryan MacLean [Sun, 23 Apr 2017 04:26:47 +0000 (21:26 -0700)]
Update keymap.c

7 years agoInitial Ortho Commit (LEFT SIDE)
Ryan MacLean [Sun, 23 Apr 2017 03:49:34 +0000 (20:49 -0700)]
Initial Ortho Commit (LEFT SIDE)

Using only one layer, and activating it with two keys at the moment.
As with previous comments, this isn't final, but is a good starting point for a one-handed keyboard, half a Planck-like ortholinear keyboard, or a sample to show a layout with a function layer.

7 years agoAdded lae3 keymap
Justin Frank [Sat, 22 Apr 2017 22:15:17 +0000 (15:15 -0700)]
Added lae3 keymap

7 years agoAdded an additional clueboard layout. (#1252)
Solomon [Sat, 22 Apr 2017 13:25:41 +0000 (09:25 -0400)]
Added an additional clueboard layout. (#1252)

* Current building keymap

* Working media keys

* Added mute key. Fixed volume. Fixed media

* Updating readme

* Swapped readme order

7 years agoTweak the shift_fn keymap so it works
skullY [Sat, 22 Apr 2017 04:46:01 +0000 (21:46 -0700)]
Tweak the shift_fn keymap so it works

7 years ago- Moved S60-X RGB in sub project for S60-X
dbroqua [Wed, 19 Apr 2017 20:12:23 +0000 (22:12 +0200)]
- Moved S60-X RGB in sub project for S60-X

7 years agoMerge pull request #1246 from reversebias/master
Jack Humbert [Wed, 19 Apr 2017 12:43:28 +0000 (08:43 -0400)]
Merge pull request #1246 from reversebias/master

Initial support for the Mitosis Keyboard

7 years agoUpdate readme.md
reversebias [Wed, 19 Apr 2017 12:39:44 +0000 (22:39 +1000)]
Update readme.md

7 years agoMerge pull request #1245 from fredizzimo/fix_lcd_pin_configuration
Jack Humbert [Wed, 19 Apr 2017 11:50:03 +0000 (07:50 -0400)]
Merge pull request #1245 from fredizzimo/fix_lcd_pin_configuration

Fix LCD SS pin configuration

7 years agoMerge pull request #1244 from ryanmaclean/patch-3
Jack Humbert [Wed, 19 Apr 2017 11:49:46 +0000 (07:49 -0400)]
Merge pull request #1244 from ryanmaclean/patch-3

Adding Maximized Keymap

7 years agoMerge pull request #1243 from Xyverz/master
Jack Humbert [Wed, 19 Apr 2017 11:47:56 +0000 (07:47 -0400)]
Merge pull request #1243 from Xyverz/master

Removed LT macros

7 years agoFirst Commit
cam [Wed, 19 Apr 2017 10:27:49 +0000 (20:27 +1000)]
First Commit

7 years agoDelete temp
reversebias [Wed, 19 Apr 2017 10:15:44 +0000 (20:15 +1000)]
Delete temp

7 years agoCreate temp
reversebias [Wed, 19 Apr 2017 10:12:50 +0000 (20:12 +1000)]
Create temp

7 years agotune clicks
Priyadi Iman Nurcahyo [Wed, 19 Apr 2017 05:35:05 +0000 (12:35 +0700)]
tune clicks

7 years agoMerge remote-tracking branch 'upstream/master' into promethium
Priyadi Iman Nurcahyo [Wed, 19 Apr 2017 05:04:15 +0000 (12:04 +0700)]
Merge remote-tracking branch 'upstream/master' into promethium

7 years agoFix LED sequence; bug fixes
Priyadi Iman Nurcahyo [Wed, 19 Apr 2017 05:03:48 +0000 (12:03 +0700)]
Fix LED sequence; bug fixes

7 years agoFix LCD SS pin configuration
Fred Sundvik [Wed, 19 Apr 2017 04:59:39 +0000 (07:59 +0300)]
Fix LCD SS pin configuration

There was a typo, so the attempted configuration proably didn't do
what it should have done. I think it left the pin floating, and
could cause the LCD problems issue-1230.

7 years agoAdding Sample Max Layout
Ryan MacLean [Wed, 19 Apr 2017 04:54:58 +0000 (21:54 -0700)]
Adding Sample Max Layout

7 years agoAdding Maximized Keymap
Ryan MacLean [Wed, 19 Apr 2017 04:53:10 +0000 (21:53 -0700)]
Adding Maximized Keymap

For use with grid layout pads.

7 years agoLT doesn't work with tri_layer. Removed it from this keymap.
Xyverz [Wed, 19 Apr 2017 03:36:26 +0000 (20:36 -0700)]
LT doesn't work with tri_layer. Removed it from this keymap.

7 years agoswapped RAISE with LOWER in layer-tapping macros.
Xyverz [Wed, 19 Apr 2017 01:15:46 +0000 (18:15 -0700)]
swapped RAISE with LOWER in layer-tapping macros.

7 years ago- Fixed bug in keymap for s60-X RGB
dbroqua [Tue, 18 Apr 2017 20:26:32 +0000 (22:26 +0200)]
- Fixed bug in keymap for s60-X RGB

7 years agoMerge pull request #1239 from priyadi/promethium
Jack Humbert [Tue, 18 Apr 2017 20:17:27 +0000 (16:17 -0400)]
Merge pull request #1239 from priyadi/promethium

Keymap updates

7 years agoMerge pull request #1238 from priyadi/fauxclicky_fix
Jack Humbert [Tue, 18 Apr 2017 20:16:35 +0000 (16:16 -0400)]
Merge pull request #1238 from priyadi/fauxclicky_fix

Faux clicky bug fixes

7 years agoMerge pull request #1236 from Xyverz/master
Jack Humbert [Tue, 18 Apr 2017 20:08:16 +0000 (16:08 -0400)]
Merge pull request #1236 from Xyverz/master

Revamp TV44 keymap.

7 years agoMerge pull request #1235 from siroken3/siroken3
Jack Humbert [Tue, 18 Apr 2017 20:06:27 +0000 (16:06 -0400)]
Merge pull request #1235 from siroken3/siroken3

Siroken3

7 years agoFix Planck compatibility
Priyadi Iman Nurcahyo [Tue, 18 Apr 2017 19:55:19 +0000 (02:55 +0700)]
Fix Planck compatibility

7 years agoKeymap updates and some adjustment for latest version of QMK
Priyadi Iman Nurcahyo [Tue, 18 Apr 2017 19:52:57 +0000 (02:52 +0700)]
Keymap updates and some adjustment for latest version of QMK

7 years agoFaux clicky bug fixes
Priyadi Iman Nurcahyo [Tue, 18 Apr 2017 18:40:16 +0000 (01:40 +0700)]
Faux clicky bug fixes

7 years agoPromethium rev2
Priyadi Iman Nurcahyo [Tue, 18 Apr 2017 18:38:08 +0000 (01:38 +0700)]
Promethium rev2

* 10 more indicator LEDs
* Piezo buzzer
* Uses HC138 decoder to free up 5 pins
* Trackpoint buttons are now part of matrix

7 years agoFixed a weird diff mishap.
Xyverz [Tue, 18 Apr 2017 04:54:02 +0000 (21:54 -0700)]
Fixed a weird diff mishap.

7 years agoMerge branch 'tv44_revamp'
Xyverz [Tue, 18 Apr 2017 03:20:27 +0000 (20:20 -0700)]
Merge branch 'tv44_revamp'

7 years agoUpdated my TV44 keymap to be more planck-like.
Xyverz [Tue, 18 Apr 2017 03:15:57 +0000 (20:15 -0700)]
Updated my TV44 keymap to be more planck-like.

Used the current default planck keymap as a guide.

7 years agoMerge pull request #1234 from whitef0x0/patch-1
Jack Humbert [Mon, 17 Apr 2017 23:02:24 +0000 (19:02 -0400)]
Merge pull request #1234 from whitef0x0/patch-1

Fixed dvorak layout for Atreus50

7 years agoFixed dvorak layout for Atreus50
David Baldwynn [Mon, 17 Apr 2017 19:05:47 +0000 (12:05 -0700)]
Fixed dvorak layout for Atreus50

7 years agoMerge pull request #1228 from fitzsim/fix-keymap-yoruian-macro
Jack Humbert [Mon, 17 Apr 2017 17:21:03 +0000 (13:21 -0400)]
Merge pull request #1228 from fitzsim/fix-keymap-yoruian-macro

Fix KEYMAP_YORUIAN macro

7 years agomacros to make keymap reading easier.
Xyverz [Mon, 17 Apr 2017 04:52:49 +0000 (21:52 -0700)]
macros to make keymap reading easier.

7 years agoAdded keymap to TV44 Revamp
Xyverz [Mon, 17 Apr 2017 04:09:23 +0000 (21:09 -0700)]
Added keymap to TV44 Revamp

7 years agoAdded simple macros to test.
htang156 [Mon, 17 Apr 2017 00:39:04 +0000 (17:39 -0700)]
Added simple macros to test.

7 years agoAdded media layer for ht_156
htang156 [Sun, 16 Apr 2017 23:08:31 +0000 (16:08 -0700)]
Added media layer for ht_156

7 years agoAdded ht_156 keymap files
htang156 [Sun, 16 Apr 2017 22:31:00 +0000 (15:31 -0700)]
Added ht_156 keymap files

7 years agoMerge branch 'master' into dev
Adam YH Lee [Sun, 16 Apr 2017 22:19:20 +0000 (15:19 -0700)]
Merge branch 'master' into dev

7 years agoReplace RALT with RSFT
Adam YH Lee [Sun, 16 Apr 2017 21:50:25 +0000 (14:50 -0700)]
Replace RALT with RSFT

7 years agoAdded END and other keymap file formatting.
htang156 [Sun, 16 Apr 2017 21:19:51 +0000 (14:19 -0700)]
Added END and other keymap file formatting.

7 years agoAdded DEL and F1 to F12 keys
htang156 [Sun, 16 Apr 2017 21:10:29 +0000 (14:10 -0700)]
Added DEL and F1 to F12 keys

7 years agoAdded keymap commets to default layout.
htang156 [Sun, 16 Apr 2017 20:40:03 +0000 (13:40 -0700)]
Added keymap commets to default layout.

7 years ago- Added S-60-X RGB directory (based on qmk.sized.io work)
dbroqua [Sat, 15 Apr 2017 14:34:33 +0000 (16:34 +0200)]
- Added S-60-X RGB directory (based on qmk.sized.io work)

7 years agoAdd TAB, N, LSFT on Layer 2
Adam YH Lee [Fri, 14 Apr 2017 07:02:25 +0000 (00:02 -0700)]
Add TAB, N, LSFT on Layer 2

7 years agoAdd KC_T on Layer 2
Adam YH Lee [Fri, 14 Apr 2017 06:50:57 +0000 (23:50 -0700)]
Add KC_T on Layer 2

7 years agoAdd LCTL + L on Layer 2
Adam YH Lee [Fri, 14 Apr 2017 06:47:50 +0000 (23:47 -0700)]
Add LCTL + L on Layer 2

7 years agoFix KEYMAP_YORUIAN macro
Thomas Fitzsimmons [Fri, 14 Apr 2017 06:06:58 +0000 (02:06 -0400)]
Fix KEYMAP_YORUIAN macro

Fix the ordering of the arguments to the KEYMAP macro.

7 years agoMerge pull request #1226 from fredizzimo/fix_ergodox_righthand_warning
Jack Humbert [Thu, 13 Apr 2017 20:15:13 +0000 (16:15 -0400)]
Merge pull request #1226 from fredizzimo/fix_ergodox_righthand_warning

Add missing serial_link.h include

7 years agoAdd missing serial_link.h include
Fred Sundvik [Thu, 13 Apr 2017 20:00:27 +0000 (23:00 +0300)]
Add missing serial_link.h include

Which fixes a warning when building Ergodox Infinity as a righthand
master.

7 years agoMerge pull request #1225 from fredizzimo/fix_lcd_led_status_buffer_overrun
Jack Humbert [Thu, 13 Apr 2017 19:26:38 +0000 (15:26 -0400)]
Merge pull request #1225 from fredizzimo/fix_lcd_led_status_buffer_overrun

Fix buffer overrun in lcd_keyframes

7 years agoFix buffer overrun in lcd_keyframes
Fred Sundvik [Thu, 13 Apr 2017 18:40:06 +0000 (21:40 +0300)]
Fix buffer overrun in lcd_keyframes

This would often cause the keyboard to crash when restarting the
computer.

7 years agoMerge pull request #1224 from fredizzimo/fix_warnings
Jack Humbert [Thu, 13 Apr 2017 18:07:48 +0000 (14:07 -0400)]
Merge pull request #1224 from fredizzimo/fix_warnings

Fix all warnings and turn on warnings as errors

7 years agoUpdate keymap - hopefully more usable
Adam YH Lee [Thu, 13 Apr 2017 16:25:05 +0000 (09:25 -0700)]
Update keymap - hopefully more usable

7 years agoAdd make option for allowing warnings
Fred Sundvik [Thu, 13 Apr 2017 13:12:55 +0000 (16:12 +0300)]
Add make option for allowing warnings

7 years agoFix process_unicode_common.c being included twice
Fred Sundvik [Thu, 13 Apr 2017 12:58:58 +0000 (15:58 +0300)]
Fix process_unicode_common.c being included twice