From 9e038cdf7c2e8ae41757efaada9001cdd2769518 Mon Sep 17 00:00:00 2001 From: Bertrand Benjamin Date: Mon, 2 Jan 2023 19:56:16 +0100 Subject: [PATCH] =?UTF-8?q?Feat:=20enl=C3=A8ve=20la=20ligne=20des=20nombre?= =?UTF-8?q?s=20et=20une=20touche=20du=20pouce?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- keymap.c | 55 ++++++++++++++++++++++++++++--------------------------- rules.mk | 2 +- 2 files changed, 29 insertions(+), 28 deletions(-) diff --git a/keymap.c b/keymap.c index e11a4bc..05be10e 100644 --- a/keymap.c +++ b/keymap.c @@ -17,61 +17,62 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_QWERTY] = LAYOUT( //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐ - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, FR_RPRN, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ - FR_CIRC,KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, FR_DLR, + FR_CIRC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, FR_DLR, //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ FR_ASTR, LGUI_T(KC_A),RALT_T(KC_S),CTL_T(KC_D),LSFT_T(KC_F),KC_G, KC_H,RSFT_T(KC_J),CTL_T(KC_K), RALT_T(KC_L), RGUI_T(KC_SCLN), FR_UGRV, //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤ - FR_LABK, KC_Z, KC_X, KC_C, KC_V, KC_B, MO(_ADJUST), TG(_SHEET), KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, FR_EQL, + FR_LABK, KC_Z, KC_X, KC_C, KC_V, KC_B, _______, _______, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, FR_EQL, //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘ └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘ - LT(_LOWER, KC_TAB), KC_ENT, KC_ESC, KC_BSPC, KC_SPC,LT(_LOWER, KC_TAB) + LT(_LOWER, KC_TAB), KC_ENT, KC_ESC, KC_BSPC, KC_SPC,LT(_ADJUST, KC_TAB) // └────────┴────────┴────────┘ └────────┴────────┴────────┘ ), [_LOWER] = LAYOUT( //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐ - KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ - _______, FR_1, FR_2, FR_3, FR_4, FR_5, FR_6 , FR_7 , FR_8 , FR_9, FR_0 , _______, + _______, _______, KC_MUTE, KC_VOLD, KC_VOLU , _______, KC_6, KC_7, KC_8, KC_9 , KC_0, KC_MINS, //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ - A(KC_LCTRL), FR_BSLS, FR_LCBR, FR_LBRC, FR_RBRC, FR_RCBR, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, + _______, KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤ - _______, _______, _______, _______, _______, _______, A(KC_TAB), _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, KC_F7, KC_F8, KC_F9, KC_F10 , KC_F11, KC_F12, //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘ └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘ - _______, _______, _______, KC_DEL, _______, _______ + _______, _______, _______, KC_DEL, _______, TO(_SHEET) // └────────┴────────┴────────┘ └────────┴────────┴────────┘ ), - [_SHEET] = LAYOUT( - //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐ - XXXXXXX, XXXXXXX, KC_P7, KC_P8, KC_P9, KC_PSLS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ - XXXXXXX, XXXXXXX, KC_P4, KC_P5, KC_P6, KC_PAST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ - LCTL(FR_S), XXXXXXX, KC_P1, KC_P2, KC_P3, KC_PMNS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, XXXXXXX, - //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤ - KC_LSFT, XXXXXXX, KC_P0, KC_PDOT, _______, KC_PPLS, KC_BSPC, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘ └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘ - XXXXXXX, _______, _______, _______, _______, _______ - // └────────┴────────┴────────┘ └────────┴────────┴────────┘ - ), - [_ADJUST] = LAYOUT( //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_MS_LEFT, KC_MS_DOWN, KC_MS_UP, KC_MS_RIGHT, KC_MS_BTN1 , KC_MS_BTN2, + //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ + _______, FR_BSLS, FR_LCBR, FR_LBRC, FR_RBRC, FR_RCBR, _______, KC_RSFT, KC_RCTL, KC_RALT, KC_RGUI, _______ , + //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤ + KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, _______, _______, _______, _______, _______, _______, _______, _______, + //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘ └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘ + TO(_SHEET), _______, _______, _______, _______, _______ + // └────────┴────────┴────────┘ └────────┴────────┴────────┘ + ), + + [_SHEET] = LAYOUT( + //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ - _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, + KC_TAB, XXXXXXX, KC_P7, KC_P8, KC_P9, KC_PSLS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_SLEP, + //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ + KC_DEL, XXXXXXX, KC_P4, KC_P5, KC_P6, KC_PAST, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, XXXXXXX, //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤ - _______, _______, _______, _______, _______, _______, _______, KC_SLEP, _______, _______, _______, _______, _______, _______, + _______, XXXXXXX, KC_P1, KC_P2, KC_P3, KC_PMNS, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘ └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘ - _______, _______, _______, _______, _______, _______ + KC_P0, KC_ENT, KC_BSPC, _______, _______, TO(_QWERTY) // └────────┴────────┴────────┘ └────────┴────────┴────────┘ ) + }; bool process_record_user(uint16_t keycode, keyrecord_t *record) { @@ -122,7 +123,7 @@ void matrix_scan_user(void) { } } -uint32_t layer_state_set_user(uint32_t state) { +layer_state_t layer_state_set_user(layer_state_t state) { switch (biton32(state)) { case _SHEET: rgblight_enable(); diff --git a/rules.mk b/rules.mk index 019c9d7..d0a2ee0 100644 --- a/rules.mk +++ b/rules.mk @@ -2,7 +2,7 @@ MCU = atmega32u4 BOOTLOADER = qmk-dfu BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration -MOUSEKEY_ENABLE = no # Mouse keys +MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control CONSOLE_ENABLE = yes # Console for debug COMMAND_ENABLE = no # Commands for debug and configuration