Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@qmk-bot
qmk-bot committed Aug 19, 2021
2 parents b23a4db + 068ab28 commit c8e8c21
Show file tree
Hide file tree
Showing 7 changed files with 2,194 additions and 47 deletions.
472 changes: 472 additions & 0 deletions keyboards/keebio/quefrency/rev1/info.json
View file

Large diffs are not rendered by default.

85 changes: 44 additions & 41 deletions keyboards/keebio/quefrency/info.json → keyboards/keebio/quefrency/rev2/info.json
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
{
"keyboard_name": "Quefrency",
"keyboard_name": "Quefrency rev2",
"url": "https://keeb.io",
"maintainer": "nooges",
"width": 17,
"width": 19.25,
"height": 5,
"layout_aliases": {
"LAYOUT": "LAYOUT_60"
},
"layouts": {
"LAYOUT_60": {
"layout": [
Expand Down Expand Up @@ -207,8 +210,8 @@
{ "label": "I", "x": 11.75, "y": 1 },
{ "label": "O", "x": 12.75, "y": 1 },
{ "label": "P", "x": 13.75, "y": 1 },
{ "label": "{", "x": 14.75, "y": 1 },
{ "label": "}", "x": 15.75, "y": 1 },
{ "label": "[", "x": 14.75, "y": 1 },
{ "label": "]", "x": 15.75, "y": 1 },
{ "label": "Backslash", "x": 16.75, "y": 1, "w": 1.5 },

{ "label": "F3", "x": 0, "y": 2 },
Expand All @@ -225,8 +228,8 @@
{ "label": "J", "x": 11, "y": 2 },
{ "label": "K", "x": 12, "y": 2 },
{ "label": "L", "x": 13, "y": 2 },
{ "label": ":", "x": 14, "y": 2 },
{ "label": "\"", "x": 15, "y": 2 },
{ "label": ";", "x": 14, "y": 2 },
{ "label": "'", "x": 15, "y": 2 },
{ "label": "Enter", "x": 16, "y": 2, "w": 2.25 },

{ "label": "F4", "x": 0, "y": 3 },
Expand All @@ -245,14 +248,14 @@
{ "label": ".", "x": 13.5, "y": 3 },
{ "label": "/", "x": 14.5, "y": 3 },
{ "label": "Shift", "x": 15.5, "y": 3, "w": 1.75 },
{ "label": "Fn", "x": 17.25, "y": 3 },
{ "label": "Up", "x": 17.25, "y": 3 },

{ "label": "F5", "x": 0, "y": 4 },
{ "label": "F10", "x": 1, "y": 4 },

{ "label": "Ctrl", "x": 2.25, "y": 4, "w": 1.25 },
{ "label": "Win", "x": 3.5, "y": 4, "w": 1.25 },
{ "label": "Alt", "x": 4.75, "y": 4, "w": 1.25 },
{ "label": "Alt", "x": 3.5, "y": 4, "w": 1.25 },
{ "label": "Win", "x": 4.75, "y": 4, "w": 1.25 },
{ "label": "Fn", "x": 6, "y": 4, "w": 1.25 },
{ "label": "Space", "x": 7.25, "y": 4, "w": 2.25 },

Expand Down Expand Up @@ -284,7 +287,7 @@
{ "label": "0", "x": 13.25, "y": 0 },
{ "label": "-", "x": 14.25, "y": 0 },
{ "label": "=", "x": 15.25, "y": 0 },
{ "label": "=", "x": 16.25, "y": 0 },
{ "label": "Del", "x": 16.25, "y": 0 },
{ "label": "Bksp", "x": 17.25, "y": 0 },
{ "label": "Home", "x": 18.25, "y": 0 },

Expand All @@ -303,9 +306,9 @@
{ "label": "I", "x": 11.75, "y": 1 },
{ "label": "O", "x": 12.75, "y": 1 },
{ "label": "P", "x": 13.75, "y": 1 },
{ "label": "{", "x": 14.75, "y": 1 },
{ "label": "}", "x": 15.75, "y": 1 },
{ "label": "|", "x": 16.75, "y": 1, "w": 1.5 },
{ "label": "[", "x": 14.75, "y": 1 },
{ "label": "]", "x": 15.75, "y": 1 },
{ "label": "Backslash", "x": 16.75, "y": 1, "w": 1.5 },
{ "label": "PgUp", "x": 18.25, "y": 1 },

{ "label": "F3", "x": 0, "y": 2 },
Expand All @@ -322,8 +325,8 @@
{ "label": "J", "x": 11, "y": 2 },
{ "label": "K", "x": 12, "y": 2 },
{ "label": "L", "x": 13, "y": 2 },
{ "label": ":", "x": 14, "y": 2 },
{ "label": "\"", "x": 15, "y": 2 },
{ "label": ";", "x": 14, "y": 2 },
{ "label": "'", "x": 15, "y": 2 },
{ "label": "Enter", "x": 16, "y": 2, "w": 2.25 },
{ "label": "PgDn", "x": 18.25, "y": 2 },

Expand All @@ -350,8 +353,8 @@
{ "label": "F10", "x": 1, "y": 4 },

{ "label": "Ctrl", "x": 2.25, "y": 4, "w": 1.25 },
{ "label": "Win", "x": 3.5, "y": 4, "w": 1.25 },
{ "label": "Alt", "x": 4.75, "y": 4, "w": 1.25 },
{ "label": "Alt", "x": 3.5, "y": 4, "w": 1.25 },
{ "label": "Win", "x": 4.75, "y": 4, "w": 1.25 },
{ "label": "Fn", "x": 6, "y": 4, "w": 1.25 },
{ "label": "Space", "x": 7.25, "y": 4, "w": 2.25 },

Expand All @@ -367,7 +370,7 @@
},
"LAYOUT_60_iso": {
"layout": [
{ "label": "`", "x": 0, "y": 0 },
{ "label": "Esc", "x": 0, "y": 0 },
{ "label": "1", "x": 1, "y": 0 },
{ "label": "2", "x": 2, "y": 0 },
{ "label": "3", "x": 3, "y": 0 },
Expand Down Expand Up @@ -448,7 +451,7 @@
},
"LAYOUT_65_iso": {
"layout": [
{ "label": "`", "x": 0, "y": 0 },
{ "label": "Esc", "x": 0, "y": 0 },
{ "label": "1", "x": 1, "y": 0 },
{ "label": "2", "x": 2, "y": 0 },
{ "label": "3", "x": 3, "y": 0 },
Expand Down Expand Up @@ -569,8 +572,8 @@
{ "label": "I", "x": 11.75, "y": 1 },
{ "label": "O", "x": 12.75, "y": 1 },
{ "label": "P", "x": 13.75, "y": 1 },
{ "label": "{", "x": 14.75, "y": 1 },
{ "label": "}", "x": 15.75, "y": 1 },
{ "label": "[", "x": 14.75, "y": 1 },
{ "label": "]", "x": 15.75, "y": 1 },

{ "label": "F3", "x": 0, "y": 2 },
{ "label": "F8", "x": 1, "y": 2 },
Expand All @@ -586,8 +589,8 @@
{ "label": "J", "x": 11, "y": 2 },
{ "label": "K", "x": 12, "y": 2 },
{ "label": "L", "x": 13, "y": 2 },
{ "label": ":", "x": 14, "y": 2 },
{ "label": "\"", "x": 15, "y": 2 },
{ "label": ";", "x": 14, "y": 2 },
{ "label": "'", "x": 15, "y": 2 },
{ "label": "NUHS", "x": 16, "y": 2 },
{ "label": "Enter", "x": 17, "y": 1, "w": 1.25, "h": 2 },

Expand All @@ -608,14 +611,14 @@
{ "label": ".", "x": 13.5, "y": 3 },
{ "label": "/", "x": 14.5, "y": 3 },
{ "label": "Shift", "x": 15.5, "y": 3, "w": 1.75 },
{ "label": "Fn", "x": 17.25, "y": 3 },
{ "label": "Up", "x": 17.25, "y": 3 },

{ "label": "F5", "x": 0, "y": 4 },
{ "label": "F10", "x": 1, "y": 4 },

{ "label": "Ctrl", "x": 2.25, "y": 4, "w": 1.25 },
{ "label": "Win", "x": 3.5, "y": 4, "w": 1.25 },
{ "label": "Alt", "x": 4.75, "y": 4, "w": 1.25 },
{ "label": "Alt", "x": 3.5, "y": 4, "w": 1.25 },
{ "label": "Win", "x": 4.75, "y": 4, "w": 1.25 },
{ "label": "Fn", "x": 6, "y": 4, "w": 1.25 },
{ "label": "Space", "x": 7.25, "y": 4, "w": 2.25 },

Expand Down Expand Up @@ -647,7 +650,7 @@
{ "label": "0", "x": 13.25, "y": 0 },
{ "label": "-", "x": 14.25, "y": 0 },
{ "label": "=", "x": 15.25, "y": 0 },
{ "label": "=", "x": 16.25, "y": 0 },
{ "label": "Del", "x": 16.25, "y": 0 },
{ "label": "Bksp", "x": 17.25, "y": 0 },
{ "label": "Home", "x": 18.25, "y": 0 },

Expand All @@ -666,8 +669,8 @@
{ "label": "I", "x": 11.75, "y": 1 },
{ "label": "O", "x": 12.75, "y": 1 },
{ "label": "P", "x": 13.75, "y": 1 },
{ "label": "{", "x": 14.75, "y": 1 },
{ "label": "}", "x": 15.75, "y": 1 },
{ "label": "[", "x": 14.75, "y": 1 },
{ "label": "]", "x": 15.75, "y": 1 },
{ "label": "PgUp", "x": 18.25, "y": 1 },

{ "label": "F3", "x": 0, "y": 2 },
Expand All @@ -684,8 +687,8 @@
{ "label": "J", "x": 11, "y": 2 },
{ "label": "K", "x": 12, "y": 2 },
{ "label": "L", "x": 13, "y": 2 },
{ "label": ":", "x": 14, "y": 2 },
{ "label": "\"", "x": 15, "y": 2 },
{ "label": ";", "x": 14, "y": 2 },
{ "label": "'", "x": 15, "y": 2 },
{ "label": "NUHS", "x": 16, "y": 2 },
{ "label": "Enter", "x": 17, "y": 1, "w": 1.25, "h": 2 },
{ "label": "PgDn", "x": 18.25, "y": 2 },
Expand Down Expand Up @@ -714,8 +717,8 @@
{ "label": "F10", "x": 1, "y": 4 },

{ "label": "Ctrl", "x": 2.25, "y": 4, "w": 1.25 },
{ "label": "Win", "x": 3.5, "y": 4, "w": 1.25 },
{ "label": "Alt", "x": 4.75, "y": 4, "w": 1.25 },
{ "label": "Alt", "x": 3.5, "y": 4, "w": 1.25 },
{ "label": "Win", "x": 4.75, "y": 4, "w": 1.25 },
{ "label": "Fn", "x": 6, "y": 4, "w": 1.25 },
{ "label": "Space", "x": 7.25, "y": 4, "w": 2.25 },

Expand Down Expand Up @@ -748,7 +751,7 @@
{ "label": "0", "x": 13.25, "y": 0 },
{ "label": "-", "x": 14.25, "y": 0 },
{ "label": "=", "x": 15.25, "y": 0 },
{ "label": "=", "x": 16.25, "y": 0 },
{ "label": "Del", "x": 16.25, "y": 0 },
{ "label": "Bksp", "x": 17.25, "y": 0 },
{ "label": "Home", "x": 18.25, "y": 0 },

Expand All @@ -767,9 +770,9 @@
{ "label": "I", "x": 11.75, "y": 1 },
{ "label": "O", "x": 12.75, "y": 1 },
{ "label": "P", "x": 13.75, "y": 1 },
{ "label": "{", "x": 14.75, "y": 1 },
{ "label": "}", "x": 15.75, "y": 1 },
{ "label": "|", "x": 16.75, "y": 1, "w": 1.5 },
{ "label": "[", "x": 14.75, "y": 1 },
{ "label": "]", "x": 15.75, "y": 1 },
{ "label": "Backslash", "x": 16.75, "y": 1, "w": 1.5 },
{ "label": "PgUp", "x": 18.25, "y": 1 },

{ "label": "F3", "x": 0, "y": 2 },
Expand All @@ -786,8 +789,8 @@
{ "label": "J", "x": 11, "y": 2 },
{ "label": "K", "x": 12, "y": 2 },
{ "label": "L", "x": 13, "y": 2 },
{ "label": ":", "x": 14, "y": 2 },
{ "label": "\"", "x": 15, "y": 2 },
{ "label": ";", "x": 14, "y": 2 },
{ "label": "'", "x": 15, "y": 2 },
{ "label": "NUHS", "x": 16, "y": 2 },
{ "label": "Enter", "x": 17, "y": 2, "w": 1.25 },
{ "label": "PgDn", "x": 18.25, "y": 2 },
Expand Down Expand Up @@ -816,8 +819,8 @@
{ "label": "F10", "x": 1, "y": 4 },

{ "label": "Ctrl", "x": 2.25, "y": 4, "w": 1.25 },
{ "label": "Win", "x": 3.5, "y": 4, "w": 1.25 },
{ "label": "Alt", "x": 4.75, "y": 4, "w": 1.25 },
{ "label": "Alt", "x": 3.5, "y": 4, "w": 1.25 },
{ "label": "Win", "x": 4.75, "y": 4, "w": 1.25 },
{ "label": "Fn", "x": 6, "y": 4, "w": 1.25 },
{ "label": "Space", "x": 7.25, "y": 4 },
{ "label": "Space", "x": 8.25, "y": 4, "w": 1.25 },
Expand Down
2 changes: 0 additions & 2 deletions keyboards/keebio/quefrency/rev2/rev2.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@
{ RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, KC_NO } \
}

#define LAYOUT LAYOUT_60 // For backwards compatibility with Rev. 1

#define LAYOUT_65( \
LA3, LA4, LA5, LA6, LA7, LA8, LA9, RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9, \
LB3, LB4, LB5, LB6, LB7, LB8, RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9, \
Expand Down
Loading

0 comments on commit c8e8c21

Please sign in to comment.