diff options
Diffstat (limited to 'keyboards/uzu42')
| -rw-r--r-- | keyboards/uzu42/config.h | 3 | ||||
| -rw-r--r-- | keyboards/uzu42/keymaps/default/keymap.c | 43 | ||||
| -rw-r--r-- | keyboards/uzu42/rev1/config.h | 2 | ||||
| -rw-r--r-- | keyboards/uzu42/rules.mk | 7 |
4 files changed, 24 insertions, 31 deletions
diff --git a/keyboards/uzu42/config.h b/keyboards/uzu42/config.h index 45f497d782..3364d3063d 100644 --- a/keyboards/uzu42/config.h +++ b/keyboards/uzu42/config.h @@ -24,6 +24,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define SOFT_SERIAL_PIN D2 #define SERIAL_USE_MULTI_TRANSACTION #endif - -#define NO_ACTION_MACRO -#define NO_ACTION_FUNCTION diff --git a/keyboards/uzu42/keymaps/default/keymap.c b/keyboards/uzu42/keymaps/default/keymap.c index 54b944b244..01e31ceb39 100644 --- a/keyboards/uzu42/keymaps/default/keymap.c +++ b/keyboards/uzu42/keymaps/default/keymap.c @@ -39,51 +39,51 @@ enum custom_keycodes { #define KC_ALBS ALT_T(KC_BSPC) const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_QWERTY] = LAYOUT( \ + [_QWERTY] = LAYOUT( //,---------------------------------------. ,---------------------------------------. - KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,\ + KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, //|-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| - KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT,\ + KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, //|-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| - KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M,KC_COMM, KC_DOT,KC_SLSH,\ + KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M,KC_COMM, KC_DOT,KC_SLSH, //|-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------| - KC_LSFT, KC_SPC,KC_LALT,KC_LGUI, LOWER,KC_CTES, KC_SFSP, RAISE,KC_ALBS,KC_RCTL,KC_LGUI,XXXXXXX \ + KC_LSFT, KC_SPC,KC_LALT,KC_LGUI, LOWER,KC_CTES, KC_SFSP, RAISE,KC_ALBS,KC_RCTL,KC_LGUI,XXXXXXX //|-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------| ), - [_LOWER] = LAYOUT( \ + [_LOWER] = LAYOUT( //,---------------------------------------. ,---------------------------------------. - KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,\ + KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, //|-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| - KC_TAB,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, KC_LEFT,KC_DOWN, KC_UP,KC_RGHT, KC_ENT,\ + KC_TAB,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, KC_LEFT,KC_DOWN, KC_UP,KC_RGHT, KC_ENT, //|-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| - KC_LCTL, KC_SPC,KC_LSFT,KC_LALT, KC_DEL, KC_BSPC,KC_HOME, KC_END,XXXXXXX,XXXXXXX,\ + KC_LCTL, KC_SPC,KC_LSFT,KC_LALT, KC_DEL, KC_BSPC,KC_HOME, KC_END,XXXXXXX,XXXXXXX, //|-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------| - _______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______ \ + _______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______ //|-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------| ), - [_RAISE] = LAYOUT( \ + [_RAISE] = LAYOUT( //,---------------------------------------. ,---------------------------------------. - KC_EXLM, KC_AT,KC_HASH, KC_DLR,KC_PERC, KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,\ + KC_EXLM, KC_AT,KC_HASH, KC_DLR,KC_PERC, KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN, //|-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| - KC_TAB,KC_UNDS,KC_PLUS,KC_PIPE,KC_TILD, KC_COLN,KC_DQUO, KC_GT,KC_LCBR,KC_RCBR,\ + KC_TAB,KC_UNDS,KC_PLUS,KC_PIPE,KC_TILD, KC_COLN,KC_DQUO, KC_GT,KC_LCBR,KC_RCBR, //|-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| - KC_LCTL,KC_MINS, KC_EQL,KC_BSLS, KC_GRV, KC_SCLN,KC_QUOT, KC_LT,KC_LBRC,KC_RBRC,\ + KC_LCTL,KC_MINS, KC_EQL,KC_BSLS, KC_GRV, KC_SCLN,KC_QUOT, KC_LT,KC_LBRC,KC_RBRC, //|-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------| - _______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______ \ + _______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______ //|-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------| ), - [_ADJUST] = LAYOUT( \ + [_ADJUST] = LAYOUT( //,---------------------------------------. ,---------------------------------------. - KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10,\ + KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, //|-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| - KC_F11, KC_F12, RESET,KC_PSCR, KC_INS, RGB_TOG,RGB_HUI,RGB_SAI,RGB_VAI,XXXXXXX,\ + KC_F11, KC_F12, QK_BOOT,KC_PSCR, KC_INS, RGB_TOG,RGB_HUI,RGB_SAI,RGB_VAI,XXXXXXX, //|-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| - XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, RGB_MOD,RGB_HUD,RGB_SAD,RGB_VAD,RGBRST,\ + XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, RGB_MOD,RGB_HUD,RGB_SAD,RGB_VAD,RGBRST, //|-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------| - _______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______ \ + _______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______ //|-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------| ) }; @@ -197,7 +197,7 @@ oled_rotation_t oled_init_user(oled_rotation_t rotation) { return rotation; } -void oled_task_user(void) { +bool oled_task_user(void) { if (is_keyboard_master()) { // If you want to change the display of OLED, you need to change here oled_write_ln(read_layer_state(), false); @@ -209,6 +209,7 @@ void oled_task_user(void) { } else { oled_write(read_logo(), false); } + return false; } #endif // OLED_ENABLE diff --git a/keyboards/uzu42/rev1/config.h b/keyboards/uzu42/rev1/config.h index 5d8c9000e6..815442ed21 100644 --- a/keyboards/uzu42/rev1/config.h +++ b/keyboards/uzu42/rev1/config.h @@ -74,5 +74,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. //#define NO_ACTION_LAYER //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT -//#define NO_ACTION_MACRO -//#define NO_ACTION_FUNCTION diff --git a/keyboards/uzu42/rules.mk b/keyboards/uzu42/rules.mk index d33fedf728..eb2392e08b 100644 --- a/keyboards/uzu42/rules.mk +++ b/keyboards/uzu42/rules.mk @@ -5,20 +5,17 @@ MCU = atmega32u4 BOOTLOADER = caterina # Build Options -# change to "no" to disable the options, or define them in the Makefile in -# the appropriate keymap folder that will get included automatically +# change yes to no to disable # BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite MOUSEKEY_ENABLE = no # Mouse keys EXTRAKEY_ENABLE = no # Audio control and System control CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE = no # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality AUDIO_ENABLE = no # Audio output RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. -# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend OLED_ENABLE = no # OLED display SPLIT_KEYBOARD = yes |