Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						97b610e166
					
				
					 8 changed files with 299 additions and 4 deletions
				
			
		| 
						 | 
				
			
			@ -14,6 +14,7 @@
 | 
			
		|||
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		||||
 */
 | 
			
		||||
#include QMK_KEYBOARD_H
 | 
			
		||||
#include "version.h"
 | 
			
		||||
 | 
			
		||||
#define DF_COLE  DF(_COLEMAK)
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -54,6 +55,10 @@ enum layer_names {
 | 
			
		|||
     _FN
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
enum custom_keycodes {
 | 
			
		||||
    VERSION = SAFE_RANGE
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
// Alias layout macros that expand groups of keys.
 | 
			
		||||
#define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__)
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -142,7 +147,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		|||
 | 
			
		||||
     _______,        MI_OCTD, MI_OCTU, MI_VELD, MI_VELU,         _______,
 | 
			
		||||
                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  RGB_RMOD, RGB_MOD,
 | 
			
		||||
                XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
 | 
			
		||||
                XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, VERSION,
 | 
			
		||||
     _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
 | 
			
		||||
            RGB_SAD, RGB_SAI, RGB_HUD, RGB_HUI, RGB_SPD, RGB_SPI, RGB_VAD, RGB_VAI,
 | 
			
		||||
          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_RMOD, RGB_MOD, EEP_RST, RGB_TOG
 | 
			
		||||
| 
						 | 
				
			
			@ -177,6 +182,17 @@ void keyboard_post_init_user(void) {
 | 
			
		|||
    rgb_matrix_mode(RGB_MATRIX_RAINBOW_MOVING_CHEVRON);
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 | 
			
		||||
    switch (keycode) {
 | 
			
		||||
        case VERSION: // Output firmware info.
 | 
			
		||||
            if (record->event.pressed) {
 | 
			
		||||
                SEND_STRING(QMK_KEYBOARD ":" QMK_KEYMAP " @ " QMK_VERSION " | " QMK_BUILDDATE);
 | 
			
		||||
            }
 | 
			
		||||
            break;
 | 
			
		||||
    }
 | 
			
		||||
    return true;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#ifdef RGB_MATRIX_ENABLE
 | 
			
		||||
void rgb_matrix_indicators_user(void) {
 | 
			
		||||
    if (rgb_matrix_is_enabled()) {  // turn the lights on when it is enabled.
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue