New keymap with changes to make firmware size go down

This commit is contained in:
Tran Minh 2021-09-04 21:31:29 -04:00
parent b1894a8857
commit 6fa58771fa
No known key found for this signature in database
GPG Key ID: D220F08535CA3DDA
4 changed files with 47 additions and 61 deletions

View File

@ -20,6 +20,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#define NO_ACTION_MACRO
#define NO_ACTION_FUNCTION
/* Select hand configuration */
#define MASTER_LEFT
@ -29,13 +31,19 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define TAPPING_FORCE_HOLD
#define TAPPING_TERM 100
#undef RGBLED_NUM
#define RGBLIGHT_ANIMATIONS
#define RGBLED_NUM 27
#define RGBLIGHT_LIMIT_VAL 120
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
#define RGBLIGHT_VAL_STEP 17
#ifndef NO_DEBUG
#define NO_DEBUG
#endif // !NO_DEBUG
#if !defined(NO_PRINT) && !defined(CONSOLE_ENABLE)
#define NO_PRINT
#endif // !NO_PRINT
/* #define RGBLIGHT_ANIMATIONS */
/* #undef RGBLED_NUM */
/* #define RGBLED_NUM 27 */
/* #define RGBLIGHT_LIMIT_VAL 120 */
/* #define RGBLIGHT_HUE_STEP 10 */
/* #define RGBLIGHT_SAT_STEP 17 */
/* #define RGBLIGHT_VAL_STEP 17 */
// Underglow
/*

View File

@ -12,31 +12,10 @@ enum layer_number {
};
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_QWERTY] = LAYOUT(
KC_TAB, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,
KC_BSPC, KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O,
KC_P, KC_QUOT, KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K,
KC_L, KC_SCLN, KC_ENT, KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LBRC,
KC_RBRC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_GRV, KC_LGUI, KC_LALT,
MO(1), KC_SPC, KC_SPC, MO(2), KC_EQL, KC_MINS),
[_LOWER] =
LAYOUT(KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO,
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
KC_NO, KC_TRNS, KC_BRID, KC_BRIU, KC_NO, KC_NO, KC_NO, KC_NO,
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_VOLD, KC_VOLU,
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
KC_NO, KC_BSLS, KC_TRNS, KC_TRNS, KC_NO, KC_TRNS, KC_TRNS, KC_NO,
KC_TRNS, KC_TRNS),
[_RAISE] = LAYOUT(KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7,
KC_F8, KC_F9, KC_F10, KC_TRNS, KC_TRNS, KC_NO, KC_NO,
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_F11,
KC_F12, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_NO, KC_TRNS, KC_TRNS,
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
KC_NO, KC_NO, KC_NO, KC_NO, KC_BSLS, KC_TRNS, KC_TRNS,
KC_NO, KC_TRNS, KC_TRNS, KC_NO, KC_TRNS, KC_TRNS)};
[0] = LAYOUT(KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_QUOT, KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LBRC, KC_RBRC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_BSLS, KC_LGUI, KC_LAPO, MO(2), KC_SPC, KC_SPC, MO(1), KC_RAPC, KC_RCTL),
[1] = LAYOUT(KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_GRV, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_BRID, KC_BRIU, KC_MPRV, KC_MNXT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_MSTP, KC_LPRN, KC_NO, KC_NO, KC_RPRN, KC_EQL, KC_MINS, KC_NO, KC_DEL, KC_BSLS, KC_TRNS, KC_TRNS, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
[2] = LAYOUT(KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_F11, KC_F12, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_NO, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_TRNS, KC_TRNS)
};
layer_state_t layer_state_set_user(layer_state_t state) {
return update_tri_layer_state(state, _LOWER, _RAISE, _BLANK);
}
@ -53,7 +32,6 @@ oled_rotation_t oled_init_user(oled_rotation_t rotation) {
// When you add source files to SRC in rules.mk, you can use functions.
const char *read_layer_state(void);
const char *read_logo(void);
void set_keylog(uint16_t keycode, keyrecord_t *record);
const char *read_keylog(void);
const char *read_keylogs(void);
@ -65,12 +43,12 @@ const char *read_keylogs(void);
// WPM-responsive animation stuff here
#define IDLE_FRAMES 5
#define IDLE_SPEED 20 // below this wpm value your animation will idle
#define IDLE_SPEED 35 // below this wpm value your animation will idle
// #define PREP_FRAMES 1 // uncomment if >1
#define TAP_FRAMES 2
#define TAP_SPEED 40 // above this wpm value typing animation to trigger
#define TAP_SPEED 45 // above this wpm value typing animation to trigger
#define ANIM_FRAME_DURATION 200 // how long each frame lasts in ms
// #define SLEEP_TIMER 60000 // should sleep after this period of 0 wpm, needs

46
nm.json
View File

@ -7,7 +7,7 @@
"layout": "LAYOUT",
"layers": [
[
"KC_TAB",
"KC_GESC",
"KC_1",
"KC_2",
"KC_3",
@ -19,7 +19,7 @@
"KC_9",
"KC_0",
"KC_BSPC",
"KC_ESC",
"KC_TAB",
"KC_Q",
"KC_W",
"KC_E",
@ -56,15 +56,15 @@
"KC_COMM",
"KC_DOT",
"KC_SLSH",
"KC_GRV",
"KC_BSLS",
"KC_LGUI",
"KC_LALT",
"MO(1)",
"KC_SPC",
"KC_SPC",
"KC_LAPO",
"MO(2)",
"KC_EQL",
"KC_MINS"
"KC_SPC",
"KC_SPC",
"MO(1)",
"KC_RAPC",
"KC_RCTL"
],
[
"KC_TRNS",
@ -80,7 +80,7 @@
"KC_TRNS",
"KC_TRNS",
"KC_TRNS",
"KC_NO",
"KC_GRV",
"KC_NO",
"KC_NO",
"KC_NO",
@ -94,8 +94,8 @@
"KC_TRNS",
"KC_BRID",
"KC_BRIU",
"KC_NO",
"KC_NO",
"KC_MPRV",
"KC_MNXT",
"KC_NO",
"KC_NO",
"KC_NO",
@ -106,23 +106,23 @@
"KC_TRNS",
"KC_VOLD",
"KC_VOLU",
"KC_MUTE",
"KC_MSTP",
"KC_LPRN",
"KC_NO",
"KC_NO",
"KC_RPRN",
"KC_EQL",
"KC_MINS",
"KC_NO",
"KC_NO",
"KC_NO",
"KC_NO",
"KC_NO",
"KC_NO",
"KC_NO",
"KC_NO",
"KC_DEL",
"KC_BSLS",
"KC_TRNS",
"KC_TRNS",
"KC_NO",
"KC_TRNS",
"KC_TRNS",
"KC_NO",
"KC_TRNS",
"KC_TRNS",
"KC_TRNS"
],
@ -176,12 +176,12 @@
"KC_NO",
"KC_NO",
"KC_NO",
"KC_BSLS",
"KC_TRNS",
"KC_TRNS",
"KC_NO",
"KC_TRNS",
"KC_TRNS",
"KC_TRNS",
"KC_TRNS",
"KC_TRNS",
"KC_NO",
"KC_TRNS",
"KC_TRNS"

View File

@ -22,10 +22,10 @@ EXTRAKEY_ENABLE = yes
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
EXTRAFLAGS += -flto
# If you want to change the display of OLED, you need to change here
SRC += ./lib/rgb_state_reader.c \
./lib/layer_state_reader.c \
./lib/logo_reader.c \
SRC += ./lib/layer_state_reader.c \
./lib/keylogger.c \
# ./lib/mode_icon_reader.c \
# ./lib/host_led_state_reader.c \