drashna/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
QMK Bot 2021-07-20 00:30:40 +00:00
commit f9332747e3
39 changed files with 335 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
keyboards/40percentclub/5x5/info.json
View File

@ -1,5 +1,5 @@
{
"keyboard_name": "40percent.club 4x4",
"keyboard_name": "40percent.club 5x5",
"url": "",
"maintainer": "qmk",
"height": 4,

2
keyboards/40percentclub/6lit/rules.mk
View File

@ -32,3 +32,5 @@ AUDIO_ENABLE = no # Audio output on port C6
# Enable generic behavior for split boards
SPLIT_KEYBOARD = yes
LAYOUTS = ortho_2x3 ortho_2x6

7
keyboards/40percentclub/sixpack/config.h
View File

@ -40,8 +40,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
* ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
*
*/
// #define MATRIX_ROW_PINS { B0 } // B0 equivalents the ground pin
// #define MATRIX_COL_PINS { E6, D7, C6, D4 }
#define DIRECT_PINS { \
{ D4, C6, D7 }, \
{ E6, B4, B5 } \
@ -56,6 +54,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define BACKLIGHT_LEVELS 6
#define BACKLIGHT_PINS { F4, F5 } // Top Row, Bottom Row
/* LED Indicators */
#define LED_PIN_ON_STATE 0
#define LED_CAPS_LOCK_PIN B0 // RX Led
#define LED_NUM_LOCK_PIN D5 // TX Led
// #define RGB_DI_PIN B1 // PB1 on expansion connector
// #ifdef RGB_DI_PIN
// #define RGBLED_NUM 16

2
keyboards/40percentclub/sixpack/info.json
View File

@ -1,5 +1,5 @@
{
"keyboard_name": "sixpack",
"keyboard_name": "Six Pack",
"url": "https://www.40percent.club/2017/05/six-pack-11.html",
"maintainer": "qmk",
"width": 3,

4
keyboards/40percentclub/sixpack/keymaps/via/keymap.c
View File

@ -33,9 +33,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS, KC_TRNS, KC_TRNS),
[3] = LAYOUT_ortho_2x3(KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS),
[4] = LAYOUT_ortho_2x3(KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS),
[5] = LAYOUT_ortho_2x3(KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS),
};

2
keyboards/40percentclub/sixpack/rules.mk
View File

@ -20,3 +20,5 @@ BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
BLUETOOTH_ENABLE = no # Enable Bluetooth
AUDIO_ENABLE = no # Audio output
LAYOUTS = ortho_2x3

3
keyboards/boardsource/holiday/spooky/keymaps/default/keymap.c
View File

@ -24,7 +24,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Base */
[_BASE] = LAYOUT_ortho_2x3(
KC_F1, KC_F2, KC_F3,
KC_F4, KC_F5,KC_F6
KC_F4, KC_F5, KC_F6
),
};

2
keyboards/boardsource/holiday/spooky/rules.mk
View File

@ -20,3 +20,5 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
BLUETOOTH_ENABLE = no # Enable Bluetooth
AUDIO_ENABLE = no # Audio output
LAYOUTS = ortho_2x3

3
keyboards/handwired/stream_cheap/2x3/readme.md Normal file
View File

@ -0,0 +1,3 @@
# Stream Cheap
An ortholinear macropad, 2x3 configuration.

2
keyboards/handwired/stream_cheap/2x3/rules.mk
View File

@ -20,3 +20,5 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
BLUETOOTH_ENABLE = no # Enable Bluetooth
AUDIO_ENABLE = no # Audio output
LAYOUTS = ortho_2x3

3
keyboards/handwired/stream_cheap/2x4/readme.md Normal file
View File

@ -0,0 +1,3 @@
# Stream Cheap
An ortholinear macropad, 2x4 configuration.

3
keyboards/handwired/stream_cheap/2x5/readme.md Normal file
View File

@ -0,0 +1,3 @@
# Stream Cheap
An ortholinear macropad, 2x5 configuration.

2
keyboards/sixkeyboard/info.json
View File

