Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OSX Kinesis-like Mapping #47

Merged
merged 3 commits into from
Dec 20, 2015
Merged

OSX Kinesis-like Mapping #47

merged 3 commits into from
Dec 20, 2015

Conversation

pnutster
Copy link
Contributor

OS X Kinesis Like key mapping. Only the default layer was changed into
a more Kinesis-like mapping. Hopefully useful as a starting point.

OS X Kinesis Like key mapping. Only the default layer was changed into
a more Kinesis-like mapping. Hopefully useful as a starting point.
jackhumbert added a commit that referenced this pull request Dec 20, 2015
OSX Kinesis-like Mapping
@jackhumbert jackhumbert merged commit e70cdb0 into qmk:master Dec 20, 2015
@jackhumbert
Copy link
Member

Thanks!

jackhumbert pushed a commit that referenced this pull request Jul 7, 2017
Add a clean up delay in the CDC bootloader before disconnect to fix transient communication issues (thanks to NicoHood).
drashna referenced this pull request in drashna/qmk_firmware Jul 9, 2019
IsaacElenbaas added a commit to IsaacElenbaas/qmk_firmware that referenced this pull request Mar 13, 2021
stdvar pushed a commit to stdvar/qmk_firmware that referenced this pull request Jul 17, 2021
Added newline to c1.h to help fix compile issues.
rizalfr pushed a commit to rizalfr/qmk_firmware that referenced this pull request Sep 4, 2021
* Added Vial keymap for Bolt

* Removed VIAL_INSECURE
FlauschiBunny pushed a commit to FlauschiBunny/qmk_firmware that referenced this pull request Oct 31, 2021
* Make led mcu wakeup delay configurable

* add missing newlines
shearn89 pushed a commit to shearn89/qmk_firmware that referenced this pull request Feb 16, 2022
* Make led mcu wakeup delay configurable

* add missing newlines
msrx9 pushed a commit to msrx9/qmk_firmware that referenced this pull request Feb 27, 2022
tipok pushed a commit to tipok/qmk_firmware that referenced this pull request Aug 23, 2022
jiaxin96 pushed a commit to Oh-My-Mechanical-Keyboard/qmk_firmware that referenced this pull request Dec 4, 2022
eaceaser pushed a commit to eaceaser/qmk_firmware that referenced this pull request Dec 29, 2023
* tentatively add dilemma 4x6_4 WIP untested

* Add dilemma 4x6_4 WIP

set max brightness to 128 pending testing
migrate rgbmatrix layout macro to info.json
migrate other settings to info.json
add default keymap and readme
add via keymap readme

* 4x6_4 Remove files that shouldn't be in main

KLE and Via JSONs should not be included in qmk_firmware

* 4x6_4 Add RGBMATRIX coordinates in info.json WIP

Still pending testing to validate coordinates
Add copyright lines

* 4x6_4 Change RGB matrix centre

* 4x6_4 update rgb flags for outer columns

* 4x6_4 add swap_hands config from Drashna

* 4x6_4 explicitly set some defaults

some things were only working because "processor: RP2040" defaults to
GENERIC_PROMICRO_RP2040.
explicitly set "board": "GENERIC_RP_RP2040" instead.
correctly enable SPI0 and SPID0 instead of SPI1

* Update dilemma/readme.md

* 4x6_4 migrate more items to info.json

Forgot to move rgb matrix animations to info.json
Didn't realise RGB_MATRIX_CENTER had an info.json mapping
Missed migrating some rules.mk options to info.json

* Update keyboards/bastardkb/dilemma/4x6_4/rules.mk

per requested changes

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/bastardkb/dilemma/4x6_4/rules.mk

per requested changes

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/bastardkb/dilemma/4x6_4/keymaps/via/config.h

per requested changes

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/bastardkb/dilemma/4x6_4/keymaps/via/keymap.c

per requested changes

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/bastardkb/dilemma/4x6_4/config.h

per requested changes

Co-authored-by: Joel Challis <git@zvecr.com>

* 4x6_4/config.h formatting change per review request

Co-authored-by: Drashna Jaelre <drashna@live.com>

* 4x6_4/info.json formatting change per review request

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Add layer indicators

* Use predefined rgb colors for layers

* Refactor layer indicators from keymap to keyboard

* swap encoder volume directions for CW=volup

* Revert wrong conflict solutions following review

* Update keyboards/bastardkb/dilemma/4x6_4/info.json

