From bcfceaa41df10966553f713bfe6360ab7f21ac3c Mon Sep 17 00:00:00 2001 From: Isaac Rex Date: Sat, 2 Sep 2023 16:28:01 -0500 Subject: [PATCH] Updated Nifty Numpad readme Updated Cadence keymap Updated vscode settings to match QMK master --- .vscode/settings.json | 12 +--- keyboards/nifty_numpad/config.h | 58 +++++++++++++------ .../nifty_numpad/keymaps/cadence/keymap.c | 47 ++++++++------- keyboards/nifty_numpad/keymaps/via/keymap.c | 1 + keyboards/nifty_numpad/readme.md | 28 +++++---- 5 files changed, 82 insertions(+), 64 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 2fc34952a67..f369ecb1748 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -11,7 +11,6 @@ }, "files.associations": { "*.h": "c", - "*.ino": "cpp", "*.c": "c", "*.inc": "c", "*.cpp": "cpp", @@ -19,16 +18,7 @@ "xstddef": "c", "type_traits": "c", "utility": "c", - "ranges": "c", - "ios": "c", - "regex": "c", - "random": "c", - "variant": "c", - "chrono": "c", - "limits": "c", - "algorithm": "c", - "locale": "c", - "string": "c" + "ranges": "c" }, "[markdown]": { "editor.trimAutoWhitespace": false, diff --git a/keyboards/nifty_numpad/config.h b/keyboards/nifty_numpad/config.h index b2f5e8eff08..3bc1724debc 100644 --- a/keyboards/nifty_numpad/config.h +++ b/keyboards/nifty_numpad/config.h @@ -9,24 +9,6 @@ #define RGB_MATRIX_LED_COUNT 33 #define WS2812_DI_PIN GP19 -// RGB Matrix Enabled Effects -#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN -#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT -#define ENABLE_RGB_MATRIX_BREATHING -#define ENABLE_RGB_MATRIX_BAND_SAT -#define ENABLE_RGB_MATRIX_BAND_VAL -#define ENABLE_RGB_MATRIX_CYCLE_ALL -#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT -#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN -#define ENABLE_RGB_MATRIX_HUE_BREATHING -#define ENABLE_RGB_MATRIX_HUE_PENDULUM -#define ENABLE_RGB_MATRIX_HUE_WAVE -#define ENABLE_RGB_MATRIX_PIXEL_RAIN -#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE -#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE -#define ENABLE_RGB_MATRIX_SPLASH -#define ENABLE_RGB_MATRIX_SOLID_SPLASH - // RGB Matrix Parameters #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR // Sets the default mode, if none has been set #define RGB_MATRIX_DEFAULT_SPD 100 // Sets the default animation speed, if none has been set @@ -37,4 +19,42 @@ #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS // Sets the default brightness value, if none has been set #define RGB_MATRIX_FRAMEBUFFER_EFFECTS -#define RGB_MATRIX_KEYPRESSES \ No newline at end of file +#define RGB_MATRIX_KEYPRESSES + +// RGB Matrix Enabled Effects +#define ENABLE_RGB_MATRIX_ALPHAS_MODS +#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN +#define ENABLE_RGB_MATRIX_BREATHING +#define ENABLE_RGB_MATRIX_BAND_SAT +#define ENABLE_RGB_MATRIX_BAND_VAL +#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT +#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL +#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT +#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL +#define ENABLE_RGB_MATRIX_CYCLE_ALL +#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT +#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN +#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN +#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL +#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON +#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL +#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL +#define ENABLE_RGB_MATRIX_DUAL_BEACON +#define ENABLE_RGB_MATRIX_RAINBOW_BEACON +#define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS +#define ENABLE_RGB_MATRIX_RAINDROPS +#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS +#define ENABLE_RGB_MATRIX_TYPING_HEATMAP +#define ENABLE_RGB_MATRIX_DIGITAL_RAIN +#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE +#define ENABLE_RGB_MATRIX_SOLID_REACTIVE +#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE +#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE +#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS +#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS +#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS +#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS +#define ENABLE_RGB_MATRIX_SPLASH +#define ENABLE_RGB_MATRIX_MULTISPLASH +#define ENABLE_RGB_MATRIX_SOLID_SPLASH +#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH \ No newline at end of file diff --git a/keyboards/nifty_numpad/keymaps/cadence/keymap.c b/keyboards/nifty_numpad/keymaps/cadence/keymap.c index 2f7a99298f0..c973550ece4 100644 --- a/keyboards/nifty_numpad/keymaps/cadence/keymap.c +++ b/keyboards/nifty_numpad/keymaps/cadence/keymap.c @@ -13,18 +13,17 @@ #define STR_ROUTE "xx" #define STR_SLIDE "dd" #define STR_VIA "vv" -#define STR_MEASURE "me" +#define STR_MEASURE "~m" #define STR_SHOW "sh" #define STR_UPDATE_SHAPES "sup" -#define STR_ROTATE "rr" -#define STR_MIRROR "ff" +#define STR_ROTATE "r" +#define STR_MIRROR "f" #define STR_PAM "pam" -#define STR_MOVE "mm" +#define STR_MOVE "m" // Layer Defines #define _LAYER_BL 0 #define _LAYER_CAD 1 -#define _LAYER_RGB 15 #define _LAYER_CAD_LED_INDEX 8 @@ -82,18 +81,18 @@ void tap_dance_num_toggle(tap_dance_state_t *state, void *user_data){ tap_dance_action_t tap_dance_actions[] = { [TD_NUM_TOGGLE] = ACTION_TAP_DANCE_FN(tap_dance_num_toggle), - [TD_M1] = ACTION_TAP_DANCE_DOUBLE(KC_F13, LCTL(KC_F13)), - [TD_M2] = ACTION_TAP_DANCE_DOUBLE(KC_F14, LCTL(KC_F14)), - [TD_M3] = ACTION_TAP_DANCE_DOUBLE(KC_F15, LCTL(KC_F15)), - [TD_M4] = ACTION_TAP_DANCE_DOUBLE(KC_F16, LCTL(KC_F16)), - [TD_M5] = ACTION_TAP_DANCE_DOUBLE(KC_F17, LCTL(KC_F17)), - [TD_M6] = ACTION_TAP_DANCE_DOUBLE(KC_F18, LCTL(KC_F18)), - [TD_M7] = ACTION_TAP_DANCE_DOUBLE(KC_F19, LCTL(KC_F19)), - [TD_M8] = ACTION_TAP_DANCE_DOUBLE(KC_F20, LCTL(KC_F20)), - [TD_M9] = ACTION_TAP_DANCE_DOUBLE(KC_F21, LCTL(KC_F21)), - [TD_M10] = ACTION_TAP_DANCE_DOUBLE(KC_F22, LCTL(KC_F22)), - [TD_M11] = ACTION_TAP_DANCE_DOUBLE(KC_F23, LCTL(KC_F23)), - [TD_M12] = ACTION_TAP_DANCE_DOUBLE(KC_F24, LCTL(KC_F24)) + [TD_M1] = ACTION_TAP_DANCE_DOUBLE(LSFT(KC_1), LCTL(KC_1)), + [TD_M2] = ACTION_TAP_DANCE_DOUBLE(LSFT(KC_2), LCTL(KC_2)), + [TD_M3] = ACTION_TAP_DANCE_DOUBLE(LSFT(KC_3), LCTL(KC_3)), + [TD_M4] = ACTION_TAP_DANCE_DOUBLE(LSFT(KC_4), LCTL(KC_4)), + [TD_M5] = ACTION_TAP_DANCE_DOUBLE(LSFT(KC_5), LCTL(KC_5)), + [TD_M6] = ACTION_TAP_DANCE_DOUBLE(LSFT(KC_F5), LCTL(KC_F5)), + [TD_M7] = ACTION_TAP_DANCE_DOUBLE(LSFT(KC_F6), LCTL(KC_F6)), + [TD_M8] = ACTION_TAP_DANCE_DOUBLE(LSFT(KC_6), LCTL(KC_6)), + [TD_M9] = ACTION_TAP_DANCE_DOUBLE(LSFT(KC_7), LCTL(KC_7)), + [TD_M10] = ACTION_TAP_DANCE_DOUBLE(LSFT(KC_8), LCTL(KC_8)), + [TD_M11] = ACTION_TAP_DANCE_DOUBLE(LSFT(KC_9), LCTL(KC_9)), + [TD_M12] = ACTION_TAP_DANCE_DOUBLE(LSFT(KC_0), LCTL(KC_0)) }; // Setup LED map @@ -142,12 +141,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * └───┴───┘ └───────┴───┴───┘ */ [_LAYER_BL] = LAYOUT_numpad_6x6( - TD(TD_M1), TD(TD_M12), LT(_LAYER_RGB, KC_F1), KC_F2, KC_F3, KC_F4, - TD(TD_M2), TD(TD_M11), TD(TD_NUM_TOGGLE), KC_PSLS, KC_PAST, KC_PMNS, - TD(TD_M3), TD(TD_M10), KC_P7, KC_P8, KC_P9, KC_PPLS, - TD(TD_M4), TD(TD_M9), KC_P4, KC_P5, KC_P6, - TD(TD_M5), TD(TD_M8), KC_P1, KC_P2, KC_P3, KC_PENT, - TD(TD_M6), TD(TD_M7), KC_P0, KC_PDOT + TD(TD_M1), TD(TD_M12), LT(_LAYER_RGB, (KC_F1)), LALT(LWIN(KC_F)), KC_F3, KC_BACKSPACE, + TD(TD_M2), TD(TD_M11), TD(TD_NUM_TOGGLE), KC_PSLS, KC_PAST, KC_PMNS, + TD(TD_M3), TD(TD_M10), KC_P7, KC_P8, KC_P9, KC_PPLS, + TD(TD_M4), TD(TD_M9), KC_P4, KC_P5, KC_P6, + TD(TD_M5), TD(TD_M8), KC_P1, KC_P2, KC_P3, KC_PENT, + TD(TD_M6), TD(TD_M7), KC_P0, KC_PDOT ), /* @@ -171,7 +170,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, TD(TD_NUM_TOGGLE), _______, _______, _______, _______, _______, ROUTE, SLIDE, VIA, KC_F8, _______, _______, MEASURE, SHOW, UPDATE_SHAPES, - _______, _______, ROTATE, MIRROR, PAM, KC_F6, + _______, _______, ROTATE, MIRROR, PAM, KC_ESC, _______, _______, MOVE, KC_F9 ), diff --git a/keyboards/nifty_numpad/keymaps/via/keymap.c b/keyboards/nifty_numpad/keymaps/via/keymap.c index 35e65f8a849..9460e54e4f4 100644 --- a/keyboards/nifty_numpad/keymaps/via/keymap.c +++ b/keyboards/nifty_numpad/keymaps/via/keymap.c @@ -6,6 +6,7 @@ #define _LAYER_BL 0 #define _LAYER_RGB 3 + // Setup LED map led_config_t g_led_config = { { // Key Matrix to LED Index diff --git a/keyboards/nifty_numpad/readme.md b/keyboards/nifty_numpad/readme.md index 9d091ea7cfd..8bb0bc82f60 100644 --- a/keyboards/nifty_numpad/readme.md +++ b/keyboards/nifty_numpad/readme.md @@ -1,12 +1,21 @@ -# nifty_numpad +# Nifty Numpad -![nifty_numpad](imgur.com image replace me!) +![Nifty Numpad](https://gitlab.com/Acliad/nifty-numpad/-/raw/main/Docs/Render%20(Blue,%20SS%20screws).png) -*A short description of the keyboard/project* +Nifty Numpad is a full sized numpad with an extra row and two extra columns of macro keys. It was created because I wanted a companion to my TKL keyboard for work. My main workflow involves heavy use of ECAD programs, so the design was tailored for that, but it is generic enough to be nice for many workflows! -* Keyboard Maintainer: [Isaac Rex](https://github.com/Isaac Rex) -* Hardware Supported: *The PCBs, controllers supported* -* Hardware Availability: *Links to where you can find this hardware* + +The main features are: +- Full sized numpad with row of macro/function keys on the top +- Two extra columns of macro keys +- Cherry MX style socketed switches +- Key Backlights +- 3D printable case (FDM or resin) + +### Development Information: +* Keyboard Maintainer: [Isaac Rex](https://github.com/Acliad/) +* Hardware Supported: RP2040 +* Hardware Availability: See [The GitLab Page](https://gitlab.com/Acliad/nifty-numpad) for full details Make example for this keyboard (after setting up your build environment): @@ -20,8 +29,7 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to ## Bootloader -Enter the bootloader in 3 ways: +Enter the bootloader in 2 ways: -* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard -* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead -* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (top left) and plug in the keyboard +* **Physical reset button**: Press the ```RST``` button while holding the ```BOOT_SEL``` button on the back of the PCB