summaryrefslogtreecommitdiff
path: root/keyboards/noxary/268_2
diff options
context:
space:
mode:
authorMechMerlin <30334081+mechmerlin@users.noreply.github.com>2019-09-25 12:55:27 -0700
committerDrashna Jaelre <drashna@live.com>2019-09-25 12:55:27 -0700
commit0850a8cb634febb92314af5a65a11e58b123e86f (patch)
tree34f3a19d2ba9f6c2820aa8cc438b238c16adf707 /keyboards/noxary/268_2
parentc61d7d7cb001498e6edf09a9ebc6124c1fe6ed97 (diff)
65 ansi blocker everywhere (everywhere I can find) (#6805)
* e6.5 actually already had a 65_ansi_blocker LAYOUT macro, so just had to enable in rules. * Add the 65_ansi_blocker LAYOUT macro and enable in rules.mk * rename LAYOUT macro in .h and in the keymap.c as it was only a default keymap. Also enable in rules.mk * rename but also had to define the existing LAYOUT macro as the new one to prevent breakage of existing keymaps * add 65_ansi_blocker support for vinta * forgot to update the info.json on these * add new default layout 65_ansi_blocker support to alt * add 65_ansi_blocker support * undo changes
Diffstat (limited to 'keyboards/noxary/268_2')
-rw-r--r--keyboards/noxary/268_2/268_2.h2
-rw-r--r--keyboards/noxary/268_2/info.json2
-rw-r--r--keyboards/noxary/268_2/keymaps/default/keymap.c4
-rw-r--r--keyboards/noxary/268_2/rules.mk2
4 files changed, 6 insertions, 4 deletions
diff --git a/keyboards/noxary/268_2/268_2.h b/keyboards/noxary/268_2/268_2.h
index 71fd844172..e69ed88def 100644
--- a/keyboards/noxary/268_2/268_2.h
+++ b/keyboards/noxary/268_2/268_2.h
@@ -25,7 +25,7 @@
* The second converts the arguments into a two-dimensional array which
* represents the switch matrix.
*/
-#define LAYOUT( \
+#define LAYOUT_65_ansi_blocker( \
K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, K015, \
K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K114, K115, \
K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K214, K215, \
diff --git a/keyboards/noxary/268_2/info.json b/keyboards/noxary/268_2/info.json
index b47e2de980..cef0f302ce 100644
--- a/keyboards/noxary/268_2/info.json
+++ b/keyboards/noxary/268_2/info.json
@@ -5,7 +5,7 @@
"width": 16,
"height": 5,
"layouts": {
- "LAYOUT": {
+ "LAYOUT_65_ansi_blocker": {
"layout": [
{"x":0, "y":0},
{"x":1, "y":0},
diff --git a/keyboards/noxary/268_2/keymaps/default/keymap.c b/keyboards/noxary/268_2/keymaps/default/keymap.c
index c22ec2b1d6..01d5613cac 100644
--- a/keyboards/noxary/268_2/keymaps/default/keymap.c
+++ b/keyboards/noxary/268_2/keymaps/default/keymap.c
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* │Ctrl│Win │Alt │ Space │Alt │ Fn │ │ ← │ ↓ │ → │
* └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘
*/
- [_BL] = LAYOUT(
+ [_BL] = LAYOUT_65_ansi_blocker(
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_GRV,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP,
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* │ │ │ │ BL Toggle │ │ │ │ │Vl-│ │
* └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘
*/
- [_FL] = LAYOUT(
+ [_FL] = LAYOUT_65_ansi_blocker(
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, _______,
_______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME,
diff --git a/keyboards/noxary/268_2/rules.mk b/keyboards/noxary/268_2/rules.mk
index a89c930a14..d1d781ccfa 100644
--- a/keyboards/noxary/268_2/rules.mk
+++ b/keyboards/noxary/268_2/rules.mk
@@ -68,3 +68,5 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
AUDIO_ENABLE = no # Audio output on port C6
FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches
HD44780_ENABLE = no # Enable support for HD44780 based LCDs (+400)
+
+LAYOUTS = 65_ansi_blocker \ No newline at end of file