From a85643739b29ed5ad0b10d5d1cb22063177b1e56 Mon Sep 17 00:00:00 2001 From: Bart Riemens Date: Mon, 2 Dec 2019 16:20:44 +0100 Subject: [PATCH] Update dz60rgb keymap --- .../dztech/dz60rgb/keymaps/briemens/keymap.c | 7 ++++--- keyboards/dztech/dz60rgb/v2/rules.mk | 18 +++++------------- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/keyboards/dztech/dz60rgb/keymaps/briemens/keymap.c b/keyboards/dztech/dz60rgb/keymaps/briemens/keymap.c index 133e7c39a..4d91e812b 100644 --- a/keyboards/dztech/dz60rgb/keymaps/briemens/keymap.c +++ b/keyboards/dztech/dz60rgb/keymaps/briemens/keymap.c @@ -11,19 +11,19 @@ enum { #define SftLck TD(SFT_LCK) const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_LAYER0] = LAYOUT_ANSI( /* Base */ + [_LAYER0] = LAYOUT_60_ansi( /* Base */ KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, 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_LBRC, KC_RBRC, KC_BSLS,\ LT(2, KC_ESC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \ SftLck, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,\ KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RALT, MO(1) , KC_APP, KC_RCTL), - [_LAYER1] = LAYOUT_ANSI( /* FN */ + [_LAYER1] = LAYOUT_60_ansi( /* FN */ KC_GRV, 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_DEL ,\ KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS,\ KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\ KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), - [_LAYER2] = LAYOUT_ANSI( /* FN2 */ + [_LAYER2] = LAYOUT_60_ansi( /* FN2 */ KC_TRNS, KC_BRIGHTNESS_DOWN, KC_BRIGHTNESS_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PREV_TRACK, KC_MEDIA_NEXT_TRACK, KC_MEDIA_PLAY_PAUSE, KC_VOLD, KC_VOLU, KC_TRNS,\ KC_TRNS, LCTL(KC_Q), LCTL(KC_W), LCTL(KC_E), LCTL(KC_R), LCTL(KC_T), LCTL(KC_Y), KC_PGUP, KC_HOME, KC_END, KC_PGDOWN, LSFT(LCTL(KC_TAB)), LCTL(KC_TAB), KC_TRNS,\ KC_TRNS, LCTL(KC_A), LCTL(KC_S), LCTL(KC_D), LCTL(KC_F), LCTL(KC_G), KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, LCTL(LALT(KC_SCOLON)), LCTL(LALT(KC_QUOTE)), LGUI(KC_TAB),\ @@ -40,6 +40,7 @@ void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue, bool def } void rgb_matrix_indicators_user(void) { + return; uint8_t this_led = host_keyboard_leds(); if (!g_suspend_state) { switch (biton32(layer_state)) { diff --git a/keyboards/dztech/dz60rgb/v2/rules.mk b/keyboards/dztech/dz60rgb/v2/rules.mk index 9dda31a1b..3d2d0cff4 100644 --- a/keyboards/dztech/dz60rgb/v2/rules.mk +++ b/keyboards/dztech/dz60rgb/v2/rules.mk @@ -1,16 +1,7 @@ -MCU = atmega32u4 - -# Bootloader selection -# Teensy halfkay -# Pro Micro caterina -# Atmel DFU atmel-dfu -# LUFA DFU lufa-dfu -# QMK DFU qmk-dfu -# ATmega32A bootloadHID -# ATmega328P USBasp -BOOTLOADER = atmel-dfu - -BACKLIGHT_ENABLE = no +MCU = STM32F303 +DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave +DFU_SUFFIX_ARGS = -p DF11 -v 0483 +BACKLIGHT_ENABLE = yes BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control @@ -21,3 +12,4 @@ NKRO_ENABLE = yes # USB Nkey Rollover AUDIO_ENABLE = no RGB_MATRIX_ENABLE = IS31FL3733 # Use RGB matrix NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in +LAYOUTS = 60_ansi