diff --git a/keyboards/aplusx_pulsar/xboard_qs/keymaps/via/keymap.c b/keyboards/aplusx_pulsar/xboard_qs/keymaps/via/keymap.c index 685bcaa6cc0..2b914e44348 100644 --- a/keyboards/aplusx_pulsar/xboard_qs/keymaps/via/keymap.c +++ b/keyboards/aplusx_pulsar/xboard_qs/keymaps/via/keymap.c @@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [MAC_BASE] = LAYOUT( /* Layer 2 ; MAC Base Layer */ KC_PC1, KC_PC2, KC_MUTE, - KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_SPLT, KC_SIRI, KC_DOND, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE,KC_VOLD,KC_VOLU, KC_TMODE, KC_SNAP,KC_LPAD,KC_LOCK_, + KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_WSCH, KC_SIRI, KC_DOND, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE,KC_VOLD,KC_VOLU, KC_TMODE, KC_SNAP,KC_LPAD,KC_LOCK_, 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_INS, KC_HOME, KC_PGUP, 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, KC_DEL, KC_END, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, diff --git a/keyboards/aplusx_pulsar/xboard_qs/xboard_qs.c b/keyboards/aplusx_pulsar/xboard_qs/xboard_qs.c index f4b6c47450e..797b28fd496 100644 --- a/keyboards/aplusx_pulsar/xboard_qs/xboard_qs.c +++ b/keyboards/aplusx_pulsar/xboard_qs/xboard_qs.c @@ -47,12 +47,14 @@ void kvm_switch(bool pc_num){ kvm_timer = timer_read(); kvm_sel_on = true; -}; +} void keyboard_pre_init_kb(void) { gpio_set_pin_output(GPIO_KM_OE); // H/W power on default = 0 gpio_set_pin_output(GPIO_KM_SEL); // H/W power on default = 0 gpio_set_pin_output(GPIO_KM_PWEN); // H/W power on default = 1 + + keyboard_pre_init_user(); } void keyboard_post_init_kb(void) { @@ -62,6 +64,8 @@ void keyboard_post_init_kb(void) { Status_LED_Bright = keyboard_config.eeprom_Status_LED_Bright; // 0 = 초기값, 1~5 = 50~250의 5단계 밝기 if (Status_LED_Bright == 0) Status_LED_Bright = 5; + + keyboard_post_init_user(); } #define HCS(report) host_consumer_send(record->event.pressed ? report : 0); return false @@ -80,8 +84,6 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { } break; - case KC_SPOTLIGHT: - HCS(0x221); case KC_DICTATION: HCS(0xCF); case KC_DO_NOT_DISTURB: @@ -198,12 +200,12 @@ void housekeeping_task_kb(void) { } #ifdef DYNAMIC_MACRO_ENABLE -void dynamic_macro_record_start_kb(int8_t direction) { +__attribute__((weak)) void dynamic_macro_record_start_user(int8_t direction) { isRecording = true; isRecordingLedOn = true; recording_timer = timer_read(); } -void dynamic_macro_record_end_kb(int8_t direction){ +__attribute__((weak)) void dynamic_macro_record_end_user(int8_t direction) { isRecording = false; isRecordingLedOn = false; } diff --git a/keyboards/aplusx_pulsar/xboard_qs/xboard_qs.h b/keyboards/aplusx_pulsar/xboard_qs/xboard_qs.h index 7314039b201..f205b786e9d 100644 --- a/keyboards/aplusx_pulsar/xboard_qs/xboard_qs.h +++ b/keyboards/aplusx_pulsar/xboard_qs/xboard_qs.h @@ -23,7 +23,6 @@ enum pulsar_keycodes { KC_WIN_MODE, // WINDOWS Keyboard로 변경 KC_MAC_MODE, // Machintosh Keyboard로 변경 KC_TMODE, // WINDOWS <--> Machintosh - KC_SPOTLIGHT, // MAC_key KC_DICTATION, // MAC_key KC_DO_NOT_DISTURB, // MAC_key KC_LOCK_SCREEN, // MAC_key @@ -33,13 +32,12 @@ enum pulsar_keycodes { KC_PC2, // KM Switch PC2 KC_TPC, // KM Switch PC1<-->PC2 Toggle INIT_3S, // EE_CLR(EEPROM CLear)(공장초기화)를 3초이상 눌러야 동작 - KC_S_LED, // Change Status LED Brightness -}; + KC_S_LED // Change Status LED Brightness +} #define KC_WINM KC_WIN_MODE #define KC_MACM KC_MAC_MODE -#define KC_SPLT KC_SPOTLIGHT #define KC_SIRI KC_DICTATION #define KC_DOND KC_DO_NOT_DISTURB #define KC_LOCK_ KC_LOCK_SCREEN