@ -5,7 +5,7 @@
"width": 3,
"height": 2,
"layouts": {
"LAYOUT": {
"LAYOUT_ortho_2x3": {
"layout": [{"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}, {"label":"k10", "x":0, "y":1}, {"label":"k11", "x":1, "y":1}, {"label":"k12", "x":2, "y":1}]
}
}

2
keyboards/sixkeyboard/keymaps/default/keymap.c
View File

@ -3,7 +3,7 @@
#include "matrix.h"
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT(
[0] = LAYOUT_ortho_2x3(
KC_A, KC_B, KC_C, \
KC_D, KC_E, KC_F \
)

8
keyboards/sixkeyboard/keymaps/via/keymap.c
View File

@ -17,22 +17,22 @@
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT(
[0] = LAYOUT_ortho_2x3(
KC_A, KC_B, KC_C,
KC_D, KC_E, KC_F
),
[1] = LAYOUT(
[1] = LAYOUT_ortho_2x3(
KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS
),
[2] = LAYOUT(
[2] = LAYOUT_ortho_2x3(
KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS
),
[3] = LAYOUT(
[3] = LAYOUT_ortho_2x3(
KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS
)

3
keyboards/sixkeyboard/rules.mk
View File

@ -28,4 +28,5 @@ UNICODE_ENABLE = no # Unicode
BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
CUSTOM_MATRIX = yes
SRC = matrix.c
SRC += matrix.c
LAYOUTS = ortho_2x3

2
keyboards/sixkeyboard/sixkeyboard.h
View File

@ -22,7 +22,7 @@
* │ D │ E │ F │
* └───┴───┴───┘
*/
#define LAYOUT( \
#define LAYOUT_ortho_2x3( \
k00, k01, k02, \
k10, k11, k12 \
) { \

3
layouts/community/ortho_1x4/readme.md Normal file
View File

@ -0,0 +1,3 @@
# ortho_1x4
LAYOUT_ortho_1x4

2
layouts/community/ortho_2x3/layout.json Normal file
View File

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

3
layouts/community/ortho_2x3/readme.md Normal file
View File

@ -0,0 +1,3 @@
# ortho_2x3
LAYOUT_ortho_2x3

2
layouts/community/ortho_2x6/layout.json Normal file
View File

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

3
layouts/community/ortho_2x6/readme.md Normal file
View File

@ -0,0 +1,3 @@
# ortho_2x6
LAYOUT_ortho_2x6

6
layouts/community/ortho_5x5/layout.json
View File

@ -1 +1,5 @@
["","","","",""],["","","","",""],["","","","",""],["","","","",""],["","","","",""]
["","","","",""],
["","","","",""],
["","","","",""],
["","","","",""],
["","","","",""]

15
layouts/default/ortho_2x3/default_ortho_2x3/keymap.c Normal file
View File

@ -0,0 +1,15 @@
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/*
* ┌───┬───┬───┐
* │ A │ B │ C │
* ├───┼───┼───┤
* │ D │ E │ F │
* └───┴───┴───┘
*/
[0] = LAYOUT_ortho_2x3(
KC_A, KC_B, KC_C,
KC_D, KC_E, KC_F
)
};

20
layouts/default/ortho_2x3/info.json Normal file
View File

@ -0,0 +1,20 @@
{
"keyboard_name": "2x3 ortholinear layout",
"url": "",
"maintainer": "qmk",
"width": 3,
"height": 2,
"layouts": {
"LAYOUT_ortho_2x3": {
"layout": [
{"x":0, "y":0},
{"x":1, "y":0},
{"x":2, "y":0},
{"x":0, "y":1},
{"x":1, "y":1},
{"x":2, "y":1}
]
}
}
}

2
layouts/default/ortho_2x3/layout.json Normal file
View File

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

3
layouts/default/ortho_2x3/readme.md Normal file
View File

@ -0,0 +1,3 @@
# ortho_2x3
LAYOUT_ortho_2x3

15
layouts/default/ortho_2x6/default_ortho_2x6/keymap.c Normal file
View File

@ -0,0 +1,15 @@
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/*
* ┌───┬───┬───┬───┬───┬───┐
* │ A │ B │ C │ D │ E │ F │
* ├───┼───┼───┼───┼───┼───┤
* │ G │ H │ I │ J │ K │ L │
* └───┴───┴───┴───┴───┴───┘
*/
[0] = LAYOUT_ortho_2x6(
KC_A, KC_B, KC_C, KC_D, KC_E, KC_F,
KC_G, KC_H, KC_I, KC_J, KC_K, KC_L
)
};

26
layouts/default/ortho_2x6/info.json Normal file
View File

@ -0,0 +1,26 @@
{
"keyboard_name": "2x6 ortholinear layout",
"url": "",
"maintainer": "qmk",
"width": 6,
"height": 2,
"layouts": {
"LAYOUT_ortho_2x6": {
"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":0, "y":1},
{"x":1, "y":1},
{"x":2, "y":1},
{"x":3, "y":1},
{"x":4, "y":1},
{"x":5, "y":1}
]
}
}
}

2
layouts/default/ortho_2x6/layout.json Normal file
View File

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

3
layouts/default/ortho_2x6/readme.md Normal file
View File

@ -0,0 +1,3 @@
# ortho_2x6
LAYOUT_ortho_2x6

24
layouts/default/ortho_5x10/default_ortho_5x10/keymap.c Normal file
View File

@ -0,0 +1,24 @@
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/*
* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
* │ A │ B │ C │ D │ E │ F │ G │ H │ I │ J │
* ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
* │ A │ B │ C │ D │ E │ F │ G │ H │ I │ J │
* ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
* │ A │ B │ C │ D │ E │ F │ G │ H │ I │ J │
* ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
* │ A │ B │ C │ D │ E │ F │ G │ H │ I │ J │
* ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
* │ A │ B │ C │ D │ E │ F │ G │ H │ I │ J │
* └───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘
*/
[0] = LAYOUT_ortho_5x10(
KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J,
KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J,
KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J,
KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J,
KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J
)
};

67
layouts/default/ortho_5x10/info.json Normal file
View File

@ -0,0 +1,67 @@
{
"keyboard_name": "5x10 ortholinear layout",
"url": "",
"maintainer": "qmk",
"width": 10,
"height": 5,
"layouts": {
"LAYOUT_ortho_5x10": {
"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":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":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":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":0, "y":4},
{"x":1, "y":4},
{"x":2, "y":4},
{"x":3, "y":4},
{"x":4, "y":4},
{"x":5, "y":4},
{"x":6, "y":4},
{"x":7, "y":4},
{"x":8, "y":4},
{"x":9, "y":4},
]
}
}
}

5
layouts/default/ortho_5x10/layout.json Normal file
View File

@ -0,0 +1,5 @@
[{a:7},"","","","","","","","","",""],
["","","","","","","","","",""],
["","","","","","","","","",""],
["","","","","","","","","",""],
["","","","","","","","","",""]

3
layouts/default/ortho_5x10/readme.md Normal file
View File

@ -0,0 +1,3 @@
# ortho_5x10
LAYOUT_ortho_5x10

42
layouts/default/ortho_5x5/info.json Normal file
View File

@ -0,0 +1,42 @@
{
"keyboard_name": "5x5 ortholinear layout",
"url": "",
"maintainer": "qmk",
"width": 5,
"height": 5,
"layouts": {
"LAYOUT_ortho_5x5": {
"layout": [
{"x":0, "y":0},
{"x":1, "y":0},
{"x":2, "y":0},
{"x":3, "y":0},
{"x":4, "y":0},
{"x":0, "y":1},
{"x":1, "y":1},
{"x":2, "y":1},
{"x":3, "y":1},
{"x":4, "y":1},
{"x":0, "y":2},
{"x":1, "y":2},
{"x":2, "y":2},
{"x":3, "y":2},
{"x":4, "y":2},
{"x":0, "y":3},
{"x":1, "y":3},
{"x":2, "y":3},
{"x":3, "y":3},
{"x":4, "y":3},
{"x":0, "y":4},
{"x":1, "y":4},
{"x":2, "y":4},
{"x":3, "y":4},
{"x":4, "y":4}
]
}
}
}

5
layouts/default/ortho_5x5/layout.json Normal file
View File

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

3
layouts/default/ortho_5x5/readme.md Normal file
View File

@ -0,0 +1,3 @@
# ortho_5x5
LAYOUT_ortho_5x5

48
layouts/default/readme.md
View File

@ -660,6 +660,24 @@ LAYOUT_numpad_6x4
### Ortholinear Layouts
```
LAYOUT_ortho_2x3
┌───┬───┬───┐
│ │ │ │
├───┼───┼───┤
│ │ │ │
└───┴───┴───┘
```
```
LAYOUT_ortho_2x6
┌───┬───┬───┬───┬───┬───┐
│ │ │ │ │ │ │
├───┼───┼───┼───┼───┼───┤
│ │ │ │ │ │ │
└───┴───┴───┴───┴───┴───┘
```
```
LAYOUT_ortho_3x10
┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
@ -710,6 +728,36 @@ LAYOUT_ortho_4x4
└───┴───┴───┴───┘
```
```
LAYOUT_ortho_5x5
┌───┬───┬───┬───┬───┐
│ │ │ │ │ │
├───┼───┼───┼───┼───┤
│ │ │ │ │ │
├───┼───┼───┼───┼───┤
│ │ │ │ │ │
├───┼───┼───┼───┼───┤
│ │ │ │ │ │
├───┼───┼───┼───┼───┤
│ │ │ │ │ │
└───┴───┴───┴───┴───┘
```
```
LAYOUT_ortho_5x10
┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
│ │ │ │ │ │ │ │ │ │ │
├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
│ │ │ │ │ │ │ │ │ │ │
├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
│ │ │ │ │ │ │ │ │ │ │
├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
│ │ │ │ │ │ │ │ │ │ │
├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
│ │ │ │ │ │ │ │ │ │ │
└───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘
```
```
LAYOUT_ortho_5x12
┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