diff --git a/keyboards/crkbd/keymaps/nic/info.json b/keyboards/crkbd/keymaps/nic/info.json index 6469fc375bc7..363308a3d13a 100644 --- a/keyboards/crkbd/keymaps/nic/info.json +++ b/keyboards/crkbd/keymaps/nic/info.json @@ -2,14 +2,12 @@ "keyboard_name": "crkbd", "processor": "STM32F303", "development_board": "proton_c", - "board": "QMK_PROTON_C", "bootloader": "stm32-dfu", - "platform": "chibios", "features": { - "rgblight": true, + "rgblight": false, "bootmagic": true, "mousekey": false, - "extrakey": true, + "extrakey": false, "nkro": true, "rgb_matrix": false }, diff --git a/keyboards/crkbd/keymaps/nic/rules.mk b/keyboards/crkbd/keymaps/nic/rules.mk index 27ec0abdc20a..2f4df32602c9 100644 --- a/keyboards/crkbd/keymaps/nic/rules.mk +++ b/keyboards/crkbd/keymaps/nic/rules.mk @@ -4,6 +4,4 @@ DEBUG_ENABLE = yes CONSOLE_ENABLE = yes -SPLIT_KEYBOARD = yes -VERBOSE = yes FIRMWARE_FORMAT = bin diff --git a/users/nic/config.h b/users/nic/config.h deleted file mode 100644 index 9794ff3857f2..000000000000 --- a/users/nic/config.h +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once - -/* Set Polling rate to 1000Hz */ -//#define USB_POLLING_INTERVAL_MS 1 diff --git a/users/nic/nic.c b/users/nic/nic.c index 56fbb6314664..8f50935cbd26 100644 --- a/users/nic/nic.c +++ b/users/nic/nic.c @@ -1,5 +1,3 @@ -#include "nic.h" - #include QMK_KEYBOARD_H #ifdef AUDIO_ENABLE diff --git a/users/nic/nic.h b/users/nic/nic.h index e3ce78ee24cf..85483b1f660e 100644 --- a/users/nic/nic.h +++ b/users/nic/nic.h @@ -1,5 +1,4 @@ #pragma once - #include QMK_KEYBOARD_H #include "wrappers.h" @@ -11,41 +10,6 @@ enum userspace_layers { _ADJUST }; -enum userspace_custom_keycodes { - VRSN = SAFE_RANGE, // Prints QMK Firmware and board info - KC_MAKE, // Run keyboard's customized make command - KC_RGB_T, // Toggles RGB Layer Indication mode - RGB_IDL, // RGB Idling animations - RGBRST, // Reset RGB - EPRM, // Reset eeprom - NEW_SAFE_RANGE // use "NEWPLACEHOLDER for keymap specific codes -}; #define LOWER MO(_LOWER) //TL_LOWR //MO(_LOWER) #define RAISE MO(_RAISE) //TL_UPPR //MO(_RAISE) -/* OSM keycodes, to keep things clean and easy to change */ -#define OS_LGUI OSM(MOD_LGUI) -#define OS_RGUI OSM(MOD_RGUI) -#define OS_LSFT OSM(MOD_LSFT) -#define OS_RSFT OSM(MOD_RSFT) -#define OS_LCTL OSM(MOD_LCTL) -#define OS_RCTL OSM(MOD_RCTL) -#define OS_LALT OSM(MOD_LALT) -#define OS_RALT OSM(MOD_RALT) -#define OS_MEH OSM(MOD_MEH) -#define OS_HYPR OSM(MOD_HYPR) - -#define MT_TAB MT(MOD_LCTL, KC_TAB) - -#define ALT_APP ALT_T(KC_APP) - -#define MG_NKRO MAGIC_TOGGLE_NKRO - -#define UC_IRNY UC(0x2E2E) -#define UC_CLUE UC(0x203D) - -// KWin Window Switching -#define KC_DT1 LCTL(KC_F1) -#define KC_DT2 LCTL(KC_F2) -#define KC_DT3 LCTL(KC_F3) -#define KC_DT4 LCTL(KC_F4) \ No newline at end of file diff --git a/users/nic/rules.mk b/users/nic/rules.mk index 47a76e5a7b1e..66fbfab0d733 100644 --- a/users/nic/rules.mk +++ b/users/nic/rules.mk @@ -1,11 +1,9 @@ SRC += nic.c -TRI_LAYER_ENABLE = yes +#TRI_LAYER_ENABLE = yes BIN_FOLDER = /workspaces cp: $(FIRMWARE_FORMAT) printf "Copying $(TARGET).$(FIRMWARE_FORMAT) to $(BIN_FOLDER)/$(TARGET).$(FIRMWARE_FORMAT)" | $(AWK_CMD) $(COPY) $(BUILD_DIR)/$(TARGET).$(FIRMWARE_FORMAT) $(BIN_FOLDER)/$(TARGET).$(FIRMWARE_FORMAT) && $(PRINT_OK) - $(SILENT) || printf "Copying $(TARGET).elf to $(BIN_FOLDER)/$(TARGET).elf" | $(AWK_CMD) - $(COPY) $(BUILD_DIR)/$(TARGET).elf $(BIN_FOLDER)/$(TARGET).elf && $(PRINT_OK) diff --git a/users/nic/wrappers.h b/users/nic/wrappers.h index ee14c2b0d486..695d9204f1d9 100644 --- a/users/nic/wrappers.h +++ b/users/nic/wrappers.h @@ -66,13 +66,13 @@ expanded before being used as arguments to the LAYOUT_xxx macro. #define _________________RAISE_R4__________________ _________________NUMPAD_3__________________ #define _________________ADJUST_L1_________________ ___________________BLANK___________________ -#define _________________ADJUST_L2_________________ RGB_MOD, RGB_TOG, RGBRST, VRSN, QK_DEBUG_TOGGLE, EPRM +#define _________________ADJUST_L2_________________ KC_NO, KC_NO, KC_NO, KC_NO, QK_DEBUG_TOGGLE, QK_CLEAR_EEPROM #define _________________ADJUST_L3_________________ MU_TOGG , CK_TOGG, AU_ON, AU_OFF, CG_NORM, QK_BOOT -#define _________________ADJUST_L4_________________ QK_DEBUG_TOGGLE,QK_DEBUG_TOGGLE,RGB_SAD, RGB_VAD, RGB_TOG, RGB_IDL +#define _________________ADJUST_L4_________________ QK_DEBUG_TOGGLE,QK_DEBUG_TOGGLE,KC_NO, KC_NO, KC_NO, KC_NO #define _________________ADJUST_R1_________________ ___________________BLANK___________________ -#define _________________ADJUST_R2_________________ KC_NO, KC_NO, EPRM, KC_MAKE, QK_DEBUG_TOGGLE, QK_BOOT -#define _________________ADJUST_R3_________________ RGB_MOD, KC_MAKE, QK_DEBUG_TOGGLE, QK_BOOT,EPRM,RGB_TOG +#define _________________ADJUST_R2_________________ KC_NO, KC_NO, KC_NO, KC_TRNS, QK_DEBUG_TOGGLE, QK_BOOT +#define _________________ADJUST_R3_________________ KC_NO, KC_TRNS, QK_DEBUG_TOGGLE, QK_BOOT,QK_CLEAR_EEPROM,RGB_TOG #define _________________ADJUST_R4_________________ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, TO(0) // clang-format on