diff --git a/keyboards/zompi/config.h b/keyboards/zompi/config.h index 5d987153dd..15024ea6d8 100644 --- a/keyboards/zompi/config.h +++ b/keyboards/zompi/config.h @@ -20,8 +20,8 @@ #define VENDOR_ID 0xA8F8 #define PRODUCT_ID 0x1830 #define DEVICE_VER 0x0001 -#define MANUFACTURER tompi -#define PRODUCT Zompi +#define MANUFACTURER "tompi" +#define PRODUCT "Zompi" #define SOFT_SERIAL_PIN GP0 #define CRC8_USE_TABLE @@ -43,9 +43,37 @@ //#define OLED_FONT_H "keyboards/mlego/m65/lib/glcdfont.c" #endif -/* RGB settings. */ -#define RGBLED_NUM 3 - #define RGBLED_SPLIT { 18, 18 } -# define RGB_DI_PIN GP14 -# define DRIVER_LED_TOTAL 3 +#ifdef RGB_MATRIX_ENABLE +# define RGBLED_NUM 6 +# define RGBLED_SPLIT { 3,3 } +# define RGB_DI_PIN GP14 +# define DRIVER_LED_TOTAL 6 + + /* Enable Framebuffer and keypress effects */ +# define RGB_MATRIX_FRAMEBUFFER_EFFECTS +# define RGB_MATRIX_KEYPRESSES + +# 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_HUE_BREATHING +# define ENABLE_RGB_MATRIX_PIXEL_RAIN +# define ENABLE_RGB_MATRIX_PIXEL_FLOW +# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL +# define ENABLE_RGB_MATRIX_TYPING_HEATMAP +# define ENABLE_RGB_MATRIX_DIGITAL_RAIN +# 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 +#endif diff --git a/keyboards/zompi/info.json b/keyboards/zompi/info.json index 2d2d6a5f60..b8eb86b66c 100644 --- a/keyboards/zompi/info.json +++ b/keyboards/zompi/info.json @@ -20,7 +20,7 @@ "backlight": false, "bootmagic": true, "command": false, - "console": false, + "console": true, "encoder": true, "extrakey": true, "mousekey": true, diff --git a/keyboards/zompi/keymaps/default/keymap.c b/keyboards/zompi/keymaps/default/keymap.c index a5159a9b20..ea247aae43 100644 --- a/keyboards/zompi/keymaps/default/keymap.c +++ b/keyboards/zompi/keymaps/default/keymap.c @@ -24,7 +24,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, + // KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, + RGB_MOD, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, RGB_MOD, //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| KC_LGUI, KC_SPC , MO(1), MO(2), KC_ENT , KC_RALT //`--------------------------' `--------------------------' diff --git a/keyboards/zompi/rules.mk b/keyboards/zompi/rules.mk index 7f451fb890..c396141634 100644 --- a/keyboards/zompi/rules.mk +++ b/keyboards/zompi/rules.mk @@ -15,7 +15,7 @@ LTO_ENABLE = yes AUDIO_SUPPORTED = no RGB_MATRIX_SUPPORTED = yes -RGBLIGHT_ENABLE = yes +#RGBLIGHT_ENABLE = yes ##BACKLIGHT_ENABLE = yes SERIAL_DRIVER = vendor diff --git a/keyboards/zompi/zompi.c b/keyboards/zompi/zompi.c index bf5931c88b..8062916dbf 100644 --- a/keyboards/zompi/zompi.c +++ b/keyboards/zompi/zompi.c @@ -17,6 +17,24 @@ #include "zompi.h" +#ifdef RGB_MATRIX + led_config_t g_led_config = { { + { 1, 2, 1, 1, 1 }, + { 1, 2, 1, 1, 1 }, + { 1, 2, 1, 1, 1 }, + { 1, 2, 1, 1, 1 }, + { 1, 2, 1, 1, 1 }, + { 1, 2, 1, 1, 1 }, + { 1, 2, 1, 1, 1 }, + { 1, 2, 1, 1, 1 } + }, { + { 85, 16 }, { 50, 13 }, { 16, 20 }, { 16, 38 }, { 50, 48 }, { 85, 52 } + }, { + 4, 4, 4, 4, 4, 4 + } }; +#endif + + #ifdef OLED_ENABLE static void render_logo(void) { static const char PROGMEM raw_logo[] = { @@ -93,10 +111,8 @@ static void render_status(void) { } bool oled_task_kb(void) { - render_logo(); - return true; if (!oled_task_user()) { return false; } - if (is_keyboard_left()) { + if (is_keyboard_left()) { render_status(); // Renders the current keyboard state (layer, lock, caps, scroll, etc) } else { render_logo(); @@ -140,14 +156,3 @@ bool encoder_update_user(uint8_t index, bool clockwise) { return false; } -/* RGB Positioning */ - led_config_t g_led_config = { { - { 0, 1, 2 }, - { 3, 4, 5 }, - { 6, 7, 8 }, - { 9, 10, 11 } - }, { - { 0, 0 }, { 112, 0 }, { 224, 0} - }, { - - } };