Fixed info.json and fixed bugs in files for firmware

This commit is contained in:
ItzAdel 2022-01-07 19:30:28 +04:00
parent 1514a54b9b
commit 0c2d073446
4 changed files with 255 additions and 41 deletions

View File

@ -1,43 +1,247 @@
{ {
"name": "AngelWings", "keyboard_name": "AngelWings",
"vendorId": "0xFEED", "url": "",
"productId": "0x0000", "maintainer": "Doryan and NM17",
"lighting": "qmk_rgblight",
"matrix": {
"rows": 8,
"cols": 7
},
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [
[{"x":4},"0,4",{"x":6.5},"0,9"], {
[{"y":-0.9,"x":5},"0,5"], "label": "Esc",
[{"y":-1,"x":10.5},"0,8"], "x": 0,
[{"y":-0.87,"x":6},"0,6",{"x":2.5},"0,7"], "y": 2.45
[{"y":-0.98,"x":3},"0,3",{"x":8.5},"0,10"], },
[{"y":-0.65,"x":2},"0,2",{"x":10.5},"0,11"], {
[{"y":-0.85,"x":1},"0,1",{"x":12.5},"0,12"], "label": "`",
[{"y":-0.75,"x":4},"1,4",{"x":6.5},"1,9"], "x": 1,
[{"y":-0.9,"x":5},"1,5",{"x":4.5},"1,8"], "y": 1.75
[{"y":-0.87,"x":6},"1,6",{"x":2.5},"1,7"], },
[{"y":-0.98,"x":3},"1,3",{"x":8.5},"1,10"], {
[{"y":-0.8},"0,0",{"x":14.5},"0,13"], "label": "Q",
[{"y":-0.85,"x":2},"1,2",{"x":10.5},"1,11"], "x": 2,
[{"y":-0.85,"x":1},"1,1",{"x":12.5},"1,12"], "y": 1.6
[{"y":-0.75,"x":4},"2,4",{"x":6.5},"2,9"], },
[{"y":-0.9,"x":5},"2,5",{"x":4.5},"2,8"], {
[{"y":-0.87,"x":6},"2,6",{"x":2.5},"2,7"], "label": "W",
[{"y":-0.98,"x":3},"2,3",{"x":8.5},"2,10"], "x": 3,
[{"y":-0.8},"1,0",{"x":14.5},"1,13"], "y": 1.25
[{"y":-0.85,"x":2},"2,2",{"x":10.5},"2,11"], },
[{"y":-0.85,"x":1},"2,1",{"x":12.5},"2,12"], {
[{"y":-0.59,"x":4.5},"3,4"], "label": "E",
[{"y":3.16,"x":-0.5},"3,9"], "x": 4,
[{"y":-1.45,"x":0.4},"3,5"], "y": 1
[{"y":-1.83,"x":1.25,"h":1.5},"3,6"], },
[{"y":-2.28,"x":-2.27,"h":1.5},"3,7"], {
[{"y":-0.17,"x":-1.41},"3,8"] "label": "R",
"x": 5,
"y": 1.1
},
{
"label": "T",
"x": 6,
"y": 1.23
},
{
"label": "Y",
"x": 10.5,
"y": 1.23
},
{
"label": "U",
"x": 11.5,
"y": 1.1
},
{
"label": "I",
"x": 12.5,
"y": 1
},
{
"label": "O",
"x": 13.5,
"y": 1.25
},
{
"label": "P",
"x": 14.5,
"y": 1.6
},
{
"label": "[{",
"x": 15.5,
"y": 1.75
},
{
"label": "]}",
"x": 16.5,
"y": 2.45
},
{
"label": "PgUp",
"x": 0,
"y": 3.45
},
{
"label": "Ctrl",
"x": 1,
"y": 2.75
},
{
"label": "A",
"x": 2,
"y": 2.6
},
{
"label": "S",
"x": 3,
"y": 2.25
},
{
"label": "D",
"x": 4,
"y": 2
},
{
"label": "F",
"x": 5,
"y": 2.1
},
{
"label": "G",
"x": 6,
"y": 2.23
},
{
"label": "H",
"x": 10.5,
"y": 2.23
},
{
"label": "J",
"x": 11.5,
"y": 2.1
},
{
"label": "K",
"x": 12.5,
"y": 2
},
{
"label": "L",
"x": 13.5,
"y": 2.25
},
{
"label": ";:",
"x": 14.5,
"y": 2.6
},
{
"label": "\"'",
"x": 15.5,
"y": 2.75
},
{
"label": "PgDn",
"x": 16.5,
"y": 3.45
},
{
"label": "Alt",
"x": 1,
"y": 3.75
},
{
"label": "Z",
"x": 2,
"y": 3.6
},
{
"label": "X",
"x": 3,
"y": 3.25
},
{
"label": "C",
"x": 4,
"y": 3
},
{
"label": "V",
"x": 5,
"y": 3.1
},
{
"label": "B",
"x": 6,
"y": 3.23
},
{
"label": "N",
"x": 10.5,
"y": 3.23
},
{
"label": "M",
"x": 11.5,
"y": 3.1
},
{
"label": ",<",
"x": 12.5,
"y": 3
},
{
"label": ".>",
"x": 13.5,
"y": 3.25
},
{
"label": "/?",
"x": 14.5,
"y": 3.6
},
{
"label": "|\\",
"x": 15.5,
"y": 3.75
},
{
"label": "Rise",
"x": 5,
"y": 5
},
{
"label": "Space",
"x": 6,
"y": 5
},
{
"label": "Lower",
"x": 7,
"y": 4.5,
"h": 1.5
},
{
"label": "Lower",
"x": 9.5,
"y": 4.5,
"h": 1.5
},
{
"label": "Bcs",
"x": 10.5,
"y": 5
},
{
"label": "Rise",
"x": 11.5,
"y": 5
}
] ]
} }
} }
} }

