aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfauxpark <fauxpark@gmail.com>2019-07-07 13:55:25 +1000
committerMechMerlin <30334081+mechmerlin@users.noreply.github.com>2019-07-06 20:55:25 -0700
commitdd1790c1b3a840ba541751e605106236816ba877 (patch)
tree8092af3616a4c1a90b49935c7de2982ed4496626
parent44f3c614c25048942c527e38a41ee4800e20f1fd (diff)
downloadqmk_firmware-dd1790c1b3a840ba541751e605106236816ba877.tar.gz
qmk_firmware-dd1790c1b3a840ba541751e605106236816ba877.zip
Noxary 268.2 update (#6254)
* Fix Noxary 268.2 layout macros & info.json * Update Noxary 268.2 to current QMK code style
-rw-r--r--keyboards/noxary/268_2/268_2.c42
-rw-r--r--keyboards/noxary/268_2/268_2.h65
-rw-r--r--keyboards/noxary/268_2/config.h53
-rw-r--r--keyboards/noxary/268_2/info.json287
-rw-r--r--keyboards/noxary/268_2/keymaps/default/keymap.c103
-rw-r--r--keyboards/noxary/268_2/readme.md7
-rw-r--r--keyboards/noxary/268_2/rules.mk10
7 files changed, 428 insertions, 139 deletions
diff --git a/keyboards/noxary/268_2/268_2.c b/keyboards/noxary/268_2/268_2.c
index da4e5efb7..9e2d82236 100644
--- a/keyboards/noxary/268_2/268_2.c
+++ b/keyboards/noxary/268_2/268_2.c
@@ -15,40 +15,14 @@
15 */ 15 */
16#include "268_2.h" 16#include "268_2.h"
17 17
18void matrix_init_kb(void) {
19 // put your keyboard start-up code here
20 // runs once when the firmware starts up
21
22 matrix_init_user();
23}
24
25void matrix_scan_kb(void) {
26 // put your looping keyboard code here
27 // runs every cycle (a lot)
28
29 matrix_scan_user();
30}
31
32bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
33 // put your per-action keyboard code here
34 // runs for every action, just before processing by the firmware
35
36 return process_record_user(keycode, record);
37}
38
39void led_set_kb(uint8_t usb_led) { 18void led_set_kb(uint8_t usb_led) {
40 // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here 19 if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
41 20 setPinOutput(B0);
42 led_set_user(usb_led); 21 writePinHigh(B0);
43} 22 } else {
44 23 setPinInput(B0);
45__attribute__((weak)) 24 writePinLow(B0);
46void led_set_user(uint8_t usb_led) {
47
48 if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
49 DDRB |= (1 << 0); PORTB |= (1 << 0);
50 }
51 else {
52 DDRB &= ~(1 << 0); PORTB &= ~(1 << 0);
53 } 25 }
26
27 led_set_user(usb_led);
54} 28}
diff --git a/keyboards/noxary/268_2/268_2.h b/keyboards/noxary/268_2/268_2.h
index 2f5d985a3..71fd84417 100644
--- a/keyboards/noxary/268_2/268_2.h
+++ b/keyboards/noxary/268_2/268_2.h
@@ -13,8 +13,7 @@
13 * You should have received a copy of the GNU General Public License 13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>. 14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */ 15 */
16#ifndef N268_2_H 16#pragma once
17#define N268_2_H
18 17
19#include "quantum.h" 18#include "quantum.h"
20 19
@@ -27,17 +26,57 @@
27 * represents the switch matrix. 26 * represents the switch matrix.
28 */ 27 */
29#define LAYOUT( \ 28#define LAYOUT( \
30 K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \ 29 K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, K015, \
31 K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K114, K115, \ 30 K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K114, K115, \
32 K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K214, K215, \ 31 K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K214, K215, \
33 K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K314, K315, \ 32 K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K314, K315, \
34 K400, K401, K402, K406, K409, K410, K412, K414, K415 \ 33 K400, K401, K402, K406, K409, K410, K412, K414, K415 \
35) { \ 34) { \
36 { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, }, \ 35 { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, KC_NO, K014, K015 }, \
37 { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, KC_NO, K114, K115, }, \ 36 { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, KC_NO, K114, K115 }, \
38 { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, KC_NO, KC_NO, K214, K215, }, \ 37 { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, KC_NO, KC_NO, K214, K215 }, \
39 { K300, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, KC_NO, K314, K315, }, \ 38 { K300, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, KC_NO, K314, K315 }, \
40 { K400, K401, K402, KC_NO, KC_NO, KC_NO, K406, KC_NO, KC_NO, K409, K410, KC_NO, K412, KC_NO, K414, K415, } \ 39 { K400, K401, K402, KC_NO, KC_NO, KC_NO, K406, KC_NO, KC_NO, K409, K410, KC_NO, K412, KC_NO, K414, K415 } \
41} 40}
42 41
43#endif 42#define LAYOUT_split_bs( \
43 K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
44 K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K114, K115, \
45 K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K214, K215, \
46 K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K314, K315, \
47 K400, K401, K402, K406, K409, K410, K412, K414, K415 \
48) { \
49 { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015 }, \
50 { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, KC_NO, K114, K115 }, \
51 { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, KC_NO, KC_NO, K214, K215 }, \
52 { K300, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, KC_NO, K314, K315 }, \
53 { K400, K401, K402, KC_NO, KC_NO, KC_NO, K406, KC_NO, KC_NO, K409, K410, KC_NO, K412, KC_NO, K414, K415 } \
54}
55
56#define LAYOUT_7u_space( \
57 K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, K015, \
58 K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K114, K115, \
59 K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K214, K215, \
60 K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K314, K315, \
61 K400, K401, K402, K406, K410, K412, K414, K415 \
62) { \
63 { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, KC_NO, K014, K015 }, \
64 { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, KC_NO, K114, K115 }, \
65 { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, KC_NO, KC_NO, K214, K215 }, \
66 { K300, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, KC_NO, K314, K315 }, \
67 { K400, K401, K402, KC_NO, KC_NO, KC_NO, K406, KC_NO, KC_NO, KC_NO, K410, KC_NO, K412, KC_NO, K414, K415 } \
68}
69
70#define LAYOUT_7u_space_split_bs( \
71 K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
72 K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K114, K115, \
73 K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K214, K215, \
74 K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K314, K315, \
75 K400, K401, K402, K406, K410, K412, K414, K415 \
76) { \
77 { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015 }, \
78 { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, KC_NO, K114, K115 }, \
79 { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, KC_NO, KC_NO, K214, K215 }, \
80 { K300, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, KC_NO, K314, K315 }, \
81 { K400, K401, K402, KC_NO, KC_NO, KC_NO, K406, KC_NO, KC_NO, KC_NO, K410, KC_NO, K412, KC_NO, K414, K415 } \
82}
diff --git a/keyboards/noxary/268_2/config.h b/keyboards/noxary/268_2/config.h
index 547c729f9..fbfb97f02 100644
--- a/keyboards/noxary/268_2/config.h
+++ b/keyboards/noxary/268_2/config.h
@@ -41,7 +41,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
41 * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) 41 * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
42 * 42 *
43*/ 43*/
44/* key matrix pins */
45#define MATRIX_ROW_PINS { F7, F6, F5, F0, B5 } 44#define MATRIX_ROW_PINS { F7, F6, F5, F0, B5 }
46#define MATRIX_COL_PINS { C6, B6, C7, F4, E6, D0, D7, D1, D2, B4, D6, D4, D5, F1, D3, B1 } 45#define MATRIX_COL_PINS { C6, B6, C7, F4, E6, D0, D7, D1, D2, B4, D6, D4, D5, F1, D3, B1 }
47#define UNUSED_PINS 46#define UNUSED_PINS
@@ -49,11 +48,42 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
49/* COL2ROW, ROW2COL*/ 48/* COL2ROW, ROW2COL*/
50#define DIODE_DIRECTION COL2ROW 49#define DIODE_DIRECTION COL2ROW
51 50
52/* number of backlight levels */ 51/*
52 * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
53 */
54#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6
55
53#define BACKLIGHT_PIN B7 56#define BACKLIGHT_PIN B7
54#ifdef BACKLIGHT_PIN 57//define BACKLIGHT_BREATHING
55#define BACKLIGHT_LEVELS 3 58#define BACKLIGHT_LEVELS 3
56#endif 59
60// #define RGB_DI_PIN E2
61// #ifdef RGB_DI_PIN
62// #define RGBLED_NUM 16
63// #define RGBLIGHT_HUE_STEP 8
64// #define RGBLIGHT_SAT_STEP 8
65// #define RGBLIGHT_VAL_STEP 8
66// #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
67// #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
68// /*== all animations enable ==*/
69// #define RGBLIGHT_ANIMATIONS
70// /*== or choose animations ==*/
71// #define RGBLIGHT_EFFECT_BREATHING
72// #define RGBLIGHT_EFFECT_RAINBOW_MOOD
73// #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
74// #define RGBLIGHT_EFFECT_SNAKE
75// #define RGBLIGHT_EFFECT_KNIGHT
76// #define RGBLIGHT_EFFECT_CHRISTMAS
77// #define RGBLIGHT_EFFECT_STATIC_GRADIENT
78// #define RGBLIGHT_EFFECT_RGB_TEST
79// #define RGBLIGHT_EFFECT_ALTERNATING
80// /*== customize breathing effect ==*/
81// /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
82// #define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64
83// /*==== use exp() and sin() ====*/
84// #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7
85// #define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255
86// #endif
57 87
58/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ 88/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
59#define DEBOUNCE 5 89#define DEBOUNCE 5
@@ -106,6 +136,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
106 * 136 *
107 */ 137 */
108 138
139/* key combination for magic key command */
140/* defined by default; to change, uncomment and set to the combination you want */
141// #define IS_COMMAND() (get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)))
142
109/* control how magic key switches layers */ 143/* control how magic key switches layers */
110//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS true 144//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS true
111//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS true 145//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS true
@@ -115,8 +149,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
115//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS 149//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS
116//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS 150//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS
117//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM 151//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM
118//#define MAGIC_KEY_HELP1 H 152//#define MAGIC_KEY_HELP H
119//#define MAGIC_KEY_HELP2 SLASH 153//#define MAGIC_KEY_HELP_ALT SLASH
120//#define MAGIC_KEY_DEBUG D 154//#define MAGIC_KEY_DEBUG D
121//#define MAGIC_KEY_DEBUG_MATRIX X 155//#define MAGIC_KEY_DEBUG_MATRIX X
122//#define MAGIC_KEY_DEBUG_KBD K 156//#define MAGIC_KEY_DEBUG_KBD K
@@ -124,9 +158,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
124//#define MAGIC_KEY_VERSION V 158//#define MAGIC_KEY_VERSION V
125//#define MAGIC_KEY_STATUS S 159//#define MAGIC_KEY_STATUS S
126//#define MAGIC_KEY_CONSOLE C 160//#define MAGIC_KEY_CONSOLE C
127//#define MAGIC_KEY_LAYER0_ALT1 ESC
128//#define MAGIC_KEY_LAYER0_ALT2 GRAVE
129//#define MAGIC_KEY_LAYER0 0 161//#define MAGIC_KEY_LAYER0 0
162//#define MAGIC_KEY_LAYER0_ALT GRAVE
130//#define MAGIC_KEY_LAYER1 1 163//#define MAGIC_KEY_LAYER1 1
131//#define MAGIC_KEY_LAYER2 2 164//#define MAGIC_KEY_LAYER2 2
132//#define MAGIC_KEY_LAYER3 3 165//#define MAGIC_KEY_LAYER3 3
@@ -136,9 +169,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
136//#define MAGIC_KEY_LAYER7 7 169//#define MAGIC_KEY_LAYER7 7
137//#define MAGIC_KEY_LAYER8 8 170//#define MAGIC_KEY_LAYER8 8
138//#define MAGIC_KEY_LAYER9 9 171//#define MAGIC_KEY_LAYER9 9
139//#define MAGIC_KEY_BOOTLOADER PAUSE 172//#define MAGIC_KEY_BOOTLOADER B
173//#define MAGIC_KEY_BOOTLOADER_ALT ESC
140//#define MAGIC_KEY_LOCK CAPS 174//#define MAGIC_KEY_LOCK CAPS
141//#define MAGIC_KEY_EEPROM E 175//#define MAGIC_KEY_EEPROM E
176//#define MAGIC_KEY_EEPROM_CLEAR BSPACE
142//#define MAGIC_KEY_NKRO N 177//#define MAGIC_KEY_NKRO N
143//#define MAGIC_KEY_SLEEP_LED Z 178//#define MAGIC_KEY_SLEEP_LED Z
144 179
diff --git a/keyboards/noxary/268_2/info.json b/keyboards/noxary/268_2/info.json
index 8d227afd8..b47e2de98 100644
--- a/keyboards/noxary/268_2/info.json
+++ b/keyboards/noxary/268_2/info.json
@@ -5,8 +5,289 @@
5 "width": 16, 5 "width": 16,
6 "height": 5, 6 "height": 5,
7 "layouts": { 7 "layouts": {
8 "LAYOUT": { 8 "LAYOUT": {
9 "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":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}] 9 "layout": [
10 } 10 {"x":0, "y":0},
11 {"x":1, "y":0},
12 {"x":2, "y":0},
13 {"x":3, "y":0},
14 {"x":4, "y":0},
15 {"x":5, "y":0},
16 {"x":6, "y":0},
17 {"x":7, "y":0},
18 {"x":8, "y":0},
19 {"x":9, "y":0},
20 {"x":10, "y":0},
21 {"x":11, "y":0},
22 {"x":12, "y":0},
23 {"x":13, "y":0, "w":2},
24 {"x":15, "y":0},
25 {"x":0, "y":1, "w":1.5},
26 {"x":1.5, "y":1},
27 {"x":2.5, "y":1},
28 {"x":3.5, "y":1},
29 {"x":4.5, "y":1},
30 {"x":5.5, "y":1},
31 {"x":6.5, "y":1},
32 {"x":7.5, "y":1},
33 {"x":8.5, "y":1},
34 {"x":9.5, "y":1},
35 {"x":10.5, "y":1},
36 {"x":11.5, "y":1},
37 {"x":12.5, "y":1},
38 {"x":13.5, "y":1, "w":1.5},
39 {"x":15, "y":1},
40 {"x":0, "y":2, "w":1.75},
41 {"x":1.75, "y":2},
42 {"x":2.75, "y":2},
43 {"x":3.75, "y":2},
44 {"x":4.75, "y":2},
45 {"x":5.75, "y":2},
46 {"x":6.75, "y":2},
47 {"x":7.75, "y":2},
48 {"x":8.75, "y":2},
49 {"x":9.75, "y":2},
50 {"x":10.75, "y":2},
51 {"x":11.75, "y":2},
52 {"x":12.75, "y":2, "w":2.25},
53 {"x":15, "y":2},
54 {"x":0, "y":3, "w":2.25},
55 {"x":2.25, "y":3},
56 {"x":3.25, "y":3},
57 {"x":4.25, "y":3},
58 {"x":5.25, "y":3},
59 {"x":6.25, "y":3},
60 {"x":7.25, "y":3},
61 {"x":8.25, "y":3},
62 {"x":9.25, "y":3},
63 {"x":10.25, "y":3},
64 {"x":11.25, "y":3},
65 {"x":12.25, "y":3, "w":1.75},
66 {"x":14, "y":3},
67 {"x":15, "y":3},
68 {"x":0, "y":4, "w":1.25},
69 {"x":1.25, "y":4, "w":1.25},
70 {"x":2.5, "y":4, "w":1.25},
71 {"x":3.75, "y":4, "w":6.25},
72 {"x":10, "y":4, "w":1.25},
73 {"x":11.25, "y":4, "w":1.25},
74 {"x":13, "y":4},
75 {"x":14, "y":4},
76 {"x":15, "y":4}
77 ]
78 },
79 "LAYOUT_split_bs": {
80 "layout": [
81 {"x":0, "y":0},
82 {"x":1, "y":0},
83 {"x":2, "y":0},
84 {"x":3, "y":0},
85 {"x":4, "y":0},
86 {"x":5, "y":0},
87 {"x":6, "y":0},
88 {"x":7, "y":0},
89 {"x":8, "y":0},
90 {"x":9, "y":0},
91 {"x":10, "y":0},
92 {"x":11, "y":0},
93 {"x":12, "y":0},
94 {"x":13, "y":0},
95 {"x":14, "y":0},
96 {"x":15, "y":0},
97 {"x":0, "y":1, "w":1.5},
98 {"x":1.5, "y":1},
99 {"x":2.5, "y":1},
100 {"x":3.5, "y":1},
101 {"x":4.5, "y":1},
102 {"x":5.5, "y":1},
103 {"x":6.5, "y":1},
104 {"x":7.5, "y":1},
105 {"x":8.5, "y":1},
106 {"x":9.5, "y":1},
107 {"x":10.5, "y":1},
108 {"x":11.5, "y":1},
109 {"x":12.5, "y":1},
110 {"x":13.5, "y":1, "w":1.5},
111 {"x":15, "y":1},
112 {"x":0, "y":2, "w":1.75},
113 {"x":1.75, "y":2},
114 {"x":2.75, "y":2},
115 {"x":3.75, "y":2},
116 {"x":4.75, "y":2},
117 {"x":5.75, "y":2},
118 {"x":6.75, "y":2},
119 {"x":7.75, "y":2},
120 {"x":8.75, "y":2},
121 {"x":9.75, "y":2},
122 {"x":10.75, "y":2},
123 {"x":11.75, "y":2},
124 {"x":12.75, "y":2, "w":2.25},
125 {"x":15, "y":2},
126 {"x":0, "y":3, "w":2.25},
127 {"x":2.25, "y":3},
128 {"x":3.25, "y":3},
129 {"x":4.25, "y":3},
130 {"x":5.25, "y":3},
131 {"x":6.25, "y":3},
132 {"x":7.25, "y":3},
133 {"x":8.25, "y":3},
134 {"x":9.25, "y":3},
135 {"x":10.25, "y":3},
136 {"x":11.25, "y":3},
137 {"x":12.25, "y":3, "w":1.75},
138 {"x":14, "y":3},
139 {"x":15, "y":3},
140 {"x":0, "y":4, "w":1.25},
141 {"x":1.25, "y":4, "w":1.25},
142 {"x":2.5, "y":4, "w":1.25},
143 {"x":3.75, "y":4, "w":6.25},
144 {"x":10, "y":4, "w":1.25},
145 {"x":11.25, "y":4, "w":1.25},
146 {"x":13, "y":4},
147 {"x":14, "y":4},
148 {"x":15, "y":4}
149 ]
150 },
151 "LAYOUT_7u_space": {
152 "layout": [
153 {"x":0, "y":0},
154 {"x":1, "y":0},
155 {"x":2, "y":0},
156 {"x":3, "y":0},
157 {"x":4, "y":0},
158 {"x":5, "y":0},
159 {"x":6, "y":0},
160 {"x":7, "y":0},
161 {"x":8, "y":0},
162 {"x":9, "y":0},
163 {"x":10, "y":0},
164 {"x":11, "y":0},
165 {"x":12, "y":0},
166 {"x":13, "y":0, "w":2},
167 {"x":15, "y":0},
168 {"x":0, "y":1, "w":1.5},
169 {"x":1.5, "y":1},
170 {"x":2.5, "y":1},
171 {"x":3.5, "y":1},
172 {"x":4.5, "y":1},
173 {"x":5.5, "y":1},
174 {"x":6.5, "y":1},
175 {"x":7.5, "y":1},
176 {"x":8.5, "y":1},
177 {"x":9.5, "y":1},
178 {"x":10.5, "y":1},
179 {"x":11.5, "y":1},
180 {"x":12.5, "y":1},
181 {"x":13.5, "y":1, "w":1.5},
182 {"x":15, "y":1},
183 {"x":0, "y":2, "w":1.75},
184 {"x":1.75, "y":2},
185 {"x":2.75, "y":2},
186 {"x":3.75, "y":2},
187 {"x":4.75, "y":2},
188 {"x":5.75, "y":2},
189 {"x":6.75, "y":2},
190 {"x":7.75, "y":2},
191 {"x":8.75, "y":2},
192 {"x":9.75, "y":2},
193 {"x":10.75, "y":2},
194 {"x":11.75, "y":2},
195 {"x":12.75, "y":2, "w":2.25},
196 {"x":15, "y":2},
197 {"x":0, "y":3, "w":2.25},
198 {"x":2.25, "y":3},
199 {"x":3.25, "y":3},
200 {"x":4.25, "y":3},
201 {"x":5.25, "y":3},
202 {"x":6.25, "y":3},
203 {"x":7.25, "y":3},
204 {"x":8.25, "y":3},
205 {"x":9.25, "y":3},
206 {"x":10.25, "y":3},
207 {"x":11.25, "y":3},
208 {"x":12.25, "y":3, "w":1.75},
209 {"x":14, "y":3},
210 {"x":15, "y":3},
211 {"x":0, "y":4, "w":1.5},
212 {"x":1.5, "y":4},
213 {"x":2.5, "y":4, "w":1.5},
214 {"x":4, "y":4, "w":7},
215 {"x":11, "y":4, "w":1.5},
216 {"x":13, "y":4},
217 {"x":14, "y":4},
218 {"x":15, "y":4}
219 ]
220 },
221 "LAYOUT_7u_space_split_bs": {
222 "layout": [
223 {"x":0, "y":0},
224 {"x":1, "y":0},
225 {"x":2, "y":0},
226 {"x":3, "y":0},
227 {"x":4, "y":0},
228 {"x":5, "y":0},
229 {"x":6, "y":0},
230 {"x":7, "y":0},
231 {"x":8, "y":0},
232 {"x":9, "y":0},
233 {"x":10, "y":0},
234 {"x":11, "y":0},
235 {"x":12, "y":0},
236 {"x":13, "y":0},
237 {"x":14, "y":0},
238 {"x":15, "y":0},
239 {"x":0, "y":1, "w":1.5},
240 {"x":1.5, "y":1},
241 {"x":2.5, "y":1},
242 {"x":3.5, "y":1},
243 {"x":4.5, "y":1},
244 {"x":5.5, "y":1},
245 {"x":6.5, "y":1},
246 {"x":7.5, "y":1},
247 {"x":8.5, "y":1},
248 {"x":9.5, "y":1},
249 {"x":10.5, "y":1},
250 {"x":11.5, "y":1},
251 {"x":12.5, "y":1},
252 {"x":13.5, "y":1, "w":1.5},
253 {"x":15, "y":1},
254 {"x":0, "y":2, "w":1.75},
255 {"x":1.75, "y":2},
256 {"x":2.75, "y":2},
257 {"x":3.75, "y":2},
258 {"x":4.75, "y":2},
259 {"x":5.75, "y":2},
260 {"x":6.75, "y":2},
261 {"x":7.75, "y":2},
262 {"x":8.75, "y":2},
263 {"x":9.75, "y":2},
264 {"x":10.75, "y":2},
265 {"x":11.75, "y":2},
266 {"x":12.75, "y":2, "w":2.25},
267 {"x":15, "y":2},
268 {"x":0, "y":3, "w":2.25},
269 {"x":2.25, "y":3},
270 {"x":3.25, "y":3},
271 {"x":4.25, "y":3},
272 {"x":5.25, "y":3},
273 {"x":6.25, "y":3},
274 {"x":7.25, "y":3},
275 {"x":8.25, "y":3},
276 {"x":9.25, "y":3},
277 {"x":10.25, "y":3},
278 {"x":11.25, "y":3},
279 {"x":12.25, "y":3, "w":1.75},
280 {"x":14, "y":3},
281 {"x":15, "y":3},
282 {"x":0, "y":4, "w":1.5},
283 {"x":1.5, "y":4},
284 {"x":2.5, "y":4, "w":1.5},
285 {"x":4, "y":4, "w":7},
286 {"x":11, "y":4, "w":1.5},
287 {"x":13, "y":4},
288 {"x":14, "y":4},
289 {"x":15, "y":4}
290 ]
291 }
11 } 292 }
12} 293}
diff --git a/keyboards/noxary/268_2/keymaps/default/keymap.c b/keyboards/noxary/268_2/keymaps/default/keymap.c
index 994fe36b0..c22ec2b1d 100644
--- a/keyboards/noxary/268_2/keymaps/default/keymap.c
+++ b/keyboards/noxary/268_2/keymaps/default/keymap.c
@@ -4,80 +4,51 @@
4// The underscores don't mean anything - you can have a layer called STUFF or any other name. 4// The underscores don't mean anything - you can have a layer called STUFF or any other name.
5// Layer names don't all need to be of the same length, obviously, and you can also skip them 5// Layer names don't all need to be of the same length, obviously, and you can also skip them
6// entirely and just use numbers. 6// entirely and just use numbers.
7#define _BL 0 7enum layer_names {
8#define _FL1 1 8 _BL,
9#define _FL2 2 9 _FL
10};
10 11
11const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 12const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
12 /* _BL: Base Layer(Default) - For ISO enter use ANSI enter 13 /* Base Layer
13 * ,----------------------------------------------------------------. 14 * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
14 * |Esc | 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| \|BSpc| Grv| 15 * Esc 1 2 3 4 5 6 7 8 9 0 - = Bspc │ ` │
15 * |----------------------------------------------------------------| 16 * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
16 * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \ | Del| 17 * Tab Q W E R T Y U I O P [ ] \ Del
17 * |----------------------------------------------------------------| 18 * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
18 * |CAPS | A| S| D| F| G| H| J| K| L| ;| '| #| Ent|PgUp| 19 * Caps A S D F G H J K L ; ' Enter │PgU
19 * |----------------------------------------------------------------| 20 * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
20 * |Shift| \| Z| X| C| V| B| N| M| ,| .| /|Shift | Up|PgDn| 21 * Shift Z X C V B N M , . /Shift ↑ │PgD
21 * |----------------------------------------------------------------| 22 * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
22 * |Ctrl|Win |Alt | Space |Alt|Mo(1)|Ctrl|Lef|Dow|Rght| 23 * CtrlWin Alt Space Alt │ Fn │ │ ← │ ↓ │ → │
23 * `----------------------------------------------------------------' 24 * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘
24 */ 25 */
25 [_BL] = LAYOUT( 26 [_BL] = LAYOUT(
26 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_BSLS, KC_BSPC, KC_GRV, 27 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,
27 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, 28 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,
28 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, 29 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,
29 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, 30 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN,
30 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_FL1), KC_LEFT, KC_DOWN, KC_RGHT), 31 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_FL), KC_LEFT, KC_DOWN, KC_RGHT
31 /* _FL1: Function Layer 1 - For ISO enter use ANSI enter 32 ),
32 * ,----------------------------------------------------------------. 33
33 * | `|F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12| |PScr| | 34 /* Function Layer
34 * |----------------------------------------------------------------| 35 * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
35 * | | | | |RST| | | | | | | | | | Ins| 36 * │ ` │F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│ PScr │ │
36 * |----------------------------------------------------------------| 37 * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
37 * | | | | | | | | | | | | | | |Home| 38 * │ │ │ │ │RST│ │ │ │ │ │ │ │ │ │Ins│
38 * |----------------------------------------------------------------| 39 * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
39 * | | | | | | | | | |Bl-|Bl+| |Mute|Vol+| End| 40 * │ │ │ │ │ │ │ │ │ │ │ │ │ │Hom│
40 * |----------------------------------------------------------------| 41 * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
41 * | | | | BL_Toggle | | | | |Vol-| | 42 * │ │ │ │ │ │ │ │ │ │Bl-│Bl+│ Mute │Vl+│End│
42 * `----------------------------------------------------------------' 43 * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
44 * │ │ │ │ BL Toggle │ │ │ │ │Vl-│ │
45 * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘
43 */ 46 */
44 [_FL1] = LAYOUT( 47 [_FL] = LAYOUT(
45 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, _______, 48 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, _______,
46 _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, 49 _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,
47 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, 50 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME,
48 _______, _______, _______, _______, _______, _______, _______, _______, BL_DEC, BL_INC, _______, KC_MUTE, KC_VOLU, KC_END, 51 _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_DEC, BL_INC, KC_MUTE, KC_VOLU, KC_END,
49 _______, _______, _______, BL_TOGG, _______, _______, _______, KC_VOLD, _______), 52 _______, _______, _______, BL_TOGG, _______, _______, _______, KC_VOLD, _______
50 /* _FL2: Function Layer 2 - For ISO enter use ANSI enter 53 )
51 * ,----------------------------------------------------------------.
52 * | | | | | | | | | | | | | | | | |
53 * |----------------------------------------------------------------|
54 * | | | | | | | | | | | | | | | |
55 * |----------------------------------------------------------------|
56 * | | | | | | | | | | | | | | | |
57 * |----------------------------------------------------------------|
58 * | | | | | | | | | | | | | | | |
59 * |----------------------------------------------------------------|
60 * | | | | | | | | | | |
61 * `----------------------------------------------------------------'
62 */
63 [_FL2] = LAYOUT(
64 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
65 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
66 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
67 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
68 _______, _______, _______, _______, _______, _______, _______, _______, _______),
69
70}; 54};
71
72
73void matrix_init_user(void) {
74}
75
76void matrix_scan_user(void) {
77}
78
79bool process_record_user(uint16_t keycode, keyrecord_t *record) {
80 return true;
81}
82
83
diff --git a/keyboards/noxary/268_2/readme.md b/keyboards/noxary/268_2/readme.md
index 85d1a4717..075a1d26c 100644
--- a/keyboards/noxary/268_2/readme.md
+++ b/keyboards/noxary/268_2/readme.md
@@ -4,10 +4,9 @@
4 4
5A fully customizable 65% keyboard. 5A fully customizable 65% keyboard.
6 6
7* Keyboard Maintainer: [Rozakiin](https://github.com/rozakiin) 7Keyboard Maintainer: [Rozakiin](https://github.com/rozakiin)
8* Hardware Supported: 268.2 PCB 8Hardware Supported: 268.2 PCB
9 * rev1 9Hardware Availability: [Noxary](https://shop.noxary.co/collections/268-2/products/noxary-268-2-polycarbonate)
10* Hardware Availability: [Noxary](https://shop.noxary.co/collections/268-2/products/noxary-268-2-polycarbonate)
11 10
12Make example for this keyboard (after setting up your build environment): 11Make example for this keyboard (after setting up your build environment):
13 12
diff --git a/keyboards/noxary/268_2/rules.mk b/keyboards/noxary/268_2/rules.mk
index 9b6d7e672..a89c930a1 100644
--- a/keyboards/noxary/268_2/rules.mk
+++ b/keyboards/noxary/268_2/rules.mk
@@ -48,16 +48,6 @@ OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
48BOOTLOADER = atmel-dfu 48BOOTLOADER = atmel-dfu
49 49
50 50
51# If you don't know the bootloader type, then you can specify the
52# Boot Section Size in *bytes* by uncommenting out the OPT_DEFS line
53# Teensy halfKay 512
54# Teensy++ halfKay 1024
55# Atmel DFU loader 4096
56# LUFA bootloader 4096
57# USBaspLoader 2048
58# OPT_DEFS += -DBOOTLOADER_SIZE=4096
59
60
61# Build Options 51# Build Options
62# change yes to no to disable 52# change yes to no to disable
63# 53#