From 030962aa517ac12367e8a7450af7dfe520b723d9 Mon Sep 17 00:00:00 2001 From: Flashquark Date: Fri, 26 May 2023 13:44:22 -0400 Subject: [PATCH 1/8] Added Flashquark Horizon Z --- keyboards/flashquark/horizon_z/config.h | 75 ++++++++++++++ keyboards/flashquark/horizon_z/horizon_z.c | 97 +++++++++++++++++++ keyboards/flashquark/horizon_z/horizon_z.h | 19 ++++ keyboards/flashquark/horizon_z/info.json | 85 ++++++++++++++++ .../horizon_z/keymaps/default/keymap.c | 17 ++++ .../flashquark/horizon_z/keymaps/via/keymap.c | 17 ++++ .../flashquark/horizon_z/keymaps/via/rules.mk | 2 + keyboards/flashquark/horizon_z/readme.md | 9 ++ keyboards/flashquark/horizon_z/rules.mk | 15 +++ 9 files changed, 336 insertions(+) create mode 100755 keyboards/flashquark/horizon_z/config.h create mode 100755 keyboards/flashquark/horizon_z/horizon_z.c create mode 100755 keyboards/flashquark/horizon_z/horizon_z.h create mode 100755 keyboards/flashquark/horizon_z/info.json create mode 100755 keyboards/flashquark/horizon_z/keymaps/default/keymap.c create mode 100755 keyboards/flashquark/horizon_z/keymaps/via/keymap.c create mode 100755 keyboards/flashquark/horizon_z/keymaps/via/rules.mk create mode 100644 keyboards/flashquark/horizon_z/readme.md create mode 100755 keyboards/flashquark/horizon_z/rules.mk diff --git a/keyboards/flashquark/horizon_z/config.h b/keyboards/flashquark/horizon_z/config.h new file mode 100755 index 000000000000..b2aee68f7065 --- /dev/null +++ b/keyboards/flashquark/horizon_z/config.h @@ -0,0 +1,75 @@ +#pragma once + + +/* + * Keyboard Matrix Assignments + * + * Change this to how you wired your keyboard + * COLS: AVR pins used for columns, left to right + * ROWS: AVR pins used for rows, top to bottom + * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) + * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) + * + */ +#define MATRIX_ROW_PINS {F0, F1, F4, F5, B4} +#define MATRIX_COL_PINS {B5, B6, C6, C7, F7, F6, B0, B1, B2, B3, B7, D2, D3, D5 } +/* COL2ROW, ROW2COL*/ +#define DIODE_DIRECTION COL2ROW + +#ifdef RGB_MATRIX_ENABLE +# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended +# define RGB_MATRIX_KEYPRESSES +# define RGB_MATRIX_FRAMEBUFFER_EFFECTS +// RGB Matrix Animation modes. Explicitly enabled +// For full list of effects, see: +// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects +# define ENABLE_RGB_MATRIX_ALPHAS_MODS +// # define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN +# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT +# define ENABLE_RGB_MATRIX_BREATHING +// # define ENABLE_RGB_MATRIX_BAND_SAT +# define ENABLE_RGB_MATRIX_BAND_VAL +// # define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT +# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL +// # define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT +# define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL +# define ENABLE_RGB_MATRIX_CYCLE_ALL +# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT +# define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN +# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON +# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN +# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL +# define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL +# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL +# define ENABLE_RGB_MATRIX_DUAL_BEACON +# define ENABLE_RGB_MATRIX_RAINBOW_BEACON +# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS +# define ENABLE_RGB_MATRIX_RAINDROPS +# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS +# define ENABLE_RGB_MATRIX_HUE_BREATHING +# define ENABLE_RGB_MATRIX_HUE_PENDULUM +# define ENABLE_RGB_MATRIX_HUE_WAVE +# define ENABLE_RGB_MATRIX_PIXEL_RAIN +# define ENABLE_RGB_MATRIX_PIXEL_FLOW +# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL +// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined +# define ENABLE_RGB_MATRIX_TYPING_HEATMAP +// # define ENABLE_RGB_MATRIX_DIGITAL_RAIN +// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE +// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE +// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE +// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS +// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS +// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS +// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS +// # define ENABLE_RGB_MATRIX_SPLASH +// # define ENABLE_RGB_MATRIX_MULTISPLASH +// # define ENABLE_RGB_MATRIX_SOLID_SPLASH +// # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH + +# define DRIVER_ADDR_1 0b1010000 +# define DRIVER_COUNT 1 +# define RGB_MATRIX_LED_COUNT 62 +#endif diff --git a/keyboards/flashquark/horizon_z/horizon_z.c b/keyboards/flashquark/horizon_z/horizon_z.c new file mode 100755 index 000000000000..8f5869778cc8 --- /dev/null +++ b/keyboards/flashquark/horizon_z/horizon_z.c @@ -0,0 +1,97 @@ +#include "horizon_z.h" + +#ifdef RGB_MATRIX_ENABLE +const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { + {0, B_1, A_1, C_1}, + {0, B_2, A_2, C_2}, + {0, B_3, A_3, C_3}, + {0, B_4, A_4, C_4}, + {0, B_5, A_5, C_5}, + {0, B_6, A_6, C_6}, + {0, B_7, A_7, C_7}, + {0, B_8, A_8, C_8}, + {0, B_9, A_9, C_9}, + {0, B_10, A_10, C_10}, + {0, B_11, A_11, C_11}, + {0, B_12, A_12, C_12}, + {0, B_13, A_13, C_13}, + {0, B_14, A_14, C_14}, + {0, E_1, D_1, F_1}, + {0, E_2, D_2, F_2}, + {0, E_3, D_3, F_3}, + {0, E_4, D_4, F_4}, + {0, E_5, D_5, F_5}, + {0, E_6, D_6, F_6}, + {0, E_7, D_7, F_7}, + {0, E_8, D_8, F_8}, + {0, E_9, D_9, F_9}, + {0, E_10, D_10, F_10}, + {0, E_11, D_11, F_11}, + {0, E_12, D_12, F_12}, + {0, E_13, D_13, F_13}, + {0, E_14, D_14, F_14}, + {0, H_1, G_1, I_1}, + {0, H_2, G_2, I_2}, + {0, H_3, G_3, I_3}, + {0, H_4, G_4, I_4}, + {0, H_5, G_5, I_5}, + {0, H_6, G_6, I_6}, + {0, H_7, G_7, I_7}, + {0, H_8, G_8, I_8}, + {0, H_9, G_9, I_9}, + {0, H_10, G_10, I_10}, + {0, H_11, G_11, I_11}, + {0, H_12, G_12, I_12}, + {0, H_13, G_13, I_13}, + {0, K_1, J_1, L_1}, + {0, K_2, J_2, L_2}, + {0, K_3, J_3, L_3}, + {0, K_4, J_4, L_4}, + {0, K_5, J_5, L_5}, + {0, K_6, J_6, L_6}, + {0, K_7, J_7, L_7}, + {0, K_8, J_8, L_8}, + {0, K_9, J_9, L_9}, + {0, K_10, J_10, L_10}, + {0, K_11, J_11, L_11}, + {0, K_14, J_14, L_14}, + {0, B_16, A_16, C_16}, + {0, E_16, D_16, F_16}, + {0, H_16, G_16, I_16}, + {0, K_16, J_16, L_16}, + {0, K_15, J_15, L_15}, + {0, K_12, J_12, L_12}, + {0, K_13, J_13, L_13}, + {0, H_14, G_14, I_14}, +}; + +led_config_t g_led_config = { { + { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13 }, + { 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27 }, + { 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, NO_LED, 40 }, + { 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, NO_LED,NO_LED, 52 }, + { 53, 54, 55, NO_LED, NO_LED, 56, NO_LED, NO_LED, NO_LED, 57, 58, NO_LED,59, 60 } +}, { + { 0, 0 }, { 16, 0 }, { 32, 0 }, { 48, 0 }, { 64, 0 }, { 80, 0 }, { 96, 0 }, { 112, 0 }, { 128, 0 }, { 144, 0 }, { 160, 0 }, { 176, 0 }, { 192, 0 }, { 216, 0 }, + { 4, 16 }, { 24, 16 }, { 40, 16 }, { 56, 16 }, { 72, 16 }, { 88, 16 }, { 104, 16 }, { 120, 16 }, { 136, 16 }, { 152, 16 }, { 168, 16 }, { 184, 16 }, { 200, 16 }, { 220, 16 }, + { 6, 32 }, { 28, 32 }, { 44, 32 }, { 60, 32 }, { 76, 32 }, { 92, 32 }, { 108, 32 }, { 124, 32 }, { 140, 32 }, { 156, 32 }, { 172, 32 }, { 188, 32 }, { 204, 32 }, + { 10, 48 }, { 20, 48 }, { 52, 48 }, { 68, 48 }, { 84, 48 }, { 100, 48 }, { 116, 48 }, { 132, 48 }, { 148, 48 }, { 164, 48 }, { 180, 48 }, { 210, 48 }, + { 2, 64 }, { 22, 64 }, { 42, 64 }, { 102, 64 }, { 162, 64 }, { 182, 64 }, { 202, 64 }, { 222, 64 }, +}, { + 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, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, + 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, + 1, 1, 1, 4, 1, 1, 1, 1 +} }; +#endif + +bool rgb_matrix_indicators_kb(void) { + if (!rgb_matrix_indicators_user()) { + return false; + } + if (host_keyboard_led_state().caps_lock) { + rgb_matrix_set_color(28, 0xFF, 0xFF, 0xFF); + } + return true; +} diff --git a/keyboards/flashquark/horizon_z/horizon_z.h b/keyboards/flashquark/horizon_z/horizon_z.h new file mode 100755 index 000000000000..2e16d82869b9 --- /dev/null +++ b/keyboards/flashquark/horizon_z/horizon_z.h @@ -0,0 +1,19 @@ +#pragma once + +#include "quantum.h" + +#define XXX KC_NO + +#define LAYOUT_60_ansi( \ + K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,\ + K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,\ + K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D,\ + K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3D,\ + K40, K41, K42, K45, K49, K4A, K4C, K4D \ +) { \ + { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \ + { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \ + { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D }, \ + { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, XXX, XXX, K3D }, \ + { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, K49, K4A, XXX, K4C, K4D } \ +} diff --git a/keyboards/flashquark/horizon_z/info.json b/keyboards/flashquark/horizon_z/info.json new file mode 100755 index 000000000000..d9c72bcd52c4 --- /dev/null +++ b/keyboards/flashquark/horizon_z/info.json @@ -0,0 +1,85 @@ +{ + "keyboard_name": "Horizon_Z", + "manufacturer": "FLASHQUARK", + "url": "https://flashquark.com", + "maintainer": "FLASHQUARK", + "usb": { + "vid": "0x4B42", + "pid": "0x0223", + "device_version": "0.0.1" + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", + "debounce": 3, + "layouts": { + "LAYOUT_60_ansi": { + "layout": [ + {"x":0, "y":0}, + {"x":1, "y":0}, + {"x":2, "y":0}, + {"x":3, "y":0}, + {"x":4, "y":0}, + {"x":5, "y":0}, + {"x":6, "y":0}, + {"x":7, "y":0}, + {"x":8, "y":0}, + {"x":9, "y":0}, + {"x":10, "y":0}, + {"x":11, "y":0}, + {"x":12, "y":0}, + {"x":13, "y":0, "w":2}, + + {"x":0, "y":1, "w":1.5}, + {"x":1.5, "y":1}, + {"x":2.5, "y":1}, + {"x":3.5, "y":1}, + {"x":4.5, "y":1}, + {"x":5.5, "y":1}, + {"x":6.5, "y":1}, + {"x":7.5, "y":1}, + {"x":8.5, "y":1}, + {"x":9.5, "y":1}, + {"x":10.5, "y":1}, + {"x":11.5, "y":1}, + {"x":12.5, "y":1}, + {"x":13.5, "y":1, "w":1.5}, + + {"x":0, "y":2, "w":1.75}, + {"x":1.75, "y":2}, + {"x":2.75, "y":2}, + {"x":3.75, "y":2}, + {"x":4.75, "y":2}, + {"x":5.75, "y":2}, + {"x":6.75, "y":2}, + {"x":7.75, "y":2}, + {"x":8.75, "y":2}, + {"x":9.75, "y":2}, + {"x":10.75, "y":2}, + {"x":11.75, "y":2}, + {"x":12.75, "y":2, "w":2.25}, + + {"x":0, "y":3, "w":2.25}, + {"x":2.25, "y":3}, + {"x":3.25, "y":3}, + {"x":4.25, "y":3}, + {"x":5.25, "y":3}, + {"x":6.25, "y":3}, + {"x":7.25, "y":3}, + {"x":8.25, "y":3}, + {"x":9.25, "y":3}, + {"x":10.25, "y":3}, + {"x":11.25, "y":3}, + {"x":12.25, "y":3, "w":2.75}, + + {"x":0, "y":4, "w":1.25}, + {"x":1.25, "y":4, "w":1.25}, + {"x":2.5, "y":4, "w":1.25}, + {"x":3.75, "y":4, "w":6.25}, + {"x":10, "y":4, "w":1.25}, + {"x":11.25, "y":4, "w":1.25}, + {"x":12.5, "y":4, "w":1.25}, + {"x":13.75, "y":4, "w":1.25} + ] + } + } +} diff --git a/keyboards/flashquark/horizon_z/keymaps/default/keymap.c b/keyboards/flashquark/horizon_z/keymaps/default/keymap.c new file mode 100755 index 000000000000..07b3acee9b9f --- /dev/null +++ b/keyboards/flashquark/horizon_z/keymaps/default/keymap.c @@ -0,0 +1,17 @@ +#include QMK_KEYBOARD_H +#define _LAYER0 0 +#define _LAYER1 1 +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_LAYER0] = LAYOUT_60_ansi( /* Base */ + QK_GESC, 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_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, + CTL_T(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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RGUI, KC_RCTL), + [_LAYER1] = LAYOUT_60_ansi( /* FN */ + QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL , + KC_TRNS, RGB_TOG, KC_UP, RGB_MOD, KC_TRNS, KC_TRNS, KC_CALC, KC_TRNS, KC_INS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT , + KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_TRNS, + KC_MPRV, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, MAGIC_TOGGLE_NKRO, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, KC_MNXT, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + }; \ No newline at end of file diff --git a/keyboards/flashquark/horizon_z/keymaps/via/keymap.c b/keyboards/flashquark/horizon_z/keymaps/via/keymap.c new file mode 100755 index 000000000000..07b3acee9b9f --- /dev/null +++ b/keyboards/flashquark/horizon_z/keymaps/via/keymap.c @@ -0,0 +1,17 @@ +#include QMK_KEYBOARD_H +#define _LAYER0 0 +#define _LAYER1 1 +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_LAYER0] = LAYOUT_60_ansi( /* Base */ + QK_GESC, 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_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, + CTL_T(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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RGUI, KC_RCTL), + [_LAYER1] = LAYOUT_60_ansi( /* FN */ + QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL , + KC_TRNS, RGB_TOG, KC_UP, RGB_MOD, KC_TRNS, KC_TRNS, KC_CALC, KC_TRNS, KC_INS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT , + KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_TRNS, + KC_MPRV, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, MAGIC_TOGGLE_NKRO, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, KC_MNXT, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + }; \ No newline at end of file diff --git a/keyboards/flashquark/horizon_z/keymaps/via/rules.mk b/keyboards/flashquark/horizon_z/keymaps/via/rules.mk new file mode 100755 index 000000000000..bfbf8681c994 --- /dev/null +++ b/keyboards/flashquark/horizon_z/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +LTO_ENABLE = yes diff --git a/keyboards/flashquark/horizon_z/readme.md b/keyboards/flashquark/horizon_z/readme.md new file mode 100644 index 000000000000..b9474aa79eeb --- /dev/null +++ b/keyboards/flashquark/horizon_z/readme.md @@ -0,0 +1,9 @@ +# Horizon Z QMK Edition + + + +Make example for this keyboard (after setting up your build environment): + + make flashquark/horizon_z:default + +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). diff --git a/keyboards/flashquark/horizon_z/rules.mk b/keyboards/flashquark/horizon_z/rules.mk new file mode 100755 index 000000000000..c1fb17d02d61 --- /dev/null +++ b/keyboards/flashquark/horizon_z/rules.mk @@ -0,0 +1,15 @@ +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = yes # Enable N-Key Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output +RGB_MATRIX_ENABLE = yes # Use RGB matrix +RGB_MATRIX_DRIVER = IS31FL3733 +NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in From 956d55f46a1c4ed99cfa7bfcdf9618db3217d63b Mon Sep 17 00:00:00 2001 From: Flashquark Date: Sun, 28 May 2023 00:44:56 -0400 Subject: [PATCH 2/8] Performed qmk migrate procedure --- keyboards/flashquark/horizon_z/config.h | 1 - keyboards/flashquark/horizon_z/info.json | 153 ++++++++++++----------- keyboards/flashquark/horizon_z/rules.mk | 4 - 3 files changed, 80 insertions(+), 78 deletions(-) diff --git a/keyboards/flashquark/horizon_z/config.h b/keyboards/flashquark/horizon_z/config.h index b2aee68f7065..9a3ae4e55fc8 100755 --- a/keyboards/flashquark/horizon_z/config.h +++ b/keyboards/flashquark/horizon_z/config.h @@ -14,7 +14,6 @@ #define MATRIX_ROW_PINS {F0, F1, F4, F5, B4} #define MATRIX_COL_PINS {B5, B6, C6, C7, F7, F6, B0, B1, B2, B3, B7, D2, D3, D5 } /* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW #ifdef RGB_MATRIX_ENABLE # define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended diff --git a/keyboards/flashquark/horizon_z/info.json b/keyboards/flashquark/horizon_z/info.json index d9c72bcd52c4..7c4a0a6c4fb0 100755 --- a/keyboards/flashquark/horizon_z/info.json +++ b/keyboards/flashquark/horizon_z/info.json @@ -1,85 +1,92 @@ { - "keyboard_name": "Horizon_Z", "manufacturer": "FLASHQUARK", - "url": "https://flashquark.com", + "keyboard_name": "Horizon_Z", "maintainer": "FLASHQUARK", + "bootloader": "atmel-dfu", + "bootmagic": { + "enabled": true + }, + "debounce": 3, + "diode_direction": "COL2ROW", + "mouse_key": { + "enabled": true + }, + "processor": "atmega32u4", + "rgb_matrix": { + "driver": "IS31FL3733" + }, + "url": "https://flashquark.com", "usb": { - "vid": "0x4B42", + "device_version": "0.0.1", + "no_startup_check": false, "pid": "0x0223", - "device_version": "0.0.1" + "vid": "0x4B42" }, - "processor": "atmega32u4", - "bootloader": "atmel-dfu", - "debounce": 3, "layouts": { "LAYOUT_60_ansi": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":4, "y":0}, - {"x":5, "y":0}, - {"x":6, "y":0}, - {"x":7, "y":0}, - {"x":8, "y":0}, - {"x":9, "y":0}, - {"x":10, "y":0}, - {"x":11, "y":0}, - {"x":12, "y":0}, - {"x":13, "y":0, "w":2}, - - {"x":0, "y":1, "w":1.5}, - {"x":1.5, "y":1}, - {"x":2.5, "y":1}, - {"x":3.5, "y":1}, - {"x":4.5, "y":1}, - {"x":5.5, "y":1}, - {"x":6.5, "y":1}, - {"x":7.5, "y":1}, - {"x":8.5, "y":1}, - {"x":9.5, "y":1}, - {"x":10.5, "y":1}, - {"x":11.5, "y":1}, - {"x":12.5, "y":1}, - {"x":13.5, "y":1, "w":1.5}, - - {"x":0, "y":2, "w":1.75}, - {"x":1.75, "y":2}, - {"x":2.75, "y":2}, - {"x":3.75, "y":2}, - {"x":4.75, "y":2}, - {"x":5.75, "y":2}, - {"x":6.75, "y":2}, - {"x":7.75, "y":2}, - {"x":8.75, "y":2}, - {"x":9.75, "y":2}, - {"x":10.75, "y":2}, - {"x":11.75, "y":2}, - {"x":12.75, "y":2, "w":2.25}, - - {"x":0, "y":3, "w":2.25}, - {"x":2.25, "y":3}, - {"x":3.25, "y":3}, - {"x":4.25, "y":3}, - {"x":5.25, "y":3}, - {"x":6.25, "y":3}, - {"x":7.25, "y":3}, - {"x":8.25, "y":3}, - {"x":9.25, "y":3}, - {"x":10.25, "y":3}, - {"x":11.25, "y":3}, - {"x":12.25, "y":3, "w":2.75}, - - {"x":0, "y":4, "w":1.25}, - {"x":1.25, "y":4, "w":1.25}, - {"x":2.5, "y":4, "w":1.25}, - {"x":3.75, "y":4, "w":6.25}, - {"x":10, "y":4, "w":1.25}, - {"x":11.25, "y":4, "w":1.25}, - {"x":12.5, "y":4, "w":1.25}, - {"x":13.75, "y":4, "w":1.25} + { "x": 0, "y": 0 }, + { "x": 1, "y": 0 }, + { "x": 2, "y": 0 }, + { "x": 3, "y": 0 }, + { "x": 4, "y": 0 }, + { "x": 5, "y": 0 }, + { "x": 6, "y": 0 }, + { "x": 7, "y": 0 }, + { "x": 8, "y": 0 }, + { "x": 9, "y": 0 }, + { "x": 10, "y": 0 }, + { "x": 11, "y": 0 }, + { "x": 12, "y": 0 }, + { "w": 2, "x": 13, "y": 0 }, + { "w": 1.5, "x": 0, "y": 1 }, + { "x": 1.5, "y": 1 }, + { "x": 2.5, "y": 1 }, + { "x": 3.5, "y": 1 }, + { "x": 4.5, "y": 1 }, + { "x": 5.5, "y": 1 }, + { "x": 6.5, "y": 1 }, + { "x": 7.5, "y": 1 }, + { "x": 8.5, "y": 1 }, + { "x": 9.5, "y": 1 }, + { "x": 10.5, "y": 1 }, + { "x": 11.5, "y": 1 }, + { "x": 12.5, "y": 1 }, + { "w": 1.5, "x": 13.5, "y": 1 }, + { "w": 1.75, "x": 0, "y": 2 }, + { "x": 1.75, "y": 2 }, + { "x": 2.75, "y": 2 }, + { "x": 3.75, "y": 2 }, + { "x": 4.75, "y": 2 }, + { "x": 5.75, "y": 2 }, + { "x": 6.75, "y": 2 }, + { "x": 7.75, "y": 2 }, + { "x": 8.75, "y": 2 }, + { "x": 9.75, "y": 2 }, + { "x": 10.75, "y": 2 }, + { "x": 11.75, "y": 2 }, + { "w": 2.25, "x": 12.75, "y": 2 }, + { "w": 2.25, "x": 0, "y": 3 }, + { "x": 2.25, "y": 3 }, + { "x": 3.25, "y": 3 }, + { "x": 4.25, "y": 3 }, + { "x": 5.25, "y": 3 }, + { "x": 6.25, "y": 3 }, + { "x": 7.25, "y": 3 }, + { "x": 8.25, "y": 3 }, + { "x": 9.25, "y": 3 }, + { "x": 10.25, "y": 3 }, + { "x": 11.25, "y": 3 }, + { "w": 2.75, "x": 12.25, "y": 3 }, + { "w": 1.25, "x": 0, "y": 4 }, + { "w": 1.25, "x": 1.25, "y": 4 }, + { "w": 1.25, "x": 2.5, "y": 4 }, + { "w": 6.25, "x": 3.75, "y": 4 }, + { "w": 1.25, "x": 10, "y": 4 }, + { "w": 1.25, "x": 11.25, "y": 4 }, + { "w": 1.25, "x": 12.5, "y": 4 }, + { "w": 1.25, "x": 13.75, "y": 4 } ] } } -} +} \ No newline at end of file diff --git a/keyboards/flashquark/horizon_z/rules.mk b/keyboards/flashquark/horizon_z/rules.mk index c1fb17d02d61..8a943e1183c4 100755 --- a/keyboards/flashquark/horizon_z/rules.mk +++ b/keyboards/flashquark/horizon_z/rules.mk @@ -1,8 +1,6 @@ # Build Options # change yes to no to disable # -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = no # Commands for debug and configuration @@ -11,5 +9,3 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes # Use RGB matrix -RGB_MATRIX_DRIVER = IS31FL3733 -NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in From 1aab610361d6c6212da4cc447d4f00539b67e2b9 Mon Sep 17 00:00:00 2001 From: Flashquark Date: Sun, 28 May 2023 11:45:33 -0400 Subject: [PATCH 3/8] Added c header files --- keyboards/flashquark/horizon_z/config.h | 17 +++++++++++++++++ keyboards/flashquark/horizon_z/horizon_z.c | 16 ++++++++++++++++ keyboards/flashquark/horizon_z/horizon_z.h | 16 ++++++++++++++++ .../horizon_z/keymaps/default/keymap.c | 16 ++++++++++++++++ .../flashquark/horizon_z/keymaps/via/keymap.c | 16 ++++++++++++++++ keyboards/flashquark/horizon_z/readme.md | 0 6 files changed, 81 insertions(+) mode change 100644 => 100755 keyboards/flashquark/horizon_z/readme.md diff --git a/keyboards/flashquark/horizon_z/config.h b/keyboards/flashquark/horizon_z/config.h index 9a3ae4e55fc8..11a327a3f4e8 100755 --- a/keyboards/flashquark/horizon_z/config.h +++ b/keyboards/flashquark/horizon_z/config.h @@ -1,3 +1,20 @@ +/* Copyright 2023 Flashquark + * + * 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 diff --git a/keyboards/flashquark/horizon_z/horizon_z.c b/keyboards/flashquark/horizon_z/horizon_z.c index 8f5869778cc8..89b5b3e7a14b 100755 --- a/keyboards/flashquark/horizon_z/horizon_z.c +++ b/keyboards/flashquark/horizon_z/horizon_z.c @@ -1,3 +1,19 @@ +/* Copyright 2023 Flashquark + * + * 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 "horizon_z.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/flashquark/horizon_z/horizon_z.h b/keyboards/flashquark/horizon_z/horizon_z.h index 2e16d82869b9..e6db17f37b5f 100755 --- a/keyboards/flashquark/horizon_z/horizon_z.h +++ b/keyboards/flashquark/horizon_z/horizon_z.h @@ -1,3 +1,19 @@ +/* Copyright 2023 Flashquark + * + * 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" diff --git a/keyboards/flashquark/horizon_z/keymaps/default/keymap.c b/keyboards/flashquark/horizon_z/keymaps/default/keymap.c index 07b3acee9b9f..26f4443c3f95 100755 --- a/keyboards/flashquark/horizon_z/keymaps/default/keymap.c +++ b/keyboards/flashquark/horizon_z/keymaps/default/keymap.c @@ -1,3 +1,19 @@ +/* Copyright 2023 Flashquark + * + * 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 #define _LAYER0 0 #define _LAYER1 1 diff --git a/keyboards/flashquark/horizon_z/keymaps/via/keymap.c b/keyboards/flashquark/horizon_z/keymaps/via/keymap.c index 07b3acee9b9f..26f4443c3f95 100755 --- a/keyboards/flashquark/horizon_z/keymaps/via/keymap.c +++ b/keyboards/flashquark/horizon_z/keymaps/via/keymap.c @@ -1,3 +1,19 @@ +/* Copyright 2023 Flashquark + * + * 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 #define _LAYER0 0 #define _LAYER1 1 diff --git a/keyboards/flashquark/horizon_z/readme.md b/keyboards/flashquark/horizon_z/readme.md old mode 100644 new mode 100755 From 086aff70e9a470c4e3044122a07dcd238f92d5cd Mon Sep 17 00:00:00 2001 From: Flashquark Date: Wed, 31 May 2023 13:25:50 -0400 Subject: [PATCH 4/8] Moved everything to info.json. --- keyboards/flashquark/horizon_z/config.h | 4 +- keyboards/flashquark/horizon_z/horizon_z.h | 13 -- keyboards/flashquark/horizon_z/info.json | 141 ++++++++++-------- .../horizon_z/keymaps/default/keymap.c | 6 +- .../flashquark/horizon_z/keymaps/via/keymap.c | 6 +- keyboards/flashquark/horizon_z/readme.md | 15 +- keyboards/flashquark/horizon_z/rules.mk | 9 +- 7 files changed, 103 insertions(+), 91 deletions(-) diff --git a/keyboards/flashquark/horizon_z/config.h b/keyboards/flashquark/horizon_z/config.h index 11a327a3f4e8..04212071ec91 100755 --- a/keyboards/flashquark/horizon_z/config.h +++ b/keyboards/flashquark/horizon_z/config.h @@ -28,9 +28,7 @@ * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) * */ -#define MATRIX_ROW_PINS {F0, F1, F4, F5, B4} -#define MATRIX_COL_PINS {B5, B6, C6, C7, F7, F6, B0, B1, B2, B3, B7, D2, D3, D5 } -/* COL2ROW, ROW2COL*/ + #ifdef RGB_MATRIX_ENABLE # define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended diff --git a/keyboards/flashquark/horizon_z/horizon_z.h b/keyboards/flashquark/horizon_z/horizon_z.h index e6db17f37b5f..a85e61d427f3 100755 --- a/keyboards/flashquark/horizon_z/horizon_z.h +++ b/keyboards/flashquark/horizon_z/horizon_z.h @@ -20,16 +20,3 @@ #define XXX KC_NO -#define LAYOUT_60_ansi( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,\ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,\ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D,\ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3D,\ - K40, K41, K42, K45, K49, K4A, K4C, K4D \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, XXX, XXX, K3D }, \ - { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, K49, K4A, XXX, K4C, K4D } \ -} diff --git a/keyboards/flashquark/horizon_z/info.json b/keyboards/flashquark/horizon_z/info.json index 7c4a0a6c4fb0..4fc3ee4e61ff 100755 --- a/keyboards/flashquark/horizon_z/info.json +++ b/keyboards/flashquark/horizon_z/info.json @@ -1,6 +1,7 @@ { "manufacturer": "FLASHQUARK", "keyboard_name": "Horizon_Z", + "url": "https://flashquark.com/product/flashquark-horizon-z-qmk-edition-custom-kit/", "maintainer": "FLASHQUARK", "bootloader": "atmel-dfu", "bootmagic": { @@ -15,77 +16,93 @@ "rgb_matrix": { "driver": "IS31FL3733" }, - "url": "https://flashquark.com", "usb": { "device_version": "0.0.1", "no_startup_check": false, "pid": "0x0223", "vid": "0x4B42" + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "rgb_matrix": true, + "nkro": true + }, + "matrix_pins": { + "rows": ["F0", "F1", "F4", "F5", "B4"] + "cols": ["B5", "B6", "C6", "C7", "F7", "F6", "B0", "B1", "B2", "B3", "B7", "D2", "D3", "D5"], }, "layouts": { "LAYOUT_60_ansi": { "layout": [ - { "x": 0, "y": 0 }, - { "x": 1, "y": 0 }, - { "x": 2, "y": 0 }, - { "x": 3, "y": 0 }, - { "x": 4, "y": 0 }, - { "x": 5, "y": 0 }, - { "x": 6, "y": 0 }, - { "x": 7, "y": 0 }, - { "x": 8, "y": 0 }, - { "x": 9, "y": 0 }, - { "x": 10, "y": 0 }, - { "x": 11, "y": 0 }, - { "x": 12, "y": 0 }, - { "w": 2, "x": 13, "y": 0 }, - { "w": 1.5, "x": 0, "y": 1 }, - { "x": 1.5, "y": 1 }, - { "x": 2.5, "y": 1 }, - { "x": 3.5, "y": 1 }, - { "x": 4.5, "y": 1 }, - { "x": 5.5, "y": 1 }, - { "x": 6.5, "y": 1 }, - { "x": 7.5, "y": 1 }, - { "x": 8.5, "y": 1 }, - { "x": 9.5, "y": 1 }, - { "x": 10.5, "y": 1 }, - { "x": 11.5, "y": 1 }, - { "x": 12.5, "y": 1 }, - { "w": 1.5, "x": 13.5, "y": 1 }, - { "w": 1.75, "x": 0, "y": 2 }, - { "x": 1.75, "y": 2 }, - { "x": 2.75, "y": 2 }, - { "x": 3.75, "y": 2 }, - { "x": 4.75, "y": 2 }, - { "x": 5.75, "y": 2 }, - { "x": 6.75, "y": 2 }, - { "x": 7.75, "y": 2 }, - { "x": 8.75, "y": 2 }, - { "x": 9.75, "y": 2 }, - { "x": 10.75, "y": 2 }, - { "x": 11.75, "y": 2 }, - { "w": 2.25, "x": 12.75, "y": 2 }, - { "w": 2.25, "x": 0, "y": 3 }, - { "x": 2.25, "y": 3 }, - { "x": 3.25, "y": 3 }, - { "x": 4.25, "y": 3 }, - { "x": 5.25, "y": 3 }, - { "x": 6.25, "y": 3 }, - { "x": 7.25, "y": 3 }, - { "x": 8.25, "y": 3 }, - { "x": 9.25, "y": 3 }, - { "x": 10.25, "y": 3 }, - { "x": 11.25, "y": 3 }, - { "w": 2.75, "x": 12.25, "y": 3 }, - { "w": 1.25, "x": 0, "y": 4 }, - { "w": 1.25, "x": 1.25, "y": 4 }, - { "w": 1.25, "x": 2.5, "y": 4 }, - { "w": 6.25, "x": 3.75, "y": 4 }, - { "w": 1.25, "x": 10, "y": 4 }, - { "w": 1.25, "x": 11.25, "y": 4 }, - { "w": 1.25, "x": 12.5, "y": 4 }, - { "w": 1.25, "x": 13.75, "y": 4 } + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 5], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 11], "x": 12.5, "y": 4}, + {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5} ] } } diff --git a/keyboards/flashquark/horizon_z/keymaps/default/keymap.c b/keyboards/flashquark/horizon_z/keymaps/default/keymap.c index 26f4443c3f95..1ab95c54a562 100755 --- a/keyboards/flashquark/horizon_z/keymaps/default/keymap.c +++ b/keyboards/flashquark/horizon_z/keymaps/default/keymap.c @@ -15,8 +15,10 @@ */ #include QMK_KEYBOARD_H -#define _LAYER0 0 -#define _LAYER1 1 +enum layers { + _LAYER0, + _LAYER1, +}; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LAYER0] = LAYOUT_60_ansi( /* Base */ QK_GESC, 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, diff --git a/keyboards/flashquark/horizon_z/keymaps/via/keymap.c b/keyboards/flashquark/horizon_z/keymaps/via/keymap.c index 26f4443c3f95..1ab95c54a562 100755 --- a/keyboards/flashquark/horizon_z/keymaps/via/keymap.c +++ b/keyboards/flashquark/horizon_z/keymaps/via/keymap.c @@ -15,8 +15,10 @@ */ #include QMK_KEYBOARD_H -#define _LAYER0 0 -#define _LAYER1 1 +enum layers { + _LAYER0, + _LAYER1, +}; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LAYER0] = LAYOUT_60_ansi( /* Base */ QK_GESC, 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, diff --git a/keyboards/flashquark/horizon_z/readme.md b/keyboards/flashquark/horizon_z/readme.md index b9474aa79eeb..c37cac5df7a6 100755 --- a/keyboards/flashquark/horizon_z/readme.md +++ b/keyboards/flashquark/horizon_z/readme.md @@ -1,9 +1,22 @@ # Horizon Z QMK Edition +A hotsawp 60% keyboard by Flashquark + +* Keyboard Maintainer: [Flashquark](https://flashquark.com) +* Hardware Supported: Horizon Z QMK +* Hardware Availability: [Horizon Z QMK Edition](https://flashquark.com/product/flashquark-horizon-z-qmk-edition-custom-kit/) + + +## Build + Make example for this keyboard (after setting up your build environment): - make flashquark/horizon_z:default + make flashquark/horizon_z:default 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 + +Press reset button on the back of keyboard. \ No newline at end of file diff --git a/keyboards/flashquark/horizon_z/rules.mk b/keyboards/flashquark/horizon_z/rules.mk index 8a943e1183c4..8dba3827b34e 100755 --- a/keyboards/flashquark/horizon_z/rules.mk +++ b/keyboards/flashquark/horizon_z/rules.mk @@ -1,11 +1,4 @@ # Build Options # change yes to no to disable # -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -RGB_MATRIX_ENABLE = yes # Use RGB matrix + From 5ee0fcfefa7fee6ce53bd5c22118e4aec9985035 Mon Sep 17 00:00:00 2001 From: Flashquark Date: Fri, 2 Jun 2023 14:17:42 -0400 Subject: [PATCH 5/8] Made changes requested, fixed key matrix --- keyboards/flashquark/horizon_z/horizon_z.c | 20 +---- keyboards/flashquark/horizon_z/info.json | 90 ++++++++++++++++++---- 2 files changed, 75 insertions(+), 35 deletions(-) diff --git a/keyboards/flashquark/horizon_z/horizon_z.c b/keyboards/flashquark/horizon_z/horizon_z.c index 89b5b3e7a14b..a6f7cc3a87aa 100755 --- a/keyboards/flashquark/horizon_z/horizon_z.c +++ b/keyboards/flashquark/horizon_z/horizon_z.c @@ -81,25 +81,7 @@ const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { {0, H_14, G_14, I_14}, }; -led_config_t g_led_config = { { - { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13 }, - { 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27 }, - { 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, NO_LED, 40 }, - { 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, NO_LED,NO_LED, 52 }, - { 53, 54, 55, NO_LED, NO_LED, 56, NO_LED, NO_LED, NO_LED, 57, 58, NO_LED,59, 60 } -}, { - { 0, 0 }, { 16, 0 }, { 32, 0 }, { 48, 0 }, { 64, 0 }, { 80, 0 }, { 96, 0 }, { 112, 0 }, { 128, 0 }, { 144, 0 }, { 160, 0 }, { 176, 0 }, { 192, 0 }, { 216, 0 }, - { 4, 16 }, { 24, 16 }, { 40, 16 }, { 56, 16 }, { 72, 16 }, { 88, 16 }, { 104, 16 }, { 120, 16 }, { 136, 16 }, { 152, 16 }, { 168, 16 }, { 184, 16 }, { 200, 16 }, { 220, 16 }, - { 6, 32 }, { 28, 32 }, { 44, 32 }, { 60, 32 }, { 76, 32 }, { 92, 32 }, { 108, 32 }, { 124, 32 }, { 140, 32 }, { 156, 32 }, { 172, 32 }, { 188, 32 }, { 204, 32 }, - { 10, 48 }, { 20, 48 }, { 52, 48 }, { 68, 48 }, { 84, 48 }, { 100, 48 }, { 116, 48 }, { 132, 48 }, { 148, 48 }, { 164, 48 }, { 180, 48 }, { 210, 48 }, - { 2, 64 }, { 22, 64 }, { 42, 64 }, { 102, 64 }, { 162, 64 }, { 182, 64 }, { 202, 64 }, { 222, 64 }, -}, { - 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, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, - 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, - 1, 1, 1, 4, 1, 1, 1, 1 -} }; + #endif bool rgb_matrix_indicators_kb(void) { diff --git a/keyboards/flashquark/horizon_z/info.json b/keyboards/flashquark/horizon_z/info.json index 4fc3ee4e61ff..1de90f9be67a 100755 --- a/keyboards/flashquark/horizon_z/info.json +++ b/keyboards/flashquark/horizon_z/info.json @@ -4,20 +4,78 @@ "url": "https://flashquark.com/product/flashquark-horizon-z-qmk-edition-custom-kit/", "maintainer": "FLASHQUARK", "bootloader": "atmel-dfu", - "bootmagic": { - "enabled": true - }, "debounce": 3, "diode_direction": "COL2ROW", - "mouse_key": { - "enabled": true - }, "processor": "atmega32u4", "rgb_matrix": { "driver": "IS31FL3733" + "layout": [ + {"x": 0, "y": 0, "flags": 1}, + {"x": 0, "y": 0, "flags": 4 }, + {"x": 16, "y": 0, "flags": 4 }, + {"x": 32, "y": 0, "flags": 4 }, + {"x": 48, "y": 0, "flags": 4 }, + {"x": 64, "y": 0, "flags": 4 }, + {"x": 80, "y": 0, "flags": 4 }, + {"x": 96, "y": 0, "flags": 4 }, + {"x": 112, "y": 0, "flags": 4 }, + {"x": 128, "y": 0, "flags": 4 }, + {"x": 144, "y": 0, "flags": 4 }, + {"x": 160, "y": 0, "flags": 4 }, + {"x": 176, "y": 0, "flags": 4 }, + {"x": 192, "y": 0, "flags": 4 }, + {"x": 216, "y": 0, "flags": 1 }, + {"x": 4, "y": 16, "flags": 4 }, + {"x": 24, "y": 16, "flags": 4 }, + {"x": 40, "y": 16, "flags": 4 }, + {"x": 56, "y": 16, "flags": 4 }, + {"x": 72, "y": 16, "flags": 4 }, + {"x": 88, "y": 16, "flags": 4 }, + {"x": 104, "y": 16, "flags": 4 }, + {"x": 120, "y": 16, "flags": 4 }, + {"x": 136, "y": 16, "flags": 4 }, + {"x": 152, "y": 16, "flags": 4 }, + {"x": 168, "y": 16, "flags": 4 }, + {"x": 184, "y": 16, "flags": 4 }, + {"x": 200, "y": 16, "flags": 4 }, + {"x": 220, "y": 16, "flags": 4 }, + {"x": 6, "y": 32, "flags": 4 }, + {"x": 28, "y": 32, "flags": 4 }, + {"x": 44, "y": 32, "flags": 4 }, + {"x": 60, "y": 32, "flags": 4 }, + {"x": 76, "y": 32, "flags": 4 }, + {"x": 92, "y": 32, "flags": 4 }, + {"x": 108, "y": 32, "flags": 4 }, + {"x": 124, "y": 32, "flags": 4 }, + {"x": 140, "y": 32, "flags": 4 }, + {"x": 156, "y": 32, "flags": 4 }, + {"x": 172, "y": 32, "flags": 4 }, + {"x": 188, "y": 32, "flags": 4 }, + {"x": 204, "y": 32, "flags": 1 }, + {"x": 10, "y": 48, "flags": 1 }, + {"x": 20, "y": 48, "flags": 4 }, + {"x": 52, "y": 48, "flags": 4 }, + {"x": 68, "y": 48, "flags": 4 }, + {"x": 84, "y": 48, "flags": 4 }, + {"x": 100, "y": 48, "flags": 4 }, + {"x": 116, "y": 48, "flags": 4 }, + {"x": 132, "y": 48, "flags": 4 }, + {"x": 148, "y": 48, "flags": 4 }, + {"x": 164, "y": 48, "flags": 4 }, + {"x": 180, "y": 48, "flags": 4 }, + {"x": 210, "y": 48, "flags": 1 }, + {"x": 2, "y": 64, "flags": 1 }, + {"x": 22, "y": 64, "flags": 1 }, + {"x": 42, "y": 64, "flags": 1 }, + {"x": 102, "y": 64, "flags": 1 }, + {"x": 162, "y": 64, "flags": 1 }, + {"x": 182, "y": 64, "flags": 1 }, + {"x": 202, "y": 64, "flags": 1 }, + {"x": 222, "y": 64, "flags": 1 } + ] }, "usb": { - "device_version": "0.0.1", + "device_version": "1.0.0", "no_startup_check": false, "pid": "0x0223", "vid": "0x4B42" @@ -93,16 +151,16 @@ {"matrix": [3, 8], "x": 9.25, "y": 3}, {"matrix": [3, 9], "x": 10.25, "y": 3}, {"matrix": [3, 10], "x": 11.25, "y": 3}, - {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75}, - {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75}, - {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, - {"matrix": [4, 1], "x": 1.5, "y": 4}, - {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, - {"matrix": [4, 5], "x": 4, "y": 4, "w": 7}, - {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5}, - {"matrix": [4, 11], "x": 12.5, "y": 4}, - {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5} + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25} ] } } From 2c95cd861eb1f5cebe11746411c8a2d4ba0ab388 Mon Sep 17 00:00:00 2001 From: Flashquark Date: Sat, 3 Jun 2023 01:11:19 -0400 Subject: [PATCH 6/8] Made changes requested, ran qmk format-json --- keyboards/flashquark/horizon_z/config.h | 11 ----------- keyboards/flashquark/horizon_z/horizon_z.c | 2 +- keyboards/flashquark/horizon_z/horizon_z.h | 22 ---------------------- keyboards/flashquark/horizon_z/info.json | 1 - keyboards/flashquark/horizon_z/readme.md | 4 +--- keyboards/flashquark/horizon_z/rules.mk | 4 ---- 6 files changed, 2 insertions(+), 42 deletions(-) delete mode 100755 keyboards/flashquark/horizon_z/horizon_z.h diff --git a/keyboards/flashquark/horizon_z/config.h b/keyboards/flashquark/horizon_z/config.h index 04212071ec91..8828834d740c 100755 --- a/keyboards/flashquark/horizon_z/config.h +++ b/keyboards/flashquark/horizon_z/config.h @@ -18,17 +18,6 @@ #pragma once -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ - #ifdef RGB_MATRIX_ENABLE # define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended diff --git a/keyboards/flashquark/horizon_z/horizon_z.c b/keyboards/flashquark/horizon_z/horizon_z.c index a6f7cc3a87aa..da62deaf29bf 100755 --- a/keyboards/flashquark/horizon_z/horizon_z.c +++ b/keyboards/flashquark/horizon_z/horizon_z.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "horizon_z.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { diff --git a/keyboards/flashquark/horizon_z/horizon_z.h b/keyboards/flashquark/horizon_z/horizon_z.h deleted file mode 100755 index a85e61d427f3..000000000000 --- a/keyboards/flashquark/horizon_z/horizon_z.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2023 Flashquark - * - * 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 - diff --git a/keyboards/flashquark/horizon_z/info.json b/keyboards/flashquark/horizon_z/info.json index 1de90f9be67a..3cc5d5f33623 100755 --- a/keyboards/flashquark/horizon_z/info.json +++ b/keyboards/flashquark/horizon_z/info.json @@ -76,7 +76,6 @@ }, "usb": { "device_version": "1.0.0", - "no_startup_check": false, "pid": "0x0223", "vid": "0x4B42" }, diff --git a/keyboards/flashquark/horizon_z/readme.md b/keyboards/flashquark/horizon_z/readme.md index c37cac5df7a6..0c4e8d574570 100755 --- a/keyboards/flashquark/horizon_z/readme.md +++ b/keyboards/flashquark/horizon_z/readme.md @@ -1,8 +1,6 @@ # Horizon Z QMK Edition -A hotsawp 60% keyboard by Flashquark - - +A hotswap 60% keyboard by Flashquark * Keyboard Maintainer: [Flashquark](https://flashquark.com) * Hardware Supported: Horizon Z QMK diff --git a/keyboards/flashquark/horizon_z/rules.mk b/keyboards/flashquark/horizon_z/rules.mk index 8dba3827b34e..e69de29bb2d1 100755 --- a/keyboards/flashquark/horizon_z/rules.mk +++ b/keyboards/flashquark/horizon_z/rules.mk @@ -1,4 +0,0 @@ -# Build Options -# change yes to no to disable -# - From 48cae2c7c927730fe33dd0e5a2bf4dd8d128097f Mon Sep 17 00:00:00 2001 From: Flashquark Date: Sat, 3 Jun 2023 15:52:42 -0400 Subject: [PATCH 7/8] Made requested changes, ran qmk format-json --- keyboards/flashquark/horizon_z/info.json | 283 +++++++++++------------ 1 file changed, 139 insertions(+), 144 deletions(-) diff --git a/keyboards/flashquark/horizon_z/info.json b/keyboards/flashquark/horizon_z/info.json index 3cc5d5f33623..70a9c5bd4ca6 100755 --- a/keyboards/flashquark/horizon_z/info.json +++ b/keyboards/flashquark/horizon_z/info.json @@ -1,165 +1,160 @@ { "manufacturer": "FLASHQUARK", "keyboard_name": "Horizon_Z", - "url": "https://flashquark.com/product/flashquark-horizon-z-qmk-edition-custom-kit/", "maintainer": "FLASHQUARK", "bootloader": "atmel-dfu", "debounce": 3, "diode_direction": "COL2ROW", - "processor": "atmega32u4", - "rgb_matrix": { - "driver": "IS31FL3733" - "layout": [ - {"x": 0, "y": 0, "flags": 1}, - {"x": 0, "y": 0, "flags": 4 }, - {"x": 16, "y": 0, "flags": 4 }, - {"x": 32, "y": 0, "flags": 4 }, - {"x": 48, "y": 0, "flags": 4 }, - {"x": 64, "y": 0, "flags": 4 }, - {"x": 80, "y": 0, "flags": 4 }, - {"x": 96, "y": 0, "flags": 4 }, - {"x": 112, "y": 0, "flags": 4 }, - {"x": 128, "y": 0, "flags": 4 }, - {"x": 144, "y": 0, "flags": 4 }, - {"x": 160, "y": 0, "flags": 4 }, - {"x": 176, "y": 0, "flags": 4 }, - {"x": 192, "y": 0, "flags": 4 }, - {"x": 216, "y": 0, "flags": 1 }, - {"x": 4, "y": 16, "flags": 4 }, - {"x": 24, "y": 16, "flags": 4 }, - {"x": 40, "y": 16, "flags": 4 }, - {"x": 56, "y": 16, "flags": 4 }, - {"x": 72, "y": 16, "flags": 4 }, - {"x": 88, "y": 16, "flags": 4 }, - {"x": 104, "y": 16, "flags": 4 }, - {"x": 120, "y": 16, "flags": 4 }, - {"x": 136, "y": 16, "flags": 4 }, - {"x": 152, "y": 16, "flags": 4 }, - {"x": 168, "y": 16, "flags": 4 }, - {"x": 184, "y": 16, "flags": 4 }, - {"x": 200, "y": 16, "flags": 4 }, - {"x": 220, "y": 16, "flags": 4 }, - {"x": 6, "y": 32, "flags": 4 }, - {"x": 28, "y": 32, "flags": 4 }, - {"x": 44, "y": 32, "flags": 4 }, - {"x": 60, "y": 32, "flags": 4 }, - {"x": 76, "y": 32, "flags": 4 }, - {"x": 92, "y": 32, "flags": 4 }, - {"x": 108, "y": 32, "flags": 4 }, - {"x": 124, "y": 32, "flags": 4 }, - {"x": 140, "y": 32, "flags": 4 }, - {"x": 156, "y": 32, "flags": 4 }, - {"x": 172, "y": 32, "flags": 4 }, - {"x": 188, "y": 32, "flags": 4 }, - {"x": 204, "y": 32, "flags": 1 }, - {"x": 10, "y": 48, "flags": 1 }, - {"x": 20, "y": 48, "flags": 4 }, - {"x": 52, "y": 48, "flags": 4 }, - {"x": 68, "y": 48, "flags": 4 }, - {"x": 84, "y": 48, "flags": 4 }, - {"x": 100, "y": 48, "flags": 4 }, - {"x": 116, "y": 48, "flags": 4 }, - {"x": 132, "y": 48, "flags": 4 }, - {"x": 148, "y": 48, "flags": 4 }, - {"x": 164, "y": 48, "flags": 4 }, - {"x": 180, "y": 48, "flags": 4 }, - {"x": 210, "y": 48, "flags": 1 }, - {"x": 2, "y": 64, "flags": 1 }, - {"x": 22, "y": 64, "flags": 1 }, - {"x": 42, "y": 64, "flags": 1 }, - {"x": 102, "y": 64, "flags": 1 }, - {"x": 162, "y": 64, "flags": 1 }, - {"x": 182, "y": 64, "flags": 1 }, - {"x": 202, "y": 64, "flags": 1 }, - {"x": 222, "y": 64, "flags": 1 } - ] - }, - "usb": { - "device_version": "1.0.0", - "pid": "0x0223", - "vid": "0x4B42" - }, - "features": { + "features": { "bootmagic": true, "command": false, "console": false, "extrakey": true, "mousekey": true, - "rgb_matrix": true, - "nkro": true + "nkro": true, + "rgb_matrix": true }, - "matrix_pins": { - "rows": ["F0", "F1", "F4", "F5", "B4"] + "matrix_pins": { "cols": ["B5", "B6", "C6", "C7", "F7", "F6", "B0", "B1", "B2", "B3", "B7", "D2", "D3", "D5"], + "rows": ["F0", "F1", "F4", "F5", "B4"] + }, + "processor": "atmega32u4", + "rgb_matrix": { + "driver": "IS31FL3733", + "layout": [ + { "flags": 1, "matrix": [0, 0], "x": 0, "y": 0 }, + { "flags": 4, "matrix": [0, 1], "x": 16, "y": 0 }, + { "flags": 4, "matrix": [0, 2], "x": 32, "y": 0 }, + { "flags": 4, "matrix": [0, 3], "x": 48, "y": 0 }, + { "flags": 4, "matrix": [0, 4], "x": 64, "y": 0 }, + { "flags": 4, "matrix": [0, 5], "x": 80, "y": 0 }, + { "flags": 4, "matrix": [0, 6], "x": 96, "y": 0 }, + { "flags": 4, "matrix": [0, 7], "x": 112, "y": 0 }, + { "flags": 4, "matrix": [0, 8], "x": 128, "y": 0 }, + { "flags": 4, "matrix": [0, 9], "x": 144, "y": 0 }, + { "flags": 4, "matrix": [0, 10], "x": 160, "y": 0 }, + { "flags": 4, "matrix": [0, 11], "x": 176, "y": 0 }, + { "flags": 4, "matrix": [0, 12], "x": 192, "y": 0 }, + { "flags": 1, "matrix": [0, 13], "x": 216, "y": 0 }, + { "flags": 4, "matrix": [1, 0], "x": 4, "y": 16 }, + { "flags": 4, "matrix": [1, 1], "x": 24, "y": 16 }, + { "flags": 4, "matrix": [1, 2], "x": 40, "y": 16 }, + { "flags": 4, "matrix": [1, 3], "x": 56, "y": 16 }, + { "flags": 4, "matrix": [1, 4], "x": 72, "y": 16 }, + { "flags": 4, "matrix": [1, 5], "x": 88, "y": 16 }, + { "flags": 4, "matrix": [1, 6], "x": 104, "y": 16 }, + { "flags": 4, "matrix": [1, 7], "x": 120, "y": 16 }, + { "flags": 4, "matrix": [1, 8], "x": 136, "y": 16 }, + { "flags": 4, "matrix": [1, 9], "x": 152, "y": 16 }, + { "flags": 4, "matrix": [1, 10], "x": 168, "y": 16 }, + { "flags": 4, "matrix": [1, 11], "x": 184, "y": 16 }, + { "flags": 4, "matrix": [1, 12], "x": 200, "y": 16 }, + { "flags": 4, "matrix": [1, 13], "x": 220, "y": 16 }, + { "flags": 4, "matrix": [2, 0], "x": 6, "y": 32 }, + { "flags": 4, "matrix": [2, 1], "x": 28, "y": 32 }, + { "flags": 4, "matrix": [2, 2], "x": 44, "y": 32 }, + { "flags": 4, "matrix": [2, 3], "x": 60, "y": 32 }, + { "flags": 4, "matrix": [2, 4], "x": 76, "y": 32 }, + { "flags": 4, "matrix": [2, 5], "x": 92, "y": 32 }, + { "flags": 4, "matrix": [2, 6], "x": 108, "y": 32 }, + { "flags": 4, "matrix": [2, 7], "x": 124, "y": 32 }, + { "flags": 4, "matrix": [2, 8], "x": 140, "y": 32 }, + { "flags": 4, "matrix": [2, 9], "x": 156, "y": 32 }, + { "flags": 4, "matrix": [2, 10], "x": 172, "y": 32 }, + { "flags": 4, "matrix": [2, 11], "x": 188, "y": 32 }, + { "flags": 1, "matrix": [2, 13], "x": 204, "y": 32 }, + { "flags": 1, "matrix": [3, 0], "x": 10, "y": 48 }, + { "flags": 4, "matrix": [3, 1], "x": 20, "y": 48 }, + { "flags": 4, "matrix": [3, 2], "x": 52, "y": 48 }, + { "flags": 4, "matrix": [3, 3], "x": 68, "y": 48 }, + { "flags": 4, "matrix": [3, 4], "x": 84, "y": 48 }, + { "flags": 4, "matrix": [3, 5], "x": 100, "y": 48 }, + { "flags": 4, "matrix": [3, 6], "x": 116, "y": 48 }, + { "flags": 4, "matrix": [3, 7], "x": 132, "y": 48 }, + { "flags": 4, "matrix": [3, 8], "x": 148, "y": 48 }, + { "flags": 4, "matrix": [3, 9], "x": 164, "y": 48 }, + { "flags": 4, "matrix": [3, 10], "x": 180, "y": 48 }, + { "flags": 1, "matrix": [3, 13], "x": 210, "y": 48 }, + { "flags": 1, "matrix": [4, 0], "x": 2, "y": 64 }, + { "flags": 1, "matrix": [4, 1], "x": 22, "y": 64 }, + { "flags": 1, "matrix": [4, 2], "x": 42, "y": 64 }, + { "flags": 1, "matrix": [4, 5], "x": 102, "y": 64 }, + { "flags": 1, "matrix": [4, 9], "x": 162, "y": 64 }, + { "flags": 1, "matrix": [4, 10], "x": 182, "y": 64 }, + { "flags": 1, "matrix": [4, 12], "x": 202, "y": 64 }, + { "flags": 1, "matrix": [4, 13], "x": 222, "y": 64 } + ] + }, + "url": "https://flashquark.com/product/flashquark-horizon-z-qmk-edition-custom-kit/", + "usb": { + "device_version": "1.0.0", + "pid": "0x0223", + "vid": "0x4B42" }, "layouts": { "LAYOUT_60_ansi": { "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [0, 2], "x": 2, "y": 0}, - {"matrix": [0, 3], "x": 3, "y": 0}, - {"matrix": [0, 4], "x": 4, "y": 0}, - {"matrix": [0, 5], "x": 5, "y": 0}, - {"matrix": [0, 6], "x": 6, "y": 0}, - {"matrix": [0, 7], "x": 7, "y": 0}, - {"matrix": [0, 8], "x": 8, "y": 0}, - {"matrix": [0, 9], "x": 9, "y": 0}, - {"matrix": [0, 10], "x": 10, "y": 0}, - {"matrix": [0, 11], "x": 11, "y": 0}, - {"matrix": [0, 12], "x": 12, "y": 0}, - {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, - - {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, - {"matrix": [1, 1], "x": 1.5, "y": 1}, - {"matrix": [1, 2], "x": 2.5, "y": 1}, - {"matrix": [1, 3], "x": 3.5, "y": 1}, - {"matrix": [1, 4], "x": 4.5, "y": 1}, - {"matrix": [1, 5], "x": 5.5, "y": 1}, - {"matrix": [1, 6], "x": 6.5, "y": 1}, - {"matrix": [1, 7], "x": 7.5, "y": 1}, - {"matrix": [1, 8], "x": 8.5, "y": 1}, - {"matrix": [1, 9], "x": 9.5, "y": 1}, - {"matrix": [1, 10], "x": 10.5, "y": 1}, - {"matrix": [1, 11], "x": 11.5, "y": 1}, - {"matrix": [1, 12], "x": 12.5, "y": 1}, - {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, - - {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, - {"matrix": [2, 1], "x": 1.75, "y": 2}, - {"matrix": [2, 2], "x": 2.75, "y": 2}, - {"matrix": [2, 3], "x": 3.75, "y": 2}, - {"matrix": [2, 4], "x": 4.75, "y": 2}, - {"matrix": [2, 5], "x": 5.75, "y": 2}, - {"matrix": [2, 6], "x": 6.75, "y": 2}, - {"matrix": [2, 7], "x": 7.75, "y": 2}, - {"matrix": [2, 8], "x": 8.75, "y": 2}, - {"matrix": [2, 9], "x": 9.75, "y": 2}, - {"matrix": [2, 10], "x": 10.75, "y": 2}, - {"matrix": [2, 11], "x": 11.75, "y": 2}, - {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, - - {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, - {"matrix": [3, 1], "x": 2.25, "y": 3}, - {"matrix": [3, 2], "x": 3.25, "y": 3}, - {"matrix": [3, 3], "x": 4.25, "y": 3}, - {"matrix": [3, 4], "x": 5.25, "y": 3}, - {"matrix": [3, 5], "x": 6.25, "y": 3}, - {"matrix": [3, 6], "x": 7.25, "y": 3}, - {"matrix": [3, 7], "x": 8.25, "y": 3}, - {"matrix": [3, 8], "x": 9.25, "y": 3}, - {"matrix": [3, 9], "x": 10.25, "y": 3}, - {"matrix": [3, 10], "x": 11.25, "y": 3}, - {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75}, - - {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, - {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, - {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, - {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25}, - {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25}, - {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25}, - {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25}, - {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25} + { "matrix": [0, 0], "x": 0, "y": 0 }, + { "matrix": [0, 1], "x": 1, "y": 0 }, + { "matrix": [0, 2], "x": 2, "y": 0 }, + { "matrix": [0, 3], "x": 3, "y": 0 }, + { "matrix": [0, 4], "x": 4, "y": 0 }, + { "matrix": [0, 5], "x": 5, "y": 0 }, + { "matrix": [0, 6], "x": 6, "y": 0 }, + { "matrix": [0, 7], "x": 7, "y": 0 }, + { "matrix": [0, 8], "x": 8, "y": 0 }, + { "matrix": [0, 9], "x": 9, "y": 0 }, + { "matrix": [0, 10], "x": 10, "y": 0 }, + { "matrix": [0, 11], "x": 11, "y": 0 }, + { "matrix": [0, 12], "x": 12, "y": 0 }, + { "matrix": [0, 13], "w": 2, "x": 13, "y": 0 }, + { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, + { "matrix": [1, 1], "x": 1.5, "y": 1 }, + { "matrix": [1, 2], "x": 2.5, "y": 1 }, + { "matrix": [1, 3], "x": 3.5, "y": 1 }, + { "matrix": [1, 4], "x": 4.5, "y": 1 }, + { "matrix": [1, 5], "x": 5.5, "y": 1 }, + { "matrix": [1, 6], "x": 6.5, "y": 1 }, + { "matrix": [1, 7], "x": 7.5, "y": 1 }, + { "matrix": [1, 8], "x": 8.5, "y": 1 }, + { "matrix": [1, 9], "x": 9.5, "y": 1 }, + { "matrix": [1, 10], "x": 10.5, "y": 1 }, + { "matrix": [1, 11], "x": 11.5, "y": 1 }, + { "matrix": [1, 12], "x": 12.5, "y": 1 }, + { "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 }, + { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, + { "matrix": [2, 1], "x": 1.75, "y": 2 }, + { "matrix": [2, 2], "x": 2.75, "y": 2 }, + { "matrix": [2, 3], "x": 3.75, "y": 2 }, + { "matrix": [2, 4], "x": 4.75, "y": 2 }, + { "matrix": [2, 5], "x": 5.75, "y": 2 }, + { "matrix": [2, 6], "x": 6.75, "y": 2 }, + { "matrix": [2, 7], "x": 7.75, "y": 2 }, + { "matrix": [2, 8], "x": 8.75, "y": 2 }, + { "matrix": [2, 9], "x": 9.75, "y": 2 }, + { "matrix": [2, 10], "x": 10.75, "y": 2 }, + { "matrix": [2, 11], "x": 11.75, "y": 2 }, + { "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 }, + { "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 }, + { "matrix": [3, 1], "x": 2.25, "y": 3 }, + { "matrix": [3, 2], "x": 3.25, "y": 3 }, + { "matrix": [3, 3], "x": 4.25, "y": 3 }, + { "matrix": [3, 4], "x": 5.25, "y": 3 }, + { "matrix": [3, 5], "x": 6.25, "y": 3 }, + { "matrix": [3, 6], "x": 7.25, "y": 3 }, + { "matrix": [3, 7], "x": 8.25, "y": 3 }, + { "matrix": [3, 8], "x": 9.25, "y": 3 }, + { "matrix": [3, 9], "x": 10.25, "y": 3 }, + { "matrix": [3, 10], "x": 11.25, "y": 3 }, + { "matrix": [3, 13], "w": 2.75, "x": 12.25, "y": 3 }, + { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 }, + { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 }, + { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 }, + { "matrix": [4, 5], "w": 6.25, "x": 3.75, "y": 4 }, + { "matrix": [4, 9], "w": 1.25, "x": 10, "y": 4 }, + { "matrix": [4, 10], "w": 1.25, "x": 11.25, "y": 4 }, + { "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4 }, + { "matrix": [4, 13], "w": 1.25, "x": 13.75, "y": 4 } ] } } From 00c6a496b645ebfac4bc58a0f7f5cd6e776ffca8 Mon Sep 17 00:00:00 2001 From: jack <0x6a73@protonmail.com> Date: Sun, 11 Jun 2023 01:54:34 -0600 Subject: [PATCH 8/8] Update keyboards/flashquark/horizon_z/info.json --- keyboards/flashquark/horizon_z/info.json | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/flashquark/horizon_z/info.json b/keyboards/flashquark/horizon_z/info.json index 70a9c5bd4ca6..3e299442c542 100755 --- a/keyboards/flashquark/horizon_z/info.json +++ b/keyboards/flashquark/horizon_z/info.json @@ -91,6 +91,7 @@ "pid": "0x0223", "vid": "0x4B42" }, + "community_layouts": ["60_ansi"], "layouts": { "LAYOUT_60_ansi": { "layout": [