diff options
| -rw-r--r-- | common_features.mk | 5 | ||||
| -rw-r--r-- | docs/cli_commands.md | 2 | ||||
| -rw-r--r-- | docs/feature_rgblight.md | 4 | ||||
| -rw-r--r-- | keyboards/mxss/rules.mk | 26 | ||||
| -rw-r--r-- | quantum/rgblight/rgblight.c (renamed from quantum/rgblight.c) | 2 | ||||
| -rw-r--r-- | quantum/rgblight/rgblight.h (renamed from quantum/rgblight.h) | 0 | ||||
| -rw-r--r-- | quantum/rgblight/rgblight_breathe_table.h (renamed from quantum/rgblight_breathe_table.h) | 0 | ||||
| -rw-r--r-- | quantum/rgblight/rgblight_modes.h (renamed from quantum/rgblight_modes.h) | 0 | ||||
| -rw-r--r-- | quantum/rgblight/rgblight_post_config.h (renamed from quantum/rgblight_post_config.h) | 0 | 
9 files changed, 16 insertions, 23 deletions
| diff --git a/common_features.mk b/common_features.mk index 9373d1de25..2d3f00d216 100644 --- a/common_features.mk +++ b/common_features.mk @@ -196,10 +196,11 @@ ifeq ($(strip $(RGBLIGHT_ENABLE)), yes)      ifeq ($(filter $(RGBLIGHT_DRIVER),$(VALID_RGBLIGHT_TYPES)),)          $(error RGBLIGHT_DRIVER="$(RGBLIGHT_DRIVER)" is not a valid RGB type)      else -        POST_CONFIG_H += $(QUANTUM_DIR)/rgblight_post_config.h +        COMMON_VPATH += $(QUANTUM_DIR)/rgblight +        POST_CONFIG_H += $(QUANTUM_DIR)/rgblight/rgblight_post_config.h          OPT_DEFS += -DRGBLIGHT_ENABLE          SRC += $(QUANTUM_DIR)/color.c -        SRC += $(QUANTUM_DIR)/rgblight.c +        SRC += $(QUANTUM_DIR)/rgblight/rgblight.c          CIE1931_CURVE := yes          RGB_KEYCODES_ENABLE := yes      endif diff --git a/docs/cli_commands.md b/docs/cli_commands.md index 581342093a..e30593daa9 100644 --- a/docs/cli_commands.md +++ b/docs/cli_commands.md @@ -368,7 +368,7 @@ qmk generate-docs  ## `qmk generate-rgb-breathe-table` -This command generates a lookup table (LUT) header file for the [RGB Lighting](feature_rgblight.md) feature's breathing animation. Place this file in your keyboard or keymap directory as `rgblight_breathe_table.h` to override the default LUT in `quantum/`. +This command generates a lookup table (LUT) header file for the [RGB Lighting](feature_rgblight.md) feature's breathing animation. Place this file in your keyboard or keymap directory as `rgblight_breathe_table.h` to override the default LUT in `quantum/rgblight/`.  **Usage**: diff --git a/docs/feature_rgblight.md b/docs/feature_rgblight.md index 994a014a28..0e75411f09 100644 --- a/docs/feature_rgblight.md +++ b/docs/feature_rgblight.md @@ -119,7 +119,7 @@ if `RGBLIGHT_EFFECT_xxxx` or `RGBLIGHT_ANIMATIONS` is defined, you also have a n  Check out [this video](https://youtube.com/watch?v=VKrpPAHlisY) for a demonstration. -Note: For versions older than 0.6.117, The mode numbers were written directly. In `quantum/rgblight.h` there is a contrast table between the old mode number and the current symbol. +Note: For versions older than 0.6.117, The mode numbers were written directly. In `quantum/rgblight/rgblight.h` there is a contrast table between the old mode number and the current symbol.  ### Effect and Animation Toggles @@ -328,7 +328,7 @@ Normally lighting layers are not shown when RGB Lighting is disabled (e.g. with  ## Functions -If you need to change your RGB lighting in code, for example in a macro to change the color whenever you switch layers, QMK provides a set of functions to assist you. See [`rgblight.h`](https://github.com/qmk/qmk_firmware/blob/master/quantum/rgblight.h) for the full list, but the most commonly used functions include: +If you need to change your RGB lighting in code, for example in a macro to change the color whenever you switch layers, QMK provides a set of functions to assist you. See [`rgblight.h`](https://github.com/qmk/qmk_firmware/blob/master/quantum/rgblight/rgblight.h) for the full list, but the most commonly used functions include:  ### Utility Functions  |Function                                    |Description                                                        | diff --git a/keyboards/mxss/rules.mk b/keyboards/mxss/rules.mk index 7dc98d4739..40de15828a 100644 --- a/keyboards/mxss/rules.mk +++ b/keyboards/mxss/rules.mk @@ -2,39 +2,31 @@  MCU = atmega32u4  # Bootloader selection -#   Teensy       halfkay -#   Pro Micro    caterina -#   Atmel DFU    atmel-dfu -#   LUFA DFU     lufa-dfu -#   QMK DFU      qmk-dfu -#   ATmega32A    bootloadHID -#   ATmega328P   USBasp  BOOTLOADER = atmel-dfu  # Build Options  #   change yes to no to disable  # -BOOTMAGIC_ENABLE = lite      # Virtual DIP switch configuration +BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration  MOUSEKEY_ENABLE = yes       # Mouse keys  EXTRAKEY_ENABLE = yes       # Audio control and System control -CONSOLE_ENABLE = no        # Console for debug +CONSOLE_ENABLE = no         # Console for debug  COMMAND_ENABLE = yes        # Commands for debug and configuration  # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE  SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend  # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work  NKRO_ENABLE = no            # USB Nkey Rollover -BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality on B7 by default -MIDI_ENABLE = no            # MIDI support -UNICODE_ENABLE = no         # Unicode -BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID -AUDIO_ENABLE = no           # Audio output on port C6 +BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality +BLUETOOTH_ENABLE = no       # Enable Bluetooth +AUDIO_ENABLE = no           # Audio output  SRC += mxss_frontled.c  # Remove the common RGB light code and use my iteration instead +COMMON_VPATH += $(QUANTUM_DIR)/rgblight  OPT_DEFS += -DRGBLIGHT_ENABLE -SRC += $(QUANTUM_DIR)/process_keycode/process_rgb.c  SRC += rgblight.c -SRC += color.c -SRC += ws2812.c +SRC += $(QUANTUM_DIR)/color.c +WS2812_DRIVER_REQUIRED = yes  CIE1931_CURVE = yes +RGB_KEYCODES_ENABLE = yes diff --git a/quantum/rgblight.c b/quantum/rgblight/rgblight.c index baa10ec416..54face173c 100644 --- a/quantum/rgblight.c +++ b/quantum/rgblight/rgblight.c @@ -890,7 +890,7 @@ void rgblight_update_sync(rgblight_syncinfo_t *syncinfo, bool write_to_eeprom) {          animation_status.restart = true;      }  #        endif /* RGBLIGHT_SPLIT_NO_ANIMATION_SYNC */ -#    endif /* RGBLIGHT_USE_TIMER */ +#    endif     /* RGBLIGHT_USE_TIMER */  }  #endif /* RGBLIGHT_SPLIT */ diff --git a/quantum/rgblight.h b/quantum/rgblight/rgblight.h index bec2c66955..bec2c66955 100644 --- a/quantum/rgblight.h +++ b/quantum/rgblight/rgblight.h diff --git a/quantum/rgblight_breathe_table.h b/quantum/rgblight/rgblight_breathe_table.h index 30245318b6..30245318b6 100644 --- a/quantum/rgblight_breathe_table.h +++ b/quantum/rgblight/rgblight_breathe_table.h diff --git a/quantum/rgblight_modes.h b/quantum/rgblight/rgblight_modes.h index 7abdb87bc6..7abdb87bc6 100644 --- a/quantum/rgblight_modes.h +++ b/quantum/rgblight/rgblight_modes.h diff --git a/quantum/rgblight_post_config.h b/quantum/rgblight/rgblight_post_config.h index 3c14cb6109..3c14cb6109 100644 --- a/quantum/rgblight_post_config.h +++ b/quantum/rgblight/rgblight_post_config.h | 
