diff options
5 files changed, 57 insertions, 122 deletions
| diff --git a/keyboards/thevankeyboards/minivan/config.h b/keyboards/thevankeyboards/minivan/config.h index 22fb377629..7bc8192ed3 100644 --- a/keyboards/thevankeyboards/minivan/config.h +++ b/keyboards/thevankeyboards/minivan/config.h @@ -66,91 +66,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  /* Locking resynchronize hack */  #define LOCKING_RESYNC_ENABLE -/* - * Force NKRO - * - * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved - * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the - * makefile for this to work.) - * - * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) - * until the next keyboard reset. - * - * NKRO may prevent your keystrokes from being detected in the BIOS, but it is - * fully operational during normal computer usage. - * - * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N) - * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by - * bootmagic, NKRO mode will always be enabled until it is toggled again during a - * power-up. - * - */ -//#define FORCE_NKRO - -/* - * Magic Key Options - * - * Magic keys are hotkey commands that allow control over firmware functions of - * the keyboard. They are best used in combination with the HID Listen program, - * found here: https://www.pjrc.com/teensy/hid_listen.html - * - * The options below allow the magic key functionality to be changed. This is - * useful if your keyboard/keypad is missing keys and you want magic key support. - * - */ - -/* control how magic key switches layers */ -//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS  true -//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS  true -//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false - -/* override magic key keymap */ -//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS -//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS -//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM -//#define MAGIC_KEY_HELP1          H -//#define MAGIC_KEY_HELP2          SLASH -//#define MAGIC_KEY_DEBUG          D -//#define MAGIC_KEY_DEBUG_MATRIX   X -//#define MAGIC_KEY_DEBUG_KBD      K -//#define MAGIC_KEY_DEBUG_MOUSE    M -//#define MAGIC_KEY_VERSION        V -//#define MAGIC_KEY_STATUS         S -//#define MAGIC_KEY_CONSOLE        C -//#define MAGIC_KEY_LAYER0_ALT1    ESC -//#define MAGIC_KEY_LAYER0_ALT2    GRAVE -//#define MAGIC_KEY_LAYER0         0 -//#define MAGIC_KEY_LAYER1         1 -//#define MAGIC_KEY_LAYER2         2 -//#define MAGIC_KEY_LAYER3         3 -//#define MAGIC_KEY_LAYER4         4 -//#define MAGIC_KEY_LAYER5         5 -//#define MAGIC_KEY_LAYER6         6 -//#define MAGIC_KEY_LAYER7         7 -//#define MAGIC_KEY_LAYER8         8 -//#define MAGIC_KEY_LAYER9         9 -//#define MAGIC_KEY_BOOTLOADER     PAUSE -//#define MAGIC_KEY_LOCK           CAPS -//#define MAGIC_KEY_EEPROM         E -//#define MAGIC_KEY_NKRO           N -//#define MAGIC_KEY_SLEEP_LED      Z - -/* - * Feature disable options - *  These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT -//#define NO_ACTION_MACRO -//#define NO_ACTION_FUNCTION +/* RGB Setup */ +#define RGB_DI_PIN D0 +#define RGBLED_NUM 3 +#define RGBLIGHT_SLEEP  #endif diff --git a/keyboards/thevankeyboards/minivan/keymaps/jetpacktuxedo/config.h b/keyboards/thevankeyboards/minivan/keymaps/jetpacktuxedo/config.h index 5f5872becc..426b76b3b1 100644 --- a/keyboards/thevankeyboards/minivan/keymaps/jetpacktuxedo/config.h +++ b/keyboards/thevankeyboards/minivan/keymaps/jetpacktuxedo/config.h @@ -1,7 +1,4 @@ -#ifndef CONFIG_USER_H -#define CONFIG_USER_H - -#include "../../config.h" +#pragma once  #define PERMISSIVE_HOLD -#endif +#define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/thevankeyboards/minivan/keymaps/jetpacktuxedo/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/jetpacktuxedo/keymap.c index 4c045ac0a5..f9bb64e05f 100644 --- a/keyboards/thevankeyboards/minivan/keymaps/jetpacktuxedo/keymap.c +++ b/keyboards/thevankeyboards/minivan/keymaps/jetpacktuxedo/keymap.c @@ -11,13 +11,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {    ),    [1] = LAYOUT_arrow_command( /* LAYER 2 */      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL, -    KC_TRNS, KC_MINS, KC_EQL,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MINS, KC_EQL,  KC_QUOT, KC_TRNS, +    KC_TRNS, KC_MINS, KC_EQL,  KC_SCLN, KC_QUOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_MINS, KC_EQL,  KC_QUOT, KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_PGUP, KC_BSLS,      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS, KC_HOME, KC_PGDN, KC_END    ),    [2] = LAYOUT_arrow_command( /* LAYER 1 */      KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL, -    KC_TRNS, KC_UNDS, KC_PLUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UNDS, KC_PLUS, KC_DQUO, KC_TRNS, +    KC_TRNS, KC_UNDS, KC_PLUS, KC_COLN, KC_DQUO, KC_TRNS, KC_TRNS, KC_TRNS, KC_UNDS, KC_PLUS, KC_DQUO, KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LCBR, KC_RCBR, KC_PGUP, KC_PIPE,      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS, KC_HOME, KC_PGDN, KC_END    ), @@ -30,7 +30,54 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {    [4] = LAYOUT_arrow_command( /* Gaming Layer*/      KC_ESC,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_WH_U, KC_BTN1, KC_MS_U, KC_BTN2, KC_TRNS, KC_TRNS,      KC_TAB,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_WH_D, KC_MS_L, KC_MS_D, KC_MS_R, 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_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, LT(5, KC_SLSH),      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_SPACE, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS +  ), +  [5] = LAYOUT_arrow_command( /* RESET Layer*/ +    RESET,   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_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_TRNS, +    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,  KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS    )  }; + +void keyboard_post_init_user(void) { +  #ifdef RGBLIGHT_ENABLE +    // Set up RGB effects on _only_ the third LED (index 2) +    rgblight_set_effect_range(2, 1); +    // Set LED effects to breathing mode in a tealish blue color +    rgblight_sethsv_noeeprom(185, 255, 255); +    rgblight_mode_noeeprom(RGBLIGHT_EFFECT_BREATHING + 2); + +    // Init the first two LEDs to a static color +    setrgb(0, 0, 0, (LED_TYPE *)&led[0]); +    setrgb(0, 0, 0, (LED_TYPE *)&led[1]); +    rgblight_set(); +  #endif //RGBLIGHT_ENABLE +} + +uint32_t layer_state_set_user(uint32_t state){ +  #ifdef RGBLIGHT_ENABLE +    uint8_t led0r = 0; uint8_t led0g = 0; uint8_t led0b = 0; +    uint8_t led1r = 0; uint8_t led1g = 0; uint8_t led1b = 0; + +    if (layer_state_cmp(state, 1)) { +      led0r = 255; +    } +    if (layer_state_cmp(state, 2)) { +      led0g = 255; +    } + +    if (layer_state_cmp(state, 4)) { +      led1b = 255; +    } +    if (layer_state_cmp(state, 5)) { +      led1r = 255; +    } + +    setrgb(led0r, led0g, led0b, (LED_TYPE *)&led[0]); +    setrgb(led1r, led1g, led1b, (LED_TYPE *)&led[1]); +    rgblight_set(); +  #endif //RGBLIGHT_ENABLE +  return state; +} diff --git a/keyboards/thevankeyboards/minivan/keymaps/jetpacktuxedo/rules.mk b/keyboards/thevankeyboards/minivan/keymaps/jetpacktuxedo/rules.mk index d7ca73ac58..4a27701076 100644 --- a/keyboards/thevankeyboards/minivan/keymaps/jetpacktuxedo/rules.mk +++ b/keyboards/thevankeyboards/minivan/keymaps/jetpacktuxedo/rules.mk @@ -13,5 +13,5 @@ MIDI_ENABLE = no            # MIDI controls  AUDIO_ENABLE = no           # Audio output on port C6  UNICODE_ENABLE = no         # Unicode  BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID -RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.  +RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.  SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend diff --git a/keyboards/thevankeyboards/minivan/minivan.c b/keyboards/thevankeyboards/minivan/minivan.c index b260195cec..19996f9208 100644 --- a/keyboards/thevankeyboards/minivan/minivan.c +++ b/keyboards/thevankeyboards/minivan/minivan.c @@ -1,28 +1 @@  #include "minivan.h" - -void matrix_init_kb(void) { -	// put your keyboard start-up code here -	// runs once when the firmware starts up - -	matrix_init_user(); -} - -void matrix_scan_kb(void) { -	// put your looping keyboard code here -	// runs every cycle (a lot) - -	matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { -	// put your per-action keyboard code here -	// runs for every action, just before processing by the firmware - -	return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { -	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - -	led_set_user(usb_led); -} | 
