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

This commit is contained in:
QMK Bot 2022-01-10 23:05:34 +00:00
commit 20e16bbcc4
6 changed files with 164 additions and 6 deletions

View file

@ -1,19 +1,18 @@
# Cradio keyboards
![Cradio](https://github.com/davidphilipbarr/hypergolic/raw/main/hypergarlic/ht.png)
![Cradio](https://raw.githubusercontent.com/filterpaper/filterpaper.github.io/main/images/cradio.png)
Cradio are low-profile 34-key split-keyboards designed by [@davidphilipbarr](https://github.com/davidphilipbarr), with no diodes and direct micro-controller pin wiring.
Cradio are minimalist 34-key split-keyboards designed with no diodes, using direct micro-controller pin wiring.
## Keyboard Info
* Keyboard Maintainer: [davidphilipbarr](https://github.com/davidphilipbarr)
* Keyboard Maintainer: [David Barr](https://github.com/davidphilipbarr)
* Hardware Supported:
* [Cradio](https://github.com/davidphilipbarr/36keys/tree/master/34Keys)
* [Sweep](https://github.com/davidphilipbarr/Sweep)
* [Hypergarlic](https://github.com/davidphilipbarr/hypergolic/tree/main/hypergarlic)
* [Paroxysm](https://github.com/davidphilipbarr/hypergolic/tree/main/paroxysm)
* [Hypergolic](https://github.com/davidphilipbarr/hypergolic)
* Variants of the same 34-key direct pin PCB
* Hardware Availability: order PCBs with gerber files from the repository
* Hardware Availability: order PCBs using gerber files from the repository
Make example for this keyboard (after setting up your build environment):

View file

@ -0,0 +1,61 @@
// Copyright 2022 QMK (James Young @noroadsleft)
// SPDX-License-Identifier: GPL-2.0-or-later
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
* Tab Q W E R T Y U I O P BS 7 8 9 /
*
* Esc A S D F G H J K L ;: '" │ 4 │ 5 │ 6 │ * │
*
* Sft Z X C V B N M ,< .> /? Ent 1 2 3 -
*
* ` CtlGUIAltFn Fn2LftDwnUp Rgt 0 . Ent +
*
*/
[0] = LAYOUT_ortho_4x16(
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_P7, KC_P8, KC_P9, KC_PSLS,
KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_P4, KC_P5, KC_P6, KC_PAST,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, KC_P1, KC_P2, KC_P3, KC_PMNS,
KC_GRV, KC_LCTL, KC_LGUI, KC_LALT, MO(1), KC_SPC, KC_SPC, MO(2), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_P0, KC_PDOT, KC_PENT, KC_PPLS
),
/* Lower
*
* ~ ! @ # $ % ^ & * ( ) BS
*
* DelF1 F2 F3 F4 F5 F6 _ + { }
*
* F7 F8 F9 F10F11F12#~ \| HomEnd
*
* NxtVlVl+Ply
*
*/
[1] = LAYOUT_ortho_4x16(
KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, _______, _______, _______, _______,
KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, _______, _______, _______, _______,
_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______, _______, _______, _______
),
/* Raise
*
* ` 1 2 3 4 5 6 7 8 9 0 BS
*
* DelF1 F2 F3 F4 F5 F6 - = [ ] \
*
* F7 F8 F9 F10F11F12 # \ PUpPDn
*
* NxtVl-Vl+Ply
*
*/
[2] = LAYOUT_ortho_4x16(
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, _______, _______, _______, _______,
KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, _______, _______, _______, _______,
_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______, _______, _______, _______
),
};

View file

@ -0,0 +1,78 @@
{
"keyboard_name": "4x16 ortholinear layout",
"url": "",
"maintainer": "qmk",
"layouts": {
"LAYOUT_ortho_4x16": {
"layout": [
{"x":0, "y":0},
{"x":1, "y":0},
{"x":2, "y":0},
{"x":3, "y":0},
{"x":4, "y":0},
{"x":5, "y":0},
{"x":6, "y":0},
{"x":7, "y":0},
{"x":8, "y":0},
{"x":9, "y":0},
{"x":10, "y":0},
{"x":11, "y":0},
{"x":12, "y":0},
{"x":13, "y":0},
{"x":14, "y":0},
{"x":15, "y":0},
{"x":0, "y":1},
{"x":1, "y":1},
{"x":2, "y":1},
{"x":3, "y":1},
{"x":4, "y":1},
{"x":5, "y":1},
{"x":6, "y":1},
{"x":7, "y":1},
{"x":8, "y":1},
{"x":9, "y":1},
{"x":10, "y":1},
{"x":11, "y":1},
{"x":12, "y":1},
{"x":13, "y":1},
{"x":14, "y":1},
{"x":15, "y":1},
{"x":0, "y":2},
{"x":1, "y":2},
{"x":2, "y":2},
{"x":3, "y":2},
{"x":4, "y":2},
{"x":5, "y":2},
{"x":6, "y":2},
{"x":7, "y":2},
{"x":8, "y":2},
{"x":9, "y":2},
{"x":10, "y":2},
{"x":11, "y":2},
{"x":12, "y":2},
{"x":13, "y":2},
{"x":14, "y":2},
{"x":15, "y":2},
{"x":0, "y":3},
{"x":1, "y":3},
{"x":2, "y":3},
{"x":3, "y":3},
{"x":4, "y":3},
{"x":5, "y":3},
{"x":6, "y":3},
{"x":7, "y":3},
{"x":8, "y":3},
{"x":9, "y":3},
{"x":10, "y":3},
{"x":11, "y":3},
{"x":12, "y":3},
{"x":13, "y":3},
{"x":14, "y":3},
{"x":15, "y":3}
]
}
}
}

View file

@ -0,0 +1,4 @@
["","","","","","","","","","","","","","","",""],
["","","","","","","","","","","","","","","",""],
["","","","","","","","","","","","","","","",""],
["","","","","","","","","","","","","","","",""]

View file

@ -0,0 +1,3 @@
# ortho_4x16
LAYOUT_ortho_4x16

View file

@ -856,6 +856,19 @@ LAYOUT_ortho_4x12
└───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘
```
```
LAYOUT_ortho_4x16
┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
└───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘
```
```
LAYOUT_ortho_4x4
┌───┬───┬───┬───┐