Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
QMK Bot 2021-03-23 18:19:00 +00:00
commit 9afbbf21fd
2 changed files with 50 additions and 34 deletions

View file

@ -8,29 +8,29 @@
"LAYOUT_64key": { "LAYOUT_64key": {
"key_count": 64, "key_count": 64,
"layout": [ "layout": [
{"x":2, "y":0.5}, {"x":3, "y":0}, {"x":4, "y":0.3}, {"x":2.5, "y":0.4}, {"x":3.5, "y":0}, {"x":4.5, "y":0.3},
{"x":8, "y":0.7}, {"x":9, "y":0.3}, {"x":10, "y":0}, {"x":8.5, "y":0.3}, {"x":9.5, "y":0}, {"x":10.5, "y":0.4},
{"x":2, "y":1.5}, {"x":3, "y":1}, {"x":4, "y":1.3}, {"x":5, "y":0.7}, {"x":2.5, "y":1.4}, {"x":3.5, "y":1}, {"x":4.5, "y":1.3}, {"x":5.5, "y":0.9},
{"x":8, "y":0.7}, {"x":9, "y":1.3}, {"x":10, "y":1}, {"x":11, "y":1.5}, {"x":7.5, "y":0.9}, {"x":8.5, "y":1.3}, {"x":9.5, "y":1}, {"x":10.5, "y":1.4},
{"x":3, "y":2}, {"x":4, "y":2.3}, {"x":5, "y":1.7}, {"x":3.5, "y":2}, {"x":4.5, "y":2.3}, {"x":5.5, "y":1.9},
{"x":8, "y":1.7}, {"x":9, "y":2.3}, {"x":10, "y":2}, {"x":7.5, "y":1.9}, {"x":8.5, "y":2.3}, {"x":9.5, "y":2},
{"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":2, "y":4}, {"x":3, "y":3.8}, {"x":4, "y":4}, {"x":5, "y":4.3},
{"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":8, "y":4.3}, {"x":9, "y":4}, {"x":10, "y":3.8}, {"x":11, "y":4},
{"x":0, "y":5}, {"x":1, "y":5}, {"x":2, "y":5}, {"x":3, "y":5}, {"x":4, "y":5}, {"x":5, "y":5}, {"x":0, "y":5}, {"x":1, "y":5}, {"x":2, "y":5}, {"x":3, "y":4.8}, {"x":4, "y":5}, {"x":5, "y":5.3},
{"x":8, "y":5}, {"x":9, "y":5}, {"x":10, "y":5}, {"x":11, "y":5}, {"x":12, "y":5}, {"x":13, "y":5}, {"x":8, "y":5.3}, {"x":9, "y":5}, {"x":10, "y":4.8}, {"x":11, "y":5}, {"x":12, "y":5}, {"x":13, "y":5},
{"x":0, "y":6}, {"x":1, "y":6}, {"x":2, "y":6}, {"x":3, "y":6}, {"x":4, "y":6}, {"x":5, "y":6}, {"x":0, "y":6}, {"x":1, "y":6}, {"x":2, "y":6}, {"x":3, "y":5.8}, {"x":4, "y":6}, {"x":5, "y":6.3},
{"x":8, "y":6}, {"x":9, "y":6}, {"x":10, "y":6}, {"x":11, "y":6}, {"x":12, "y":6}, {"x":13, "y":6}, {"x":8, "y":6.3}, {"x":9, "y":6}, {"x":10, "y":5.8}, {"x":11, "y":6}, {"x":12, "y":6}, {"x":13, "y":6},
{"x":0, "y":7}, {"x":1, "y":7}, {"x":2, "y":7}, {"x":3, "y":7}, {"x":4, "y":7}, {"x":0, "y":7}, {"x":1, "y":7}, {"x":2, "y":7}, {"x":3, "y":6.8}, {"x":4, "y":7},
{"x":9, "y":7}, {"x":10, "y":7}, {"x":11, "y":7}, {"x":12, "y":7}, {"x":13, "y":7}, {"x":9, "y":7}, {"x":10, "y":6.8}, {"x":11, "y":7}, {"x":12, "y":7}, {"x":13, "y":7},
{"x":3, "y":8}, {"x":3, "y":7.8},
{"x":10, "y":8} {"x":10, "y":7.8}
] ]
} }
} }

View file

@ -1,32 +1,48 @@
# Concertina 64-key # Concertina 64-key
![Concertina 64-key](https://raw.githubusercontent.com/noroadsleft/qmk_images/master/keyboards/handwired/concertina/64key/concertina-1-side-view.jpg) A diploid, concave, columnar keyboard, with vertical finger clusters
beneath large horizontal thumb clusters.
A diploid, concave, columnar keyboard. ![Side view](https://viktor.eikman.se/image/concertina-1-side-view/display)
This folder represents the keyboard configuration identified as ## Hardware
`concertina_64key` in the DMOTE applications list of GNU make targets, as of
version 0.7.0 of that application. The QMK code is fully compatible back to
version 0.6.0, which introduced the Concertina.
The default keymap for this layout has a QWERTY base layer but is intended for * Keyboard maintainer: [Viktor Eikman](https://github.com/veikman)
running Colemak on the OS side. It has a separate key layer that forces Colemak * Hardware supported: Concertina 64-key case, Pro Micro (ATmega32U4)
from the QMK side in case the keyboard has to be used with a computer that does * Hardware availability: [viktor.eikman.se](https://viktor.eikman.se/article/the-concertina/)
not run Colemak.
This QMK model represents the printable keyboard shape identified as
`concertina_64key` in the DMOTE applications list of GNU make
targets, available [here](https://github.com/veikman/dactyl-keyboard),
as of version 0.7.0 of that application. The QMK code is fully
compatible back to version 0.6.0, which introduced the Concertina.
A full set of printable caps to match the keymap is available in the A full set of printable caps to match the keymap is available in the
`dmote-keycap` application, [here](https://github.com/veikman/dmote-keycap). `dmote-keycap` application,
[here](https://github.com/veikman/dmote-keycap).
* Keyboard Maintainer: [Viktor Eikman](https://github.com/veikman) ## Firmware
* Hardware Supported: Concertina 64-key case, Pro Micro (ATmega32U4)
* Hardware Availability: [viktor.eikman.se](https://viktor.eikman.se/article/the-concertina/)
Make example for this keyboard (after setting up your build environment): Brand new to QMK? Start [here](https://docs.qmk.fm/#/newbs).
The default keymap for this layout has a QWERTY base layer (0) but is
intended for running Colemak on the OS side. It has a separate key
layer (1) that forces Colemak from the QMK side in case the keyboard
has to be used with a computer that does not run Colemak. Layer 2
flips the navigation clusters around. Layer 3 is numbers and mouse
control.
### Building from the CLI
See the general [build
environment](https://docs.qmk.fm/#/getting_started_build_tools) and
[make instructions](https://docs.qmk.fm/#/getting_started_make_guide)
to get set up.
To build firmware for the Concertina without the `qmk` utility:
make handwired/concertina/64key:default make handwired/concertina/64key:default
Flashing example for this keyboard: To also flash a connected Concertina:
make handwired/concertina/64key:default:flash make handwired/concertina/64key:default:flash
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).