From c6ce79f518a064843ce5bcde70f27ac504de5085 Mon Sep 17 00:00:00 2001 From: doryan Date: Sat, 27 Apr 2024 21:09:29 +0400 Subject: [PATCH] fixed some things in keymaps and config file --- firmware/config.h | 23 ++++++------ firmware/info.json | 12 +++---- firmware/keymaps/default/keymap.c | 58 +++++++++++++++++-------------- firmware/keymaps/via/keymap.c | 47 ++++++++++++++++++------- firmware/rev1/config.h | 10 +++--- firmware/rev1/rev1.c | 38 +++++++++----------- firmware/rev1/rev1.h | 4 +-- firmware/rules.mk | 22 ++++++------ 8 files changed, 119 insertions(+), 95 deletions(-) diff --git a/firmware/config.h b/firmware/config.h index bd13224..1d8bf25 100644 --- a/firmware/config.h +++ b/firmware/config.h @@ -1,25 +1,23 @@ #pragma once -#include "config_common.h" - -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0001 -#define MANUFACTURER DlSgv_and_NM17 -#define PRODUCT Angelwings Keyboard -#define DESCRIPTION Split 40 percent ergo-keyboard +#define VENDOR_ID 0xFEED +#define PRODUCT_ID 0x0000 +#define DEVICE_VER 0x0001 +#define LMANUFACTURER "DRN04" /* key matrix size */ /* Rows are doubled up */ #define MATRIX_ROWS 8 #define MATRIX_COLS 7 -#define MATRIX_ROW_PINS { D4, C6, D7, E6 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 } +#define MATRIX_ROW_PINS \ + { D4, C6, D7, E6 } +#define MATRIX_COL_PINS \ + { F4, F5, F6, F7, B1, B3, B2 } #define UNUSED_PINS /* define if matrix has ghost (lacks anti-ghosting diodes) */ -//#define MATRIX_HAS_GHOST +// #define MATRIX_HAS_GHOST /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ #define DEBOUNCE 5 @@ -28,4 +26,5 @@ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN. */ -#define RGBLED_NUM 46 \ No newline at end of file +#define RGBLED_NUM 46 +#define RGB_MATRIX_LED_COUNT 64 diff --git a/firmware/info.json b/firmware/info.json index 0bb11ca..01eb33c 100644 --- a/firmware/info.json +++ b/firmware/info.json @@ -1,7 +1,7 @@ { - "keyboard_name": "AngelWings", - "url": "", - "maintainer": "Doryan and NM17", + "keyboard_name": "AngelWings", + "url": "", + "manufacturer": "Doryan and NM17", "layouts": { "LAYOUT_3x7": { "layout": [ @@ -207,7 +207,7 @@ "x": 15.5, "y": 3.75 }, - + { "label": "Rise", "x": 5, @@ -427,7 +427,7 @@ "x": 15.5, "y": 3.75 }, - + { "label": "Rise", "x": 5, @@ -464,4 +464,4 @@ ] } } -} \ No newline at end of file +} diff --git a/firmware/keymaps/default/keymap.c b/firmware/keymaps/default/keymap.c index f07d2f2..df2f66f 100644 --- a/firmware/keymaps/default/keymap.c +++ b/firmware/keymaps/default/keymap.c @@ -11,14 +11,14 @@ enum layers { #define KC_XXXXX KC_NO #define KC_LOWER KC_LWR #define KC_RAISE KC_RSE -#define KC_LTOG RGB_TOG -#define KC_LHUI RGB_HUI -#define KC_LHUD RGB_HUD -#define KC_LSAI RGB_SAI -#define KC_LSAD RGB_SAD -#define KC_LVAI RGB_VAI -#define KC_LVAD RGB_VAD -#define KC_LMOD RGB_MOD +#define KC_LTOG RGB_TOG +#define KC_LHUI RGB_HUI +#define KC_LHUD RGB_HUD +#define KC_LSAI RGB_SAI +#define KC_LSAD RGB_SAD +#define KC_LVAI RGB_VAI +#define KC_LVAD RGB_VAD +#define KC_LMOD RGB_MOD #define KC_LWR MO(_LOWER) #define KC_RSE MO(_RAISE) #define BSL_RAL MT(MOD_RALT, KC_BSLS) @@ -30,36 +30,42 @@ enum layers { #define ENT_LWR LT(_LOWER, KC_ENT) #define PUP_ADJ LT(_ADJUST, KC_PGUP) #define PDN_ADJ LT(_ADJUST, KC_PGDN) +#define RCTL_QT RCTL_T(KC_QUOT) +#define KC_SCRL KC_SCROLL_LOCK +#define KC_NLCK KC_NUM_LOCK const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_QWERTY] = LAYOUT_3x7( - KC_ESC, KC_GRV, 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_PGUP, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, RCTL_T(KC_QUOT), KC_PGDN, - KC_LALT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, BSL_RAL, - DEL_RSE, BSP_LSH, GUI_LWR, ENT_LWR, SPC_RSH, TAB_RSE + KC_ESC, KC_GRV, 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_PGUP, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, RCTL_QT, KC_PGDN, + KC_LALT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, BSL_RAL, + DEL_RSE, BSP_LSH, GUI_LWR, ENT_LWR, SPC_RSH, TAB_RSE ), [_LOWER] = LAYOUT_3x7( - KC_MUTE, KC_UNDS, 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_PPLS, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_EQL, _______, - KC_PMNS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, - _______, _______, _______, _______, _______, _______ + _______, KC_UNDS, 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_PPLS, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PMNS, _______, + KC_PEQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, + _______, _______, _______, _______, _______, _______ ), - [_RAISE] = LAYOUT_3x7( - _______, KC_NLCK, KC_PSLS, KC_P7, KC_P8, KC_P9, KC_PMNS, _______, KC_END, KC_HOME, KC_PSCR, KC_SLCK, KC_CAPS, _______, - KC_VOLU, KC_PEQL, KC_PAST, KC_P4, KC_P5, KC_P6, KC_PPLS, _______, KC_LEFT, KC_UP, KC_RGHT, KC_INS, KC_APP, KC_VOLD, - _______, KC_P0, KC_P1, KC_P2, KC_P3, KC_PCMM, _______, KC_END, KC_DOWN, KC_PGDN, KC_PAUS, _______, - _______, _______, _______, _______, _______, _______ + [_RAISE] = LAYOUT_3x7( + KC_MUTE, KC_NLCK, KC_PSLS, KC_P7, KC_P8, KC_P9, KC_PMNS, _______, KC_HOME, KC_PSCR, KC_PAUS, KC_SCRL, KC_CAPS, KC_END, + KC_VOLU, KC_PEQL, KC_PAST, KC_P4, KC_P5, KC_P6, KC_PPLS, _______, KC_LEFT, KC_UP, KC_RGHT, KC_INS, KC_APP, KC_VOLD, + _______, KC_P0, KC_P1, KC_P2, KC_P3, KC_PCMM, _______, KC_END, KC_DOWN, _______, _______, _______, + _______, _______, _______, _______, _______, _______ ), + [_ADJUST] = LAYOUT_3x7( - _______, _______, KC_ASUP, KC_ASTG, KC_ASDN, _______, _______, KC_WH_U, KC_BTN1, KC_ACL1, KC_BTN2, _______, _______, _______, - _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, KC_WH_D, KC_MS_L, KC_MS_U, KC_MS_R, _______, _______, _______, - RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, KC_ACL0, KC_MS_D, KC_ACL2, _______, _______, - _______, _______, _______, _______, _______, _______ + _______, _______, _______, _______, _______, _______, _______, KC_WH_U, KC_BTN1, KC_ACL1, KC_BTN2, _______, _______, _______, + _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, KC_WH_D, KC_MS_L, KC_MS_U, KC_MS_R, _______, _______, _______, + RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, KC_ACL0, KC_MS_D, KC_ACL2, _______, _______, + _______, _______, _______, _______, _______, _______ ), + }; layer_state_t layer_state_set_user(layer_state_t state) { return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); -} \ No newline at end of file +} diff --git a/firmware/keymaps/via/keymap.c b/firmware/keymaps/via/keymap.c index abfcb22..446ef58 100644 --- a/firmware/keymaps/via/keymap.c +++ b/firmware/keymaps/via/keymap.c @@ -1,32 +1,55 @@ #include QMK_KEYBOARD_H -#define _______ KC_TRANSPARENT +#define _______ KC_TRANSPARENT + +#define RSE_DEL LT(2, KC_DEL) +#define RSE_TAB LT(2, KC_TAB) + +#define LSH_BSP MT(MOD_LSFT, KC_BSPC) +#define RSH_SPC MT(MOD_RSFT, KC_SPC) + +#define LWR_ESC LT(1, KC_ESC) +#define LWR_ENT LT(1, KC_ENT) + +#define RALT_BSLS RALT_T(KC_BSLS) +#define RCTL_QUOT RCTL_T(KC_QUOTE) +#define RCTL_APP RCTL_T(KC_APP) + +#define KC_SCRL KC_SCROLL_LOCK +#define KC_NLCK KC_NUM_LOCK const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_3x7( - KC_ESC, KC_GRV, 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_PGUP, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, RCTL_T(KC_QUOT), KC_PGDN, - KC_LALT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, MT(MOD_RALT, KC_BSLS), - LT(2, KC_DEL), MT(MOD_LSFT, KC_BSPC), LT(1, KC_LGUI), LT(1, KC_ENT), MT(MOD_RSFT, KC_SPC), LT(2, KC_TAB) + KC_LGUI, KC_GRV, 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_PGUP, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, RCTL_QUOT, KC_PGDN, + KC_LALT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, RALT_BSLS, + RSE_DEL, LSH_BSP, LWR_ESC, LWR_ENT, RSH_SPC, RSE_TAB ), [1] = LAYOUT_3x7( _______, KC_UNDS, 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_PPLS, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_EQL, _______, - KC_PMNS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, + _______, KC_PPLS, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PMNS, _______, + KC_PEQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, MO(3) , _______, _______, _______, _______, MO(3) ), [2] = LAYOUT_3x7( - KC_MUTE, KC_NLCK, KC_PSLS, KC_P7, KC_P8, KC_P9, KC_PMNS, _______, KC_HOME, KC_PSCR, KC_PAUS, KC_SLCK, KC_CAPS, KC_END, - KC_VOLU, KC_PEQL, KC_PAST, KC_P4, KC_P5, KC_P6, KC_PPLS, _______, KC_LEFT, KC_UP, KC_RGHT, KC_INS, MT(MOD_RCTL, KC_APP), KC_VOLD, - _______, KC_P0, KC_P1, KC_P2, KC_P3, KC_PCMM, _______, KC_END, KC_DOWN, _______, _______, _______, + KC_MUTE, KC_NLCK, KC_PSLS, KC_P7, KC_P8, KC_P9, KC_PMNS, _______, KC_HOME, KC_PSCR, KC_PAUS, KC_SCRL, KC_CAPS, KC_END, + KC_VOLU, KC_PEQL, KC_PAST, KC_P4, KC_P5, KC_P6, KC_PPLS, _______, KC_LEFT, KC_UP, KC_RGHT, KC_INS, RCTL_T(KC_APP), KC_VOLD, + _______, KC_P0, KC_P1, KC_P2, KC_P3, KC_PCMM, _______, KC_END, KC_DOWN, _______, _______, _______, _______, _______, MO(3) , MO(3) , _______, _______ ), [3] = LAYOUT_3x7( - _______, _______, KC_ASUP, KC_ASTG, KC_ASDN, _______, _______, KC_WH_U, KC_BTN1, KC_ACL1, KC_BTN2, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, KC_WH_U, KC_BTN1, KC_ACL1, KC_BTN2, _______, _______, _______, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, KC_WH_D, KC_MS_L, KC_MS_U, KC_MS_R, _______, _______, _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, KC_ACL0, KC_MS_D, KC_ACL2, _______, _______, _______, _______, _______, _______, _______, _______ ), -}; \ No newline at end of file +}; + + + + + + + diff --git a/firmware/rev1/config.h b/firmware/rev1/config.h index 445edb6..3408448 100644 --- a/firmware/rev1/config.h +++ b/firmware/rev1/config.h @@ -2,17 +2,17 @@ #define USE_SERIAL #define SOFT_SERIAL_PIN D3 -#define RGB_DI_PIN D2 +#define WS2812_DI_PIN D2 #ifdef RGB_MATRIX_ENABLE -# define RGBLED_NUM 46 +# define RGBLED_NUM 46 # define DRIVER_LED_TOTAL RGBLED_NUM # define RGB_MATRIX_SPLIT \ { 23, 23 } -# define RGB_DISABLE_AFTER_TIMEOUT 0 -# define RGB_DISABLE_WHEN_USB_SUSPENDED -# define RGB_MATRIX_FRAMEBUFFER_EFFECTS +# define RGB_DISABLE_AFTER_TIMEOUT 0 +# define RGB_DISABLE_WHEN_USB_SUSPENDED +# define RGB_MATRIX_FRAMEBUFFER_EFFECTS # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 130 # define RGB_MATRIX_HUE_STEP 8 # define RGB_MATRIX_SAT_STEP 8 diff --git a/firmware/rev1/rev1.c b/firmware/rev1/rev1.c index aa57a4e..6ae736c 100644 --- a/firmware/rev1/rev1.c +++ b/firmware/rev1/rev1.c @@ -2,34 +2,30 @@ #ifdef RGB_MATRIX_ENABLE -led_config_t g_led_config = { +#define __ NO_LED + +led_config_t g_led_config = { { { 23, 19, 18, 13, 12, 5, 4 }, { 22, 20, 17, 14, 11, 6, 3 }, - { NO_LED, 21, 16, 15, 10, 7, 2 }, - { NO_LED, NO_LED, NO_LED, NO_LED, 9, 8, 1 }, + { __, 21, 16, 15, 10, 7, 2 }, + { __, __, __, __, 9, 8, 1 }, { 46, 42, 41, 36, 35, 28, 27 }, { 45, 43, 40, 37, 34, 29, 26 }, - { NO_LED, 44, 39, 38, 33, 30, 25 }, - { NO_LED, NO_LED, NO_LED, NO_LED, 32, 31, 24 }, + { __, 44, 39, 38, 33, 30, 25 }, + { __, __, __, __, 32, 31, 24 }, }, { - { 110, 63 }, { 102, 46 }, { 102, 25 }, { 102, 4 }, { 85, 2 }, { 85, 23 }, { 85, 44 }, - { 98, 63 }, { 76, 63 }, { 68, 42 }, { 68, 21 }, { 68, 0 }, { 51, 5 }, { 51, 26 }, - { 51, 47 }, { 34, 54 }, { 34, 33 }, { 34, 12 }, { 17, 15 }, { 17, 36 }, { 17, 57 }, - { 0, 51 }, { 0, 30 }, { 120, 63 }, { 128, 46 }, { 128, 25 }, { 128, 4 }, { 145, 2 }, - { 145, 23 }, { 145, 44 }, { 132, 63 }, { 162, 63 }, { 162, 42 }, { 162, 21 }, { 162, 0 }, - { 179, 5 }, { 179, 26 }, { 179, 47 }, { 196, 54 }, { 196, 33 }, { 196, 12 }, { 213, 15 }, - { 213, 36 }, { 213, 57 }, { 230, 51 }, { 230, 30 } - }, + { 110, 63 }, { 102, 46 }, { 102, 25 }, { 102, 4 }, { 85, 2 }, { 85, 23 }, { 85, 44 }, { 98, 63 }, { 76, 63 }, { 68, 42 }, { 68, 21 }, { 68, 0 }, { 51, 5 }, { 51, 26 }, + { 51, 47 }, { 34, 54 }, { 34, 33 }, { 34, 12 }, { 17, 15 }, { 17, 36 }, { 17, 57 }, { 0, 51 }, { 0, 30 }, { 120, 63 }, { 128, 46 }, { 128, 25 }, { 128, 4 }, { 145, 2 }, + { 145, 23 }, { 145, 44 }, { 132, 63 }, { 162, 63 }, { 162, 42 }, { 162, 21 }, { 162, 0 }, { 179, 5 }, { 179, 26 }, { 179, 47 }, { 196, 54 }, { 196, 33 }, + { 196, 12 }, { 213, 15 }, { 213, 36 }, { 213, 57 }, { 230, 51 }, { 230, 30 } + }, { - 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, 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, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 4, + 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, + 8, 1, 8, 8, 1, 8, } }; @@ -42,4 +38,4 @@ void suspend_wakeup_init_kb(void) { rgb_matrix_set_suspend_state(false); suspend_wakeup_init_user(); } -#endif \ No newline at end of file +#endif diff --git a/firmware/rev1/rev1.h b/firmware/rev1/rev1.h index 12685f6..93c44a9 100644 --- a/firmware/rev1/rev1.h +++ b/firmware/rev1/rev1.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "quantum.h" #include "angelwings.h" @@ -39,4 +39,4 @@ {XXX, XXX, XXX, XXX, R32, R31, R30} \ } -#define LAYOUT LAYOUT_3x7 \ No newline at end of file +#define LAYOUT LAYOUT_3x7 diff --git a/firmware/rules.mk b/firmware/rules.mk index 02d899c..dd4de17 100644 --- a/firmware/rules.mk +++ b/firmware/rules.mk @@ -6,22 +6,22 @@ EXTRAKEY_ENABLE = yes CONSOLE_ENABLE = no COMMAND_ENABLE = no SLEEP_LED_ENABLE = no -NKRO_ENABLE = no -BACKLIGHT_ENABLE = no -MIDI_ENABLE = no -UNICODE_ENABLE = no -BLUETOOTH_ENABLE = no -AUDIO_ENABLE = no -FAUXCLICKY_ENABLE = no -HD44780_ENABLE = no -SPLIT_KEYBOARD = yes +NKRO_ENABLE = no +BACKLIGHT_ENABLE = no +MIDI_ENABLE = no +UNICODE_ENABLE = no +BLUETOOTH_ENABLE = no +AUDIO_ENABLE = no +FAUXCLICKY_ENABLE = no +HD44780_ENABLE = no +SPLIT_KEYBOARD = yes RGBLIGHT_ENABLE = no RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = WS2812 +RGB_MATRIX_DRIVER = ws2812 DEFAULT_FOLDER = angelwings/rev1 RGBLIGHT_SUPPORTED = no LTO_ENABLE = yes RGB_MATRIX_SUPPORTED = yes -LAYOUTS = 3x7 3x6 \ No newline at end of file +LAYOUTS = 3x7 3x6