From 425fb54e0f018ce4a845670749d4ced760b55dde Mon Sep 17 00:00:00 2001 From: Adophoxia Date: Fri, 21 Apr 2023 21:48:32 -0700 Subject: [PATCH 01/28] Add fancyalice66 --- keyboards/fancytech/fancyalice66/config.h | 15 + .../fancytech/fancyalice66/fancyalice66.c | 74 ++++ .../fancytech/fancyalice66/fancyalice66.h | 49 +++ keyboards/fancytech/fancyalice66/info.json | 358 ++++++++++++++++++ .../fancyalice66/keymaps/default/keymap.c | 49 +++ .../fancyalice66/keymaps/via/keymap.c | 75 ++++ .../fancyalice66/keymaps/via/rules.mk | 3 + keyboards/fancytech/fancyalice66/readme.md | 27 ++ keyboards/fancytech/fancyalice66/rules.mk | 1 + 9 files changed, 651 insertions(+) create mode 100644 keyboards/fancytech/fancyalice66/config.h create mode 100644 keyboards/fancytech/fancyalice66/fancyalice66.c create mode 100644 keyboards/fancytech/fancyalice66/fancyalice66.h create mode 100644 keyboards/fancytech/fancyalice66/info.json create mode 100644 keyboards/fancytech/fancyalice66/keymaps/default/keymap.c create mode 100644 keyboards/fancytech/fancyalice66/keymaps/via/keymap.c create mode 100644 keyboards/fancytech/fancyalice66/keymaps/via/rules.mk create mode 100644 keyboards/fancytech/fancyalice66/readme.md create mode 100644 keyboards/fancytech/fancyalice66/rules.mk diff --git a/keyboards/fancytech/fancyalice66/config.h b/keyboards/fancytech/fancyalice66/config.h new file mode 100644 index 000000000000..ff3fe580c6c5 --- /dev/null +++ b/keyboards/fancytech/fancyalice66/config.h @@ -0,0 +1,15 @@ +// Copyright 2022 chent7 (@chent7) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +/* RGB Matrix config */ +#define RGB_DI_PIN B0 + +#ifdef RGB_MATRIX_ENABLE + #define RGB_MATRIX_LED_COUNT 82 + + /* RGB Matrix effect */ +# define RGB_MATRIX_KEYPRESSES // reacts to keypresses +# define RGB_MATRIX_FRAMEBUFFER_EFFECTS +#endif \ No newline at end of file diff --git a/keyboards/fancytech/fancyalice66/fancyalice66.c b/keyboards/fancytech/fancyalice66/fancyalice66.c new file mode 100644 index 000000000000..17c0fc60b0da --- /dev/null +++ b/keyboards/fancytech/fancyalice66/fancyalice66.c @@ -0,0 +1,74 @@ +/* Copyright 2022 chent7 + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "fancyalice66.h" + +#ifdef RGB_MATRIX_ENABLE + +#define XX NO_LED + +led_config_t g_led_config = {{ + //It's mirrored + { 14, XX, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 }, + { 29, 28, 27, 26, 25, 24, 23, 22, 21, XX, 20, 19, 18, 17, 16, 15 }, + { 43, XX, 42, 41, 40, 39, 38, 37, 36, XX, 35, 34, 33, 32, 31, 30 }, + { XX, 56, XX, 55, 54, 53, 52, 51, 50, XX, 49, 48, 47, 46, 45, 44 }, + { 65, 64, 63, XX, XX, 62, XX, XX, 61, 60, XX, XX, 59, 58, XX, 57 } +}, { + //Key matrix (0 -> 65) + {224, 0}, {194, 0}, {180, 0}, {164, 0}, {150, 0}, {135, 0}, {120, 0}, {105, 0}, {90, 0}, {75, 0}, {60, 0}, {45, 0}, {30, 0}, {15, 0}, {0, 0}, + {224,16}, {209,16}, {194,16}, {180,16}, {164,16}, {150,16}, {135,16}, {120,16}, {105,16}, {75, 16}, {60, 16}, {45, 16}, {30, 16}, {15, 16}, {0, 16}, + {224,32}, {194,32}, {180,32}, {164,32}, {150,32}, {135,32}, {120,32}, {105,32}, {75, 32}, {60, 32}, {45, 32}, {30, 32}, {15, 32}, {0, 32}, + {209,48}, {180,48}, {164,48}, {150,48}, {135,48}, {120,48}, {105,48}, {75, 48}, {60, 48}, {45, 48}, {30, 48}, {15, 48}, {0, 48}, + {224,64}, {209,64}, {194,64}, {150,64}, {105,64}, {90, 64}, {45, 64}, {30, 64}, {0, 64}, + + //Underglow (66 -> 81) + {0, 64}, {0, 32}, {0, 0}, {37, 0}, {75, 0}, {112, 0}, {149, 0}, {187, 0}, {224, 0}, {224,32}, {224,64}, {187,64}, {149,64}, {112,64}, {75, 64}, {37, 64} +}, { + //Key matrix (0 -> 65) + 4, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, + 4, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, + 4, 4, 4, 1, 4, 1, 4, 1, 1, + + //Underglow (66 -> 81) + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2 +}}; + +bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) { + if (!rgb_matrix_indicators_advanced_user(led_min, led_max)) { return false; } + if (host_keyboard_led_state().caps_lock) { + rgb_matrix_set_color(43, 0xFF, 0xFF, 0xFF); + } + return true; +} + +#endif + +#if defined(ENCODER_ENABLE) +bool encoder_update_kb(uint8_t index, bool clockwise) { + if (!encoder_update_user(index, clockwise)) { + return false; + } + if (clockwise) { + tap_code_delay(KC_VOLU, 10); + } else { + tap_code_delay(KC_VOLD, 10); + } + return true; +} +#endif diff --git a/keyboards/fancytech/fancyalice66/fancyalice66.h b/keyboards/fancytech/fancyalice66/fancyalice66.h new file mode 100644 index 000000000000..6600a6610b90 --- /dev/null +++ b/keyboards/fancytech/fancyalice66/fancyalice66.h @@ -0,0 +1,49 @@ +/* Copyright 2022 chent7 + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#pragma once + +#include "quantum.h" + +#define XXX KC_NO + + /* + * ┌───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬───────┐ ┌───┐ 4B  4C + * │00 │01 │02 │03 │04 │05 │06 │ │07 │08 │09 │0A │0B │0C │ 0D │ │0F │ + * ┌┴───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┘ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┴┐ └┬──┴┐ + * │ 10 │11 │12 │13 │14 │15 │ │17 │18 │19 │1A │1B │1C │1D │ 1E │ │1F │ + * ┌┴─────┼───┼───┼───┼───┼───┤ └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴──────┴┐ └┬──┴┐ + * │ 20 │21 │22 │23 │24 │25 │ │27 │28 │29 │2A │2B │2C │ 2D │ │2F │ + * ┌┴──────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ └─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───────┬─┬┴──┼───┘ + * │ 30 │31 │32 │33 │34 │35 │ │37 │38 │39 │3A │3B │ 3C │ │3E │ + * ├─────┬──┴───┼───┴─┬─┴───┴─┬─┴─┐ ┌─┴───┴───┴┬──┴──┬┴───┴───────┬─┴─┼───┼───┐ + * │ 40 │ │ 42 │ 43 │46 │ │ 47 │ 4A │ │4D │4E │4F │ + * └─────┘ └─────┴───────┴───┘ └──────────┴─────┘ └───┴───┴───┘ + */ + +#define LAYOUT( \ + K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0F, \ + K10, K11, K12, K13, K14, K15, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \ + K20, K21, K22, K23, K24, K25, K27, K28, K29, K2A, K2B, K2C, K2D, K2F, \ + K30, K31, K32, K33, K34, K35, K37, K38, K39, K3A, K3B, K3C, K3E, \ + K40, K42, K43, K46, K47, K4A, K4D, K4E, K4F \ +) { \ + { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, XXX, K0F }, \ + { K10, K11, K12, K13, K14, K15, XXX, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \ + { K20, K21, K22, K23, K24, K25, XXX, K27, K28, K29, K2A, K2B, K2C, K2D, XXX, K2F }, \ + { K30, K31, K32, K33, K34, K35, XXX, K37, K38, K39, K3A, K3B, K3C, XXX, K3E, XXX }, \ + { K40, XXX, K42, K43, XXX, XXX, K46, K47, XXX, XXX, K4A, XXX, XXX, K4D, K4E, K4F } \ +} diff --git a/keyboards/fancytech/fancyalice66/info.json b/keyboards/fancytech/fancyalice66/info.json new file mode 100644 index 000000000000..31228d12259f --- /dev/null +++ b/keyboards/fancytech/fancyalice66/info.json @@ -0,0 +1,358 @@ +{ + "keyboard_name": "FancyAlice66", + "manufacturer": "Fancytech", + "url": "https://www.aliexpress.com/item/1005004272392611.html", + "maintainer": "chent7", + "processor": "atmega32u4", + "bootloader": "caterina", + "usb": { + "vid": "0xECED", + "pid": "0x3663", + "device_version": "0.0.1", + "force_nkro": true + }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgb_matrix": true, + "encoder": true + }, + "encoder": { + "rotary": [ + {"pin_a": "F0", "pin_b": "F1", "resolution": 2} + ] + }, + "rgb_matrix": { + "driver": "WS2812", + "max_brightness": 200, + "animations":{ + "alphas_mods": true, + "gradient_up_down": true, + "gradient_left_right": true, + "breathing": true, + "band_sat": true, + "band_val": true, + "band_pinwheel_sat": true, + "band_pinwheel_val": true, + "band_spiral_sat": true, + "band_spiral_val": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_up_down": true, + "rainbow_moving_chevron": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "dual_beacon": true, + "rainbow_beacon": true, + "rainbow_pinwheels": true, + "raindrops": true, + "jellybean_raindrops": true, + "hue_breathing": true, + "hue_pendulum": true, + "hue_wave": true, + "pixel_rain": true, + "pixel_fractal": true, + "solid_reactive_simple": true, + "solid_reactive": true, + "solid_reactive_wide": true, + "solid_reactive_multiwide": true, + "solid_reactive_cross": true, + "solid_reactive_multicross": true, + "solid_reactive_nexus": true, + "solid_reactive_multinexus": true, + "splash": true, + "multisplash": true, + "solid_splash": true, + "solid_multisplash": true + } + }, + "diode_direction": "ROW2COL", + "matrix_pins": { + "rows": ["F4", "F5", "F6", "F7", "C7"], + "cols": ["C6", "E6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0", "B7", "B3", "B2", "B1"] + }, + "layouts": { + "LAYOUT": { + "layout": [{ + "label": "Del", + "x": 17, + "y": 0, + "w": 0.75 + }, { + "label": "@", + "x": 2.75, + "y": 0.050000000000000044 + }, { + "label": "_", + "x": 12.75, + "y": 0.050000000000000044 + }, { + "label": "Esc", + "x": 0.75, + "y": 0.25 + }, { + "label": "!", + "x": 1.75, + "y": 0.25 + }, { + "label": "#", + "x": 3.75, + "y": 0.25 + }, { + "label": "$", + "x": 4.75, + "y": 0.25 + }, { + "label": "%", + "x": 5.75, + "y": 0.25 + }, { + "label": "^", + "x": 6.75, + "y": 0.25 + }, { + "label": "&", + "x": 8.75, + "y": 0.25 + }, { + "label": "*", + "x": 9.75, + "y": 0.25 + }, { + "label": "(", + "x": 10.75, + "y": 0.25 + }, { + "label": ")", + "x": 11.75, + "y": 0.25 + }, { + "label": "+", + "x": 13.75, + "y": 0.25 + }, { + "label": "Backspace", + "x": 14.75, + "y": 0.25, + "w": 2 + }, { + "label": "PgUp", + "x": 17.25, + "y": 1 + }, { + "label": "Tab", + "x": 0.5, + "y": 1.25, + "w": 1.5 + }, { + "label": "Q", + "x": 2, + "y": 1.25 + }, { + "label": "W", + "x": 3.25, + "y": 1.25 + }, { + "label": "E", + "x": 4.25, + "y": 1.25 + }, { + "label": "R", + "x": 5.25, + "y": 1.25 + }, { + "label": "T", + "x": 6.25, + "y": 1.25 + }, { + "label": "Y", + "x": 8.5, + "y": 1.25 + }, { + "label": "U", + "x": 9.5, + "y": 1.25 + }, { + "label": "I", + "x": 10.5, + "y": 1.25 + }, { + "label": "O", + "x": 11.5, + "y": 1.25 + }, { + "label": "P", + "x": 12.5, + "y": 1.25 + }, { + "label": "{", + "x": 13.5, + "y": 1.25 + }, { + "label": "}", + "x": 14.5, + "y": 1.25 + }, { + "label": "|", + "x": 15.5, + "y": 1.25, + "w": 1.5 + }, { + "label": "PgDn", + "x": 17.5, + "y": 2 + }, { + "label": "Caps Lock", + "x": 0.25, + "y": 2.25, + "w": 1.75 + }, { + "label": "A", + "x": 2, + "y": 2.25 + }, { + "label": "S", + "x": 3.5, + "y": 2.25 + }, { + "label": "D", + "x": 4.5, + "y": 2.25 + }, { + "label": "F", + "x": 5.5, + "y": 2.25 + }, { + "label": "G", + "x": 6.5, + "y": 2.25 + }, { + "label": "H", + "x": 8.75, + "y": 2.25 + }, { + "label": "J", + "x": 9.75, + "y": 2.25 + }, { + "label": "K", + "x": 10.75, + "y": 2.25 + }, { + "label": "L", + "x": 11.75, + "y": 2.25 + }, { + "label": ":", + "x": 13, + "y": 2.25 + }, { + "label": "\"", + "x": 14, + "y": 2.25 + }, { + "label": "Enter", + "x": 15, + "y": 2.25, + "w": 2.25 + }, { + "label": "Shift", + "x": 0, + "y": 3.25, + "w": 2.25 + }, { + "label": "Z", + "x": 2.25, + "y": 3.25 + }, { + "label": "X", + "x": 3.75, + "y": 3.25 + }, { + "label": "C", + "x": 4.75, + "y": 3.25 + }, { + "label": "V", + "x": 5.75, + "y": 3.25 + }, { + "label": "B", + "x": 6.75, + "y": 3.25 + }, { + "label": "N", + "x": 9, + "y": 3.25 + }, { + "label": "M", + "x": 10, + "y": 3.25 + }, { + "label": "<", + "x": 11, + "y": 3.25 + }, { + "label": ">", + "x": 12, + "y": 3.25 + }, { + "label": "?", + "x": 13.25, + "y": 3.25 + }, { + "label": "Shift", + "x": 14.25, + "y": 3.25, + "w": 1.75 + }, { + "label": "\u2191", + "x": 16.25, + "y": 3.5 + }, { + "label": "Ctrl", + "x": 0, + "y": 4.25, + "w": 1.5 + }, { + "label": "Alt", + "x": 3.5, + "y": 4.25, + "w": 1.5 + }, { + "x": 5.01, + "y": 4.25, + "w": 2.25 + }, { + "label": "Fn", + "x": 7.28, + "y": 4.25 + }, { + "x": 8.75, + "y": 4.25, + "w": 2.75 + }, { + "label": "Alt", + "x": 11.51, + "y": 4.25, + "w": 1.5 + }, { + "label": "\u2190", + "x": 15.25, + "y": 4.5 + }, { + "label": "\u2193", + "x": 16.25, + "y": 4.5 + }, { + "label": "\u2192", + "x": 17.25, + "y": 4.5 + }] + } + } +} diff --git a/keyboards/fancytech/fancyalice66/keymaps/default/keymap.c b/keyboards/fancytech/fancyalice66/keymaps/default/keymap.c new file mode 100644 index 000000000000..d8e1870685c4 --- /dev/null +++ b/keyboards/fancytech/fancyalice66/keymaps/default/keymap.c @@ -0,0 +1,49 @@ +/* Copyright 2022 chent7 + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include QMK_KEYBOARD_H +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + /* + * ┌───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬───────┐ ┌───┐ Vol-  Vol+ + * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ │ 7 │ 8 │ 9 │ 0 │ - │ = │Backsp │ │Del│ + * ┌┴───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┘ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┴┐ └┬──┴┐ + * │ Tab │ Q │ W │ E │ R │ T │ │ Y │ U │ I │ O │ P │ [ │ ] │ \ │ │PgD│ + * ┌┴─────┼───┼───┼───┼───┼───┤ └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴──────┴┐ └┬──┴┐ + * │ Caps │ A │ S │ D │ F │ G │ │ H │ J │ K │ L │ ; │ ' │ Enter │ │PgU│ + * ┌┴──────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ └─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───────┬─┬┴──┼───┘ + * │ Shift │ Z │ X │ C │ V │ B │ │ N │ M │ , │ . │ / │ Shift │ │Up │ + * ├─────┬──┴───┼───┴─┬─┴───┴─┬─┴─┐ ┌─┴───┴───┴┬──┴──┬┴───┴───────┬─┴─┼───┼───┐ + * │ Ctl │ │ Alt │ │FN │ │ │ Alt │ │Lft│Dwn│Rgt│ + * └─────┘ └─────┴───────┴───┘ └──────────┴─────┘ └───┴───┴───┘ + */ + + [0] = 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_BSPC, KC_DEL, + 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_PGUP, + 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_PGDN, + 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_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT + ), + + [1] = LAYOUT( + KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, QK_BOOT, KC_PSCR, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAI, RGB_SAD, RGB_TOG, RGB_HUI, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, + _______, _______, _______, _______, _______, RGB_MOD, _______, RGB_VAD, _______ + ) +}; \ No newline at end of file diff --git a/keyboards/fancytech/fancyalice66/keymaps/via/keymap.c b/keyboards/fancytech/fancyalice66/keymaps/via/keymap.c new file mode 100644 index 000000000000..ae2f604d8e99 --- /dev/null +++ b/keyboards/fancytech/fancyalice66/keymaps/via/keymap.c @@ -0,0 +1,75 @@ +/* Copyright 2022 chent7 + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + /* + * ┌───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬───────┐ ┌───┐ Vol-  Vol+ + * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ │ 7 │ 8 │ 9 │ 0 │ - │ = │Backsp │ │Del│ + * ┌┴───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┘ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┴┐ └┬──┴┐ + * │ Tab │ Q │ W │ E │ R │ T │ │ Y │ U │ I │ O │ P │ [ │ ] │ \ │ │PgD│ + * ┌┴─────┼───┼───┼───┼───┼───┤ └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴──────┴┐ └┬──┴┐ + * │ Caps │ A │ S │ D │ F │ G │ │ H │ J │ K │ L │ ; │ ' │ Enter │ │PgU│ + * ┌┴──────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ └─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───────┬─┬┴──┼───┘ + * │ Shift │ Z │ X │ C │ V │ B │ │ N │ M │ , │ . │ / │ Shift │ │Up │ + * ├─────┬──┴───┼───┴─┬─┴───┴─┬─┴─┐ ┌─┴───┴───┴┬──┴──┬┴───┴───────┬─┴─┼───┼───┐ + * │ Ctl │ │ Alt │ │FN │ │ │ Alt │ │Lft│Dwn│Rgt│ + * └─────┘ └─────┴───────┴───┘ └──────────┴─────┘ └───┴───┴───┘ + */ + + [0] = 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_BSPC, KC_DEL, + 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_PGUP, + 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_PGDN, + 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_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT + ), + + [1] = LAYOUT( + KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, QK_BOOT, KC_PSCR, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAI, RGB_SAD, RGB_TOG, RGB_HUI, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, + _______, _______, _______, _______, _______, RGB_MOD, _______, RGB_VAD, _______ + ), + + [2] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + + [3] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______ + ) +}; + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, +}; +#endif \ No newline at end of file diff --git a/keyboards/fancytech/fancyalice66/keymaps/via/rules.mk b/keyboards/fancytech/fancyalice66/keymaps/via/rules.mk new file mode 100644 index 000000000000..22cec3cbac97 --- /dev/null +++ b/keyboards/fancytech/fancyalice66/keymaps/via/rules.mk @@ -0,0 +1,3 @@ +VIA_ENABLE = yes +ENCODER_MAP_ENABLE = yes +LTO_ENABLE = yes \ No newline at end of file diff --git a/keyboards/fancytech/fancyalice66/readme.md b/keyboards/fancytech/fancyalice66/readme.md new file mode 100644 index 000000000000..2245aa4eae48 --- /dev/null +++ b/keyboards/fancytech/fancyalice66/readme.md @@ -0,0 +1,27 @@ +# FancyAlice66 + +![FancyAlice66](https://i.imgur.com/kg0TUlIh.jpeg) + +FancyAlice66 is a Alice layout mechanical keyboard produced by FancyTech, powered by ATM32U4. + +* Keyboard Maintainer: [chent7](https://github.com/chent7) +* Hardware Supported: FancyAlice66 PCB (ATM32U4) +* Hardware Availability: [AliExpress](https://www.aliexpress.com/item/1005004272392611.html) [TaoBao](https://item.taobao.com/item.htm?spm=a1z09.2.0.0.13892e8dGQ8r0o&id=674705234595) + +Make example for this keyboard (after setting up your build environment): + + make fancytech/fancyalice66:default + +Flashing example for this keyboard: + + make fancytech/fancyalice66:default:flash + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Keycode in layout**: Press the key mapped to `RESET` if it is available diff --git a/keyboards/fancytech/fancyalice66/rules.mk b/keyboards/fancytech/fancyalice66/rules.mk new file mode 100644 index 000000000000..7ff128fa692e --- /dev/null +++ b/keyboards/fancytech/fancyalice66/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank \ No newline at end of file From d185138b3b5b14b4beed22c9075232867298b0e2 Mon Sep 17 00:00:00 2001 From: Adophoxia Date: Sun, 30 Apr 2023 19:28:33 -0700 Subject: [PATCH 02/28] Touch-ups --- .../fancytech/fancyalice66/fancyalice66.c | 5 +- .../fancytech/fancyalice66/fancyalice66.h | 49 --- keyboards/fancytech/fancyalice66/info.json | 359 ++++-------------- .../fancyalice66/keymaps/default/keymap.c | 2 +- .../fancyalice66/keymaps/via/keymap.c | 18 +- .../fancyalice66/keymaps/via/rules.mk | 4 +- keyboards/fancytech/fancyalice66/readme.md | 6 +- 7 files changed, 86 insertions(+), 357 deletions(-) delete mode 100644 keyboards/fancytech/fancyalice66/fancyalice66.h diff --git a/keyboards/fancytech/fancyalice66/fancyalice66.c b/keyboards/fancytech/fancyalice66/fancyalice66.c index 17c0fc60b0da..8bf2b8556866 100644 --- a/keyboards/fancytech/fancyalice66/fancyalice66.c +++ b/keyboards/fancytech/fancyalice66/fancyalice66.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "fancyalice66.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE @@ -49,8 +49,7 @@ led_config_t g_led_config = {{ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2 }}; -bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) { - if (!rgb_matrix_indicators_advanced_user(led_min, led_max)) { return false; } +bool rgb_matrix_indicators_kb(void) { if (host_keyboard_led_state().caps_lock) { rgb_matrix_set_color(43, 0xFF, 0xFF, 0xFF); } diff --git a/keyboards/fancytech/fancyalice66/fancyalice66.h b/keyboards/fancytech/fancyalice66/fancyalice66.h deleted file mode 100644 index 6600a6610b90..000000000000 --- a/keyboards/fancytech/fancyalice66/fancyalice66.h +++ /dev/null @@ -1,49 +0,0 @@ -/* Copyright 2022 chent7 - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - - /* - * ┌───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬───────┐ ┌───┐ 4B  4C - * │00 │01 │02 │03 │04 │05 │06 │ │07 │08 │09 │0A │0B │0C │ 0D │ │0F │ - * ┌┴───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┘ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┴┐ └┬──┴┐ - * │ 10 │11 │12 │13 │14 │15 │ │17 │18 │19 │1A │1B │1C │1D │ 1E │ │1F │ - * ┌┴─────┼───┼───┼───┼───┼───┤ └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴──────┴┐ └┬──┴┐ - * │ 20 │21 │22 │23 │24 │25 │ │27 │28 │29 │2A │2B │2C │ 2D │ │2F │ - * ┌┴──────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ └─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───────┬─┬┴──┼───┘ - * │ 30 │31 │32 │33 │34 │35 │ │37 │38 │39 │3A │3B │ 3C │ │3E │ - * ├─────┬──┴───┼───┴─┬─┴───┴─┬─┴─┐ ┌─┴───┴───┴┬──┴──┬┴───┴───────┬─┴─┼───┼───┐ - * │ 40 │ │ 42 │ 43 │46 │ │ 47 │ 4A │ │4D │4E │4F │ - * └─────┘ └─────┴───────┴───┘ └──────────┴─────┘ └───┴───┴───┘ - */ - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0F, \ - K10, K11, K12, K13, K14, K15, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \ - K20, K21, K22, K23, K24, K25, K27, K28, K29, K2A, K2B, K2C, K2D, K2F, \ - K30, K31, K32, K33, K34, K35, K37, K38, K39, K3A, K3B, K3C, K3E, \ - K40, K42, K43, K46, K47, K4A, K4D, K4E, K4F \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, XXX, K0F }, \ - { K10, K11, K12, K13, K14, K15, XXX, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \ - { K20, K21, K22, K23, K24, K25, XXX, K27, K28, K29, K2A, K2B, K2C, K2D, XXX, K2F }, \ - { K30, K31, K32, K33, K34, K35, XXX, K37, K38, K39, K3A, K3B, K3C, XXX, K3E, XXX }, \ - { K40, XXX, K42, K43, XXX, XXX, K46, K47, XXX, XXX, K4A, XXX, XXX, K4D, K4E, K4F } \ -} diff --git a/keyboards/fancytech/fancyalice66/info.json b/keyboards/fancytech/fancyalice66/info.json index 31228d12259f..8785cf761481 100644 --- a/keyboards/fancytech/fancyalice66/info.json +++ b/keyboards/fancytech/fancyalice66/info.json @@ -2,7 +2,7 @@ "keyboard_name": "FancyAlice66", "manufacturer": "Fancytech", "url": "https://www.aliexpress.com/item/1005004272392611.html", - "maintainer": "chent7", + "maintainer": "Adophoxia", "processor": "atmega32u4", "bootloader": "caterina", "usb": { @@ -15,9 +15,10 @@ "bootmagic": true, "mousekey": true, "extrakey": true, + "lto": true, "nkro": true, "rgb_matrix": true, - "encoder": true + "encoder": false }, "encoder": { "rotary": [ @@ -76,283 +77,79 @@ "cols": ["C6", "E6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0", "B7", "B3", "B2", "B1"] }, "layouts": { - "LAYOUT": { - "layout": [{ - "label": "Del", - "x": 17, - "y": 0, - "w": 0.75 - }, { - "label": "@", - "x": 2.75, - "y": 0.050000000000000044 - }, { - "label": "_", - "x": 12.75, - "y": 0.050000000000000044 - }, { - "label": "Esc", - "x": 0.75, - "y": 0.25 - }, { - "label": "!", - "x": 1.75, - "y": 0.25 - }, { - "label": "#", - "x": 3.75, - "y": 0.25 - }, { - "label": "$", - "x": 4.75, - "y": 0.25 - }, { - "label": "%", - "x": 5.75, - "y": 0.25 - }, { - "label": "^", - "x": 6.75, - "y": 0.25 - }, { - "label": "&", - "x": 8.75, - "y": 0.25 - }, { - "label": "*", - "x": 9.75, - "y": 0.25 - }, { - "label": "(", - "x": 10.75, - "y": 0.25 - }, { - "label": ")", - "x": 11.75, - "y": 0.25 - }, { - "label": "+", - "x": 13.75, - "y": 0.25 - }, { - "label": "Backspace", - "x": 14.75, - "y": 0.25, - "w": 2 - }, { - "label": "PgUp", - "x": 17.25, - "y": 1 - }, { - "label": "Tab", - "x": 0.5, - "y": 1.25, - "w": 1.5 - }, { - "label": "Q", - "x": 2, - "y": 1.25 - }, { - "label": "W", - "x": 3.25, - "y": 1.25 - }, { - "label": "E", - "x": 4.25, - "y": 1.25 - }, { - "label": "R", - "x": 5.25, - "y": 1.25 - }, { - "label": "T", - "x": 6.25, - "y": 1.25 - }, { - "label": "Y", - "x": 8.5, - "y": 1.25 - }, { - "label": "U", - "x": 9.5, - "y": 1.25 - }, { - "label": "I", - "x": 10.5, - "y": 1.25 - }, { - "label": "O", - "x": 11.5, - "y": 1.25 - }, { - "label": "P", - "x": 12.5, - "y": 1.25 - }, { - "label": "{", - "x": 13.5, - "y": 1.25 - }, { - "label": "}", - "x": 14.5, - "y": 1.25 - }, { - "label": "|", - "x": 15.5, - "y": 1.25, - "w": 1.5 - }, { - "label": "PgDn", - "x": 17.5, - "y": 2 - }, { - "label": "Caps Lock", - "x": 0.25, - "y": 2.25, - "w": 1.75 - }, { - "label": "A", - "x": 2, - "y": 2.25 - }, { - "label": "S", - "x": 3.5, - "y": 2.25 - }, { - "label": "D", - "x": 4.5, - "y": 2.25 - }, { - "label": "F", - "x": 5.5, - "y": 2.25 - }, { - "label": "G", - "x": 6.5, - "y": 2.25 - }, { - "label": "H", - "x": 8.75, - "y": 2.25 - }, { - "label": "J", - "x": 9.75, - "y": 2.25 - }, { - "label": "K", - "x": 10.75, - "y": 2.25 - }, { - "label": "L", - "x": 11.75, - "y": 2.25 - }, { - "label": ":", - "x": 13, - "y": 2.25 - }, { - "label": "\"", - "x": 14, - "y": 2.25 - }, { - "label": "Enter", - "x": 15, - "y": 2.25, - "w": 2.25 - }, { - "label": "Shift", - "x": 0, - "y": 3.25, - "w": 2.25 - }, { - "label": "Z", - "x": 2.25, - "y": 3.25 - }, { - "label": "X", - "x": 3.75, - "y": 3.25 - }, { - "label": "C", - "x": 4.75, - "y": 3.25 - }, { - "label": "V", - "x": 5.75, - "y": 3.25 - }, { - "label": "B", - "x": 6.75, - "y": 3.25 - }, { - "label": "N", - "x": 9, - "y": 3.25 - }, { - "label": "M", - "x": 10, - "y": 3.25 - }, { - "label": "<", - "x": 11, - "y": 3.25 - }, { - "label": ">", - "x": 12, - "y": 3.25 - }, { - "label": "?", - "x": 13.25, - "y": 3.25 - }, { - "label": "Shift", - "x": 14.25, - "y": 3.25, - "w": 1.75 - }, { - "label": "\u2191", - "x": 16.25, - "y": 3.5 - }, { - "label": "Ctrl", - "x": 0, - "y": 4.25, - "w": 1.5 - }, { - "label": "Alt", - "x": 3.5, - "y": 4.25, - "w": 1.5 - }, { - "x": 5.01, - "y": 4.25, - "w": 2.25 - }, { - "label": "Fn", - "x": 7.28, - "y": 4.25 - }, { - "x": 8.75, - "y": 4.25, - "w": 2.75 - }, { - "label": "Alt", - "x": 11.51, - "y": 4.25, - "w": 1.5 - }, { - "label": "\u2190", - "x": 15.25, - "y": 4.5 - }, { - "label": "\u2193", - "x": 16.25, - "y": 4.5 - }, { - "label": "\u2192", - "x": 17.25, - "y": 4.5 - }] - } - } + "LAYOUT": { + "layout": [ + { "matrix": [0, 0], "x": 0.75, "y": 0.5 }, + { "matrix": [0, 1], "x": 1.75, "y": 0.5 }, + { "matrix": [0, 2], "x": 2.75, "y": 0.25 }, + { "matrix": [0, 3], "x": 3.75, "y": 0.5 }, + { "matrix": [0, 4], "x": 4.75, "y": 0.5 }, + { "matrix": [0, 5], "x": 5.75, "y": 0.5 }, + { "matrix": [0, 6], "x": 6.75, "y": 0.5 }, + { "matrix": [0, 7], "x": 8.75, "y": 0.5 }, + { "matrix": [0, 8], "x": 9.75, "y": 0.5 }, + { "matrix": [0, 9], "x": 10.75, "y": 0.5 }, + { "matrix": [0, 10], "x": 11.75, "y": 0.5 }, + { "matrix": [0, 11], "x": 12.75, "y": 0.25 }, + { "matrix": [0, 12], "x": 13.75, "y": 0.5 }, + { "matrix": [0, 13], "w": 2, "x": 14.75, "y": 0.5 }, + { "matrix": [0, 15], "x": 17, "y": 0 }, + + { "matrix": [1, 0], "w": 1.5, "x": 0.5, "y": 1.5 }, + { "matrix": [1, 1], "x": 2, "y": 1.5 }, + { "matrix": [1, 2], "x": 3.25, "y": 1.5 }, + { "matrix": [1, 3], "x": 4.25, "y": 1.5 }, + { "matrix": [1, 4], "x": 5.25, "y": 1.5 }, + { "matrix": [1, 5], "x": 6.25, "y": 1.5 }, + { "matrix": [1, 7], "x": 8.5, "y": 1.5 }, + { "matrix": [1, 8], "x": 9.5, "y": 1.5 }, + { "matrix": [1, 9], "x": 10.5, "y": 1.5 }, + { "matrix": [1, 10], "x": 11.5, "y": 1.5 }, + { "matrix": [1, 11], "x": 12.5, "y": 1.5 }, + { "matrix": [1, 12], "x": 13.5, "y": 1.5 }, + { "matrix": [1, 13], "x": 14.5, "y": 1.5 }, + { "matrix": [1, 14], "w": 1.5, "x": 15.5, "y": 1.5 }, + { "matrix": [1, 15], "x": 17.25, "y": 1 }, + + { "matrix": [2, 0], "w": 1.75, "x": 0.25, "y": 2.5 }, + { "matrix": [2, 1], "x": 2, "y": 2.5 }, + { "matrix": [2, 2], "x": 3.5, "y": 2.5 }, + { "matrix": [2, 3], "x": 4.5, "y": 2.5 }, + { "matrix": [2, 4], "x": 5.5, "y": 2.5 }, + { "matrix": [2, 5], "x": 6.5, "y": 2.5 }, + { "matrix": [2, 7], "x": 8.75, "y": 2.5 }, + { "matrix": [2, 8], "x": 9.75, "y": 2.5 }, + { "matrix": [2, 9], "x": 10.75, "y": 2.5 }, + { "matrix": [2, 10], "x": 11.75, "y": 2.5 }, + { "matrix": [2, 11], "x": 13, "y": 2.5 }, + { "matrix": [2, 12], "x": 14, "y": 2.5 }, + { "matrix": [2, 13], "w": 2.25, "x": 15, "y": 2.5 }, + { "matrix": [2, 15], "x": 17.5, "y": 2 }, + + { "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3.5 }, + { "matrix": [3, 1], "x": 2.25, "y": 3.5 }, + { "matrix": [3, 2], "x": 3.75, "y": 3.5 }, + { "matrix": [3, 3], "x": 4.75, "y": 3.5 }, + { "matrix": [3, 4], "x": 5.75, "y": 3.5 }, + { "matrix": [3, 5], "x": 6.75, "y": 3.5 }, + { "matrix": [3, 7], "x": 9, "y": 3.5 }, + { "matrix": [3, 8], "x": 10, "y": 3.5 }, + { "matrix": [3, 9], "x": 11, "y": 3.5 }, + { "matrix": [3, 10], "x": 12, "y": 3.5 }, + { "matrix": [3, 11], "x": 13.25, "y": 3.5 }, + { "matrix": [3, 12], "w": 1.75, "x": 14.25, "y": 3.5 }, + { "matrix": [3, 14], "x": 16.25, "y": 3.75 }, + + { "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4.5 }, + { "matrix": [4, 2], "w": 1.5, "x": 3.5, "y": 4.5 }, + { "matrix": [4, 3], "w": 2.25, "x": 5, "y": 4.5 }, + { "matrix": [4, 6], "x": 7.25, "y": 4.5 }, + { "matrix": [4, 7], "w": 2.75, "x": 8.75, "y": 4.5 }, + { "matrix": [4, 10], "w": 1.5, "x": 11.5, "y": 4.5 }, + { "matrix": [4, 13], "x": 15.25, "y": 4.75 }, + { "matrix": [4, 14], "x": 16.25, "y": 4.75 }, + { "matrix": [4, 15], "x": 17.25, "y": 4.75 } + ] + } + } } diff --git a/keyboards/fancytech/fancyalice66/keymaps/default/keymap.c b/keyboards/fancytech/fancyalice66/keymaps/default/keymap.c index d8e1870685c4..cb8696059f21 100644 --- a/keyboards/fancytech/fancyalice66/keymaps/default/keymap.c +++ b/keyboards/fancytech/fancyalice66/keymaps/default/keymap.c @@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* - * ┌───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬───────┐ ┌───┐ Vol-  Vol+ + * ┌───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬───────┐ ┌───┐ * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ │ 7 │ 8 │ 9 │ 0 │ - │ = │Backsp │ │Del│ * ┌┴───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┘ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┴┐ └┬──┴┐ * │ Tab │ Q │ W │ E │ R │ T │ │ Y │ U │ I │ O │ P │ [ │ ] │ \ │ │PgD│ diff --git a/keyboards/fancytech/fancyalice66/keymaps/via/keymap.c b/keyboards/fancytech/fancyalice66/keymaps/via/keymap.c index ae2f604d8e99..83a2c6e52339 100644 --- a/keyboards/fancytech/fancyalice66/keymaps/via/keymap.c +++ b/keyboards/fancytech/fancyalice66/keymaps/via/keymap.c @@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* - * ┌───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬───────┐ ┌───┐ Vol-  Vol+ + * ┌───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬───────┐ ┌───┐ * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ │ 7 │ 8 │ 9 │ 0 │ - │ = │Backsp │ │Del│ * ┌┴───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┘ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┴┐ └┬──┴┐ * │ Tab │ Q │ W │ E │ R │ T │ │ Y │ U │ I │ O │ P │ [ │ ] │ \ │ │PgD│ @@ -46,22 +46,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, _______, _______, _______, _______, RGB_MOD, _______, RGB_VAD, _______ - ), - - [2] = LAYOUT( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), - - [3] = LAYOUT( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; diff --git a/keyboards/fancytech/fancyalice66/keymaps/via/rules.mk b/keyboards/fancytech/fancyalice66/keymaps/via/rules.mk index 22cec3cbac97..036bd6d1c3ec 100644 --- a/keyboards/fancytech/fancyalice66/keymaps/via/rules.mk +++ b/keyboards/fancytech/fancyalice66/keymaps/via/rules.mk @@ -1,3 +1 @@ -VIA_ENABLE = yes -ENCODER_MAP_ENABLE = yes -LTO_ENABLE = yes \ No newline at end of file +VIA_ENABLE = yes \ No newline at end of file diff --git a/keyboards/fancytech/fancyalice66/readme.md b/keyboards/fancytech/fancyalice66/readme.md index 2245aa4eae48..b81f1841cf14 100644 --- a/keyboards/fancytech/fancyalice66/readme.md +++ b/keyboards/fancytech/fancyalice66/readme.md @@ -4,8 +4,8 @@ FancyAlice66 is a Alice layout mechanical keyboard produced by FancyTech, powered by ATM32U4. -* Keyboard Maintainer: [chent7](https://github.com/chent7) -* Hardware Supported: FancyAlice66 PCB (ATM32U4) +* Keyboard Maintainer: [Adophoxia](https://github.com/Adophoxia) +* Hardware Supported: FancyAlice66 PCB (Atmega32U4) * Hardware Availability: [AliExpress](https://www.aliexpress.com/item/1005004272392611.html) [TaoBao](https://item.taobao.com/item.htm?spm=a1z09.2.0.0.13892e8dGQ8r0o&id=674705234595) Make example for this keyboard (after setting up your build environment): @@ -24,4 +24,4 @@ Enter the bootloader in 3 ways: * **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard * **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead -* **Keycode in layout**: Press the key mapped to `RESET` if it is available +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available From 5fef5d3c853072f5058867399af66749021203ac Mon Sep 17 00:00:00 2001 From: Adophoxia Date: Sun, 30 Apr 2023 19:33:29 -0700 Subject: [PATCH 03/28] Update copyright --- keyboards/fancytech/fancyalice66/fancyalice66.c | 2 +- keyboards/fancytech/fancyalice66/keymaps/default/keymap.c | 2 +- keyboards/fancytech/fancyalice66/keymaps/via/keymap.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/fancytech/fancyalice66/fancyalice66.c b/keyboards/fancytech/fancyalice66/fancyalice66.c index 8bf2b8556866..caeaff44ba5c 100644 --- a/keyboards/fancytech/fancyalice66/fancyalice66.c +++ b/keyboards/fancytech/fancyalice66/fancyalice66.c @@ -1,4 +1,4 @@ -/* Copyright 2022 chent7 +/* Copyright 2023 Adophoxia * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/keyboards/fancytech/fancyalice66/keymaps/default/keymap.c b/keyboards/fancytech/fancyalice66/keymaps/default/keymap.c index cb8696059f21..0fed76c1b311 100644 --- a/keyboards/fancytech/fancyalice66/keymaps/default/keymap.c +++ b/keyboards/fancytech/fancyalice66/keymaps/default/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2022 chent7 +/* Copyright 2023 Adophoxia * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/keyboards/fancytech/fancyalice66/keymaps/via/keymap.c b/keyboards/fancytech/fancyalice66/keymaps/via/keymap.c index 83a2c6e52339..21dd5b7f9e39 100644 --- a/keyboards/fancytech/fancyalice66/keymaps/via/keymap.c +++ b/keyboards/fancytech/fancyalice66/keymaps/via/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2022 chent7 +/* Copyright 2023 Adophoxia * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by From 6f91542550b49fa0f0723068af8c0300f89bd474 Mon Sep 17 00:00:00 2001 From: adophoxia <100170946+adophoxia@users.noreply.github.com> Date: Mon, 1 May 2023 17:46:18 -0700 Subject: [PATCH 04/28] Update `via` keymap. Removed extra encoder mapping layers. Co-authored-by: Joel Challis --- keyboards/fancytech/fancyalice66/keymaps/via/keymap.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/keyboards/fancytech/fancyalice66/keymaps/via/keymap.c b/keyboards/fancytech/fancyalice66/keymaps/via/keymap.c index 21dd5b7f9e39..1d32c8f5e85d 100644 --- a/keyboards/fancytech/fancyalice66/keymaps/via/keymap.c +++ b/keyboards/fancytech/fancyalice66/keymaps/via/keymap.c @@ -52,8 +52,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { #if defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, - [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, - [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) } }; #endif \ No newline at end of file From 2638c88799905972b0bcc3930f3af54c33b92a7c Mon Sep 17 00:00:00 2001 From: adophoxia <100170946+adophoxia@users.noreply.github.com> Date: Mon, 1 May 2023 18:28:32 -0700 Subject: [PATCH 05/28] Update keyboards/fancytech/fancyalice66/info.json Co-authored-by: Ryan --- keyboards/fancytech/fancyalice66/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/fancytech/fancyalice66/info.json b/keyboards/fancytech/fancyalice66/info.json index 8785cf761481..f2f5165cbfc8 100644 --- a/keyboards/fancytech/fancyalice66/info.json +++ b/keyboards/fancytech/fancyalice66/info.json @@ -28,7 +28,7 @@ "rgb_matrix": { "driver": "WS2812", "max_brightness": 200, - "animations":{ + "animations": { "alphas_mods": true, "gradient_up_down": true, "gradient_left_right": true, From 5a56dd6bd7b03b61815e5bc35b85e95d2e48c700 Mon Sep 17 00:00:00 2001 From: Adophoxia Date: Mon, 1 May 2023 18:47:18 -0700 Subject: [PATCH 06/28] Removed extra spaces in matrix data --- keyboards/fancytech/fancyalice66/info.json | 136 ++++++++++----------- 1 file changed, 68 insertions(+), 68 deletions(-) diff --git a/keyboards/fancytech/fancyalice66/info.json b/keyboards/fancytech/fancyalice66/info.json index 8785cf761481..9d424f61203c 100644 --- a/keyboards/fancytech/fancyalice66/info.json +++ b/keyboards/fancytech/fancyalice66/info.json @@ -1,5 +1,5 @@ { - "keyboard_name": "FancyAlice66", + "keyboard_name": "FancyAlice66", "manufacturer": "Fancytech", "url": "https://www.aliexpress.com/item/1005004272392611.html", "maintainer": "Adophoxia", @@ -69,7 +69,7 @@ "multisplash": true, "solid_splash": true, "solid_multisplash": true - } + } }, "diode_direction": "ROW2COL", "matrix_pins": { @@ -79,76 +79,76 @@ "layouts": { "LAYOUT": { "layout": [ - { "matrix": [0, 0], "x": 0.75, "y": 0.5 }, - { "matrix": [0, 1], "x": 1.75, "y": 0.5 }, - { "matrix": [0, 2], "x": 2.75, "y": 0.25 }, - { "matrix": [0, 3], "x": 3.75, "y": 0.5 }, - { "matrix": [0, 4], "x": 4.75, "y": 0.5 }, - { "matrix": [0, 5], "x": 5.75, "y": 0.5 }, - { "matrix": [0, 6], "x": 6.75, "y": 0.5 }, - { "matrix": [0, 7], "x": 8.75, "y": 0.5 }, - { "matrix": [0, 8], "x": 9.75, "y": 0.5 }, - { "matrix": [0, 9], "x": 10.75, "y": 0.5 }, - { "matrix": [0, 10], "x": 11.75, "y": 0.5 }, - { "matrix": [0, 11], "x": 12.75, "y": 0.25 }, - { "matrix": [0, 12], "x": 13.75, "y": 0.5 }, - { "matrix": [0, 13], "w": 2, "x": 14.75, "y": 0.5 }, - { "matrix": [0, 15], "x": 17, "y": 0 }, + {"matrix": [0, 0], "x": 0.75, "y": 0.5}, + {"matrix": [0, 1], "x": 1.75, "y": 0.5}, + {"matrix": [0, 2], "x": 2.75, "y": 0.25}, + {"matrix": [0, 3], "x": 3.75, "y": 0.5}, + {"matrix": [0, 4], "x": 4.75, "y": 0.5}, + {"matrix": [0, 5], "x": 5.75, "y": 0.5}, + {"matrix": [0, 6], "x": 6.75, "y": 0.5}, + {"matrix": [0, 7], "x": 8.75, "y": 0.5}, + {"matrix": [0, 8], "x": 9.75, "y": 0.5}, + {"matrix": [0, 9], "x": 10.75, "y": 0.5}, + {"matrix": [0, 10], "x": 11.75, "y": 0.5}, + {"matrix": [0, 11], "x": 12.75, "y": 0.25}, + {"matrix": [0, 12], "x": 13.75, "y": 0.5}, + {"matrix": [0, 13], "w": 2, "x": 14.75, "y": 0.5}, + {"matrix": [0, 15], "x": 17, "y": 0}, - { "matrix": [1, 0], "w": 1.5, "x": 0.5, "y": 1.5 }, - { "matrix": [1, 1], "x": 2, "y": 1.5 }, - { "matrix": [1, 2], "x": 3.25, "y": 1.5 }, - { "matrix": [1, 3], "x": 4.25, "y": 1.5 }, - { "matrix": [1, 4], "x": 5.25, "y": 1.5 }, - { "matrix": [1, 5], "x": 6.25, "y": 1.5 }, - { "matrix": [1, 7], "x": 8.5, "y": 1.5 }, - { "matrix": [1, 8], "x": 9.5, "y": 1.5 }, - { "matrix": [1, 9], "x": 10.5, "y": 1.5 }, - { "matrix": [1, 10], "x": 11.5, "y": 1.5 }, - { "matrix": [1, 11], "x": 12.5, "y": 1.5 }, - { "matrix": [1, 12], "x": 13.5, "y": 1.5 }, - { "matrix": [1, 13], "x": 14.5, "y": 1.5 }, - { "matrix": [1, 14], "w": 1.5, "x": 15.5, "y": 1.5 }, - { "matrix": [1, 15], "x": 17.25, "y": 1 }, + {"matrix": [1, 0], "w": 1.5, "x": 0.5, "y": 1.5}, + {"matrix": [1, 1], "x": 2, "y": 1.5}, + {"matrix": [1, 2], "x": 3.25, "y": 1.5}, + {"matrix": [1, 3], "x": 4.25, "y": 1.5}, + {"matrix": [1, 4], "x": 5.25, "y": 1.5}, + {"matrix": [1, 5], "x": 6.25, "y": 1.5}, + {"matrix": [1, 7], "x": 8.5, "y": 1.5}, + {"matrix": [1, 8], "x": 9.5, "y": 1.5}, + {"matrix": [1, 9], "x": 10.5, "y": 1.5}, + {"matrix": [1, 10], "x": 11.5, "y": 1.5}, + {"matrix": [1, 11], "x": 12.5, "y": 1.5}, + {"matrix": [1, 12], "x": 13.5, "y": 1.5}, + {"matrix": [1, 13], "x": 14.5, "y": 1.5}, + {"matrix": [1, 14], "w": 1.5, "x": 15.5, "y": 1.5}, + {"matrix": [1, 15], "x": 17.25, "y": 1}, - { "matrix": [2, 0], "w": 1.75, "x": 0.25, "y": 2.5 }, - { "matrix": [2, 1], "x": 2, "y": 2.5 }, - { "matrix": [2, 2], "x": 3.5, "y": 2.5 }, - { "matrix": [2, 3], "x": 4.5, "y": 2.5 }, - { "matrix": [2, 4], "x": 5.5, "y": 2.5 }, - { "matrix": [2, 5], "x": 6.5, "y": 2.5 }, - { "matrix": [2, 7], "x": 8.75, "y": 2.5 }, - { "matrix": [2, 8], "x": 9.75, "y": 2.5 }, - { "matrix": [2, 9], "x": 10.75, "y": 2.5 }, - { "matrix": [2, 10], "x": 11.75, "y": 2.5 }, - { "matrix": [2, 11], "x": 13, "y": 2.5 }, - { "matrix": [2, 12], "x": 14, "y": 2.5 }, - { "matrix": [2, 13], "w": 2.25, "x": 15, "y": 2.5 }, - { "matrix": [2, 15], "x": 17.5, "y": 2 }, + {"matrix": [2, 0], "w": 1.75, "x": 0.25, "y": 2.5}, + {"matrix": [2, 1], "x": 2, "y": 2.5}, + {"matrix": [2, 2], "x": 3.5, "y": 2.5}, + {"matrix": [2, 3], "x": 4.5, "y": 2.5}, + {"matrix": [2, 4], "x": 5.5, "y": 2.5}, + {"matrix": [2, 5], "x": 6.5, "y": 2.5}, + {"matrix": [2, 7], "x": 8.75, "y": 2.5}, + {"matrix": [2, 8], "x": 9.75, "y": 2.5}, + {"matrix": [2, 9], "x": 10.75, "y": 2.5}, + {"matrix": [2, 10], "x": 11.75, "y": 2.5}, + {"matrix": [2, 11], "x": 13, "y": 2.5}, + {"matrix": [2, 12], "x": 14, "y": 2.5}, + {"matrix": [2, 13], "w": 2.25, "x": 15, "y": 2.5}, + {"matrix": [2, 15], "x": 17.5, "y": 2}, - { "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3.5 }, - { "matrix": [3, 1], "x": 2.25, "y": 3.5 }, - { "matrix": [3, 2], "x": 3.75, "y": 3.5 }, - { "matrix": [3, 3], "x": 4.75, "y": 3.5 }, - { "matrix": [3, 4], "x": 5.75, "y": 3.5 }, - { "matrix": [3, 5], "x": 6.75, "y": 3.5 }, - { "matrix": [3, 7], "x": 9, "y": 3.5 }, - { "matrix": [3, 8], "x": 10, "y": 3.5 }, - { "matrix": [3, 9], "x": 11, "y": 3.5 }, - { "matrix": [3, 10], "x": 12, "y": 3.5 }, - { "matrix": [3, 11], "x": 13.25, "y": 3.5 }, - { "matrix": [3, 12], "w": 1.75, "x": 14.25, "y": 3.5 }, - { "matrix": [3, 14], "x": 16.25, "y": 3.75 }, + {"matrix": [3, 0], "w": 2.25, "x": 0, "y": 3.5}, + {"matrix": [3, 1], "x": 2.25, "y": 3.5}, + {"matrix": [3, 2], "x": 3.75, "y": 3.5}, + {"matrix": [3, 3], "x": 4.75, "y": 3.5}, + {"matrix": [3, 4], "x": 5.75, "y": 3.5}, + {"matrix": [3, 5], "x": 6.75, "y": 3.5}, + {"matrix": [3, 7], "x": 9, "y": 3.5}, + {"matrix": [3, 8], "x": 10, "y": 3.5}, + {"matrix": [3, 9], "x": 11, "y": 3.5}, + {"matrix": [3, 10], "x": 12, "y": 3.5}, + {"matrix": [3, 11], "x": 13.25, "y": 3.5}, + {"matrix": [3, 12], "w": 1.75, "x": 14.25, "y": 3.5}, + {"matrix": [3, 14], "x": 16.25, "y": 3.75}, - { "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4.5 }, - { "matrix": [4, 2], "w": 1.5, "x": 3.5, "y": 4.5 }, - { "matrix": [4, 3], "w": 2.25, "x": 5, "y": 4.5 }, - { "matrix": [4, 6], "x": 7.25, "y": 4.5 }, - { "matrix": [4, 7], "w": 2.75, "x": 8.75, "y": 4.5 }, - { "matrix": [4, 10], "w": 1.5, "x": 11.5, "y": 4.5 }, - { "matrix": [4, 13], "x": 15.25, "y": 4.75 }, - { "matrix": [4, 14], "x": 16.25, "y": 4.75 }, - { "matrix": [4, 15], "x": 17.25, "y": 4.75 } + {"matrix": [4, 0], "w": 1.5, "x": 0, "y": 4.5}, + {"matrix": [4, 2], "w": 1.5, "x": 3.5, "y": 4.5}, + {"matrix": [4, 3], "w": 2.25, "x": 5, "y": 4.5}, + {"matrix": [4, 6], "x": 7.25, "y": 4.5}, + {"matrix": [4, 7], "w": 2.75, "x": 8.75, "y": 4.5}, + {"matrix": [4, 10], "w": 1.5, "x": 11.5, "y": 4.5}, + {"matrix": [4, 13], "x": 15.25, "y": 4.75}, + {"matrix": [4, 14], "x": 16.25, "y": 4.75}, + {"matrix": [4, 15], "x": 17.25, "y": 4.75} ] } } From 7a588c5362cc392332c8c0f369127911dc4c46a6 Mon Sep 17 00:00:00 2001 From: Adophoxia Date: Mon, 1 May 2023 18:54:20 -0700 Subject: [PATCH 07/28] Re-format `info.json` --- keyboards/fancytech/fancyalice66/info.json | 166 +++++++++++---------- 1 file changed, 85 insertions(+), 81 deletions(-) diff --git a/keyboards/fancytech/fancyalice66/info.json b/keyboards/fancytech/fancyalice66/info.json index 9d424f61203c..a529966b429c 100644 --- a/keyboards/fancytech/fancyalice66/info.json +++ b/keyboards/fancytech/fancyalice66/info.json @@ -1,87 +1,91 @@ { + "manufacturer": "Fancytech", "keyboard_name": "FancyAlice66", - "manufacturer": "Fancytech", - "url": "https://www.aliexpress.com/item/1005004272392611.html", - "maintainer": "Adophoxia", - "processor": "atmega32u4", - "bootloader": "caterina", - "usb": { - "vid": "0xECED", - "pid": "0x3663", - "device_version": "0.0.1", - "force_nkro": true - }, - "features": { - "bootmagic": true, - "mousekey": true, - "extrakey": true, - "lto": true, - "nkro": true, - "rgb_matrix": true, - "encoder": false - }, - "encoder": { + "maintainer": "Adophoxia", + "bootloader": "caterina", + "diode_direction": "ROW2COL", + "encoder": { "rotary": [ - {"pin_a": "F0", "pin_b": "F1", "resolution": 2} + { + "pin_a": "F0", + "pin_b": "F1", + "resolution": 2 + } ] }, - "rgb_matrix": { - "driver": "WS2812", - "max_brightness": 200, - "animations":{ - "alphas_mods": true, - "gradient_up_down": true, - "gradient_left_right": true, - "breathing": true, - "band_sat": true, - "band_val": true, - "band_pinwheel_sat": true, - "band_pinwheel_val": true, - "band_spiral_sat": true, - "band_spiral_val": true, - "cycle_all": true, - "cycle_left_right": true, - "cycle_up_down": true, - "rainbow_moving_chevron": true, - "cycle_out_in": true, - "cycle_out_in_dual": true, - "cycle_pinwheel": true, - "cycle_spiral": true, - "dual_beacon": true, - "rainbow_beacon": true, - "rainbow_pinwheels": true, - "raindrops": true, - "jellybean_raindrops": true, - "hue_breathing": true, - "hue_pendulum": true, - "hue_wave": true, - "pixel_rain": true, - "pixel_fractal": true, - "solid_reactive_simple": true, - "solid_reactive": true, - "solid_reactive_wide": true, - "solid_reactive_multiwide": true, - "solid_reactive_cross": true, - "solid_reactive_multicross": true, - "solid_reactive_nexus": true, - "solid_reactive_multinexus": true, - "splash": true, - "multisplash": true, - "solid_splash": true, - "solid_multisplash": true - } - }, - "diode_direction": "ROW2COL", - "matrix_pins": { - "rows": ["F4", "F5", "F6", "F7", "C7"], - "cols": ["C6", "E6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0", "B7", "B3", "B2", "B1"] - }, - "layouts": { + "features": { + "bootmagic": true, + "encoder": false, + "extrakey": true, + "lto": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, + "matrix_pins": { + "cols": ["C6", "E6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0", "B7", "B3", "B2", "B1"], + "rows": ["F4", "F5", "F6", "F7", "C7"] + }, + "processor": "atmega32u4", + "rgb_matrix": { + "animations": { + "alphas_mods": true, + "band_pinwheel_sat": true, + "band_pinwheel_val": true, + "band_sat": true, + "band_spiral_sat": true, + "band_spiral_val": true, + "band_val": true, + "breathing": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "cycle_up_down": true, + "dual_beacon": true, + "gradient_left_right": true, + "gradient_up_down": true, + "hue_breathing": true, + "hue_pendulum": true, + "hue_wave": true, + "jellybean_raindrops": true, + "multisplash": true, + "pixel_fractal": true, + "pixel_rain": true, + "rainbow_beacon": true, + "rainbow_moving_chevron": true, + "rainbow_pinwheels": true, + "raindrops": true, + "solid_multisplash": true, + "solid_reactive": true, + "solid_reactive_cross": true, + "solid_reactive_multicross": true, + "solid_reactive_multinexus": true, + "solid_reactive_multiwide": true, + "solid_reactive_nexus": true, + "solid_reactive_simple": true, + "solid_reactive_wide": true, + "solid_splash": true, + "splash": true + }, + "driver": "WS2812", + "max_brightness": 200 + }, + "url": "https://www.aliexpress.com/item/1005004272392611.html", + "usb": { + "device_version": "0.0.1", + "force_nkro": true, + "pid": "0x3663", + "vid": "0xECED" + }, + "layouts": { "LAYOUT": { "layout": [ {"matrix": [0, 0], "x": 0.75, "y": 0.5}, {"matrix": [0, 1], "x": 1.75, "y": 0.5}, - {"matrix": [0, 2], "x": 2.75, "y": 0.25}, + {"matrix": [0, 2], "x": 2.75, "y": 0.25}, {"matrix": [0, 3], "x": 3.75, "y": 0.5}, {"matrix": [0, 4], "x": 4.75, "y": 0.5}, {"matrix": [0, 5], "x": 5.75, "y": 0.5}, @@ -90,10 +94,10 @@ {"matrix": [0, 8], "x": 9.75, "y": 0.5}, {"matrix": [0, 9], "x": 10.75, "y": 0.5}, {"matrix": [0, 10], "x": 11.75, "y": 0.5}, - {"matrix": [0, 11], "x": 12.75, "y": 0.25}, + {"matrix": [0, 11], "x": 12.75, "y": 0.25}, {"matrix": [0, 12], "x": 13.75, "y": 0.5}, {"matrix": [0, 13], "w": 2, "x": 14.75, "y": 0.5}, - {"matrix": [0, 15], "x": 17, "y": 0}, + {"matrix": [0, 15], "x": 17, "y": 0}, {"matrix": [1, 0], "w": 1.5, "x": 0.5, "y": 1.5}, {"matrix": [1, 1], "x": 2, "y": 1.5}, @@ -109,7 +113,7 @@ {"matrix": [1, 12], "x": 13.5, "y": 1.5}, {"matrix": [1, 13], "x": 14.5, "y": 1.5}, {"matrix": [1, 14], "w": 1.5, "x": 15.5, "y": 1.5}, - {"matrix": [1, 15], "x": 17.25, "y": 1}, + {"matrix": [1, 15], "x": 17.25, "y": 1}, {"matrix": [2, 0], "w": 1.75, "x": 0.25, "y": 2.5}, {"matrix": [2, 1], "x": 2, "y": 2.5}, @@ -124,7 +128,7 @@ {"matrix": [2, 11], "x": 13, "y": 2.5}, {"matrix": [2, 12], "x": 14, "y": 2.5}, {"matrix": [2, 13], "w": 2.25, "x": 15, "y": 2.5}, - {"matrix": [2, 15], "x": 17.5, "y": 2}, + {"matrix": [2, 15], "x": 17.5, "y": 2}, {"matrix": [3, 0], "w": 2.25, "x": 0, "y": 3.5}, {"matrix": [3, 1], "x": 2.25, "y": 3.5}, @@ -139,7 +143,7 @@ {"matrix": [3, 11], "x": 13.25, "y": 3.5}, {"matrix": [3, 12], "w": 1.75, "x": 14.25, "y": 3.5}, {"matrix": [3, 14], "x": 16.25, "y": 3.75}, - + {"matrix": [4, 0], "w": 1.5, "x": 0, "y": 4.5}, {"matrix": [4, 2], "w": 1.5, "x": 3.5, "y": 4.5}, {"matrix": [4, 3], "w": 2.25, "x": 5, "y": 4.5}, @@ -152,4 +156,4 @@ ] } } -} +} \ No newline at end of file From 2d3fc11eeecb79a2b3d9748be7c3e09a9a38dc87 Mon Sep 17 00:00:00 2001 From: Adophoxia Date: Mon, 1 May 2023 20:36:18 -0700 Subject: [PATCH 08/28] Move `LED` matrix info to `info.json` --- .../fancytech/fancyalice66/fancyalice66.c | 274 +++++++++++++++--- keyboards/fancytech/fancyalice66/info.json | 109 ++++++- 2 files changed, 336 insertions(+), 47 deletions(-) diff --git a/keyboards/fancytech/fancyalice66/fancyalice66.c b/keyboards/fancytech/fancyalice66/fancyalice66.c index caeaff44ba5c..e2667c83a92a 100644 --- a/keyboards/fancytech/fancyalice66/fancyalice66.c +++ b/keyboards/fancytech/fancyalice66/fancyalice66.c @@ -17,45 +17,12 @@ #include "quantum.h" #ifdef RGB_MATRIX_ENABLE - -#define XX NO_LED - -led_config_t g_led_config = {{ - //It's mirrored - { 14, XX, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 }, - { 29, 28, 27, 26, 25, 24, 23, 22, 21, XX, 20, 19, 18, 17, 16, 15 }, - { 43, XX, 42, 41, 40, 39, 38, 37, 36, XX, 35, 34, 33, 32, 31, 30 }, - { XX, 56, XX, 55, 54, 53, 52, 51, 50, XX, 49, 48, 47, 46, 45, 44 }, - { 65, 64, 63, XX, XX, 62, XX, XX, 61, 60, XX, XX, 59, 58, XX, 57 } -}, { - //Key matrix (0 -> 65) - {224, 0}, {194, 0}, {180, 0}, {164, 0}, {150, 0}, {135, 0}, {120, 0}, {105, 0}, {90, 0}, {75, 0}, {60, 0}, {45, 0}, {30, 0}, {15, 0}, {0, 0}, - {224,16}, {209,16}, {194,16}, {180,16}, {164,16}, {150,16}, {135,16}, {120,16}, {105,16}, {75, 16}, {60, 16}, {45, 16}, {30, 16}, {15, 16}, {0, 16}, - {224,32}, {194,32}, {180,32}, {164,32}, {150,32}, {135,32}, {120,32}, {105,32}, {75, 32}, {60, 32}, {45, 32}, {30, 32}, {15, 32}, {0, 32}, - {209,48}, {180,48}, {164,48}, {150,48}, {135,48}, {120,48}, {105,48}, {75, 48}, {60, 48}, {45, 48}, {30, 48}, {15, 48}, {0, 48}, - {224,64}, {209,64}, {194,64}, {150,64}, {105,64}, {90, 64}, {45, 64}, {30, 64}, {0, 64}, - - //Underglow (66 -> 81) - {0, 64}, {0, 32}, {0, 0}, {37, 0}, {75, 0}, {112, 0}, {149, 0}, {187, 0}, {224, 0}, {224,32}, {224,64}, {187,64}, {149,64}, {112,64}, {75, 64}, {37, 64} -}, { - //Key matrix (0 -> 65) - 4, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, - 4, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, - 4, 4, 4, 1, 4, 1, 4, 1, 1, - - //Underglow (66 -> 81) - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2 -}}; - bool rgb_matrix_indicators_kb(void) { if (host_keyboard_led_state().caps_lock) { rgb_matrix_set_color(43, 0xFF, 0xFF, 0xFF); } return true; } - #endif #if defined(ENCODER_ENABLE) @@ -71,3 +38,244 @@ bool encoder_update_kb(uint8_t index, bool clockwise) { return true; } #endif + +{ + "manufacturer": "Fancytech", + "keyboard_name": "FancyAlice66", + "maintainer": "Adophoxia", + "bootloader": "caterina", + "diode_direction": "ROW2COL", + "encoder": { + "rotary": [ + { + "pin_a": "F0", + "pin_b": "F1", + "resolution": 2 + } + ] + }, + "features": { + "bootmagic": true, + "encoder": false, + "extrakey": true, + "lto": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, + "matrix_pins": { + "cols": ["C6", "E6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0", "B7", "B3", "B2", "B1"], + "rows": ["F4", "F5", "F6", "F7", "C7"] + }, + "processor": "atmega32u4", + "rgb_matrix": { + "animations": { + "alphas_mods": true, + "band_pinwheel_sat": true, + "band_pinwheel_val": true, + "band_sat": true, + "band_spiral_sat": true, + "band_spiral_val": true, + "band_val": true, + "breathing": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "cycle_up_down": true, + "dual_beacon": true, + "gradient_left_right": true, + "gradient_up_down": true, + "hue_breathing": true, + "hue_pendulum": true, + "hue_wave": true, + "jellybean_raindrops": true, + "multisplash": true, + "pixel_fractal": true, + "pixel_rain": true, + "rainbow_beacon": true, + "rainbow_moving_chevron": true, + "rainbow_pinwheels": true, + "raindrops": true, + "solid_multisplash": true, + "solid_reactive": true, + "solid_reactive_cross": true, + "solid_reactive_multicross": true, + "solid_reactive_multinexus": true, + "solid_reactive_multiwide": true, + "solid_reactive_nexus": true, + "solid_reactive_simple": true, + "solid_reactive_wide": true, + "solid_splash": true, + "splash": true + }, + "driver": "WS2812", + "layout": [ + { "flags": 1, "matrix": [0, 0], "x": 0, "y": 0}, + { "flags": 4, "matrix": [0, 1], "x": 15, "y": 0}, + { "flags": 4, "matrix": [0, 2], "x": 30, "y": 0}, + { "flags": 4, "matrix": [0, 3], "x": 45, "y": 0}, + { "flags": 4, "matrix": [0, 4], "x": 60, "y": 0}, + { "flags": 4, "matrix": [0, 5], "x": 75, "y": 0}, + { "flags": 4, "matrix": [0, 6], "x": 90, "y": 0}, + { "flags": 4, "matrix": [0, 7], "x": 105, "y": 0}, + { "flags": 4, "matrix": [0, 8], "x": 120, "y": 0}, + { "flags": 4, "matrix": [0, 9], "x": 135, "y": 0}, + { "flags": 4, "matrix": [0, 10], "x": 150, "y": 0}, + { "flags": 4, "matrix": [0, 11], "x": 164, "y": 0}, + { "flags": 4, "matrix": [0, 12], "x": 180, "y": 0}, + { "flags": 1, "matrix": [0, 13], "x": 194, "y": 0}, + { "flags": 4, "matrix": [0, 15], "x": 224, "y": 0}, + { "flags": 1, "matrix": [1, 0], "x": 0, "y": 16}, + { "flags": 4, "matrix": [1, 1], "x": 15, "y": 16}, + { "flags": 4, "matrix": [1, 2], "x": 30, "y": 16}, + { "flags": 4, "matrix": [1, 3], "x": 45, "y": 16}, + { "flags": 4, "matrix": [1, 4], "x": 60, "y": 16}, + { "flags": 4, "matrix": [1, 5], "x": 75, "y": 16}, + { "flags": 4, "matrix": [1, 7], "x": 105, "y": 16}, + { "flags": 4, "matrix": [1, 8], "x": 120, "y": 16}, + { "flags": 4, "matrix": [1, 9], "x": 135, "y": 16}, + { "flags": 4, "matrix": [1, 10], "x": 150, "y": 16}, + { "flags": 4, "matrix": [1, 11], "x": 164, "y": 16}, + { "flags": 4, "matrix": [1, 12], "x": 180, "y": 16}, + { "flags": 4, "matrix": [1, 13], "x": 194, "y": 16}, + { "flags": 4, "matrix": [1, 14], "x": 209, "y": 16}, + { "flags": 4, "matrix": [1, 15], "x": 224, "y": 16}, + { "flags": 1, "matrix": [2, 0], "x": 0, "y": 32}, + { "flags": 4, "matrix": [2, 1], "x": 15, "y": 32}, + { "flags": 4, "matrix": [2, 2], "x": 30, "y": 32}, + { "flags": 4, "matrix": [2, 3], "x": 45, "y": 32}, + { "flags": 4, "matrix": [2, 4], "x": 60, "y": 32}, + { "flags": 4, "matrix": [2, 5], "x": 75, "y": 32}, + { "flags": 4, "matrix": [2, 7], "x": 105, "y": 32}, + { "flags": 4, "matrix": [2, 8], "x": 120, "y": 32}, + { "flags": 4, "matrix": [2, 9], "x": 135, "y": 32}, + { "flags": 4, "matrix": [2, 10], "x": 150, "y": 32}, + { "flags": 4, "matrix": [2, 11], "x": 164, "y": 32}, + { "flags": 4, "matrix": [2, 12], "x": 180, "y": 32}, + { "flags": 1, "matrix": [2, 13], "x": 194, "y": 32}, + { "flags": 4, "matrix": [2, 15], "x": 224, "y": 32}, + { "flags": 1, "matrix": [3, 0], "x": 0, "y": 48}, + { "flags": 4, "matrix": [3, 1], "x": 15, "y": 48}, + { "flags": 4, "matrix": [3, 2], "x": 30, "y": 48}, + { "flags": 4, "matrix": [3, 3], "x": 45, "y": 48}, + { "flags": 4, "matrix": [3, 4], "x": 60, "y": 48}, + { "flags": 4, "matrix": [3, 5], "x": 75, "y": 48}, + { "flags": 4, "matrix": [3, 7], "x": 105, "y": 48}, + { "flags": 4, "matrix": [3, 8], "x": 120, "y": 48}, + { "flags": 4, "matrix": [3, 9], "x": 135, "y": 48}, + { "flags": 4, "matrix": [3, 10], "x": 150, "y": 48}, + { "flags": 4, "matrix": [3, 11], "x": 164, "y": 48}, + { "flags": 4, "matrix": [3, 12], "x": 180, "y": 48}, + { "flags": 4, "matrix": [3, 14], "x": 209, "y": 48}, + { "flags": 1, "matrix": [4, 0], "x": 0, "y": 64}, + { "flags": 1, "matrix": [4, 2], "x": 30, "y": 64}, + { "flags": 4, "matrix": [4, 3], "x": 45, "y": 64}, + { "flags": 1, "matrix": [4, 6], "x": 90, "y": 64}, + { "flags": 4, "matrix": [4, 7], "x": 105, "y": 64}, + { "flags": 1, "matrix": [4, 10], "x": 150, "y": 64}, + { "flags": 4, "matrix": [4, 13], "x": 194, "y": 64}, + { "flags": 4, "matrix": [4, 14], "x": 209, "y": 64}, + { "flags": 4, "matrix": [4, 15], "x": 224, "y": 64}, + { "flags": 2, "x": 37, "y": 64}, + { "flags": 2, "x": 75, "y": 64}, + { "flags": 2, "x": 112, "y": 64}, + { "flags": 2, "x": 149, "y": 64}, + { "flags": 2, "x": 187, "y": 64}, + { "flags": 2, "x": 224, "y": 64}, + { "flags": 2, "x": 224, "y": 32}, + { "flags": 2, "x": 224, "y": 0}, + { "flags": 2, "x": 187, "y": 0}, + { "flags": 2, "x": 149, "y": 0}, + { "flags": 2, "x": 112, "y": 0}, + { "flags": 2, "x": 75, "y": 0}, + { "flags": 2, "x": 37, "y": 0}, + { "flags": 2, "x": 0, "y": 0}, + { "flags": 2, "x": 0, "y": 32}, + { "flags": 2, "x": 0, "y": 64} + ], + "max_brightness": 200, + "rgblight.pin": "B0" + }, + "url": "https://www.aliexpress.com/item/1005004272392611.html", + "usb": { + "device_version": "0.0.1", + "force_nkro": true, + "pid": "0x3663", + "vid": "0xECED" + }, + "layouts": { + "LAYOUT": { + "layout": [ + { "matrix": [0, 0], "x": 0.75, "y": 0.5}, + { "matrix": [0, 1], "x": 1.75, "y": 0.5}, + { "matrix": [0, 2], "x": 2.75, "y": 0.25}, + { "matrix": [0, 3], "x": 3.75, "y": 0.5}, + { "matrix": [0, 4], "x": 4.75, "y": 0.5}, + { "matrix": [0, 5], "x": 5.75, "y": 0.5}, + { "matrix": [0, 6], "x": 6.75, "y": 0.5}, + { "matrix": [0, 7], "x": 8.75, "y": 0.5}, + { "matrix": [0, 8], "x": 9.75, "y": 0.5}, + { "matrix": [0, 9], "x": 10.75, "y": 0.5}, + { "matrix": [0, 10], "x": 11.75, "y": 0.5}, + { "matrix": [0, 11], "x": 12.75, "y": 0.25}, + { "matrix": [0, 12], "x": 13.75, "y": 0.5}, + { "matrix": [0, 13], "w": 2, "x": 14.75, "y": 0.5}, + { "matrix": [0, 15], "x": 17, "y": 0}, + { "matrix": [1, 0], "w": 1.5, "x": 0.5, "y": 1.5}, + { "matrix": [1, 1], "x": 2, "y": 1.5}, + { "matrix": [1, 2], "x": 3.25, "y": 1.5}, + { "matrix": [1, 3], "x": 4.25, "y": 1.5}, + { "matrix": [1, 4], "x": 5.25, "y": 1.5}, + { "matrix": [1, 5], "x": 6.25, "y": 1.5}, + { "matrix": [1, 7], "x": 8.5, "y": 1.5}, + { "matrix": [1, 8], "x": 9.5, "y": 1.5}, + { "matrix": [1, 9], "x": 10.5, "y": 1.5}, + { "matrix": [1, 10], "x": 11.5, "y": 1.5}, + { "matrix": [1, 11], "x": 12.5, "y": 1.5}, + { "matrix": [1, 12], "x": 13.5, "y": 1.5}, + { "matrix": [1, 13], "x": 14.5, "y": 1.5}, + { "matrix": [1, 14], "w": 1.5, "x": 15.5, "y": 1.5}, + { "matrix": [1, 15], "x": 17.25, "y": 1}, + { "matrix": [2, 0], "w": 1.75, "x": 0.25, "y": 2.5}, + { "matrix": [2, 1], "x": 2, "y": 2.5}, + { "matrix": [2, 2], "x": 3.5, "y": 2.5}, + { "matrix": [2, 3], "x": 4.5, "y": 2.5}, + { "matrix": [2, 4], "x": 5.5, "y": 2.5}, + { "matrix": [2, 5], "x": 6.5, "y": 2.5}, + { "matrix": [2, 7], "x": 8.75, "y": 2.5}, + { "matrix": [2, 8], "x": 9.75, "y": 2.5}, + { "matrix": [2, 9], "x": 10.75, "y": 2.5}, + { "matrix": [2, 10], "x": 11.75, "y": 2.5}, + { "matrix": [2, 11], "x": 13, "y": 2.5}, + { "matrix": [2, 12], "x": 14, "y": 2.5}, + { "matrix": [2, 13], "w": 2.25, "x": 15, "y": 2.5}, + { "matrix": [2, 15], "x": 17.5, "y": 2}, + { "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3.5}, + { "matrix": [3, 1], "x": 2.25, "y": 3.5}, + { "matrix": [3, 2], "x": 3.75, "y": 3.5}, + { "matrix": [3, 3], "x": 4.75, "y": 3.5}, + { "matrix": [3, 4], "x": 5.75, "y": 3.5}, + { "matrix": [3, 5], "x": 6.75, "y": 3.5}, + { "matrix": [3, 7], "x": 9, "y": 3.5}, + { "matrix": [3, 8], "x": 10, "y": 3.5}, + { "matrix": [3, 9], "x": 11, "y": 3.5}, + { "matrix": [3, 10], "x": 12, "y": 3.5}, + { "matrix": [3, 11], "x": 13.25, "y": 3.5}, + { "matrix": [3, 12], "w": 1.75, "x": 14.25, "y": 3.5}, + { "matrix": [3, 14], "x": 16.25, "y": 3.75}, + { "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4.5}, + { "matrix": [4, 2], "w": 1.5, "x": 3.5, "y": 4.5}, + { "matrix": [4, 3], "w": 2.25, "x": 5, "y": 4.5}, + { "matrix": [4, 6], "x": 7.25, "y": 4.5}, + { "matrix": [4, 7], "w": 2.75, "x": 8.75, "y": 4.5}, + { "matrix": [4, 10], "w": 1.5, "x": 11.5, "y": 4.5}, + { "matrix": [4, 13], "x": 15.25, "y": 4.75}, + { "matrix": [4, 14], "x": 16.25, "y": 4.75}, + { "matrix": [4, 15], "x": 17.25, "y": 4.75} + ] + } + } +} \ No newline at end of file diff --git a/keyboards/fancytech/fancyalice66/info.json b/keyboards/fancytech/fancyalice66/info.json index a529966b429c..096dc121f2f5 100644 --- a/keyboards/fancytech/fancyalice66/info.json +++ b/keyboards/fancytech/fancyalice66/info.json @@ -10,9 +10,9 @@ "pin_a": "F0", "pin_b": "F1", "resolution": 2 - } + } ] - }, + }, "features": { "bootmagic": true, "encoder": false, @@ -21,11 +21,11 @@ "mousekey": true, "nkro": true, "rgb_matrix": true - }, + }, "matrix_pins": { "cols": ["C6", "E6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0", "B7", "B3", "B2", "B1"], "rows": ["F4", "F5", "F6", "F7", "C7"] - }, + }, "processor": "atmega32u4", "rgb_matrix": { "animations": { @@ -69,17 +69,102 @@ "solid_reactive_wide": true, "solid_splash": true, "splash": true - }, + }, "driver": "WS2812", - "max_brightness": 200 - }, + "layout": [ + {"flags": 1, "matrix": [0, 0], "x": 0, "y": 0}, + {"flags": 4, "matrix": [0, 1], "x": 15, "y": 0}, + {"flags": 4, "matrix": [0, 2], "x": 30, "y": 0}, + {"flags": 4, "matrix": [0, 3], "x": 45, "y": 0}, + {"flags": 4, "matrix": [0, 4], "x": 60, "y": 0}, + {"flags": 4, "matrix": [0, 5], "x": 75, "y": 0}, + {"flags": 4, "matrix": [0, 6], "x": 90, "y": 0}, + {"flags": 4, "matrix": [0, 7], "x": 105, "y": 0}, + {"flags": 4, "matrix": [0, 8], "x": 120, "y": 0}, + {"flags": 4, "matrix": [0, 9], "x": 135, "y": 0}, + {"flags": 4, "matrix": [0, 10], "x": 150, "y": 0}, + {"flags": 4, "matrix": [0, 11], "x": 164, "y": 0}, + {"flags": 4, "matrix": [0, 12], "x": 180, "y": 0}, + {"flags": 1, "matrix": [0, 13], "x": 194, "y": 0}, + {"flags": 4, "matrix": [0, 15], "x": 224, "y": 0}, + {"flags": 1, "matrix": [1, 0], "x": 0, "y": 16}, + {"flags": 4, "matrix": [1, 1], "x": 15, "y": 16}, + {"flags": 4, "matrix": [1, 2], "x": 30, "y": 16}, + {"flags": 4, "matrix": [1, 3], "x": 45, "y": 16}, + {"flags": 4, "matrix": [1, 4], "x": 60, "y": 16}, + {"flags": 4, "matrix": [1, 5], "x": 75, "y": 16}, + {"flags": 4, "matrix": [1, 7], "x": 105, "y": 16}, + {"flags": 4, "matrix": [1, 8], "x": 120, "y": 16}, + {"flags": 4, "matrix": [1, 9], "x": 135, "y": 16}, + {"flags": 4, "matrix": [1, 10], "x": 150, "y": 16}, + {"flags": 4, "matrix": [1, 11], "x": 164, "y": 16}, + {"flags": 4, "matrix": [1, 12], "x": 180, "y": 16}, + {"flags": 4, "matrix": [1, 13], "x": 194, "y": 16}, + {"flags": 4, "matrix": [1, 14], "x": 209, "y": 16}, + {"flags": 4, "matrix": [1, 15], "x": 224, "y": 16}, + {"flags": 1, "matrix": [2, 0], "x": 0, "y": 32}, + {"flags": 4, "matrix": [2, 1], "x": 15, "y": 32}, + {"flags": 4, "matrix": [2, 2], "x": 30, "y": 32}, + {"flags": 4, "matrix": [2, 3], "x": 45, "y": 32}, + {"flags": 4, "matrix": [2, 4], "x": 60, "y": 32}, + {"flags": 4, "matrix": [2, 5], "x": 75, "y": 32}, + {"flags": 4, "matrix": [2, 7], "x": 105, "y": 32}, + {"flags": 4, "matrix": [2, 8], "x": 120, "y": 32}, + {"flags": 4, "matrix": [2, 9], "x": 135, "y": 32}, + {"flags": 4, "matrix": [2, 10], "x": 150, "y": 32}, + {"flags": 4, "matrix": [2, 11], "x": 164, "y": 32}, + {"flags": 4, "matrix": [2, 12], "x": 180, "y": 32}, + {"flags": 1, "matrix": [2, 13], "x": 194, "y": 32}, + {"flags": 4, "matrix": [2, 15], "x": 224, "y": 32}, + {"flags": 1, "matrix": [3, 0], "x": 0, "y": 48}, + {"flags": 4, "matrix": [3, 1], "x": 15, "y": 48}, + {"flags": 4, "matrix": [3, 2], "x": 30, "y": 48}, + {"flags": 4, "matrix": [3, 3], "x": 45, "y": 48}, + {"flags": 4, "matrix": [3, 4], "x": 60, "y": 48}, + {"flags": 4, "matrix": [3, 5], "x": 75, "y": 48}, + {"flags": 4, "matrix": [3, 7], "x": 105, "y": 48}, + {"flags": 4, "matrix": [3, 8], "x": 120, "y": 48}, + {"flags": 4, "matrix": [3, 9], "x": 135, "y": 48}, + {"flags": 4, "matrix": [3, 10], "x": 150, "y": 48}, + {"flags": 4, "matrix": [3, 11], "x": 164, "y": 48}, + {"flags": 4, "matrix": [3, 12], "x": 180, "y": 48}, + {"flags": 4, "matrix": [3, 14], "x": 209, "y": 48}, + {"flags": 1, "matrix": [4, 0], "x": 0, "y": 64}, + {"flags": 1, "matrix": [4, 2], "x": 30, "y": 64}, + {"flags": 4, "matrix": [4, 3], "x": 45, "y": 64}, + {"flags": 1, "matrix": [4, 6], "x": 90, "y": 64}, + {"flags": 4, "matrix": [4, 7], "x": 105, "y": 64}, + {"flags": 1, "matrix": [4, 10], "x": 150, "y": 64}, + {"flags": 4, "matrix": [4, 13], "x": 194, "y": 64}, + {"flags": 4, "matrix": [4, 14], "x": 209, "y": 64}, + {"flags": 4, "matrix": [4, 15], "x": 224, "y": 64}, + {"flags": 2, "x": 37, "y": 64}, + {"flags": 2, "x": 75, "y": 64}, + {"flags": 2, "x": 112, "y": 64}, + {"flags": 2, "x": 149, "y": 64}, + {"flags": 2, "x": 187, "y": 64}, + {"flags": 2, "x": 224, "y": 64}, + {"flags": 2, "x": 224, "y": 32}, + {"flags": 2, "x": 224, "y": 0}, + {"flags": 2, "x": 187, "y": 0}, + {"flags": 2, "x": 149, "y": 0}, + {"flags": 2, "x": 112, "y": 0}, + {"flags": 2, "x": 75, "y": 0}, + {"flags": 2, "x": 37, "y": 0}, + {"flags": 2, "x": 0, "y": 0}, + {"flags": 2, "x": 0, "y": 32}, + {"flags": 2, "x": 0, "y": 64} + ], + "max_brightness": 200, + "rgblight.pin": "B0" + }, "url": "https://www.aliexpress.com/item/1005004272392611.html", "usb": { "device_version": "0.0.1", "force_nkro": true, "pid": "0x3663", "vid": "0xECED" - }, + }, "layouts": { "LAYOUT": { "layout": [ @@ -98,7 +183,6 @@ {"matrix": [0, 12], "x": 13.75, "y": 0.5}, {"matrix": [0, 13], "w": 2, "x": 14.75, "y": 0.5}, {"matrix": [0, 15], "x": 17, "y": 0}, - {"matrix": [1, 0], "w": 1.5, "x": 0.5, "y": 1.5}, {"matrix": [1, 1], "x": 2, "y": 1.5}, {"matrix": [1, 2], "x": 3.25, "y": 1.5}, @@ -114,7 +198,6 @@ {"matrix": [1, 13], "x": 14.5, "y": 1.5}, {"matrix": [1, 14], "w": 1.5, "x": 15.5, "y": 1.5}, {"matrix": [1, 15], "x": 17.25, "y": 1}, - {"matrix": [2, 0], "w": 1.75, "x": 0.25, "y": 2.5}, {"matrix": [2, 1], "x": 2, "y": 2.5}, {"matrix": [2, 2], "x": 3.5, "y": 2.5}, @@ -129,7 +212,6 @@ {"matrix": [2, 12], "x": 14, "y": 2.5}, {"matrix": [2, 13], "w": 2.25, "x": 15, "y": 2.5}, {"matrix": [2, 15], "x": 17.5, "y": 2}, - {"matrix": [3, 0], "w": 2.25, "x": 0, "y": 3.5}, {"matrix": [3, 1], "x": 2.25, "y": 3.5}, {"matrix": [3, 2], "x": 3.75, "y": 3.5}, @@ -143,7 +225,6 @@ {"matrix": [3, 11], "x": 13.25, "y": 3.5}, {"matrix": [3, 12], "w": 1.75, "x": 14.25, "y": 3.5}, {"matrix": [3, 14], "x": 16.25, "y": 3.75}, - {"matrix": [4, 0], "w": 1.5, "x": 0, "y": 4.5}, {"matrix": [4, 2], "w": 1.5, "x": 3.5, "y": 4.5}, {"matrix": [4, 3], "w": 2.25, "x": 5, "y": 4.5}, @@ -154,6 +235,6 @@ {"matrix": [4, 14], "x": 16.25, "y": 4.75}, {"matrix": [4, 15], "x": 17.25, "y": 4.75} ] - } - } + } + } } \ No newline at end of file From 90096296117deb1854db71c41a9b0760ee2806cc Mon Sep 17 00:00:00 2001 From: Adophoxia Date: Mon, 1 May 2023 20:50:03 -0700 Subject: [PATCH 09/28] Redo formatting --- keyboards/fancytech/fancyalice66/info.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/keyboards/fancytech/fancyalice66/info.json b/keyboards/fancytech/fancyalice66/info.json index 096dc121f2f5..93a81366688a 100644 --- a/keyboards/fancytech/fancyalice66/info.json +++ b/keyboards/fancytech/fancyalice66/info.json @@ -87,6 +87,7 @@ {"flags": 4, "matrix": [0, 12], "x": 180, "y": 0}, {"flags": 1, "matrix": [0, 13], "x": 194, "y": 0}, {"flags": 4, "matrix": [0, 15], "x": 224, "y": 0}, + {"flags": 1, "matrix": [1, 0], "x": 0, "y": 16}, {"flags": 4, "matrix": [1, 1], "x": 15, "y": 16}, {"flags": 4, "matrix": [1, 2], "x": 30, "y": 16}, @@ -102,6 +103,7 @@ {"flags": 4, "matrix": [1, 13], "x": 194, "y": 16}, {"flags": 4, "matrix": [1, 14], "x": 209, "y": 16}, {"flags": 4, "matrix": [1, 15], "x": 224, "y": 16}, + {"flags": 1, "matrix": [2, 0], "x": 0, "y": 32}, {"flags": 4, "matrix": [2, 1], "x": 15, "y": 32}, {"flags": 4, "matrix": [2, 2], "x": 30, "y": 32}, @@ -116,6 +118,7 @@ {"flags": 4, "matrix": [2, 12], "x": 180, "y": 32}, {"flags": 1, "matrix": [2, 13], "x": 194, "y": 32}, {"flags": 4, "matrix": [2, 15], "x": 224, "y": 32}, + {"flags": 1, "matrix": [3, 0], "x": 0, "y": 48}, {"flags": 4, "matrix": [3, 1], "x": 15, "y": 48}, {"flags": 4, "matrix": [3, 2], "x": 30, "y": 48}, @@ -129,6 +132,7 @@ {"flags": 4, "matrix": [3, 11], "x": 164, "y": 48}, {"flags": 4, "matrix": [3, 12], "x": 180, "y": 48}, {"flags": 4, "matrix": [3, 14], "x": 209, "y": 48}, + {"flags": 1, "matrix": [4, 0], "x": 0, "y": 64}, {"flags": 1, "matrix": [4, 2], "x": 30, "y": 64}, {"flags": 4, "matrix": [4, 3], "x": 45, "y": 64}, @@ -138,6 +142,7 @@ {"flags": 4, "matrix": [4, 13], "x": 194, "y": 64}, {"flags": 4, "matrix": [4, 14], "x": 209, "y": 64}, {"flags": 4, "matrix": [4, 15], "x": 224, "y": 64}, + {"flags": 2, "x": 37, "y": 64}, {"flags": 2, "x": 75, "y": 64}, {"flags": 2, "x": 112, "y": 64}, @@ -183,6 +188,7 @@ {"matrix": [0, 12], "x": 13.75, "y": 0.5}, {"matrix": [0, 13], "w": 2, "x": 14.75, "y": 0.5}, {"matrix": [0, 15], "x": 17, "y": 0}, + {"matrix": [1, 0], "w": 1.5, "x": 0.5, "y": 1.5}, {"matrix": [1, 1], "x": 2, "y": 1.5}, {"matrix": [1, 2], "x": 3.25, "y": 1.5}, @@ -198,6 +204,7 @@ {"matrix": [1, 13], "x": 14.5, "y": 1.5}, {"matrix": [1, 14], "w": 1.5, "x": 15.5, "y": 1.5}, {"matrix": [1, 15], "x": 17.25, "y": 1}, + {"matrix": [2, 0], "w": 1.75, "x": 0.25, "y": 2.5}, {"matrix": [2, 1], "x": 2, "y": 2.5}, {"matrix": [2, 2], "x": 3.5, "y": 2.5}, @@ -212,6 +219,7 @@ {"matrix": [2, 12], "x": 14, "y": 2.5}, {"matrix": [2, 13], "w": 2.25, "x": 15, "y": 2.5}, {"matrix": [2, 15], "x": 17.5, "y": 2}, + {"matrix": [3, 0], "w": 2.25, "x": 0, "y": 3.5}, {"matrix": [3, 1], "x": 2.25, "y": 3.5}, {"matrix": [3, 2], "x": 3.75, "y": 3.5}, @@ -225,6 +233,7 @@ {"matrix": [3, 11], "x": 13.25, "y": 3.5}, {"matrix": [3, 12], "w": 1.75, "x": 14.25, "y": 3.5}, {"matrix": [3, 14], "x": 16.25, "y": 3.75}, + {"matrix": [4, 0], "w": 1.5, "x": 0, "y": 4.5}, {"matrix": [4, 2], "w": 1.5, "x": 3.5, "y": 4.5}, {"matrix": [4, 3], "w": 2.25, "x": 5, "y": 4.5}, From 3f80d6d0c3dfa9f4abc7a18b4d2f28ecb6f14ced Mon Sep 17 00:00:00 2001 From: Adophoxia Date: Mon, 1 May 2023 20:51:32 -0700 Subject: [PATCH 10/28] Delete `RGB_DI_PIN` from `config.h` --- keyboards/fancytech/fancyalice66/config.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/keyboards/fancytech/fancyalice66/config.h b/keyboards/fancytech/fancyalice66/config.h index ff3fe580c6c5..ce1bee950aaa 100644 --- a/keyboards/fancytech/fancyalice66/config.h +++ b/keyboards/fancytech/fancyalice66/config.h @@ -3,9 +3,6 @@ #pragma once -/* RGB Matrix config */ -#define RGB_DI_PIN B0 - #ifdef RGB_MATRIX_ENABLE #define RGB_MATRIX_LED_COUNT 82 From 16454d7897942d03de24058c14cf2cfe86efe766 Mon Sep 17 00:00:00 2001 From: adophoxia <100170946+adophoxia@users.noreply.github.com> Date: Mon, 1 May 2023 21:41:56 -0700 Subject: [PATCH 11/28] Update keyboards/fancytech/fancyalice66/info.json Co-authored-by: Ryan --- keyboards/fancytech/fancyalice66/info.json | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/fancytech/fancyalice66/info.json b/keyboards/fancytech/fancyalice66/info.json index 41b10c25873f..71f86756e666 100644 --- a/keyboards/fancytech/fancyalice66/info.json +++ b/keyboards/fancytech/fancyalice66/info.json @@ -161,7 +161,6 @@ {"flags": 2, "x": 0, "y": 64} ], "max_brightness": 200, - "rgblight.pin": "B0" }, "url": "https://www.aliexpress.com/item/1005004272392611.html", "usb": { From f4d43e8885161325d652b2b38c64f24a3c291716 Mon Sep 17 00:00:00 2001 From: adophoxia <100170946+adophoxia@users.noreply.github.com> Date: Mon, 1 May 2023 21:42:06 -0700 Subject: [PATCH 12/28] Update keyboards/fancytech/fancyalice66/info.json Co-authored-by: Ryan --- keyboards/fancytech/fancyalice66/info.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/keyboards/fancytech/fancyalice66/info.json b/keyboards/fancytech/fancyalice66/info.json index 71f86756e666..2b65db618a50 100644 --- a/keyboards/fancytech/fancyalice66/info.json +++ b/keyboards/fancytech/fancyalice66/info.json @@ -6,11 +6,7 @@ "diode_direction": "ROW2COL", "encoder": { "rotary": [ - { - "pin_a": "F0", - "pin_b": "F1", - "resolution": 2 - } + {"pin_a": "F0", "pin_b": "F1", "resolution": 2} ] }, "features": { From adeb35ad6652f33989e2be33adf0f6157ea50543 Mon Sep 17 00:00:00 2001 From: adophoxia <100170946+adophoxia@users.noreply.github.com> Date: Mon, 1 May 2023 21:42:13 -0700 Subject: [PATCH 13/28] Update keyboards/fancytech/fancyalice66/info.json Co-authored-by: Ryan --- keyboards/fancytech/fancyalice66/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/fancytech/fancyalice66/info.json b/keyboards/fancytech/fancyalice66/info.json index 2b65db618a50..e519c962632d 100644 --- a/keyboards/fancytech/fancyalice66/info.json +++ b/keyboards/fancytech/fancyalice66/info.json @@ -8,7 +8,7 @@ "rotary": [ {"pin_a": "F0", "pin_b": "F1", "resolution": 2} ] - }, + }, "features": { "bootmagic": true, "encoder": false, From 835f7338452868510a915253fdf4b921824f530c Mon Sep 17 00:00:00 2001 From: adophoxia <100170946+adophoxia@users.noreply.github.com> Date: Mon, 1 May 2023 21:42:21 -0700 Subject: [PATCH 14/28] Update keyboards/fancytech/fancyalice66/info.json Co-authored-by: Ryan --- keyboards/fancytech/fancyalice66/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/fancytech/fancyalice66/info.json b/keyboards/fancytech/fancyalice66/info.json index e519c962632d..17f61e2e1960 100644 --- a/keyboards/fancytech/fancyalice66/info.json +++ b/keyboards/fancytech/fancyalice66/info.json @@ -17,7 +17,7 @@ "mousekey": true, "nkro": true, "rgb_matrix": true - }, + }, "matrix_pins": { "cols": ["C6", "E6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0", "B7", "B3", "B2", "B1"], "rows": ["F4", "F5", "F6", "F7", "C7"] From 2c2404de9ad11eaf16d7af6171a34cc5116a6a8c Mon Sep 17 00:00:00 2001 From: adophoxia <100170946+adophoxia@users.noreply.github.com> Date: Mon, 1 May 2023 21:42:29 -0700 Subject: [PATCH 15/28] Update keyboards/fancytech/fancyalice66/info.json Co-authored-by: Ryan --- keyboards/fancytech/fancyalice66/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/fancytech/fancyalice66/info.json b/keyboards/fancytech/fancyalice66/info.json index 17f61e2e1960..fb6cfb2b125c 100644 --- a/keyboards/fancytech/fancyalice66/info.json +++ b/keyboards/fancytech/fancyalice66/info.json @@ -21,7 +21,7 @@ "matrix_pins": { "cols": ["C6", "E6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0", "B7", "B3", "B2", "B1"], "rows": ["F4", "F5", "F6", "F7", "C7"] - }, + }, "processor": "atmega32u4", "rgb_matrix": { "animations": { From ef8760cc681c3aa827a8087a4eb412c13a63a4a2 Mon Sep 17 00:00:00 2001 From: adophoxia <100170946+adophoxia@users.noreply.github.com> Date: Mon, 1 May 2023 21:42:37 -0700 Subject: [PATCH 16/28] Update keyboards/fancytech/fancyalice66/info.json Co-authored-by: Ryan --- keyboards/fancytech/fancyalice66/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/fancytech/fancyalice66/info.json b/keyboards/fancytech/fancyalice66/info.json index fb6cfb2b125c..69e0034c7f96 100644 --- a/keyboards/fancytech/fancyalice66/info.json +++ b/keyboards/fancytech/fancyalice66/info.json @@ -65,7 +65,7 @@ "solid_reactive_wide": true, "solid_splash": true, "splash": true - }, + }, "driver": "WS2812", "layout": [ {"flags": 1, "matrix": [0, 0], "x": 0, "y": 0}, From 94bf82de9ad63de58a934c52ea78cda5f553cdde Mon Sep 17 00:00:00 2001 From: adophoxia <100170946+adophoxia@users.noreply.github.com> Date: Mon, 1 May 2023 21:42:47 -0700 Subject: [PATCH 17/28] Update keyboards/fancytech/fancyalice66/info.json Co-authored-by: Ryan --- keyboards/fancytech/fancyalice66/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/fancytech/fancyalice66/info.json b/keyboards/fancytech/fancyalice66/info.json index 69e0034c7f96..4702ccef50f2 100644 --- a/keyboards/fancytech/fancyalice66/info.json +++ b/keyboards/fancytech/fancyalice66/info.json @@ -157,7 +157,7 @@ {"flags": 2, "x": 0, "y": 64} ], "max_brightness": 200, - }, + }, "url": "https://www.aliexpress.com/item/1005004272392611.html", "usb": { "device_version": "0.0.1", From 43dd386712dcca1a7720df7bc6a472dec3d3b591 Mon Sep 17 00:00:00 2001 From: adophoxia <100170946+adophoxia@users.noreply.github.com> Date: Mon, 1 May 2023 21:42:53 -0700 Subject: [PATCH 18/28] Update keyboards/fancytech/fancyalice66/info.json Co-authored-by: Ryan --- keyboards/fancytech/fancyalice66/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/fancytech/fancyalice66/info.json b/keyboards/fancytech/fancyalice66/info.json index 4702ccef50f2..24a0325cc729 100644 --- a/keyboards/fancytech/fancyalice66/info.json +++ b/keyboards/fancytech/fancyalice66/info.json @@ -164,7 +164,7 @@ "force_nkro": true, "pid": "0x3663", "vid": "0xECED" - }, + }, "layouts": { "LAYOUT": { "layout": [ From 16baef39ad5debc81d948ab52883ef4479a10747 Mon Sep 17 00:00:00 2001 From: adophoxia <100170946+adophoxia@users.noreply.github.com> Date: Mon, 1 May 2023 21:43:00 -0700 Subject: [PATCH 19/28] Update keyboards/fancytech/fancyalice66/info.json Co-authored-by: Ryan --- keyboards/fancytech/fancyalice66/info.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/fancytech/fancyalice66/info.json b/keyboards/fancytech/fancyalice66/info.json index 24a0325cc729..be10fe495ed9 100644 --- a/keyboards/fancytech/fancyalice66/info.json +++ b/keyboards/fancytech/fancyalice66/info.json @@ -239,6 +239,6 @@ {"matrix": [4, 14], "x": 16.25, "y": 4.75}, {"matrix": [4, 15], "x": 17.25, "y": 4.75} ] - } - } + } + } } \ No newline at end of file From 90c7b6dccb31c3051ba068d508a4ebcb7c0ac0ef Mon Sep 17 00:00:00 2001 From: adophoxia <100170946+adophoxia@users.noreply.github.com> Date: Mon, 1 May 2023 21:46:50 -0700 Subject: [PATCH 20/28] Update keyboards/fancytech/fancyalice66/info.json Co-authored-by: Ryan --- keyboards/fancytech/fancyalice66/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/fancytech/fancyalice66/info.json b/keyboards/fancytech/fancyalice66/info.json index be10fe495ed9..1be7f3763941 100644 --- a/keyboards/fancytech/fancyalice66/info.json +++ b/keyboards/fancytech/fancyalice66/info.json @@ -156,7 +156,7 @@ {"flags": 2, "x": 0, "y": 32}, {"flags": 2, "x": 0, "y": 64} ], - "max_brightness": 200, + "max_brightness": 200 }, "url": "https://www.aliexpress.com/item/1005004272392611.html", "usb": { From f82ac307958ce988488c9faf4939bd262b3284f8 Mon Sep 17 00:00:00 2001 From: Adophoxia Date: Mon, 1 May 2023 21:52:04 -0700 Subject: [PATCH 21/28] Remove copy of `info.json` in `..c` --- .../fancytech/fancyalice66/fancyalice66.c | 243 +----------------- 1 file changed, 1 insertion(+), 242 deletions(-) diff --git a/keyboards/fancytech/fancyalice66/fancyalice66.c b/keyboards/fancytech/fancyalice66/fancyalice66.c index e2667c83a92a..83462a9c2675 100644 --- a/keyboards/fancytech/fancyalice66/fancyalice66.c +++ b/keyboards/fancytech/fancyalice66/fancyalice66.c @@ -37,245 +37,4 @@ bool encoder_update_kb(uint8_t index, bool clockwise) { } return true; } -#endif - -{ - "manufacturer": "Fancytech", - "keyboard_name": "FancyAlice66", - "maintainer": "Adophoxia", - "bootloader": "caterina", - "diode_direction": "ROW2COL", - "encoder": { - "rotary": [ - { - "pin_a": "F0", - "pin_b": "F1", - "resolution": 2 - } - ] - }, - "features": { - "bootmagic": true, - "encoder": false, - "extrakey": true, - "lto": true, - "mousekey": true, - "nkro": true, - "rgb_matrix": true - }, - "matrix_pins": { - "cols": ["C6", "E6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0", "B7", "B3", "B2", "B1"], - "rows": ["F4", "F5", "F6", "F7", "C7"] - }, - "processor": "atmega32u4", - "rgb_matrix": { - "animations": { - "alphas_mods": true, - "band_pinwheel_sat": true, - "band_pinwheel_val": true, - "band_sat": true, - "band_spiral_sat": true, - "band_spiral_val": true, - "band_val": true, - "breathing": true, - "cycle_all": true, - "cycle_left_right": true, - "cycle_out_in": true, - "cycle_out_in_dual": true, - "cycle_pinwheel": true, - "cycle_spiral": true, - "cycle_up_down": true, - "dual_beacon": true, - "gradient_left_right": true, - "gradient_up_down": true, - "hue_breathing": true, - "hue_pendulum": true, - "hue_wave": true, - "jellybean_raindrops": true, - "multisplash": true, - "pixel_fractal": true, - "pixel_rain": true, - "rainbow_beacon": true, - "rainbow_moving_chevron": true, - "rainbow_pinwheels": true, - "raindrops": true, - "solid_multisplash": true, - "solid_reactive": true, - "solid_reactive_cross": true, - "solid_reactive_multicross": true, - "solid_reactive_multinexus": true, - "solid_reactive_multiwide": true, - "solid_reactive_nexus": true, - "solid_reactive_simple": true, - "solid_reactive_wide": true, - "solid_splash": true, - "splash": true - }, - "driver": "WS2812", - "layout": [ - { "flags": 1, "matrix": [0, 0], "x": 0, "y": 0}, - { "flags": 4, "matrix": [0, 1], "x": 15, "y": 0}, - { "flags": 4, "matrix": [0, 2], "x": 30, "y": 0}, - { "flags": 4, "matrix": [0, 3], "x": 45, "y": 0}, - { "flags": 4, "matrix": [0, 4], "x": 60, "y": 0}, - { "flags": 4, "matrix": [0, 5], "x": 75, "y": 0}, - { "flags": 4, "matrix": [0, 6], "x": 90, "y": 0}, - { "flags": 4, "matrix": [0, 7], "x": 105, "y": 0}, - { "flags": 4, "matrix": [0, 8], "x": 120, "y": 0}, - { "flags": 4, "matrix": [0, 9], "x": 135, "y": 0}, - { "flags": 4, "matrix": [0, 10], "x": 150, "y": 0}, - { "flags": 4, "matrix": [0, 11], "x": 164, "y": 0}, - { "flags": 4, "matrix": [0, 12], "x": 180, "y": 0}, - { "flags": 1, "matrix": [0, 13], "x": 194, "y": 0}, - { "flags": 4, "matrix": [0, 15], "x": 224, "y": 0}, - { "flags": 1, "matrix": [1, 0], "x": 0, "y": 16}, - { "flags": 4, "matrix": [1, 1], "x": 15, "y": 16}, - { "flags": 4, "matrix": [1, 2], "x": 30, "y": 16}, - { "flags": 4, "matrix": [1, 3], "x": 45, "y": 16}, - { "flags": 4, "matrix": [1, 4], "x": 60, "y": 16}, - { "flags": 4, "matrix": [1, 5], "x": 75, "y": 16}, - { "flags": 4, "matrix": [1, 7], "x": 105, "y": 16}, - { "flags": 4, "matrix": [1, 8], "x": 120, "y": 16}, - { "flags": 4, "matrix": [1, 9], "x": 135, "y": 16}, - { "flags": 4, "matrix": [1, 10], "x": 150, "y": 16}, - { "flags": 4, "matrix": [1, 11], "x": 164, "y": 16}, - { "flags": 4, "matrix": [1, 12], "x": 180, "y": 16}, - { "flags": 4, "matrix": [1, 13], "x": 194, "y": 16}, - { "flags": 4, "matrix": [1, 14], "x": 209, "y": 16}, - { "flags": 4, "matrix": [1, 15], "x": 224, "y": 16}, - { "flags": 1, "matrix": [2, 0], "x": 0, "y": 32}, - { "flags": 4, "matrix": [2, 1], "x": 15, "y": 32}, - { "flags": 4, "matrix": [2, 2], "x": 30, "y": 32}, - { "flags": 4, "matrix": [2, 3], "x": 45, "y": 32}, - { "flags": 4, "matrix": [2, 4], "x": 60, "y": 32}, - { "flags": 4, "matrix": [2, 5], "x": 75, "y": 32}, - { "flags": 4, "matrix": [2, 7], "x": 105, "y": 32}, - { "flags": 4, "matrix": [2, 8], "x": 120, "y": 32}, - { "flags": 4, "matrix": [2, 9], "x": 135, "y": 32}, - { "flags": 4, "matrix": [2, 10], "x": 150, "y": 32}, - { "flags": 4, "matrix": [2, 11], "x": 164, "y": 32}, - { "flags": 4, "matrix": [2, 12], "x": 180, "y": 32}, - { "flags": 1, "matrix": [2, 13], "x": 194, "y": 32}, - { "flags": 4, "matrix": [2, 15], "x": 224, "y": 32}, - { "flags": 1, "matrix": [3, 0], "x": 0, "y": 48}, - { "flags": 4, "matrix": [3, 1], "x": 15, "y": 48}, - { "flags": 4, "matrix": [3, 2], "x": 30, "y": 48}, - { "flags": 4, "matrix": [3, 3], "x": 45, "y": 48}, - { "flags": 4, "matrix": [3, 4], "x": 60, "y": 48}, - { "flags": 4, "matrix": [3, 5], "x": 75, "y": 48}, - { "flags": 4, "matrix": [3, 7], "x": 105, "y": 48}, - { "flags": 4, "matrix": [3, 8], "x": 120, "y": 48}, - { "flags": 4, "matrix": [3, 9], "x": 135, "y": 48}, - { "flags": 4, "matrix": [3, 10], "x": 150, "y": 48}, - { "flags": 4, "matrix": [3, 11], "x": 164, "y": 48}, - { "flags": 4, "matrix": [3, 12], "x": 180, "y": 48}, - { "flags": 4, "matrix": [3, 14], "x": 209, "y": 48}, - { "flags": 1, "matrix": [4, 0], "x": 0, "y": 64}, - { "flags": 1, "matrix": [4, 2], "x": 30, "y": 64}, - { "flags": 4, "matrix": [4, 3], "x": 45, "y": 64}, - { "flags": 1, "matrix": [4, 6], "x": 90, "y": 64}, - { "flags": 4, "matrix": [4, 7], "x": 105, "y": 64}, - { "flags": 1, "matrix": [4, 10], "x": 150, "y": 64}, - { "flags": 4, "matrix": [4, 13], "x": 194, "y": 64}, - { "flags": 4, "matrix": [4, 14], "x": 209, "y": 64}, - { "flags": 4, "matrix": [4, 15], "x": 224, "y": 64}, - { "flags": 2, "x": 37, "y": 64}, - { "flags": 2, "x": 75, "y": 64}, - { "flags": 2, "x": 112, "y": 64}, - { "flags": 2, "x": 149, "y": 64}, - { "flags": 2, "x": 187, "y": 64}, - { "flags": 2, "x": 224, "y": 64}, - { "flags": 2, "x": 224, "y": 32}, - { "flags": 2, "x": 224, "y": 0}, - { "flags": 2, "x": 187, "y": 0}, - { "flags": 2, "x": 149, "y": 0}, - { "flags": 2, "x": 112, "y": 0}, - { "flags": 2, "x": 75, "y": 0}, - { "flags": 2, "x": 37, "y": 0}, - { "flags": 2, "x": 0, "y": 0}, - { "flags": 2, "x": 0, "y": 32}, - { "flags": 2, "x": 0, "y": 64} - ], - "max_brightness": 200, - "rgblight.pin": "B0" - }, - "url": "https://www.aliexpress.com/item/1005004272392611.html", - "usb": { - "device_version": "0.0.1", - "force_nkro": true, - "pid": "0x3663", - "vid": "0xECED" - }, - "layouts": { - "LAYOUT": { - "layout": [ - { "matrix": [0, 0], "x": 0.75, "y": 0.5}, - { "matrix": [0, 1], "x": 1.75, "y": 0.5}, - { "matrix": [0, 2], "x": 2.75, "y": 0.25}, - { "matrix": [0, 3], "x": 3.75, "y": 0.5}, - { "matrix": [0, 4], "x": 4.75, "y": 0.5}, - { "matrix": [0, 5], "x": 5.75, "y": 0.5}, - { "matrix": [0, 6], "x": 6.75, "y": 0.5}, - { "matrix": [0, 7], "x": 8.75, "y": 0.5}, - { "matrix": [0, 8], "x": 9.75, "y": 0.5}, - { "matrix": [0, 9], "x": 10.75, "y": 0.5}, - { "matrix": [0, 10], "x": 11.75, "y": 0.5}, - { "matrix": [0, 11], "x": 12.75, "y": 0.25}, - { "matrix": [0, 12], "x": 13.75, "y": 0.5}, - { "matrix": [0, 13], "w": 2, "x": 14.75, "y": 0.5}, - { "matrix": [0, 15], "x": 17, "y": 0}, - { "matrix": [1, 0], "w": 1.5, "x": 0.5, "y": 1.5}, - { "matrix": [1, 1], "x": 2, "y": 1.5}, - { "matrix": [1, 2], "x": 3.25, "y": 1.5}, - { "matrix": [1, 3], "x": 4.25, "y": 1.5}, - { "matrix": [1, 4], "x": 5.25, "y": 1.5}, - { "matrix": [1, 5], "x": 6.25, "y": 1.5}, - { "matrix": [1, 7], "x": 8.5, "y": 1.5}, - { "matrix": [1, 8], "x": 9.5, "y": 1.5}, - { "matrix": [1, 9], "x": 10.5, "y": 1.5}, - { "matrix": [1, 10], "x": 11.5, "y": 1.5}, - { "matrix": [1, 11], "x": 12.5, "y": 1.5}, - { "matrix": [1, 12], "x": 13.5, "y": 1.5}, - { "matrix": [1, 13], "x": 14.5, "y": 1.5}, - { "matrix": [1, 14], "w": 1.5, "x": 15.5, "y": 1.5}, - { "matrix": [1, 15], "x": 17.25, "y": 1}, - { "matrix": [2, 0], "w": 1.75, "x": 0.25, "y": 2.5}, - { "matrix": [2, 1], "x": 2, "y": 2.5}, - { "matrix": [2, 2], "x": 3.5, "y": 2.5}, - { "matrix": [2, 3], "x": 4.5, "y": 2.5}, - { "matrix": [2, 4], "x": 5.5, "y": 2.5}, - { "matrix": [2, 5], "x": 6.5, "y": 2.5}, - { "matrix": [2, 7], "x": 8.75, "y": 2.5}, - { "matrix": [2, 8], "x": 9.75, "y": 2.5}, - { "matrix": [2, 9], "x": 10.75, "y": 2.5}, - { "matrix": [2, 10], "x": 11.75, "y": 2.5}, - { "matrix": [2, 11], "x": 13, "y": 2.5}, - { "matrix": [2, 12], "x": 14, "y": 2.5}, - { "matrix": [2, 13], "w": 2.25, "x": 15, "y": 2.5}, - { "matrix": [2, 15], "x": 17.5, "y": 2}, - { "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3.5}, - { "matrix": [3, 1], "x": 2.25, "y": 3.5}, - { "matrix": [3, 2], "x": 3.75, "y": 3.5}, - { "matrix": [3, 3], "x": 4.75, "y": 3.5}, - { "matrix": [3, 4], "x": 5.75, "y": 3.5}, - { "matrix": [3, 5], "x": 6.75, "y": 3.5}, - { "matrix": [3, 7], "x": 9, "y": 3.5}, - { "matrix": [3, 8], "x": 10, "y": 3.5}, - { "matrix": [3, 9], "x": 11, "y": 3.5}, - { "matrix": [3, 10], "x": 12, "y": 3.5}, - { "matrix": [3, 11], "x": 13.25, "y": 3.5}, - { "matrix": [3, 12], "w": 1.75, "x": 14.25, "y": 3.5}, - { "matrix": [3, 14], "x": 16.25, "y": 3.75}, - { "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4.5}, - { "matrix": [4, 2], "w": 1.5, "x": 3.5, "y": 4.5}, - { "matrix": [4, 3], "w": 2.25, "x": 5, "y": 4.5}, - { "matrix": [4, 6], "x": 7.25, "y": 4.5}, - { "matrix": [4, 7], "w": 2.75, "x": 8.75, "y": 4.5}, - { "matrix": [4, 10], "w": 1.5, "x": 11.5, "y": 4.5}, - { "matrix": [4, 13], "x": 15.25, "y": 4.75}, - { "matrix": [4, 14], "x": 16.25, "y": 4.75}, - { "matrix": [4, 15], "x": 17.25, "y": 4.75} - ] - } - } -} \ No newline at end of file +#endif \ No newline at end of file From 4f67d412d17ff6012475252ea926918b410a753f Mon Sep 17 00:00:00 2001 From: adophoxia <100170946+adophoxia@users.noreply.github.com> Date: Mon, 1 May 2023 21:52:39 -0700 Subject: [PATCH 22/28] Update keyboards/fancytech/fancyalice66/info.json Co-authored-by: Ryan --- keyboards/fancytech/fancyalice66/info.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/keyboards/fancytech/fancyalice66/info.json b/keyboards/fancytech/fancyalice66/info.json index 1be7f3763941..d04dac02fd65 100644 --- a/keyboards/fancytech/fancyalice66/info.json +++ b/keyboards/fancytech/fancyalice66/info.json @@ -158,6 +158,9 @@ ], "max_brightness": 200 }, + "rgblight": { + "pin": "B0" + }, "url": "https://www.aliexpress.com/item/1005004272392611.html", "usb": { "device_version": "0.0.1", From 07361d23d7abd48b17ce4479a157e2295bb95e52 Mon Sep 17 00:00:00 2001 From: adophoxia <100170946+adophoxia@users.noreply.github.com> Date: Sun, 14 May 2023 07:49:44 -0700 Subject: [PATCH 23/28] Remove encoder callbacks, Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/fancytech/fancyalice66/fancyalice66.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/keyboards/fancytech/fancyalice66/fancyalice66.c b/keyboards/fancytech/fancyalice66/fancyalice66.c index 83462a9c2675..ca8b5be6706f 100644 --- a/keyboards/fancytech/fancyalice66/fancyalice66.c +++ b/keyboards/fancytech/fancyalice66/fancyalice66.c @@ -23,18 +23,4 @@ bool rgb_matrix_indicators_kb(void) { } return true; } -#endif - -#if defined(ENCODER_ENABLE) -bool encoder_update_kb(uint8_t index, bool clockwise) { - if (!encoder_update_user(index, clockwise)) { - return false; - } - if (clockwise) { - tap_code_delay(KC_VOLU, 10); - } else { - tap_code_delay(KC_VOLD, 10); - } - return true; -} #endif \ No newline at end of file From 1eb6b19b62899fc6ac172bb42b9f73e4555223cf Mon Sep 17 00:00:00 2001 From: adophoxia <100170946+adophoxia@users.noreply.github.com> Date: Sun, 14 May 2023 07:51:14 -0700 Subject: [PATCH 24/28] Update keyboards/fancytech/fancyalice66/info.json Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/fancytech/fancyalice66/info.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/keyboards/fancytech/fancyalice66/info.json b/keyboards/fancytech/fancyalice66/info.json index d04dac02fd65..1be7f3763941 100644 --- a/keyboards/fancytech/fancyalice66/info.json +++ b/keyboards/fancytech/fancyalice66/info.json @@ -158,9 +158,6 @@ ], "max_brightness": 200 }, - "rgblight": { - "pin": "B0" - }, "url": "https://www.aliexpress.com/item/1005004272392611.html", "usb": { "device_version": "0.0.1", From 9f881b5779d12a7be555518019eefe2e2d9a0166 Mon Sep 17 00:00:00 2001 From: adophoxia <100170946+adophoxia@users.noreply.github.com> Date: Sun, 14 May 2023 07:51:41 -0700 Subject: [PATCH 25/28] Update keyboards/fancytech/fancyalice66/config.h Co-authored-by: Drashna Jaelre --- keyboards/fancytech/fancyalice66/config.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/keyboards/fancytech/fancyalice66/config.h b/keyboards/fancytech/fancyalice66/config.h index ce1bee950aaa..e39ff95306b9 100644 --- a/keyboards/fancytech/fancyalice66/config.h +++ b/keyboards/fancytech/fancyalice66/config.h @@ -4,7 +4,9 @@ #pragma once #ifdef RGB_MATRIX_ENABLE - #define RGB_MATRIX_LED_COUNT 82 +# define WS2812_DI_PIN B0 +# define RGB_DI_PIN WS2812_DI_PIN +# define RGB_MATRIX_LED_COUNT 82 /* RGB Matrix effect */ # define RGB_MATRIX_KEYPRESSES // reacts to keypresses From acb16581d39b46f1851675ba400f54523f21e98d Mon Sep 17 00:00:00 2001 From: adophoxia <100170946+adophoxia@users.noreply.github.com> Date: Sun, 14 May 2023 07:56:23 -0700 Subject: [PATCH 26/28] Update keyboards/fancytech/fancyalice66/fancyalice66.c Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/fancytech/fancyalice66/fancyalice66.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/keyboards/fancytech/fancyalice66/fancyalice66.c b/keyboards/fancytech/fancyalice66/fancyalice66.c index ca8b5be6706f..155cd21ac871 100644 --- a/keyboards/fancytech/fancyalice66/fancyalice66.c +++ b/keyboards/fancytech/fancyalice66/fancyalice66.c @@ -18,6 +18,9 @@ #ifdef RGB_MATRIX_ENABLE bool rgb_matrix_indicators_kb(void) { + if (!rgb_matrix_indicators_user() { + return false; + } if (host_keyboard_led_state().caps_lock) { rgb_matrix_set_color(43, 0xFF, 0xFF, 0xFF); } From 6e5685a0ef7e5717759c75fc89cb5d624024f2dd Mon Sep 17 00:00:00 2001 From: Adophoxia Date: Sun, 14 May 2023 07:59:22 -0700 Subject: [PATCH 27/28] Add missing ) from suggested commit on GitHub --- keyboards/fancytech/fancyalice66/fancyalice66.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/fancytech/fancyalice66/fancyalice66.c b/keyboards/fancytech/fancyalice66/fancyalice66.c index 155cd21ac871..72e5355a3112 100644 --- a/keyboards/fancytech/fancyalice66/fancyalice66.c +++ b/keyboards/fancytech/fancyalice66/fancyalice66.c @@ -18,7 +18,7 @@ #ifdef RGB_MATRIX_ENABLE bool rgb_matrix_indicators_kb(void) { - if (!rgb_matrix_indicators_user() { + if (!rgb_matrix_indicators_user()) { return false; } if (host_keyboard_led_state().caps_lock) { From 214c0a485b7f4e9860d48d81cead58a3d7155907 Mon Sep 17 00:00:00 2001 From: jack <0x6a73@protonmail.com> Date: Thu, 18 May 2023 18:20:35 +0200 Subject: [PATCH 28/28] Update keyboards/fancytech/fancyalice66/config.h --- keyboards/fancytech/fancyalice66/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/fancytech/fancyalice66/config.h b/keyboards/fancytech/fancyalice66/config.h index e39ff95306b9..b6fcea0c6bc3 100644 --- a/keyboards/fancytech/fancyalice66/config.h +++ b/keyboards/fancytech/fancyalice66/config.h @@ -5,7 +5,7 @@ #ifdef RGB_MATRIX_ENABLE # define WS2812_DI_PIN B0 -# define RGB_DI_PIN WS2812_DI_PIN +# define RGB_DI_PIN B0 # define RGB_MATRIX_LED_COUNT 82 /* RGB Matrix effect */