* Update keyboards/bastardkb/dilemma/4x6_4/config.h

* Update keyboards/bastardkb/dilemma/4x6_4/keymaps/default/readme.md

* Update keyboards/bastardkb/dilemma/4x6_4/config.h

* Apply suggested changes from code review

* Apply suggested changes from code review

* Break the brightness interval out into defines for configurability from keymap

* Formatting

* Add documentation for indicator brightness boosts

* narrow scope of kb-internal function

* fix type of counting variable

* remove unneccessary condition

* Remove shutdown_user

Instead of rewriting for breaking change, simply removed akin to new 3x5_3 on qmk:develop

* Formatting

---------

Co-authored-by: casuanoob <gms.rulz@hotmail.com>
Co-authored-by: casuanoob <96005765+casuanoob@users.noreply.github.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ying Kun Zhan <yingkun@zhan.co.nl>
burkfers pushed a commit to burkfers/qmk_firmware that referenced this pull request Apr 8, 2024
* tentatively add dilemma 4x6_4 WIP untested

* Add dilemma 4x6_4 WIP

set max brightness to 128 pending testing
migrate rgbmatrix layout macro to info.json
migrate other settings to info.json
add default keymap and readme
add via keymap readme

* 4x6_4 Remove files that shouldn't be in main

KLE and Via JSONs should not be included in qmk_firmware

* 4x6_4 Add RGBMATRIX coordinates in info.json WIP

Still pending testing to validate coordinates
Add copyright lines

* 4x6_4 Change RGB matrix centre

* 4x6_4 update rgb flags for outer columns

* 4x6_4 add swap_hands config from Drashna

* 4x6_4 explicitly set some defaults

some things were only working because "processor: RP2040" defaults to
GENERIC_PROMICRO_RP2040.
explicitly set "board": "GENERIC_RP_RP2040" instead.
correctly enable SPI0 and SPID0 instead of SPI1

* Update dilemma/readme.md

* 4x6_4 migrate more items to info.json

Forgot to move rgb matrix animations to info.json
Didn't realise RGB_MATRIX_CENTER had an info.json mapping
Missed migrating some rules.mk options to info.json

* Update keyboards/bastardkb/dilemma/4x6_4/rules.mk

per requested changes

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/bastardkb/dilemma/4x6_4/rules.mk

per requested changes

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/bastardkb/dilemma/4x6_4/keymaps/via/config.h

per requested changes

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/bastardkb/dilemma/4x6_4/keymaps/via/keymap.c

per requested changes

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/bastardkb/dilemma/4x6_4/config.h

per requested changes

Co-authored-by: Joel Challis <git@zvecr.com>

* 4x6_4/config.h formatting change per review request

Co-authored-by: Drashna Jaelre <drashna@live.com>

* 4x6_4/info.json formatting change per review request

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Add layer indicators

* Use predefined rgb colors for layers

* Refactor layer indicators from keymap to keyboard

* swap encoder volume directions for CW=volup

* Revert wrong conflict solutions following review

* Update keyboards/bastardkb/dilemma/4x6_4/info.json

* Update keyboards/bastardkb/dilemma/4x6_4/config.h

* Update keyboards/bastardkb/dilemma/4x6_4/keymaps/default/readme.md

* Update keyboards/bastardkb/dilemma/4x6_4/config.h

* Apply suggested changes from code review

* Apply suggested changes from code review

* Break the brightness interval out into defines for configurability from keymap

* Formatting

* Add documentation for indicator brightness boosts

* narrow scope of kb-internal function

* fix type of counting variable

* remove unneccessary condition

* Remove shutdown_user

Instead of rewriting for breaking change, simply removed akin to new 3x5_3 on qmk:develop

* Formatting

---------

Co-authored-by: casuanoob <gms.rulz@hotmail.com>
Co-authored-by: casuanoob <96005765+casuanoob@users.noreply.github.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ying Kun Zhan <yingkun@zhan.co.nl>
burkfers pushed a commit to burkfers/qmk_firmware that referenced this pull request Apr 29, 2024
* tentatively add dilemma 4x6_4 WIP untested

* Add dilemma 4x6_4 WIP

set max brightness to 128 pending testing
migrate rgbmatrix layout macro to info.json
migrate other settings to info.json
add default keymap and readme
add via keymap readme

* 4x6_4 Remove files that shouldn't be in main

