From d70a345aff8742d45339e757df15081ddbc8428b Mon Sep 17 00:00:00 2001 From: Patrick Collins Date: Wed, 20 Dec 2023 13:53:27 -0500 Subject: [PATCH] Tweak infernum firmware, my layout --- firmware/infernum/config.h | 20 +++--- firmware/infernum/info.json | 16 ++++- firmware/infernum/rules.mk | 14 ---- keyboards/infernum/keymaps/patcoll/keymap.c | 79 --------------------- 4 files changed, 23 insertions(+), 106 deletions(-) diff --git a/firmware/infernum/config.h b/firmware/infernum/config.h index e883d33..26618d4 100644 --- a/firmware/infernum/config.h +++ b/firmware/infernum/config.h @@ -3,8 +3,6 @@ #pragma once -#include "config_common.h" - /* * Feature disable options * These options are also useful to firmware size reduction. @@ -30,23 +28,23 @@ #define ENCODER_DIRECTION_FLIP /* Set 0 if debouncing isn't needed */ -#define Debounce 5 +// #define DEBOUNCE 5 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE +// #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE +// #define LOCKING_RESYNC_ENABLE /* Bootmagic Lite key configuration */ -#define BOOTMAGIC_LITE_ROW 0 -#define BOOTMAGIC_LITE_COLUMN 0 +// #define BOOTMAGIC_LITE_ROW 0 +// #define BOOTMAGIC_LITE_COLUMN 0 /* RGB Stuff */ -#define RGB_DI_PIN GP29 -#define DRIVER_LED_TOTAL 22 -#define RGBLED_NUM 22 -#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 125 +// #define RGB_DI_PIN GP29 +// #define DRIVER_LED_TOTAL 22 +// #define RGBLED_NUM 22 +// #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 125 #define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS * 3/4 #define ENABLE_RGB_MATRIX_ALPHAS_MODS diff --git a/firmware/infernum/info.json b/firmware/infernum/info.json index 93e1cf9..19e127b 100644 --- a/firmware/infernum/info.json +++ b/firmware/infernum/info.json @@ -10,13 +10,17 @@ "device_version": "0.0.1" }, "features": { + "audio": false, + "backlight": false, "bootmagic": true, "command": false, "console": false, "encoder": true, "extrakey": true, "mousekey": true, - "nkro": true + "nkro": true, + "rgblight": false, + "rgb_matrix": true }, "encoder": { "rotary": [ @@ -24,6 +28,14 @@ { "pin_a": "GP12", "pin_b": "GP11", "resolution": 4 } ] }, + "rgb_matrix": { + "led_count": 22, + "driver": "ws2812" + }, + "ws2812": { + "driver": "vendor", + "pin": "GP29" + }, "diode_direction": "COL2ROW", "matrix_pins": { "rows": ["GP8", "GP9", "GP14", "GP10"], @@ -73,4 +85,4 @@ ] } } -} \ No newline at end of file +} diff --git a/firmware/infernum/rules.mk b/firmware/infernum/rules.mk index 7d5b364..e69de29 100644 --- a/firmware/infernum/rules.mk +++ b/firmware/infernum/rules.mk @@ -1,14 +0,0 @@ - -# Build Options -# change yes to no to disable -# -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes - -RGB_MATRIX_SUPPORTED = yes -RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = WS2812 - -WS2812_DRIVER = vendor diff --git a/keyboards/infernum/keymaps/patcoll/keymap.c b/keyboards/infernum/keymaps/patcoll/keymap.c index d4a3641..8cb8b2a 100644 --- a/keyboards/infernum/keymaps/patcoll/keymap.c +++ b/keyboards/infernum/keymaps/patcoll/keymap.c @@ -1,82 +1,3 @@ -/* #include QMK_KEYBOARD_H */ -/* */ -/* const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ -/* [0] = LAYOUT( */ -/* KC_Q, KC_W, KC_E, KC_R, KC_T, KC_MPLY, KC_Y, KC_U, KC_I, KC_O, KC_P, */ -/* KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, */ -/* KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, */ -/* KC_LCTL, KC_LALT, KC_SPC, KC_MUTE, KC_BSPC, KC_RGUI, KC_RALT */ -/* ), */ -/* [1] = LAYOUT( */ -/* KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, */ -/* KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, */ -/* KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, */ -/* KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS */ -/* */ -/* ), */ -/* */ -/* [2] = LAYOUT( */ -/* KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, */ -/* KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, */ -/* KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, */ -/* KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS */ -/* ), */ -/* */ -/* [3] = LAYOUT( */ -/* KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, */ -/* KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, */ -/* KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, */ -/* KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS */ -/* ), */ -/* */ -/* [4] = LAYOUT( */ -/* KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, */ -/* KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, */ -/* KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, */ -/* KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS */ -/* ), */ -/* */ -/* [5] = LAYOUT( */ -/* KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, */ -/* KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, */ -/* KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, */ -/* KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS */ -/* ), */ -/* */ -/* [6] = LAYOUT( */ -/* KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, */ -/* KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, */ -/* KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, */ -/* KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS */ -/* ), */ -/* */ -/* [7] = LAYOUT( */ -/* KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, */ -/* KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, */ -/* KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, */ -/* KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS */ -/* ), */ -/* */ -/* }; */ -/* */ -/* #if defined(ENCODER_MAP_ENABLE) */ -/* const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { */ -/* [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, */ -/* [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, */ -/* [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, */ -/* [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, */ -/* [4] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, */ -/* [5] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, */ -/* [6] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, */ -/* [7] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, */ -/* // Encoder 1 Encoder 2 */ -/* }; */ -/* #endif */ -/* */ -/* bool process_record_user(uint16_t keycode, keyrecord_t *record) { */ -/* return true; */ -/* } */ - #include "patcoll.h" #define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__)