View File

@ -12,14 +12,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
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_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_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_PMNS, 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( [2] = LAYOUT(
_______, KC_NLCK, KC_PSLS, KC_P7, KC_P8, KC_P9, KC_PMNS, KC_END, KC_HOME, KC_UP, KC_PSCR, KC_SLCK, KC_CAPS, _______, _______, KC_NLCK, KC_PSLS, KC_P7, KC_P8, KC_P9, KC_PMNS, KC_END, KC_HOME, KC_UP, KC_PSCR, KC_SLCK, KC_CAPS, _______,
KC_VOLU, KC_PEQL, KC_PAST, KC_P4, KC_P5, KC_P6, KC_PPLS, _______, KC_LEFT, KC_DOWN, 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_DOWN, KC_RGHT, KC_INS, KC_APP, KC_VOLD,
_______, KC_P0, KC_P1, KC_P2, KC_P3, KC_PCMM, _______, KC_END, _______, KC_PGDN, KC_PAUS, _______, _______, KC_P0, KC_P1, KC_P2, KC_P3, KC_PCMM, _______, KC_END, _______, KC_PGDN, KC_PAUS, _______,
_______, _______, _______, _______, _______, _______ _______, _______, MO(3) , MO(3) , _______, _______
), ),
[3] = LAYOUT( [3] = LAYOUT(
_______, _______, KC_ASUP, KC_ASTG, KC_ASDN, KC_WH_U, _______, _______, KC_BTN1, KC_MS_U, KC_BTN2, _______, _______, _______, _______, _______, KC_ASUP, KC_ASTG, KC_ASDN, KC_WH_U, _______, _______, KC_BTN1, KC_MS_U, KC_BTN2, _______, _______, _______,

View File

@ -7,6 +7,16 @@
#ifdef RGBLIGHT_ENABLE #ifdef RGBLIGHT_ENABLE
# undef RGBLED_NUM # undef RGBLED_NUM
# define RGBLIGHT_ANIMATIONS # define RGBLIGHT_ANIMATIONS
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_BREATHING
# define RGBLIGHT_EFFECT_CHRISTMAS
# define RGBLIGHT_EFFECT_KNIGHT
# define RGBLIGHT_EFFECT_RAINBOW_MOOD
# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_SNAKE
# define RGBLIGHT_EFFECT_STATIC_GRADIENT
# define RGBLIGHT_EFFECT_TWINKLE
# define RGBLED_NUM 54 # define RGBLED_NUM 54
# define RGBLED_SPLIT \ # define RGBLED_SPLIT \
{ 23, 23 } { 23, 23 }
@ -15,7 +25,6 @@
# define RGBLIGHT_HUE_STEP 10 # define RGBLIGHT_HUE_STEP 10
# define RGBLIGHT_SAT_STEP 17 # define RGBLIGHT_SAT_STEP 17
# define RGBLIGHT_VAL_STEP 17 # define RGBLIGHT_VAL_STEP 17
# define SPLIT_TRANSPORT_MIRROR
#endif #endif
#define DIODE_DIRECTION COL2ROW #define DIODE_DIRECTION COL2ROW

View File

@ -32,6 +32,7 @@ led_config_t g_led_config = {
4, 4, 4, 4, 4, 4, 4, 4,
} }
}; };
void suspend_power_down_kb(void) { void suspend_power_down_kb(void) {
rgb_matrix_set_suspend_state(true); rgb_matrix_set_suspend_state(true);
suspend_power_down_user(); suspend_power_down_user();