diff --git a/keyboards/hfdkb/monsgeek/m2/config.h b/keyboards/monsgeek/m2/config.h similarity index 100% rename from keyboards/hfdkb/monsgeek/m2/config.h rename to keyboards/monsgeek/m2/config.h diff --git a/keyboards/hfdkb/monsgeek/m2/halconf.h b/keyboards/monsgeek/m2/halconf.h similarity index 100% rename from keyboards/hfdkb/monsgeek/m2/halconf.h rename to keyboards/monsgeek/m2/halconf.h diff --git a/keyboards/hfdkb/monsgeek/m2/info.json b/keyboards/monsgeek/m2/info.json similarity index 100% rename from keyboards/hfdkb/monsgeek/m2/info.json rename to keyboards/monsgeek/m2/info.json diff --git a/keyboards/hfdkb/monsgeek/m2/keymaps/default/keymap.c b/keyboards/monsgeek/m2/keymaps/default/keymap.c similarity index 86% rename from keyboards/hfdkb/monsgeek/m2/keymaps/default/keymap.c rename to keyboards/monsgeek/m2/keymaps/default/keymap.c index ab34f394acd..b0372c120e8 100644 --- a/keyboards/hfdkb/monsgeek/m2/keymaps/default/keymap.c +++ b/keyboards/monsgeek/m2/keymaps/default/keymap.c @@ -26,15 +26,11 @@ enum __layers { MAC_FN }; enum custom_keycodes { - KC_MISSION_CONTROL = SAFE_RANGE, - KC_LAUNCHPAD, - KC_RESET + KC_RESET = SAFE_RANGE }; #define KC_TASK LGUI(KC_TAB) #define KC_FLXP LGUI(KC_E) -#define KC_MCTL KC_MISSION_CONTROL -#define KC_LPAD KC_LAUNCHPAD const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -88,38 +84,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(MAC_FN),RGB_SAD, RGB_VAD, RGB_SAI, KC_P0, KC_PDOT) }; -// clang-format on - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case KC_MISSION_CONTROL: - if (record->event.pressed) { - host_consumer_send(0x29F); - } else { - host_consumer_send(0); - } - return false; // Skip all further processing of this key - case KC_LAUNCHPAD: - if (record->event.pressed) { - host_consumer_send(0x2A0); - } else { - host_consumer_send(0); - } - return false; // Skip all further processing of this key -#ifdef VIA_ENABLE - case KC_RESET: { - if (record->event.pressed) { -# include "via.h" - via_eeprom_set_valid(false); - eeconfig_init_via(); - } - return false; - } -#endif - } - return true; -} #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {[WIN_B] = {ENCODER_CCW_CW(KC_VOLU, KC_VOLD)}, [WIN_WASD] = {ENCODER_CCW_CW(KC_VOLU, KC_VOLD)}, [WIN_FN] = {ENCODER_CCW_CW(RGB_VAI, RGB_VAD)}, [MAC_B] = {ENCODER_CCW_CW(KC_VOLU, KC_VOLD)}, [MAC_WASD] = {ENCODER_CCW_CW(KC_VOLU, KC_VOLD)}, [MAC_FN] = {ENCODER_CCW_CW(RGB_VAI, RGB_VAD)}}; +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [WIN_B] = {ENCODER_CCW_CW(KC_VOLU, KC_VOLD)}, + [WIN_WASD] = {ENCODER_CCW_CW(KC_VOLU, KC_VOLD)}, + [WIN_FN] = {ENCODER_CCW_CW(RGB_VAI, RGB_VAD)}, + [MAC_B] = {ENCODER_CCW_CW(KC_VOLU, KC_VOLD)}, + [MAC_WASD] = {ENCODER_CCW_CW(KC_VOLU, KC_VOLD)}, + [MAC_FN] = {ENCODER_CCW_CW(RGB_VAI, RGB_VAD)} + }; #endif diff --git a/keyboards/hfdkb/monsgeek/m2/keymaps/via/keymap.c b/keyboards/monsgeek/m2/keymaps/via/keymap.c similarity index 89% rename from keyboards/hfdkb/monsgeek/m2/keymaps/via/keymap.c rename to keyboards/monsgeek/m2/keymaps/via/keymap.c index ab34f394acd..180960badda 100644 --- a/keyboards/hfdkb/monsgeek/m2/keymaps/via/keymap.c +++ b/keyboards/monsgeek/m2/keymaps/via/keymap.c @@ -26,15 +26,11 @@ enum __layers { MAC_FN }; enum custom_keycodes { - KC_MISSION_CONTROL = SAFE_RANGE, - KC_LAUNCHPAD, - KC_RESET + KC_RESET = SAFE_RANGE }; #define KC_TASK LGUI(KC_TAB) #define KC_FLXP LGUI(KC_E) -#define KC_MCTL KC_MISSION_CONTROL -#define KC_LPAD KC_LAUNCHPAD const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -92,20 +88,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { - case KC_MISSION_CONTROL: - if (record->event.pressed) { - host_consumer_send(0x29F); - } else { - host_consumer_send(0); - } - return false; // Skip all further processing of this key - case KC_LAUNCHPAD: - if (record->event.pressed) { - host_consumer_send(0x2A0); - } else { - host_consumer_send(0); - } - return false; // Skip all further processing of this key #ifdef VIA_ENABLE case KC_RESET: { if (record->event.pressed) { @@ -119,7 +101,14 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } return true; } - +// clang-format off #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {[WIN_B] = {ENCODER_CCW_CW(KC_VOLU, KC_VOLD)}, [WIN_WASD] = {ENCODER_CCW_CW(KC_VOLU, KC_VOLD)}, [WIN_FN] = {ENCODER_CCW_CW(RGB_VAI, RGB_VAD)}, [MAC_B] = {ENCODER_CCW_CW(KC_VOLU, KC_VOLD)}, [MAC_WASD] = {ENCODER_CCW_CW(KC_VOLU, KC_VOLD)}, [MAC_FN] = {ENCODER_CCW_CW(RGB_VAI, RGB_VAD)}}; +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [WIN_B] = {ENCODER_CCW_CW(KC_VOLU, KC_VOLD)}, + [WIN_WASD] = {ENCODER_CCW_CW(KC_VOLU, KC_VOLD)}, + [WIN_FN] = {ENCODER_CCW_CW(RGB_VAI, RGB_VAD)}, + [MAC_B] = {ENCODER_CCW_CW(KC_VOLU, KC_VOLD)}, + [MAC_WASD] = {ENCODER_CCW_CW(KC_VOLU, KC_VOLD)}, + [MAC_FN] = {ENCODER_CCW_CW(RGB_VAI, RGB_VAD)} + }; #endif diff --git a/keyboards/hfdkb/monsgeek/m2/keymaps/via/rules.mk b/keyboards/monsgeek/m2/keymaps/via/rules.mk similarity index 100% rename from keyboards/hfdkb/monsgeek/m2/keymaps/via/rules.mk rename to keyboards/monsgeek/m2/keymaps/via/rules.mk diff --git a/keyboards/hfdkb/monsgeek/m2/m2.c b/keyboards/monsgeek/m2/m2.c similarity index 100% rename from keyboards/hfdkb/monsgeek/m2/m2.c rename to keyboards/monsgeek/m2/m2.c diff --git a/keyboards/hfdkb/monsgeek/m2/m2.h b/keyboards/monsgeek/m2/m2.h similarity index 100% rename from keyboards/hfdkb/monsgeek/m2/m2.h rename to keyboards/monsgeek/m2/m2.h diff --git a/keyboards/hfdkb/monsgeek/m2/mcuconf.h b/keyboards/monsgeek/m2/mcuconf.h similarity index 100% rename from keyboards/hfdkb/monsgeek/m2/mcuconf.h rename to keyboards/monsgeek/m2/mcuconf.h diff --git a/keyboards/hfdkb/monsgeek/m2/readme.md b/keyboards/monsgeek/m2/readme.md similarity index 91% rename from keyboards/hfdkb/monsgeek/m2/readme.md rename to keyboards/monsgeek/m2/readme.md index e602f19eaf6..34263831b70 100644 --- a/keyboards/hfdkb/monsgeek/m2/readme.md +++ b/keyboards/monsgeek/m2/readme.md @@ -8,8 +8,8 @@ A customizable 98-key keyboard Make example for this keyboard (after setting up your build environment): - make hfdkb/monsgeek/m2:default - make hfdkb/monsgeek/m2:via + make monsgeek/m2:default + make monsgeek/m2:via **Reset Key**: Hold down the key located at *K01*, which programmed as *Esc* while plugging in the keyboard. diff --git a/keyboards/hfdkb/monsgeek/m2/rgb_matrix_kb.inc b/keyboards/monsgeek/m2/rgb_matrix_kb.inc similarity index 100% rename from keyboards/hfdkb/monsgeek/m2/rgb_matrix_kb.inc rename to keyboards/monsgeek/m2/rgb_matrix_kb.inc diff --git a/keyboards/hfdkb/monsgeek/m2/rules.mk b/keyboards/monsgeek/m2/rules.mk similarity index 100% rename from keyboards/hfdkb/monsgeek/m2/rules.mk rename to keyboards/monsgeek/m2/rules.mk