KLE and Via JSONs should not be included in qmk_firmware

* 4x6_4 Add RGBMATRIX coordinates in info.json WIP

Still pending testing to validate coordinates
Add copyright lines

* 4x6_4 Change RGB matrix centre

* 4x6_4 update rgb flags for outer columns

* 4x6_4 add swap_hands config from Drashna

* 4x6_4 explicitly set some defaults

some things were only working because "processor: RP2040" defaults to
GENERIC_PROMICRO_RP2040.
explicitly set "board": "GENERIC_RP_RP2040" instead.
correctly enable SPI0 and SPID0 instead of SPI1

* Update dilemma/readme.md

* 4x6_4 migrate more items to info.json

Forgot to move rgb matrix animations to info.json
Didn't realise RGB_MATRIX_CENTER had an info.json mapping
Missed migrating some rules.mk options to info.json

* Update keyboards/bastardkb/dilemma/4x6_4/rules.mk

per requested changes

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/bastardkb/dilemma/4x6_4/rules.mk

per requested changes

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/bastardkb/dilemma/4x6_4/keymaps/via/config.h

per requested changes

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/bastardkb/dilemma/4x6_4/keymaps/via/keymap.c

per requested changes

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/bastardkb/dilemma/4x6_4/config.h

per requested changes

Co-authored-by: Joel Challis <git@zvecr.com>

* 4x6_4/config.h formatting change per review request

Co-authored-by: Drashna Jaelre <drashna@live.com>

* 4x6_4/info.json formatting change per review request

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Add layer indicators

* Use predefined rgb colors for layers

* Refactor layer indicators from keymap to keyboard

* swap encoder volume directions for CW=volup

* Revert wrong conflict solutions following review

* Update keyboards/bastardkb/dilemma/4x6_4/info.json

* Update keyboards/bastardkb/dilemma/4x6_4/config.h

* Update keyboards/bastardkb/dilemma/4x6_4/keymaps/default/readme.md

* Update keyboards/bastardkb/dilemma/4x6_4/config.h

* Apply suggested changes from code review

* Apply suggested changes from code review

* Break the brightness interval out into defines for configurability from keymap

* Formatting

* Add documentation for indicator brightness boosts

* narrow scope of kb-internal function

* fix type of counting variable

* remove unneccessary condition

* Remove shutdown_user

Instead of rewriting for breaking change, simply removed akin to new 3x5_3 on qmk:develop

* Formatting

---------

Co-authored-by: casuanoob <gms.rulz@hotmail.com>
Co-authored-by: casuanoob <96005765+casuanoob@users.noreply.github.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ying Kun Zhan <yingkun@zhan.co.nl>
burkfers pushed a commit to burkfers/qmk_firmware that referenced this pull request May 28, 2024
* tentatively add dilemma 4x6_4 WIP untested

* Add dilemma 4x6_4 WIP

set max brightness to 128 pending testing
migrate rgbmatrix layout macro to info.json
migrate other settings to info.json
add default keymap and readme
add via keymap readme

* 4x6_4 Remove files that shouldn't be in main

KLE and Via JSONs should not be included in qmk_firmware

* 4x6_4 Add RGBMATRIX coordinates in info.json WIP

Still pending testing to validate coordinates
Add copyright lines

* 4x6_4 Change RGB matrix centre

* 4x6_4 update rgb flags for outer columns

* 4x6_4 add swap_hands config from Drashna

* 4x6_4 explicitly set some defaults

some things were only working because "processor: RP2040" defaults to
GENERIC_PROMICRO_RP2040.
explicitly set "board": "GENERIC_RP_RP2040" instead.
correctly enable SPI0 and SPID0 instead of SPI1

* Update dilemma/readme.md

* 4x6_4 migrate more items to info.json

Forgot to move rgb matrix animations to info.json
Didn't realise RGB_MATRIX_CENTER had an info.json mapping
Missed migrating some rules.mk options to info.json

* Update keyboards/bastardkb/dilemma/4x6_4/rules.mk

per requested changes

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/bastardkb/dilemma/4x6_4/rules.mk

per requested changes

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/bastardkb/dilemma/4x6_4/keymaps/via/config.h

per requested changes

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/bastardkb/dilemma/4x6_4/keymaps/via/keymap.c

per requested changes

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/bastardkb/dilemma/4x6_4/config.h

per requested changes

Co-authored-by: Joel Challis <git@zvecr.com>

