doryan
/
AWF
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: doryan:cd9f0c9c50858e6563a76f60429189fea838cfa7
Branches Tags
doryan:main
..
compare: doryan:c6ce79f518a064843ce5bcde70f27ac504de5085
Branches Tags
doryan:main

2 Commits
cd9f0c9c50 ... c6ce79f518

Author SHA1 Message Date
doryan c6ce79f518 fixed some things in keymaps and config file 2024-04-27 21:09:29 +04:00
Doryan dcc0bcf7e7
Update README.md 2024-03-08 22:04:33 +04:00
9 changed files with 122 additions and 95 deletions
Show Stats Expand all files Collapse all files

3
README.md
View File

@ -23,4 +23,7 @@ To use one or the other layer, you need to press one of the following keys:
![Photo 4](photos/awf(4).jpg) ![Photo 4](photos/awf(4).jpg)
# Nowadays, this repository is archived
## Check out updates AWF on [my gitea](https://gitea.doryan04.ru/doryan/AWF)
### Check out actual news on Telegram. https://t.me/doryanProjects ### Check out actual news on Telegram. https://t.me/doryanProjects

21
firmware/config.h
View File

@ -1,25 +1,23 @@
#pragma once #pragma once
#include "config_common.h" #define VENDOR_ID 0xFEED
#define PRODUCT_ID 0x0000
#define VENDOR_ID 0xFEED #define DEVICE_VER 0x0001
#define PRODUCT_ID 0x0000 #define LMANUFACTURER "DRN04"
#define DEVICE_VER 0x0001
#define MANUFACTURER DlSgv_and_NM17
#define PRODUCT Angelwings Keyboard
#define DESCRIPTION Split 40 percent ergo-keyboard
/* key matrix size */ /* key matrix size */
/* Rows are doubled up */ /* Rows are doubled up */
#define MATRIX_ROWS 8 #define MATRIX_ROWS 8
#define MATRIX_COLS 7 #define MATRIX_COLS 7
#define MATRIX_ROW_PINS { D4, C6, D7, E6 } #define MATRIX_ROW_PINS \
#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 } { D4, C6, D7, E6 }
#define MATRIX_COL_PINS \
{ F4, F5, F6, F7, B1, B3, B2 }
#define UNUSED_PINS #define UNUSED_PINS
/* define if matrix has ghost (lacks anti-ghosting diodes) */ /* 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 */ /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
#define DEBOUNCE 5 #define DEBOUNCE 5
@ -29,3 +27,4 @@
*/ */
#define RGBLED_NUM 46 #define RGBLED_NUM 46
#define RGB_MATRIX_LED_COUNT 64

2
firmware/info.json
View File

