From 4f764519ab3fbca7c7f2ac5a8ec5d42ae1968663 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Fri, 19 Nov 2021 06:13:05 +0000
Subject: [PATCH] Chalice: Fix QMK Configurator Implementation (#15206)
---
keyboards/chalice/chalice.h | 62 ++++++++--------
keyboards/chalice/info.json | 139 ++++++++++++++++++++++++++++--------
2 files changed, 141 insertions(+), 60 deletions(-)
diff --git a/keyboards/chalice/chalice.h b/keyboards/chalice/chalice.h
index a0bc0026f6..c55cd4ba0b 100644
--- a/keyboards/chalice/chalice.h
+++ b/keyboards/chalice/chalice.h
@@ -17,44 +17,44 @@
#pragma once
-#define ____ KC_NO
+#define ___ KC_NO
#include "quantum.h"
#define LAYOUT_default( \
- K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, \
- K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K214, \
- K401, K402, K404, K406, K408, K410, K411, K412, K413, K314 \
+ K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K46, \
+ K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K56, \
+ K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K66, K76, \
+ K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K86, K96, \
+ K80, K91, K82, K92, K83, K93, K84, K94, K85, K95 \
) { \
- { K000, K002, K004, K006, K008, K010, K012 }, \
- { K001, K003, K005, K007, K009, K011, K013 }, \
- { K100, K102, K104, K106, K108, K110, K112 }, \
- { K101, K103, K105, K107, K109, K111, K113 }, \
- { K200, K202, K204, K206, K208, K210, K014 }, \
- { K201, K203, K205, K207, K209, K211, K114 }, \
- { K301, K303, K305, K307, K309, K311, K212 }, \
- { K302, K304, K306, K308, K310, K312, K213 }, \
- { K401, ____, K404, K408, K411, K413, K313 }, \
- { ____, K402, K406, K410, K412, K314, K214 } \
+ { K00, K01, K02, K03, K04, K05, K06 }, \
+ { K10, K11, K12, K13, K14, K15, K16 }, \
+ { K20, K21, K22, K23, K24, K25, K26 }, \
+ { K30, K31, K32, K33, K34, K35, K36 }, \
+ { K40, K41, K42, K43, K44, K45, K46 }, \
+ { K50, K51, K52, K53, K54, K55, K56 }, \
+ { K60, K61, K62, K63, K64, K65, K66 }, \
+ { K70, K71, K72, K73, K74, K75, K76 }, \
+ { K80, ___, K82, K83, K84, K85, K86 }, \
+ { ___, K91, K92, K93, K94, K95, K96 } \
}
#define LAYOUT_split_bs( \
- K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K403, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, \
- K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K214, \
- K401, K402, K404, K406, K408, K410, K411, K412, K413, K314 \
+ K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K46, K81, \
+ K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K56, \
+ K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K66, K76, \
+ K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K86, K96, \
+ K80, K91, K82, K92, K83, K93, K84, K94, K85, K95 \
) { \
- { K000, K002, K004, K006, K008, K010, K012 }, \
- { K001, K003, K005, K007, K009, K011, K013 }, \
- { K100, K102, K104, K106, K108, K110, K112 }, \
- { K101, K103, K105, K107, K109, K111, K113 }, \
- { K200, K202, K204, K206, K208, K210, K014 }, \
- { K201, K203, K205, K207, K209, K211, K114 }, \
- { K301, K303, K305, K307, K309, K311, K212 }, \
- { K302, K304, K306, K308, K310, K312, K213 }, \
- { K401, K403, K404, K408, K411, K413, K313 }, \
- { ____, K402, K406, K410, K412, K314, K214 } \
+ { K00, K01, K02, K03, K04, K05, K06 }, \
+ { K10, K11, K12, K13, K14, K15, K16 }, \
+ { K20, K21, K22, K23, K24, K25, K26 }, \
+ { K30, K31, K32, K33, K34, K35, K36 }, \
+ { K40, K41, K42, K43, K44, K45, K46 }, \
+ { K50, K51, K52, K53, K54, K55, K56 }, \
+ { K60, K61, K62, K63, K64, K65, K66 }, \
+ { K70, K71, K72, K73, K74, K75, K76 }, \
+ { K80, K81, K82, K83, K84, K85, K86 }, \
+ { ___, K91, K92, K93, K94, K95, K96 } \
}
diff --git a/keyboards/chalice/info.json b/keyboards/chalice/info.json
index 68bd710a37..77a3f7bc12 100644
--- a/keyboards/chalice/info.json
+++ b/keyboards/chalice/info.json
@@ -1,25 +1,27 @@
{
"keyboard_name": "Chalice",
"url": "https://customkbd.com/products/chalice-pre-order",
- "maintainer": "CustomKBD",
+ "maintainer": "joshajohnson, CustomKBD",
"layouts": {
"LAYOUT_default": {
"layout": [
{"label":"Esc", "x":0, "y":0},
- {"label":"~", "x":1.5, "y":0},
- {"label":"!", "x":2.5, "y":0},
- {"label":"@", "x":3.5, "y":0},
- {"label":"#", "x":4.5, "y":0},
- {"label":"$", "x":5.5, "y":0},
- {"label":"%", "x":6.5, "y":0},
- {"label":"^", "x":7.5, "y":0},
- {"label":"&", "x":10.5, "y":0},
- {"label":"*", "x":11.5, "y":0},
- {"label":"(", "x":12.5, "y":0},
- {"label":")", "x":13.5, "y":0},
- {"label":"_", "x":14.5, "y":0},
- {"label":"+", "x":15.5, "y":0},
+ {"label":"`~", "x":1.5, "y":0},
+ {"label":"1!", "x":2.5, "y":0},
+ {"label":"2@", "x":3.5, "y":0},
+ {"label":"3#", "x":4.5, "y":0},
+ {"label":"4$", "x":5.5, "y":0},
+ {"label":"5%", "x":6.5, "y":0},
+ {"label":"6^", "x":7.5, "y":0},
+ {"label":"7&", "x":10.5, "y":0},
+ {"label":"8*", "x":11.5, "y":0},
+ {"label":"9(", "x":12.5, "y":0},
+ {"label":"0)", "x":13.5, "y":0},
+ {"label":"-_", "x":14.5, "y":0},
+ {"label":"=+", "x":15.5, "y":0},
{"label":"Backspace", "x":16.5, "y":0, "w":2},
+
+ {"label":"Insert", "x":0, "y":1},
{"label":"Tab", "x":1.5, "y":1, "w":1.5},
{"label":"Q", "x":3, "y":1},
{"label":"W", "x":4, "y":1},
@@ -31,10 +33,10 @@
{"label":"I", "x":12, "y":1},
{"label":"O", "x":13, "y":1},
{"label":"P", "x":14, "y":1},
- {"label":"{", "x":15, "y":1},
- {"label":"}", "x":16, "y":1},
- {"label":"|", "x":17, "y":1, "w":1.5},
- {"label":"Mute", "x":19, "y":0.5},
+ {"label":"[{", "x":15, "y":1},
+ {"label":"]}", "x":16, "y":1},
+ {"label":"\\|", "x":17, "y":1, "w":1.5},
+
{"label":"Delete", "x":0, "y":2},
{"label":"Caps Lock", "x":1.5, "y":2, "w":1.75},
{"label":"A", "x":3.25, "y":2},
@@ -46,9 +48,10 @@
{"label":"J", "x":11.25, "y":2},
{"label":"K", "x":12.25, "y":2},
{"label":"L", "x":13.25, "y":2},
- {"label":":", "x":14.25, "y":2},
- {"label":"\"", "x":15.25, "y":2},
+ {"label":";:", "x":14.25, "y":2},
+ {"label":"'\"", "x":15.25, "y":2},
{"label":"Enter", "x":16.25, "y":2, "w":2.25},
+
{"label":"Shift", "x":1.5, "y":3, "w":2.25},
{"label":"Z", "x":3.75, "y":3},
{"label":"X", "x":4.75, "y":3},
@@ -58,21 +61,99 @@
{"label":"B", "x":9.75, "y":3},
{"label":"N", "x":10.75, "y":3},
{"label":"M", "x":11.75, "y":3},
- {"label":"<", "x":12.75, "y":3},
- {"label":">", "x":13.75, "y":3},
- {"label":"?", "x":14.75, "y":3},
+ {"label":",<", "x":12.75, "y":3},
+ {"label":".>", "x":13.75, "y":3},
+ {"label":"/?", "x":14.75, "y":3},
{"label":"Shift", "x":15.75, "y":3, "w":1.75},
- {"label":"Up", "x":17.75, "y":3.25},
+ {"label":"Up", "x":17.5, "y":3},
+
{"label":"Ctrl", "x":1.5, "y":4, "w":1.5},
{"label":"Alt", "x":4.5, "y":4, "w":1.5},
- {"label":"Space", "x":6, "y":4, "w":2},
- {"label":"Fn", "x":8, "y":4},
+ {"label":"Space", "x":6, "y":4, "w":2.25},
+ {"label":"Fn", "x":8.25, "y":4},
{"label":"Space", "x":9.75, "y":4, "w":2.75},
{"label":"Alt", "x":12.5, "y":4, "w":1.5},
{"label":"Ctrl", "x":15, "y":4, "w":1.5},
- {"label":"Left", "x":16.75, "y":4.25},
- {"label":"Down", "x":17.75, "y":4.25},
- {"label":"Right", "x":18.75, "y":4.25}
+ {"label":"Left", "x":16.5, "y":4},
+ {"label":"Down", "x":17.5, "y":4},
+ {"label":"Right", "x":18.5, "y":4}
+ ]
+ },
+ "LAYOUT_split_bs": {
+ "layout": [
+ {"label":"Esc", "x":0, "y":0},
+ {"label":"`~", "x":1.5, "y":0},
+ {"label":"1!", "x":2.5, "y":0},
+ {"label":"2@", "x":3.5, "y":0},
+ {"label":"3#", "x":4.5, "y":0},
+ {"label":"4$", "x":5.5, "y":0},
+ {"label":"5%", "x":6.5, "y":0},
+ {"label":"6^", "x":7.5, "y":0},
+ {"label":"7&", "x":10.5, "y":0},
+ {"label":"8*", "x":11.5, "y":0},
+ {"label":"9(", "x":12.5, "y":0},
+ {"label":"0)", "x":13.5, "y":0},
+ {"label":"-_", "x":14.5, "y":0},
+ {"label":"=+", "x":15.5, "y":0},
+ {"label":"Backspace", "x":16.5, "y":0},
+ {"label":"Backspace", "x":17.5, "y":0},
+
+ {"label":"Insert", "x":0, "y":1},
+ {"label":"Tab", "x":1.5, "y":1, "w":1.5},
+ {"label":"Q", "x":3, "y":1},
+ {"label":"W", "x":4, "y":1},
+ {"label":"E", "x":5, "y":1},
+ {"label":"R", "x":6, "y":1},
+ {"label":"T", "x":7, "y":1},
+ {"label":"Y", "x":10, "y":1},
+ {"label":"U", "x":11, "y":1},
+ {"label":"I", "x":12, "y":1},
+ {"label":"O", "x":13, "y":1},
+ {"label":"P", "x":14, "y":1},
+ {"label":"[{", "x":15, "y":1},
+ {"label":"]}", "x":16, "y":1},
+ {"label":"\\|", "x":17, "y":1, "w":1.5},
+
+ {"label":"Delete", "x":0, "y":2},
+ {"label":"Caps Lock", "x":1.5, "y":2, "w":1.75},
+ {"label":"A", "x":3.25, "y":2},
+ {"label":"S", "x":4.25, "y":2},
+ {"label":"D", "x":5.25, "y":2},
+ {"label":"F", "x":6.25, "y":2},
+ {"label":"G", "x":7.25, "y":2},
+ {"label":"H", "x":10.25, "y":2},
+ {"label":"J", "x":11.25, "y":2},
+ {"label":"K", "x":12.25, "y":2},
+ {"label":"L", "x":13.25, "y":2},
+ {"label":";:", "x":14.25, "y":2},
+ {"label":"'\"", "x":15.25, "y":2},
+ {"label":"Enter", "x":16.25, "y":2, "w":2.25},
+
+ {"label":"Shift", "x":1.5, "y":3, "w":2.25},
+ {"label":"Z", "x":3.75, "y":3},
+ {"label":"X", "x":4.75, "y":3},
+ {"label":"C", "x":5.75, "y":3},
+ {"label":"V", "x":6.75, "y":3},
+ {"label":"B", "x":7.75, "y":3},
+ {"label":"B", "x":9.75, "y":3},
+ {"label":"N", "x":10.75, "y":3},
+ {"label":"M", "x":11.75, "y":3},
+ {"label":",<", "x":12.75, "y":3},
+ {"label":".>", "x":13.75, "y":3},
+ {"label":"/?", "x":14.75, "y":3},
+ {"label":"Shift", "x":15.75, "y":3, "w":1.75},
+ {"label":"Up", "x":17.5, "y":3},
+
+ {"label":"Ctrl", "x":1.5, "y":4, "w":1.5},
+ {"label":"Alt", "x":4.5, "y":4, "w":1.5},
+ {"label":"Space", "x":6, "y":4, "w":2.25},
+ {"label":"Fn", "x":8.25, "y":4},
+ {"label":"Space", "x":9.75, "y":4, "w":2.75},
+ {"label":"Alt", "x":12.5, "y":4, "w":1.5},
+ {"label":"Ctrl", "x":15, "y":4, "w":1.5},
+ {"label":"Left", "x":16.5, "y":4},
+ {"label":"Down", "x":17.5, "y":4},
+ {"label":"Right", "x":18.5, "y":4}
]
}
}