Quellcode durchsuchen

Noxary x268: refactor and Configurator bugfix (#4713)

- renamed layout macro LAYOUT_65_ansi to LAYOUT
- rebuilt info.json to match LAYOUT macro
noroadsleft vor 7 Jahren
Ursprung
Commit
2c3706611f

Datei-Diff unterdrückt, da er zu groß ist
+ 77 - 3
keyboards/noxary/x268/info.json


+ 3 - 3
keyboards/noxary/x268/keymaps/default/keymap.c

@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     * |Ctrl|Win |Alt |        Space        |Alt|Mo(1)|Ctrl|Lef|Dow|Rght|
     * `----------------------------------------------------------------'
     */
-    [_BL] = LAYOUT_65_ansi(
+    [_BL] = LAYOUT(
         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,
         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_NUHS,          KC_ENT,  KC_PGUP,
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     * |    |    |    |      BL_Toggle       |   |   |   |    |Vol-|    |
     * `----------------------------------------------------------------'
     */
-    [_FL1] = LAYOUT_65_ansi(
+    [_FL1] = LAYOUT(
         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, _______,
         RGB_TOG, RGB_VAI, RGB_SAI, RGB_HUI, RESET,   _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_INS,
         _______, RGB_VAD, RGB_SAD, RGB_HUD, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_HOME,
@@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     * |    |    |    |                      |   |   |   |    |    |    |
     * `----------------------------------------------------------------'
     */
-    [_FL2] = LAYOUT_65_ansi(
+    [_FL2] = LAYOUT(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,

+ 1 - 1
keyboards/noxary/x268/x268.h

@@ -18,7 +18,7 @@
 
 #include "quantum.h"
 
-#define LAYOUT_65_ansi( \
+#define LAYOUT( \
 	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, 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, K212,       K214, K215, \