Skip to content

Commit

Permalink
Wolf Sabre: fix Configurator layout data (#16465)
Browse files Browse the repository at this point in the history 
* apply friendly formatting to info.json

* rebuild Configurator layout data

KLE Rotation leads to incorrect layout data when converted to `info.json` format.

* add matrix diagram to sabre.h
  • Loading branch information
@noroadsleft
noroadsleft authored Feb 27, 2022
1 parent 57601d3 commit a7a3f72
Show file tree
Hide file tree
Showing 2 changed files with 120 additions and 2 deletions.
99 changes: 97 additions & 2 deletions keyboards/wolf/sabre/info.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,102 @@
"maintainer": "ToastyStoemp",
"layouts": {
"LAYOUT": {
"layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":8.25, "y":0}, {"label":"PrtSc", "x":17.25, "y":0}, {"label":"Scroll Lock", "x":18.25, "y":0}, {"label":"Pause", "x":19.25, "y":0}, {"label":"\u00ac", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"\"", "x":2, "y":1.25}, {"label":"\u00a3", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"Insert", "x":17.25, "y":1.25}, {"label":"Home", "x":18.25, "y":1.25}, {"label":"PgUp", "x":19.25, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Delete", "x":17.25, "y":2.25}, {"label":"End", "x":18.25, "y":2.25}, {"label":"PgDn", "x":19.25, "y":2.25}, {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"Shift", "x":0, "y":4.25, "w":2.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"\u2191", "x":18.25, "y":4.25}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.5}, {"label":"Win", "x":2.5, "y":5.25, "w":1.5}, {"label":"Alt", "x":4, "y":5.25}, {"x":5, "y":5.25, "w":2.25}, {"label":"\u2190", "x":17.25, "y":5.25}, {"label":"\u2193", "x":18.25, "y":5.25}, {"label":"\u2192", "x":19.25, "y":5.25}, {"label":"F6", "x":-7.75, "y":6.25}, {"label":"F7", "x":-6.75, "y":6.25}, {"label":"F8", "x":-5.75, "y":6.25}, {"label":"F9", "x":-4.5, "y":6.25}, {"label":"F10", "x":-3.5, "y":6.25}, {"label":"F11", "x":-2.5, "y":6.25}, {"label":"F12", "x":-1.5, "y":6.25}, {"label":"&", "x":-8.5, "y":7.5}, {"label":"*", "x":-7.5, "y":7.5}, {"label":"(", "x":-6.5, "y":7.5}, {"label":")", "x":-5.5, "y":7.5}, {"label":"_", "x":-4.5, "y":7.5}, {"label":"+", "x":-3.5, "y":7.5}, {"label":"BackSpace", "x":-2.5, "y":7.5, "w":2}, {"label":"Y", "x":-9.0, "y":8.5}, {"label":"U", "x":-8, "y":8.5}, {"label":"I", "x":-7.0, "y":8.5}, {"label":"O", "x":-6, "y":8.5}, {"label":"P", "x":-5.0, "y":8.5}, {"label":"{", "x":-4, "y":8.5}, {"label":"}", "x":-3.0, "y":8.5}, {"label":"|", "x":-2, "y":8.5, "w":1.5}, {"label":"H", "x":-8.75, "y":9.5}, {"label":"J", "x":-7.75, "y":9.5}, {"label":"K", "x":-6.75, "y":9.5}, {"label":"L", "x":-5.75, "y":9.5}, {"label":":", "x":-4.75, "y":9.5}, {"label":"@", "x":-3.75, "y":9.5}, {"label":"Enter", "x":-2.75, "y":9.5, "w":2.25}, {"label":"B", "x":-9.25, "y":10.5}, {"label":"N", "x":-8.25, "y":10.5}, {"label":"M", "x":-7.25, "y":10.5}, {"label":"<", "x":-6.25, "y":10.5}, {"label":">", "x":-5.25, "y":10.5}, {"label":"?", "x":-4.25, "y":10.5}, {"label":"Shift", "x":-3.25, "y":10.5, "w":1.75}, {"x":-1.5, "y":10.5}, {"x":-9.25, "y":11.5, "w":2.75}, {"label":"<", "x":-6.5, "y":11.5}, {"label":"Alt", "x":-5.5, "y":11.5, "w":1.5}, {"label":"Ctrl", "x":-3.0, "y":11.5, "w":1.5}]
"layout": [
{"label":"Esc", "x":0, "y":0},
{"label":"F1", "x":2, "y":0},
{"label":"F2", "x":3, "y":0},
{"label":"F3", "x":4, "y":0},
{"label":"F4", "x":5, "y":0},
{"label":"F5", "x":8.75, "y":0},
{"label":"F6", "x":9.75, "y":0},
{"label":"F7", "x":10.75, "y":0},
{"label":"F8", "x":11.75, "y":0},
{"label":"F9", "x":13, "y":0},
{"label":"F10", "x":14, "y":0},
{"label":"F11", "x":15, "y":0},
{"label":"F12", "x":16, "y":0},
{"label":"Print Screen", "x":17.25, "y":0},
{"label":"Scroll Lock", "x":18.25, "y":0},
{"label":"Pause", "x":19.25, "y":0},

{"label":"`\u00ac", "x":0, "y":1.25},
{"label":"1!", "x":1, "y":1.25},
{"label":"2\"", "x":2, "y":1.25},
{"label":"3\u00a3", "x":3, "y":1.25},
{"label":"4$", "x":4, "y":1.25},
{"label":"5%", "x":5, "y":1.25},
{"label":"6^", "x":6, "y":1.25},
{"label":"7&", "x":9, "y":1.25},
{"label":"8*", "x":10, "y":1.25},
{"label":"9(", "x":11, "y":1.25},
{"label":"0)", "x":12, "y":1.25},
{"label":"-_", "x":13, "y":1.25},
{"label":"=+", "x":14, "y":1.25},
{"label":"BackSpace", "x":15, "y":1.25, "w":2},
{"label":"Insert", "x":17.25, "y":1.25},
{"label":"Home", "x":18.25, "y":1.25},
{"label":"Page Up", "x":19.25, "y":1.25},

{"label":"Tab", "x":0, "y":2.25, "w":1.5},
{"label":"Q", "x":1.5, "y":2.25},
{"label":"W", "x":2.5, "y":2.25},
{"label":"E", "x":3.5, "y":2.25},
{"label":"R", "x":4.5, "y":2.25},
{"label":"T", "x":5.5, "y":2.25},
{"label":"Y", "x":8.5, "y":2.25},
{"label":"U", "x":9.5, "y":2.25},
{"label":"I", "x":10.5, "y":2.25},
{"label":"O", "x":11.5, "y":2.25},
{"label":"P", "x":12.5, "y":2.25},
{"label":"[{", "x":13.5, "y":2.25},
{"label":"]}", "x":14.5, "y":2.25},
{"label":"\\|", "x":15.5, "y":2.25, "w":1.5},
{"label":"Delete", "x":17.25, "y":2.25},
{"label":"End", "x":18.25, "y":2.25},
{"label":"Page Down", "x":19.25, "y":2.25},

{"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
{"label":"A", "x":1.75, "y":3.25},
{"label":"S", "x":2.75, "y":3.25},
{"label":"D", "x":3.75, "y":3.25},
{"label":"F", "x":4.75, "y":3.25},
{"label":"G", "x":5.75, "y":3.25},
{"label":"H", "x":8.75, "y":3.25},
{"label":"J", "x":9.75, "y":3.25},
{"label":"K", "x":10.75, "y":3.25},
{"label":"L", "x":11.75, "y":3.25},
{"label":";:", "x":12.75, "y":3.25},
{"label":"'@", "x":13.75, "y":3.25},
{"label":"Enter", "x":14.75, "y":3.25, "w":2.25},

{"label":"Shift", "x":0, "y":4.25, "w":2.25},
{"label":"Z", "x":2.25, "y":4.25},
{"label":"X", "x":3.25, "y":4.25},
{"label":"C", "x":4.25, "y":4.25},
{"label":"V", "x":5.25, "y":4.25},
{"label":"B", "x":6.25, "y":4.25},
{"label":"B", "x":8.25, "y":4.25},
{"label":"N", "x":9.25, "y":4.25},
{"label":"M", "x":10.25, "y":4.25},
{"label":",<", "x":11.25, "y":4.25},
{"label":".>", "x":12.25, "y":4.25},
{"label":"/?", "x":13.25, "y":4.25},
{"label":"Shift", "x":14.25, "y":4.25, "w":1.75},
{"label":"Fn", "x":16, "y":4.25},
{"label":"\u2191", "x":18.25, "y":4.25},

{"label":"Ctrl", "x":0, "y":5.25, "w":1.5},
{"label":"GUI", "x":2.5, "y":5.25, "w":1.5},
{"label":"Alt", "x":4, "y":5.25},
{"label":"Space", "x":5, "y":5.25, "w":2.25},
{"label":"Space", "x":8.25, "y":5.25, "w":2.75},
{"label":"Alt", "x":11, "y":5.25},
{"label":"GUI", "x":12, "y":5.25, "w":1.5},
{"label":"Ctrl", "x":14.5, "y":5.25, "w":1.5},
{"label":"\u2190", "x":17.25, "y":5.25},
{"label":"\u2193", "x":18.25, "y":5.25},
{"label":"\u2192", "x":19.25, "y":5.25}
]
}
}
}
}
23 changes: 23 additions & 0 deletions keyboards/wolf/sabre/sabre.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,29 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