* 4x6_4/config.h formatting change per review request

Co-authored-by: Drashna Jaelre <drashna@live.com>

* 4x6_4/info.json formatting change per review request

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Add layer indicators

* Use predefined rgb colors for layers

* Refactor layer indicators from keymap to keyboard

* swap encoder volume directions for CW=volup

* Revert wrong conflict solutions following review

* Update keyboards/bastardkb/dilemma/4x6_4/info.json

* Update keyboards/bastardkb/dilemma/4x6_4/config.h

* Update keyboards/bastardkb/dilemma/4x6_4/keymaps/default/readme.md

* Update keyboards/bastardkb/dilemma/4x6_4/config.h

* Apply suggested changes from code review

* Apply suggested changes from code review

* Break the brightness interval out into defines for configurability from keymap

* Formatting

* Add documentation for indicator brightness boosts

* narrow scope of kb-internal function

* fix type of counting variable

* remove unneccessary condition

* Remove shutdown_user

Instead of rewriting for breaking change, simply removed akin to new 3x5_3 on qmk:develop

* Formatting

---------

Co-authored-by: casuanoob <gms.rulz@hotmail.com>
Co-authored-by: casuanoob <96005765+casuanoob@users.noreply.github.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ying Kun Zhan <yingkun@zhan.co.nl>
burkfers pushed a commit to burkfers/qmk_firmware that referenced this pull request May 28, 2024
* tentatively add dilemma 4x6_4 WIP untested

* Add dilemma 4x6_4 WIP

set max brightness to 128 pending testing
migrate rgbmatrix layout macro to info.json
migrate other settings to info.json
add default keymap and readme
add via keymap readme

* 4x6_4 Remove files that shouldn't be in main

KLE and Via JSONs should not be included in qmk_firmware

* 4x6_4 Add RGBMATRIX coordinates in info.json WIP

Still pending testing to validate coordinates
Add copyright lines

* 4x6_4 Change RGB matrix centre

* 4x6_4 update rgb flags for outer columns

* 4x6_4 add swap_hands config from Drashna

* 4x6_4 explicitly set some defaults

some things were only working because "processor: RP2040" defaults to
GENERIC_PROMICRO_RP2040.
explicitly set "board": "GENERIC_RP_RP2040" instead.
correctly enable SPI0 and SPID0 instead of SPI1

* Update dilemma/readme.md

* 4x6_4 migrate more items to info.json

Forgot to move rgb matrix animations to info.json
Didn't realise RGB_MATRIX_CENTER had an info.json mapping
Missed migrating some rules.mk options to info.json

* Update keyboards/bastardkb/dilemma/4x6_4/rules.mk

per requested changes

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/bastardkb/dilemma/4x6_4/rules.mk

per requested changes

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/bastardkb/dilemma/4x6_4/keymaps/via/config.h

per requested changes

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/bastardkb/dilemma/4x6_4/keymaps/via/keymap.c

per requested changes

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/bastardkb/dilemma/4x6_4/config.h

per requested changes

Co-authored-by: Joel Challis <git@zvecr.com>

* 4x6_4/config.h formatting change per review request

Co-authored-by: Drashna Jaelre <drashna@live.com>

* 4x6_4/info.json formatting change per review request

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Add layer indicators

* Use predefined rgb colors for layers

* Refactor layer indicators from keymap to keyboard

* swap encoder volume directions for CW=volup

* Revert wrong conflict solutions following review

* Update keyboards/bastardkb/dilemma/4x6_4/info.json

* Update keyboards/bastardkb/dilemma/4x6_4/config.h

* Update keyboards/bastardkb/dilemma/4x6_4/keymaps/default/readme.md

* Update keyboards/bastardkb/dilemma/4x6_4/config.h

* Apply suggested changes from code review

* Apply suggested changes from code review

* Break the brightness interval out into defines for configurability from keymap

* Formatting

* Add documentation for indicator brightness boosts

* narrow scope of kb-internal function

* fix type of counting variable

* remove unneccessary condition

* Remove shutdown_user

Instead of rewriting for breaking change, simply removed akin to new 3x5_3 on qmk:develop

* Formatting

---------

Co-authored-by: casuanoob <gms.rulz@hotmail.com>
Co-authored-by: casuanoob <96005765+casuanoob@users.noreply.github.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ying Kun Zhan <yingkun@zhan.co.nl>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants