From 0645a7197e5c17d0459ebd0c05e352cd28e0f906 Mon Sep 17 00:00:00 2001 From: ItzAdel Date: Tue, 26 Jul 2022 19:24:10 +0400 Subject: [PATCH] Update keymap --- awf_rev1_default.hex | 12 ++++++------ awf_rev1_via.hex | 20 ++++++++++---------- firmware/README.md | 22 +++++++++++++++++++++- firmware/keymaps/default/keymap.c | 6 +++--- firmware/keymaps/via/keymap.c | 24 ++++++++++++------------ 5 files changed, 52 insertions(+), 32 deletions(-) diff --git a/awf_rev1_default.hex b/awf_rev1_default.hex index dd15c85..20dca45 100644 --- a/awf_rev1_default.hex +++ b/awf_rev1_default.hex @@ -56,24 +56,24 @@ :100370002841A8002D023A003B003C003D003E0011 :10038000010057001E021F0220022102220200006B :1003900056001E001F002000210022000000000067 -:1003A0000000000001002A620100450044004300F3 +:1003A000000000000100010001004500440043007E :1003B0004200410040003F0001002E0027022602BB :1003C0002502240223020000010027002600250048 -:1003D00024002300000000000000000001002C7237 +:1003D00024002300000000000000000001000100D4 :1003E00001000100530054005F00600061005600EE :1003F000A900670055005C005D005E00570000002A :100400000100620059005A005B00850000000000F6 -:100410000000000001002A620100010039004700CD +:100410000000000001000100010001003900470058 :1004200046004A004D000100AA00650049004F0047 :100430005200500001000000010048004E00510031 -:100440004D000100000000000000000001002C72BF +:100440004D0001000000000000000000010001005C :10045000010001000100175C1A5C185C010001003A :100460000100C35CC65CC85CCA5CCC5C01000000D7 :10047000C45CC75CC95CCB5CCD5C010000000000C3 -:100480000000000001002A620100010001000100DB +:100480000000000001000100010001000100010066 :10049000F200FE00F100F900010001000100F0008F :1004A000ED00EF00FA00000001000100FF00EE0087 -:1004B000FD000100000000000000000001002C729F +:1004B000FD0001000000000000000000010001003C :1004C000010011241FBECFEFDAE0DEBFCDBF24E074 :1004D000A2E4B2E001C01D92A43EB207E1F712E02F :1004E000A0E0B1E0E8E3F3E602C005900D92A2348B diff --git a/awf_rev1_via.hex b/awf_rev1_via.hex index 159b7d1..a328919 100644 --- a/awf_rev1_via.hex +++ b/awf_rev1_via.hex @@ -44,25 +44,25 @@ :1002B0002C72284101002D023A003B003C003D0019 :1002C0003E00010057001E021F02200221022202EE :1002D000000056001E001F00200021002200000028 -:1002E00000000000000003512A62010045004400A4 +:1002E000000000000000035101000100450044002F :1002F00043004200410040003F0001002E00270261 :100300002602250224022302000001002700260005 :10031000250024002300000000000000000003511D -:100320002C720100A800530054005F0060006100BF +:1003200001000100A800530054005F00600061005C :100330005600A900670055005C005D005E00570094 :1003400000000100620059005A005B0085000000B7 -:1003500000000000000001002A6203514D00390036 -:1003600047004B0046004A000100AA0065714900A1 -:100370004F00520050000100000001000100480041 +:100350000000000000000100010003514D003900C1 +:100360004700480046004A000100AA0065714900A4 +:100370004F00520050000100000001000100010088 :1003800051004D00010000000000000000000100CD -:100390002C72035101000100175C1A5C185C01000B +:100390000100035101000100175C1A5C185C0100A8 :1003A00001000100C25CC55CC75CC95CCB5C01009C :1003B0000000C35CC65CC85CCA5CCC5C0100000089 -:1003C00000000000000001002A620100010001009D +:1003C0000000000000000100010001000100010028 :1003D0000100F500FE00F400F90001000100010039 :1003E000F300F000F200FA00000001000100FF003D :1003F000F100FD000100000000000000000001000D -:100400002C72010000010101010101010101020240 +:1004000001000100000101010101010101010202DD :1004100002020202020202030303030303030304B2 :10042000040404040404050505050506060606067D :10043000070707070708080808090909090A0A0A37 @@ -523,7 +523,7 @@ :1020A00045E34A95F1F700002F5F3F4F28173907A6 :1020B000B9F7E2CFCDB7DEB7EAE00C949E328823C1 :1020C00081F062E283E290E00E94B43367E084E250 -:1020D00090E00E94B43360E285E290E00E94B43365 +:1020D00090E00E94B43366E285E290E00E94B4335F :1020E00008956FEF83E290E00E94B4336FEF84E2D3 :1020F00090E00E94B4336FEFEFCF1F93CF93DF9345 :10210000962F122F632F8430D8F49830C8F44730BC @@ -545,7 +545,7 @@ :102200000E949633C82F82E290E00E949633982F66 :102210008C2FCF91089583E290E00E949633823212 :1022200089F484E290E00E949633873059F485E285 -:1022300090E00E94963391E0803209F090E0892F7F +:1022300090E00E94963391E0863209F090E0892F79 :102240008170089580E0FCCF0F931F93CF93DF93AD :10225000843030F5683020F5473010F5C42FD0E0D9 :10226000CC0FDD1F2EE0629FC00DD11D112430E781 diff --git a/firmware/README.md b/firmware/README.md index 3adac8e..afdc4ff 100644 --- a/firmware/README.md +++ b/firmware/README.md @@ -4,6 +4,26 @@ AWF is a ergo-split keyboard with 46 keys, originally designed for a school proj https://github.com/ItzAdel/AWF-firmware -### You can check, how compile firmware and flash keyboard on [AWF wiki](https://github.com/ItzAdel/AngelWings-keyboard/wiki/INFO). +### How to compile firmware? + +1) First you need to download QMK MSYS and enter the command in it: +``` +qmk setup +``` +2) After we installed QMK you need to create a folder called "angelwings" in the path: +``` +"c:/users/user/qmk_firmware/keyboards" +``` +and unpack all firmware files into the folder "angelwings". + +3) The last step is compilation. Enter into QMK MSYS command: +``` +qmk compile -kb angelwings -km default +``` +or if you want VIA port: +``` +qmk compile -kb angelwings -km via +``` +4) If your firmware compiled - then let's have fun! ### Check out @tfk004 on Telegram. https://t.me/tfk004 diff --git a/firmware/keymaps/default/keymap.c b/firmware/keymaps/default/keymap.c index 967004a..f07d2f2 100644 --- a/firmware/keymaps/default/keymap.c +++ b/firmware/keymaps/default/keymap.c @@ -43,20 +43,20 @@ 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_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, _______, - _______, BSP_LSH, _______, _______, SPC_RSH, _______ + _______, _______, _______, _______, _______, _______ ), [_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, _______, - _______, BSP_LSH, _______, _______, SPC_RSH, _______ + _______, _______, _______, _______, _______, _______ ), [_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, _______, _______, - _______, BSP_LSH, _______, _______, SPC_RSH, _______ + _______, _______, _______, _______, _______, _______ ), }; diff --git a/firmware/keymaps/via/keymap.c b/firmware/keymaps/via/keymap.c index 5aed48d..8e035aa 100644 --- a/firmware/keymaps/via/keymap.c +++ b/firmware/keymaps/via/keymap.c @@ -11,22 +11,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [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, _______, - MO(3) , LSFT_T(KC_BSPC), _______, _______, RSFT_T(KC_SPC), MO(3) + _______, 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, _______, + 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_PGUP, 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_PAUS, _______, _______, - _______, LSFT_T(KC_BSPC), MO(3) , MO(3) , RSFT_T(KC_SPC), _______ + 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, _______, _______, _______, + _______, _______, MO(3) , MO(3) , _______, _______ ), [3] = 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, _______, _______, - _______, LSFT_T(KC_BSPC), _______, _______, RSFT_T(KC_SPC), _______ + _______, _______, 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, _______, _______, + _______, _______, _______, _______, _______, _______ ), }; \ No newline at end of file