#include "quantum.h"

/*
* ┌───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
* │00 │ │01 │11 │02 │12 │ │13 │04 │14 │05 │ │15 │06 │16 │07 │ │17 │08 │18 │
* └───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
* ┌───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐
* │20 │30 │21 │31 │22 │32 │23 │ │33 │24 │34 │25 │35 │26 │36 │ │37 │28 │38 │
* ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤
* │40 │50 │41 │51 │42 │52 │ │43 │53 │44 │54 │45 │55 │46 │56 │ │57 │48 │58 │
* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘
* │60 │70 │61 │71 │62 │72 │ │63 │73 │64 │74 │65 │75 │76 │
* ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ ┌───┐ ┌──────────┐
* │80 │90 │81 │91 │82 │92 │ │83 │93 │84 │94 │85 │95 │86 │96 │ │88 │ │86 │ 2.75u RShift
* ├─────┬──┴┬──┴──┬┴──┬┴───┴───┤ ├───┴───┴──┬┴──┬┴───┴┬──┴┬────┬┴───┘ ┌───┼───┼───┐ └──────────┘
* │A0 │ │B0 │A1 │A2 │ │B3 │B4 │A5 │ │A6 │ │B7 │A8 │B8 │
* └─────┘ └─────┴───┴────────┘ └──────────┴───┴─────┘ └────┘ └───┴───┴───┘
* ┌───┬─────┐ ┌─────┬───┐
* │B0 │A1 │ │B4 │A5 │
* └───┴─────┘ └─────┴───┘
* ┌────┬────┐ ┌────┬────┐
* │B0 │A1 │ │B4 │A5 │
* └────┴────┘ └────┴────┘
*/

/* sabre Keymap Definitions */
#define LAYOUT( \
K00, K01, K11, K02, K12, K13, K04, K14, K05, K15, K06, K16, K07, K17, K08, K18, \
Expand Down

0 comments on commit a7a3f72

Please sign in to comment.