@ -1,7 +1,7 @@
{ {
"keyboard_name": "AngelWings", "keyboard_name": "AngelWings",
"url": "", "url": "",
"maintainer": "Doryan and NM17", "manufacturer": "Doryan and NM17",
"layouts": { "layouts": {
"LAYOUT_3x7": { "LAYOUT_3x7": {
"layout": [ "layout": [

56
firmware/keymaps/default/keymap.c
View File

@ -11,14 +11,14 @@ enum layers {
#define KC_XXXXX KC_NO #define KC_XXXXX KC_NO
#define KC_LOWER KC_LWR #define KC_LOWER KC_LWR
#define KC_RAISE KC_RSE #define KC_RAISE KC_RSE
#define KC_LTOG RGB_TOG #define KC_LTOG RGB_TOG
#define KC_LHUI RGB_HUI #define KC_LHUI RGB_HUI
#define KC_LHUD RGB_HUD #define KC_LHUD RGB_HUD
#define KC_LSAI RGB_SAI #define KC_LSAI RGB_SAI
#define KC_LSAD RGB_SAD #define KC_LSAD RGB_SAD
#define KC_LVAI RGB_VAI #define KC_LVAI RGB_VAI
#define KC_LVAD RGB_VAD #define KC_LVAD RGB_VAD
#define KC_LMOD RGB_MOD #define KC_LMOD RGB_MOD
#define KC_LWR MO(_LOWER) #define KC_LWR MO(_LOWER)
#define KC_RSE MO(_RAISE) #define KC_RSE MO(_RAISE)
#define BSL_RAL MT(MOD_RALT, KC_BSLS) #define BSL_RAL MT(MOD_RALT, KC_BSLS)
@ -30,34 +30,40 @@ enum layers {
#define ENT_LWR LT(_LOWER, KC_ENT) #define ENT_LWR LT(_LOWER, KC_ENT)
#define PUP_ADJ LT(_ADJUST, KC_PGUP) #define PUP_ADJ LT(_ADJUST, KC_PGUP)
#define PDN_ADJ LT(_ADJUST, KC_PGDN) #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] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_QWERTY] = LAYOUT_3x7( [_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_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_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, 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 DEL_RSE, BSP_LSH, GUI_LWR, ENT_LWR, SPC_RSH, TAB_RSE
), ),
[_LOWER] = LAYOUT_3x7( [_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_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_PPLS, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PMNS, _______,
KC_PMNS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, 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( [_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_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_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, _______, _______, KC_P0, KC_P1, KC_P2, KC_P3, KC_PCMM, _______, KC_END, KC_DOWN, _______, _______, _______,
_______, _______, _______, _______, _______, _______ _______, _______, _______, _______, _______, _______
), ),
[_ADJUST] = LAYOUT_3x7( [_ADJUST] = 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_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, _______, _______, 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) { layer_state_t layer_state_set_user(layer_state_t state) {

45
firmware/keymaps/via/keymap.c
View File

@ -1,32 +1,55 @@
#include QMK_KEYBOARD_H #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] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_3x7( [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_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_T(KC_QUOT), KC_PGDN, 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, MT(MOD_RALT, KC_BSLS), KC_LALT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, RALT_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) RSE_DEL, LSH_BSP, LWR_ESC, LWR_ENT, RSH_SPC, RSE_TAB
), ),
[1] = LAYOUT_3x7( [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_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_PPLS, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PMNS, _______,
KC_PMNS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, 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) MO(3) , _______, _______, _______, _______, MO(3)
), ),
[2] = LAYOUT_3x7( [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_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, MT(MOD_RCTL, KC_APP), KC_VOLD, 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, _______, _______, _______, _______, KC_P0, KC_P1, KC_P2, KC_P3, KC_PCMM, _______, KC_END, KC_DOWN, _______, _______, _______,
_______, _______, MO(3) , MO(3) , _______, _______ _______, _______, MO(3) , MO(3) , _______, _______
), ),
[3] = LAYOUT_3x7( [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_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, _______, _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, KC_ACL0, KC_MS_D, KC_ACL2, _______, _______,
_______, _______, _______, _______, _______, _______ _______, _______, _______, _______, _______, _______
), ),
}; };

10
firmware/rev1/config.h
View File

@ -2,17 +2,17 @@
#define USE_SERIAL #define USE_SERIAL
#define SOFT_SERIAL_PIN D3 #define SOFT_SERIAL_PIN D3
#define RGB_DI_PIN D2 #define WS2812_DI_PIN D2
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
# define RGBLED_NUM 46 # define RGBLED_NUM 46
# define DRIVER_LED_TOTAL RGBLED_NUM # define DRIVER_LED_TOTAL RGBLED_NUM
# define RGB_MATRIX_SPLIT \ # define RGB_MATRIX_SPLIT \
{ 23, 23 } { 23, 23 }
# define RGB_DISABLE_AFTER_TIMEOUT 0 # define RGB_DISABLE_AFTER_TIMEOUT 0
# define RGB_DISABLE_WHEN_USB_SUSPENDED # define RGB_DISABLE_WHEN_USB_SUSPENDED
# define RGB_MATRIX_FRAMEBUFFER_EFFECTS # define RGB_MATRIX_FRAMEBUFFER_EFFECTS
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 130 # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 130
# define RGB_MATRIX_HUE_STEP 8 # define RGB_MATRIX_HUE_STEP 8
# define RGB_MATRIX_SAT_STEP 8 # define RGB_MATRIX_SAT_STEP 8

32
firmware/rev1/rev1.c
View File

@ -2,34 +2,30 @@
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
#define __ NO_LED
led_config_t g_led_config = { led_config_t g_led_config = {
{ {
{ 23, 19, 18, 13, 12, 5, 4 }, { 23, 19, 18, 13, 12, 5, 4 },
{ 22, 20, 17, 14, 11, 6, 3 }, { 22, 20, 17, 14, 11, 6, 3 },
{ NO_LED, 21, 16, 15, 10, 7, 2 }, { __, 21, 16, 15, 10, 7, 2 },
{ NO_LED, NO_LED, NO_LED, NO_LED, 9, 8, 1 }, { __, __, __, __, 9, 8, 1 },
{ 46, 42, 41, 36, 35, 28, 27 }, { 46, 42, 41, 36, 35, 28, 27 },
{ 45, 43, 40, 37, 34, 29, 26 }, { 45, 43, 40, 37, 34, 29, 26 },
{ NO_LED, 44, 39, 38, 33, 30, 25 }, { __, 44, 39, 38, 33, 30, 25 },
{ NO_LED, NO_LED, NO_LED, NO_LED, 32, 31, 24 }, { __, __, __, __, 32, 31, 24 },
}, },
{ {
{ 110, 63 }, { 102, 46 }, { 102, 25 }, { 102, 4 }, { 85, 2 }, { 85, 23 }, { 85, 44 }, { 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 },
{ 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 },
{ 51, 47 }, { 34, 54 }, { 34, 33 }, { 34, 12 }, { 17, 15 }, { 17, 36 }, { 17, 57 }, { 145, 23 }, { 145, 44 }, { 132, 63 }, { 162, 63 }, { 162, 42 }, { 162, 21 }, { 162, 0 }, { 179, 5 }, { 179, 26 }, { 179, 47 }, { 196, 54 }, { 196, 33 },
{ 0, 51 }, { 0, 30 }, { 120, 63 }, { 128, 46 }, { 128, 25 }, { 128, 4 }, { 145, 2 }, { 196, 12 }, { 213, 15 }, { 213, 36 }, { 213, 57 }, { 230, 51 }, { 230, 30 }
{ 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, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 4,
4, 4, 4, 4, 4, 4, 4, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
4, 4, 4, 4, 4, 4, 4, 8, 1, 8, 8, 1, 8,
4, 4, 4, 4, 4, 4, 4,
4, 4, 4, 4, 4, 4, 4,
4, 4, 4, 4,
} }
}; };

2
firmware/rules.mk
View File

@ -17,7 +17,7 @@ HD44780_ENABLE = no
SPLIT_KEYBOARD = yes SPLIT_KEYBOARD = yes
RGBLIGHT_ENABLE = no RGBLIGHT_ENABLE = no
RGB_MATRIX_ENABLE = yes RGB_MATRIX_ENABLE = yes
RGB_MATRIX_DRIVER = WS2812 RGB_MATRIX_DRIVER = ws2812
DEFAULT_FOLDER = angelwings/rev1 DEFAULT_FOLDER = angelwings/rev1
RGBLIGHT_SUPPORTED = no RGBLIGHT_SUPPORTED = no
LTO_ENABLE = yes LTO_ENABLE = yes