Cleanup Default Keymaps (#5442)
* Cleanup Default Keymaps to conform to QMK Firmware standards * Minor fixes * Revert some changes
This commit is contained in:
		
				
					committed by
					
						 MechMerlin
						MechMerlin
					
				
			
			
				
	
			
			
			
						parent
						
							29bfd634e1
						
					
				
				
					commit
					0072fdd799
				
			| @@ -1,4 +1,4 @@ | |||||||
| #include "1up60rgb.h" | #include QMK_KEYBOARD_H | ||||||
|  |  | ||||||
| const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|  |  | ||||||
|   | |||||||
| @@ -1,4 +1,4 @@ | |||||||
| #include "sweet16.h" | #include QMK_KEYBOARD_H | ||||||
|  |  | ||||||
| enum custom_keycodes { | enum custom_keycodes { | ||||||
|   UP_URL = SAFE_RANGE |   UP_URL = SAFE_RANGE | ||||||
|   | |||||||
| @@ -16,6 +16,4 @@ | |||||||
|  |  | ||||||
| #pragma once | #pragma once | ||||||
|  |  | ||||||
| #include "config_common.h" |  | ||||||
|  |  | ||||||
| // place overrides here | // place overrides here | ||||||
|   | |||||||
| @@ -14,11 +14,7 @@ | |||||||
|  * along with this program.  If not, see <http://www.gnu.org/licenses/>. |  * along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||||
|  */ |  */ | ||||||
|  |  | ||||||
| #ifndef CONFIG_USER_H | #pragma once | ||||||
| #define CONFIG_USER_H |  | ||||||
|  |  | ||||||
| #include "config_common.h" |  | ||||||
|  |  | ||||||
| // place overrides here | // place overrides here | ||||||
|  |  | ||||||
| #endif |  | ||||||
|   | |||||||
| @@ -1,9 +1,5 @@ | |||||||
| #include QMK_KEYBOARD_H | #include QMK_KEYBOARD_H | ||||||
|  |  | ||||||
| #ifdef RGBLIGHT_ENABLE |  | ||||||
| #include "rgblight.h" |  | ||||||
| #endif |  | ||||||
|  |  | ||||||
| // Each layer gets a name for readability, which is then used in the keymap matrix below. | // Each layer gets a name for readability, which is then used in the keymap matrix below. | ||||||
| // The underscores don't mean anything - you can have a layer called STUFF or any other name. | // The underscores don't mean anything - you can have a layer called STUFF or any other name. | ||||||
| // Layer names don't all need to be of the same length, obviously, and you can also skip them | // Layer names don't all need to be of the same length, obviously, and you can also skip them | ||||||
|   | |||||||
| @@ -1,8 +1,3 @@ | |||||||
| #ifndef CONFIG_USER_H | #pragma once | ||||||
| #define CONFIG_USER_H |  | ||||||
|  |  | ||||||
| #include "../../config.h" |  | ||||||
|  |  | ||||||
| // place overrides here | // place overrides here | ||||||
|  |  | ||||||
| #endif |  | ||||||
|   | |||||||
| @@ -14,11 +14,6 @@ | |||||||
|  * along with this program.  If not, see <http://www.gnu.org/licenses/>. |  * along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||||
|  */ |  */ | ||||||
|  |  | ||||||
| #ifndef CONFIG_USER_H | #pragma once | ||||||
| #define CONFIG_USER_H |  | ||||||
|  |  | ||||||
| #include "config_common.h" |  | ||||||
|  |  | ||||||
| // place overrides here | // place overrides here | ||||||
|  |  | ||||||
| #endif |  | ||||||
|   | |||||||
| @@ -14,7 +14,7 @@ | |||||||
|  * along with this program.  If not, see <http://www.gnu.org/licenses/>. |  * along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||||
|  */ |  */ | ||||||
|  |  | ||||||
| #include "candybar.h" | #include QMK_KEYBOARD_H | ||||||
|  |  | ||||||
| #define _BL 0 | #define _BL 0 | ||||||
| #define _FL 1 | #define _FL 1 | ||||||
| @@ -35,4 +35,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||||||
|   KC_TAB,KC_A,KC_SLCK,KC_D,KC_F,KC_G,KC_H,KC_J,KC_K,KC_L,KC_QUOT,KC_BSLS,KC_P4,KC_P5,KC_P6,KC_VOLD, \ |   KC_TAB,KC_A,KC_SLCK,KC_D,KC_F,KC_G,KC_H,KC_J,KC_K,KC_L,KC_QUOT,KC_BSLS,KC_P4,KC_P5,KC_P6,KC_VOLD, \ | ||||||
|   KC_LSFT,KC_Z,KC_X,KC_CAPS,KC_V,KC_B,KC_NLCK,KC_M,KC_COMM,KC_DOT,KC_SLSH,KC_PGUP,KC_P1,KC_P2,KC_P3,KC_PEQL, \ |   KC_LSFT,KC_Z,KC_X,KC_CAPS,KC_V,KC_B,KC_NLCK,KC_M,KC_COMM,KC_DOT,KC_SLSH,KC_PGUP,KC_P1,KC_P2,KC_P3,KC_PEQL, \ | ||||||
|   KC_LCTL,KC_LGUI,KC_LALT,KC_SPC,KC_SPC,KC_BSPC,KC_APP,MO(_FL),KC_HOME,KC_PGDN,KC_END,KC_P0,KC_PDOT,KC_PENT), |   KC_LCTL,KC_LGUI,KC_LALT,KC_SPC,KC_SPC,KC_BSPC,KC_APP,MO(_FL),KC_HOME,KC_PGDN,KC_END,KC_P0,KC_PDOT,KC_PENT), | ||||||
| }; | }; | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License | |||||||
| along with this program.  If not, see <http://www.gnu.org/licenses/>. | along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||||
| */ | */ | ||||||
|  |  | ||||||
| #include "chibios_test.h" | #include QMK_KEYBOARD_H | ||||||
|  |  | ||||||
| const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|     {{KC_CAPS}}, // test with KC_CAPS, KC_A, RESET |     {{KC_CAPS}}, // test with KC_CAPS, KC_A, RESET | ||||||
|   | |||||||
| @@ -1,6 +1,3 @@ | |||||||
| #ifndef CONFIG_USER_H | #pragma once | ||||||
| #define CONFIG_USER_H |  | ||||||
|  |  | ||||||
| #include "../../config.h" | // place overrides here | ||||||
|  |  | ||||||
| #endif |  | ||||||
|   | |||||||
| @@ -1,6 +1,3 @@ | |||||||
| #ifndef CONFIG_USER_H | #pragma once | ||||||
| #define CONFIG_USER_H |  | ||||||
|  |  | ||||||
| #include "../../config.h" | // place overrides here | ||||||
| // Add overrides here  |  | ||||||
| #endif |  | ||||||
|   | |||||||
| @@ -1,7 +1,4 @@ | |||||||
| #include QMK_KEYBOARD_H | #include QMK_KEYBOARD_H | ||||||
| #ifdef AUDIO_ENABLE |  | ||||||
|   #include "audio.h" |  | ||||||
| #endif |  | ||||||
|  |  | ||||||
| extern keymap_config_t keymap_config; | extern keymap_config_t keymap_config; | ||||||
|  |  | ||||||
|   | |||||||
| @@ -16,6 +16,4 @@ | |||||||
|  |  | ||||||
| #pragma once | #pragma once | ||||||
|  |  | ||||||
| #include "config_common.h" |  | ||||||
|  |  | ||||||
| // place overrides here | // place overrides here | ||||||
|   | |||||||
| @@ -18,14 +18,12 @@ You should have received a copy of the GNU General Public License | |||||||
| along with this program.  If not, see <http://www.gnu.org/licenses/>. | along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||||
| */ | */ | ||||||
|  |  | ||||||
| #ifndef CONFIG_USER_H | #pragma once | ||||||
| #define CONFIG_USER_H |  | ||||||
|  | // place overrides here | ||||||
|  |  | ||||||
| // #include "../../config.h" |  | ||||||
|  |  | ||||||
| /* Use I2C or Serial */ | /* Use I2C or Serial */ | ||||||
|  |  | ||||||
| #define USE_I2C | #define USE_I2C | ||||||
| #define SSD1306OLED | #define SSD1306OLED | ||||||
|  |  | ||||||
| #endif |  | ||||||
|   | |||||||
| @@ -1,7 +1,5 @@ | |||||||
| #ifndef CONFIG_USER_H | #pragma once | ||||||
| #define CONFIG_USER_H |  | ||||||
|  |  | ||||||
| #include "config_common.h" |  | ||||||
|  |  | ||||||
| #ifdef AUDIO_ENABLE | #ifdef AUDIO_ENABLE | ||||||
|     #define STARTUP_SONG SONG(PLANCK_SOUND) |     #define STARTUP_SONG SONG(PLANCK_SOUND) | ||||||
| @@ -25,7 +23,7 @@ | |||||||
| /* enable basic MIDI features: | /* enable basic MIDI features: | ||||||
|    - MIDI notes can be sent when in Music mode is on |    - MIDI notes can be sent when in Music mode is on | ||||||
| */ | */ | ||||||
|                                  |  | ||||||
| #define MIDI_BASIC | #define MIDI_BASIC | ||||||
|  |  | ||||||
| /* enable advanced MIDI features: | /* enable advanced MIDI features: | ||||||
| @@ -38,5 +36,3 @@ | |||||||
|  |  | ||||||
| /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */ | /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */ | ||||||
| //#define MIDI_TONE_KEYCODE_OCTAVES 2 | //#define MIDI_TONE_KEYCODE_OCTAVES 2 | ||||||
|  |  | ||||||
| #endif |  | ||||||
| @@ -1,6 +1,3 @@ | |||||||
| #ifndef CONFIG_USER_H | #pragma once | ||||||
| #define CONFIG_USER_H |  | ||||||
|  |  | ||||||
| #include "../../config.h" | // place overrides here | ||||||
|  |  | ||||||
| #endif |  | ||||||
|   | |||||||
| @@ -1,10 +1,6 @@ | |||||||
| #include QMK_KEYBOARD_H | #include QMK_KEYBOARD_H | ||||||
| #include "led.h" | #include "led.h" | ||||||
|  |  | ||||||
| #ifdef RGBLIGHT_ENABLE |  | ||||||
| #include "rgblight.h" |  | ||||||
| #endif |  | ||||||
|  |  | ||||||
| // Each layer gets a name for readability, which is then used in the keymap matrix below. | // Each layer gets a name for readability, which is then used in the keymap matrix below. | ||||||
| // The underscores don't mean anything - you can have a layer called STUFF or any other name. | // The underscores don't mean anything - you can have a layer called STUFF or any other name. | ||||||
| // Layer names don't all need to be of the same length, obviously, and you can also skip them | // Layer names don't all need to be of the same length, obviously, and you can also skip them | ||||||
|   | |||||||
| @@ -13,7 +13,7 @@ | |||||||
|  * You should have received a copy of the GNU General Public License |  * You should have received a copy of the GNU General Public License | ||||||
|  * along with this program.  If not, see <http://www.gnu.org/licenses/>. |  * along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||||
|  */ |  */ | ||||||
| #include "cu24.h" | #include QMK_KEYBOARD_H | ||||||
|  |  | ||||||
| const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
| [0] = LAYOUT_grid( /* Base */ | [0] = LAYOUT_grid( /* Base */ | ||||||
|   | |||||||
| @@ -1,8 +1,3 @@ | |||||||
| #ifndef CONFIG_USER_H | #pragma once | ||||||
| #define CONFIG_USER_H |  | ||||||
|  |  | ||||||
| #include "../../config.h" |  | ||||||
|  |  | ||||||
| // place overrides here | // place overrides here | ||||||
|  |  | ||||||
| #endif |  | ||||||
|   | |||||||
| @@ -16,16 +16,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | |||||||
| */ | */ | ||||||
|  |  | ||||||
|  |  | ||||||
|  | #pragma once | ||||||
|  |  | ||||||
| #define USE_SERIAL | #define USE_SERIAL | ||||||
|  |  | ||||||
| #define MASTER_LEFT | #define MASTER_LEFT | ||||||
| // #define MASTER_RIGHT | // #define MASTER_RIGHT | ||||||
| // #define EE_HANDS | // #define EE_HANDS | ||||||
|  |  | ||||||
|  |  | ||||||
| #ifdef SUBPROJECT_v2 |  | ||||||
|     #include "../../v2/config.h" |  | ||||||
| #endif |  | ||||||
| #ifdef SUBPROJECT_protosplit |  | ||||||
|     #include "../../protosplit/config.h" |  | ||||||
| #endif |  | ||||||
|   | |||||||
| @@ -1,7 +1,7 @@ | |||||||
| // this is the style you want to emulate. | // this is the style you want to emulate. | ||||||
| // This is the canonical layout file for the Quantum project. If you want to add another keyboard, | // This is the canonical layout file for the Quantum project. If you want to add another keyboard, | ||||||
|  |  | ||||||
| #include "dichotomy.h" | #include QMK_KEYBOARD_H | ||||||
|  |  | ||||||
| // Each layer gets a name for readability, which is then used in the keymap matrix below. | // Each layer gets a name for readability, which is then used in the keymap matrix below. | ||||||
| // The underscores don't mean anything - you can have a layer called STUFF or any other name. | // The underscores don't mean anything - you can have a layer called STUFF or any other name. | ||||||
|   | |||||||
| @@ -14,14 +14,9 @@ | |||||||
|  * along with this program.  If not, see <http://www.gnu.org/licenses/>. |  * along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||||
|  */ |  */ | ||||||
|  |  | ||||||
| #ifndef CONFIG_USER_H | #pragma once | ||||||
| #define CONFIG_USER_H |  | ||||||
|  |  | ||||||
| #include "config_common.h" |  | ||||||
|  |  | ||||||
| // place overrides here | // place overrides here | ||||||
| #define MASTER_RIGHT | #define MASTER_RIGHT | ||||||
| #define PERMISSIVE_HOLD | #define PERMISSIVE_HOLD | ||||||
| #define TAPPING_TERM 150 | #define TAPPING_TERM 150 | ||||||
|  |  | ||||||
| #endif |  | ||||||
|   | |||||||
| @@ -1,5 +1,4 @@ | |||||||
| #include QMK_KEYBOARD_H | #include QMK_KEYBOARD_H | ||||||
| #include "action_layer.h" |  | ||||||
|  |  | ||||||
| const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|  |  | ||||||
|   | |||||||
| @@ -18,10 +18,9 @@ You should have received a copy of the GNU General Public License | |||||||
| along with this program.  If not, see <http://www.gnu.org/licenses/>. | along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||||
| */ | */ | ||||||
|  |  | ||||||
| #ifndef CONFIG_USER_H | #pragma once | ||||||
| #define CONFIG_USER_H |  | ||||||
|  |  | ||||||
| #include "../../config.h" | // place overrides here | ||||||
|  |  | ||||||
| /* Use I2C or Serial, not both */ | /* Use I2C or Serial, not both */ | ||||||
|  |  | ||||||
| @@ -34,8 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | |||||||
| // #define MASTER_RIGHT | // #define MASTER_RIGHT | ||||||
| // #define EE_HANDS | // #define EE_HANDS | ||||||
|  |  | ||||||
| #endif |  | ||||||
|  |  | ||||||
| #undef RGBLED_NUM | #undef RGBLED_NUM | ||||||
| #define RGBLIGHT_ANIMATIONS | #define RGBLIGHT_ANIMATIONS | ||||||
| #define RGBLED_NUM 24 | #define RGBLED_NUM 24 | ||||||
|   | |||||||
| @@ -1,6 +1,4 @@ | |||||||
| #include QMK_KEYBOARD_H | #include QMK_KEYBOARD_H | ||||||
| #include "action_layer.h" |  | ||||||
| #include "eeconfig.h" |  | ||||||
|  |  | ||||||
| extern keymap_config_t keymap_config; | extern keymap_config_t keymap_config; | ||||||
|  |  | ||||||
|   | |||||||
| @@ -18,10 +18,9 @@ You should have received a copy of the GNU General Public License | |||||||
| along with this program.  If not, see <http://www.gnu.org/licenses/>. | along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||||
| */ | */ | ||||||
|  |  | ||||||
| #ifndef CONFIG_USER_H | #pragma once | ||||||
| #define CONFIG_USER_H |  | ||||||
|  |  | ||||||
| #include "../../config.h" | // place overrides here | ||||||
|  |  | ||||||
| /* Use I2C or Serial, not both */ | /* Use I2C or Serial, not both */ | ||||||
|  |  | ||||||
| @@ -34,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | |||||||
| // #define MASTER_RIGHT | // #define MASTER_RIGHT | ||||||
| // #define EE_HANDS | // #define EE_HANDS | ||||||
|  |  | ||||||
| #endif |  | ||||||
|  |  | ||||||
| #undef RGBLED_NUM | #undef RGBLED_NUM | ||||||
| #define RGBLIGHT_ANIMATIONS | #define RGBLIGHT_ANIMATIONS | ||||||
|   | |||||||
| @@ -1,6 +1,4 @@ | |||||||
| #include QMK_KEYBOARD_H | #include QMK_KEYBOARD_H | ||||||
| #include "action_layer.h" |  | ||||||
| #include "eeconfig.h" |  | ||||||
|  |  | ||||||
| extern keymap_config_t keymap_config; | extern keymap_config_t keymap_config; | ||||||
|  |  | ||||||
|   | |||||||
| @@ -1,6 +1,4 @@ | |||||||
| #include QMK_KEYBOARD_H | #include QMK_KEYBOARD_H | ||||||
| #include "debug.h" |  | ||||||
| #include "action_layer.h" |  | ||||||
| #include "version.h" | #include "version.h" | ||||||
|  |  | ||||||
| #define BASE 0 // default layer | #define BASE 0 // default layer | ||||||
|   | |||||||
| @@ -1,6 +1,4 @@ | |||||||
| #include QMK_KEYBOARD_H | #include QMK_KEYBOARD_H | ||||||
| #include "debug.h" |  | ||||||
| #include "action_layer.h" |  | ||||||
| #include "version.h" | #include "version.h" | ||||||
|  |  | ||||||
| #define BASE 0 // default layer | #define BASE 0 // default layer | ||||||
|   | |||||||
| @@ -14,11 +14,6 @@ | |||||||
|  * along with this program.  If not, see <http://www.gnu.org/licenses/>. |  * along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||||
|  */ |  */ | ||||||
|  |  | ||||||
| #ifndef CONFIG_USER_H | #pragma once | ||||||
| #define CONFIG_USER_H |  | ||||||
|  |  | ||||||
| #include "config_common.h" |  | ||||||
|  |  | ||||||
| // place overrides here | // place overrides here | ||||||
|  |  | ||||||
| #endif |  | ||||||
|   | |||||||
| @@ -14,11 +14,7 @@ | |||||||
|  * along with this program.  If not, see <http://www.gnu.org/licenses/>. |  * along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||||
|  */ |  */ | ||||||
|  |  | ||||||
| #ifndef CONFIG_USER_H | #pragma once | ||||||
| #define CONFIG_USER_H |  | ||||||
|  |  | ||||||
| #include "config_common.h" |  | ||||||
|  |  | ||||||
| // place overrides here | // place overrides here | ||||||
|  |  | ||||||
| #endif |  | ||||||
|   | |||||||
| @@ -15,10 +15,7 @@ You should have received a copy of the GNU General Public License | |||||||
| along with this program.  If not, see <http://www.gnu.org/licenses/>. | along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||||
| */ | */ | ||||||
|  |  | ||||||
| #ifndef CONFIG_USER_H | #pragma once | ||||||
| #define CONFIG_USER_H |  | ||||||
|  |  | ||||||
| #include "config_common.h" |  | ||||||
|  |  | ||||||
| #define USE_SERIAL | #define USE_SERIAL | ||||||
|  |  | ||||||
| @@ -34,5 +31,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | |||||||
| /* #define RGBLIGHT_HUE_STEP 8 */ | /* #define RGBLIGHT_HUE_STEP 8 */ | ||||||
| /* #define RGBLIGHT_SAT_STEP 8 */ | /* #define RGBLIGHT_SAT_STEP 8 */ | ||||||
| /* #define RGBLIGHT_VAL_STEP 8 */ | /* #define RGBLIGHT_VAL_STEP 8 */ | ||||||
|  |  | ||||||
| #endif |  | ||||||
|   | |||||||
| @@ -1,5 +1,4 @@ | |||||||
| #include QMK_KEYBOARD_H | #include QMK_KEYBOARD_H | ||||||
| #include "eeconfig.h" |  | ||||||
|  |  | ||||||
| extern keymap_config_t keymap_config; | extern keymap_config_t keymap_config; | ||||||
|  |  | ||||||
|   | |||||||
| @@ -1,4 +1,4 @@ | |||||||
| #include "four_banger.h" | #include QMK_KEYBOARD_H | ||||||
|  |  | ||||||
| enum custom_keycodes { | enum custom_keycodes { | ||||||
|   UP_URL = SAFE_RANGE |   UP_URL = SAFE_RANGE | ||||||
|   | |||||||
| @@ -1,7 +1,4 @@ | |||||||
| #include QMK_KEYBOARD_H | #include QMK_KEYBOARD_H | ||||||
| #ifdef AUDIO_ENABLE |  | ||||||
|   #include "audio.h" |  | ||||||
| #endif |  | ||||||
| #ifdef USE_I2C | #ifdef USE_I2C | ||||||
| #include "i2c.h" | #include "i2c.h" | ||||||
| #endif | #endif | ||||||
|   | |||||||
| @@ -20,8 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | |||||||
|  |  | ||||||
| #pragma once | #pragma once | ||||||
|  |  | ||||||
| #include "../../config.h" |  | ||||||
|  |  | ||||||
| /* Use I2C or Serial, not both */ | /* Use I2C or Serial, not both */ | ||||||
|  |  | ||||||
| #define USE_SERIAL | #define USE_SERIAL | ||||||
|   | |||||||
| @@ -1,6 +1,4 @@ | |||||||
| #include "dactyl_manuform.h" | #include QMK_KEYBOARD_H | ||||||
| #include "action_layer.h" |  | ||||||
| #include "eeconfig.h" |  | ||||||
|  |  | ||||||
| extern keymap_config_t keymap_config; | extern keymap_config_t keymap_config; | ||||||
|  |  | ||||||
| @@ -126,4 +124,3 @@ void persistent_default_layer_set(uint16_t default_layer) { | |||||||
|   eeconfig_update_default_layer(default_layer); |   eeconfig_update_default_layer(default_layer); | ||||||
|   default_layer_set(default_layer); |   default_layer_set(default_layer); | ||||||
| } | } | ||||||
|  |  | ||||||
|   | |||||||
| @@ -394,5 +394,3 @@ void led_set_user(uint8_t usb_led) { | |||||||
|   } |   } | ||||||
|   return ; |   return ; | ||||||
| } | } | ||||||
|  |  | ||||||
|  |  | ||||||
|   | |||||||
| @@ -1,6 +1,6 @@ | |||||||
| // see https://github.com/pepaslabs/hexon38 | // see https://github.com/pepaslabs/hexon38 | ||||||
|  |  | ||||||
| #include "hexon38.h" | #include QMK_KEYBOARD_H | ||||||
|  |  | ||||||
| #define A_ KC_A | #define A_ KC_A | ||||||
| #define B_ KC_B | #define B_ KC_B | ||||||
|   | |||||||
| @@ -1,4 +1,4 @@ | |||||||
| #include "maartenwut.h" | #include QMK_KEYBOARD_H | ||||||
|  |  | ||||||
| #define _MA 0 | #define _MA 0 | ||||||
| #define _NU 1 | #define _NU 1 | ||||||
|   | |||||||
| @@ -1,4 +1,4 @@ | |||||||
| #include "magicforce61.h" | #include QMK_KEYBOARD_H | ||||||
|  |  | ||||||
| #define _QWERTY 0 | #define _QWERTY 0 | ||||||
| #define _FN1 1 | #define _FN1 1 | ||||||
|   | |||||||
| @@ -1,12 +1,10 @@ | |||||||
| #ifndef CONFIG_USER_H | #pragma once | ||||||
| #define CONFIG_USER_H |  | ||||||
|  | // place overrides here | ||||||
|  |  | ||||||
| #include "../../config.h" |  | ||||||
|  |  | ||||||
| /* bootmagic salt key */ | /* bootmagic salt key */ | ||||||
| #define BOOTMAGIC_KEY_SALT              KC_ESC | #define BOOTMAGIC_KEY_SALT              KC_ESC | ||||||
|  |  | ||||||
| /* skip bootmagic and eeconfig */ | /* skip bootmagic and eeconfig */ | ||||||
| #define BOOTMAGIC_KEY_SKIP              KC_SPACE | #define BOOTMAGIC_KEY_SKIP              KC_SPACE | ||||||
|  |  | ||||||
| #endif |  | ||||||
|   | |||||||
| @@ -14,13 +14,8 @@ | |||||||
|  * along with this program.  If not, see <http://www.gnu.org/licenses/>. |  * along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||||
|  */ |  */ | ||||||
|  |  | ||||||
| #define TAPPING_TERM 150 //reduce time required to register a held key | #pragma once | ||||||
|  |  | ||||||
| #ifndef CONFIG_USER_H |  | ||||||
| #define CONFIG_USER_H |  | ||||||
|  |  | ||||||
| #include "../../config.h" |  | ||||||
|  |  | ||||||
| // place overrides here | // place overrides here | ||||||
|  |  | ||||||
| #endif | #define TAPPING_TERM 150 //reduce time required to register a held key | ||||||
|   | |||||||
| @@ -1,6 +1,5 @@ | |||||||
| #include "traveller.h" | #include QMK_KEYBOARD_H | ||||||
| #include "mousekey.h" | #include "mousekey.h" | ||||||
| #include "action_layer.h" |  | ||||||
|  |  | ||||||
| // Each layer gets a name for readability, which is then used in the keymap matrix below. | // Each layer gets a name for readability, which is then used in the keymap matrix below. | ||||||
| // The underscores don't mean anything - you can have a layer called STUFF or any other name. | // The underscores don't mean anything - you can have a layer called STUFF or any other name. | ||||||
| @@ -9,7 +8,7 @@ | |||||||
| #define _HI 2 | #define _HI 2 | ||||||
| #define _NAV 4 | #define _NAV 4 | ||||||
| #define _CUR 5 | #define _CUR 5 | ||||||
| #define _FKEYS 6  | #define _FKEYS 6 | ||||||
| #define _TRNS 8 | #define _TRNS 8 | ||||||
|  |  | ||||||
| // We do the same trick for functions | // We do the same trick for functions | ||||||
| @@ -20,7 +19,7 @@ | |||||||
| #define  MDL 4 | #define  MDL 4 | ||||||
| #define  MDR 5 | #define  MDR 5 | ||||||
| #define  MUR 6 | #define  MUR 6 | ||||||
| #define  MUL 3  | #define  MUL 3 | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
| @@ -35,9 +34,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||||||
|  * |------+------+------+------+------+------+  //  +------+------+------+------+------+------| |  * |------+------+------+------+------+------+  //  +------+------+------+------+------+------| | ||||||
|  * | Shift|   Z  | Del  | GUI  | Low  | Bspc |/Enter| Spc  | Hi   | GUI  | Alt  |  /   |Shift | |  * | Shift|   Z  | Del  | GUI  | Low  | Bspc |/Enter| Spc  | Hi   | GUI  | Alt  |  /   |Shift | | ||||||
|  * `------------------------------------------------------------------------------------------' |  * `------------------------------------------------------------------------------------------' | ||||||
|  *  |  * | ||||||
|  */ |  */ | ||||||
| [_QW] = KEYMAP(  | [_QW] = KEYMAP( | ||||||
|   TG(_NAV),         KC_GRV, KC_W,    KC_E,    KC_R,    KC_T,             KC_Y,    KC_U,    KC_I,    KC_O,    KC_MINS,  KC_EQL, |   TG(_NAV),         KC_GRV, KC_W,    KC_E,    KC_R,    KC_T,             KC_Y,    KC_U,    KC_I,    KC_O,    KC_MINS,  KC_EQL, | ||||||
|   KC_TAB,           KC_Q,    KC_S,    KC_D,    KC_F,    KC_G,            KC_H,    KC_J,    KC_K,    KC_L,    KC_P,  KC_BSLS, |   KC_TAB,           KC_Q,    KC_S,    KC_D,    KC_F,    KC_G,            KC_H,    KC_J,    KC_K,    KC_L,    KC_P,  KC_BSLS, | ||||||
|   CTL_T(KC_ESC),    KC_A,    KC_X,    KC_C,    KC_V,    KC_B,    KC_RCTL,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SCLN,   KC_QUOT, |   CTL_T(KC_ESC),    KC_A,    KC_X,    KC_C,    KC_V,    KC_B,    KC_RCTL,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SCLN,   KC_QUOT, | ||||||
| @@ -45,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||||||
|  ), |  ), | ||||||
|  |  | ||||||
| /* LOW  - numbers, missing or awkward programming keys | /* LOW  - numbers, missing or awkward programming keys | ||||||
|  Doubled 1 key allows lazy reach with ring finger.  |  Doubled 1 key allows lazy reach with ring finger. | ||||||
|  * ,-----------------------------------------.      .-----------------------------------------. |  * ,-----------------------------------------.      .-----------------------------------------. | ||||||
|  * | FKeys|   1  |   2  |  3   |   4  |   5  |      |  6   |  7   |   8  |   9  |   0  |Ctrl-alt-del| |  * | FKeys|   1  |   2  |  3   |   4  |   5  |      |  6   |  7   |   8  |   9  |   0  |Ctrl-alt-del| | ||||||
|  * |------+------+------+------+------+------|      +------+------+------+------+------+------| |  * |------+------+------+------+------+------|      +------+------+------+------+------+------| | ||||||
| @@ -55,18 +54,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||||||
|  * |------+------+------+------+------+------+  //  +------+------+------+------+------+------| |  * |------+------+------+------+------+------+  //  +------+------+------+------+------+------| | ||||||
|  * | Shift|      |      |      | Low  |      |/     |      |  Hi  |      |      |      |Shift | |  * | Shift|      |      |      | Low  |      |/     |      |  Hi  |      |      |      |Shift | | ||||||
|  * `------------------------------------------------------------------------------------------' |  * `------------------------------------------------------------------------------------------' | ||||||
|  *  |  * | ||||||
|  */ |  */ | ||||||
|  |  | ||||||
| [_LW] = KEYMAP(  | [_LW] = KEYMAP( | ||||||
|   TG(_FKEYS),  KC_1,     KC_2,      KC_3,     KC_4,    KC_5,             KC_6,    KC_7,       KC_8,      KC_9,    KC_0,  LCTL(LALT(KC_DEL)) , |   TG(_FKEYS),  KC_1,     KC_2,      KC_3,     KC_4,    KC_5,             KC_6,    KC_7,       KC_8,      KC_9,    KC_0,  LCTL(LALT(KC_DEL)) , | ||||||
|   KC_TRNS,  KC_1,     KC_RBRC,   KC_LPRN,  KC_RPRN, KC_NO,               KC_ASTR, KC_LPRN,    KC_RPRN,    KC_LBRC,    KC_NO, KC_NO, |   KC_TRNS,  KC_1,     KC_RBRC,   KC_LPRN,  KC_RPRN, KC_NO,               KC_ASTR, KC_LPRN,    KC_RPRN,    KC_LBRC,    KC_NO, KC_NO, | ||||||
|   KC_CAPS,   KC_LBRC,  KC_NO,     KC_LCBR,  KC_RCBR, KC_TILD,   KC_TRNS,  KC_HASH, KC_LCBR,    KC_RCBR,   KC_NO,    KC_RBRC,   KC_NO, |   KC_CAPS,   KC_LBRC,  KC_NO,     KC_LCBR,  KC_RCBR, KC_TILD,   KC_TRNS,  KC_HASH, KC_LCBR,    KC_RCBR,   KC_NO,    KC_RBRC,   KC_NO, | ||||||
|   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 | ||||||
| ), | ), | ||||||
|  |  | ||||||
| /* HI - Punctuation, shell and  | /* HI - Punctuation, shell and | ||||||
| url ://@.com  row on bottom,    && is opposite ||       ^$ are in regex order: ^.*$     | url ://@.com  row on bottom,    && is opposite ||       ^$ are in regex order: ^.*$ | ||||||
| Right hand nav keys work pretty well chorded with the Right hand Hi Key | Right hand nav keys work pretty well chorded with the Right hand Hi Key | ||||||
|  * ,-----------------------------------------.      .-----------------------------------------. |  * ,-----------------------------------------.      .-----------------------------------------. | ||||||
|  * |FKEYS |   !  |   @  |   #  |   $  |   %  |      |  ^   |   &  |   *  |   (  |   )  |   +  | |  * |FKEYS |   !  |   @  |   #  |   $  |   %  |      |  ^   |   &  |   *  |   (  |   )  |   +  | | ||||||
| @@ -77,19 +76,19 @@ Right hand nav keys work pretty well chorded with the Right hand Hi Key | |||||||
|  * |------+------+------+------+------+------+  //  +------+------+------+------+------+------| |  * |------+------+------+------+------+------+  //  +------+------+------+------+------+------| | ||||||
|  * |      |   /  |      |      | Low  |      |/     |      |  Hi  | PgDn | Left| Down | Right | |  * |      |   /  |      |      | Low  |      |/     |      |  Hi  | PgDn | Left| Down | Right | | ||||||
|  * `------------------------------------------------------------------------------------------' |  * `------------------------------------------------------------------------------------------' | ||||||
|  *  |  * | ||||||
|  */ |  */ | ||||||
|  |  | ||||||
| [_HI] = KEYMAP(  | [_HI] = KEYMAP( | ||||||
|  TG(_FKEYS),KC_EXLM,  KC_AT,   KC_HASH,  KC_DLR,   KC_PERC,           KC_CIRC,  KC_AMPR,    KC_ASTR,   KC_LPRN,  KC_RPRN,  KC_PLUS, |  TG(_FKEYS),KC_EXLM,  KC_AT,   KC_HASH,  KC_DLR,   KC_PERC,           KC_CIRC,  KC_AMPR,    KC_ASTR,   KC_LPRN,  KC_RPRN,  KC_PLUS, | ||||||
|  KC_TRNS, KC_EXLM,  KC_AMPR, KC_PIPE,  KC_DLR,   KC_PERC,             KC_VOLU, KC_MUTE,    KC_NO,     KC_NO,    KC_NO,    KC_NO,  |  KC_TRNS, KC_EXLM,  KC_AMPR, KC_PIPE,  KC_DLR,   KC_PERC,             KC_VOLU, KC_MUTE,    KC_NO,     KC_NO,    KC_NO,    KC_NO, | ||||||
|  KC_CAPS, KC_CIRC,  KC_COLN,  KC_DOT,  KC_ASTR,  KC_MINS,   KC_TRNS,  KC_VOLD, KC_PPLS,    KC_PGUP,   KC_HOME,  KC_UP,    KC_END, |  KC_CAPS, KC_CIRC,  KC_COLN,  KC_DOT,  KC_ASTR,  KC_MINS,   KC_TRNS,  KC_VOLD, KC_PPLS,    KC_PGUP,   KC_HOME,  KC_UP,    KC_END, | ||||||
|  KC_TRNS, KC_SLSH,  KC_TRNS,  KC_TRNS, TT(_LW),  KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS,    KC_PGDN,   KC_LEFT,  KC_DOWN,  KC_RIGHT  |  KC_TRNS, KC_SLSH,  KC_TRNS,  KC_TRNS, TT(_LW),  KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS,    KC_PGDN,   KC_LEFT,  KC_DOWN,  KC_RIGHT | ||||||
| ),   | ), | ||||||
|  |  | ||||||
| /* NAV - mouse &  navigation | /* NAV - mouse &  navigation | ||||||
| //gui left and right are line home/end, or fore & back in browser | //gui left and right are line home/end, or fore & back in browser | ||||||
| // Mouse buttons are reversed for comfort - bigger stretch is to the right button.  | // Mouse buttons are reversed for comfort - bigger stretch is to the right button. | ||||||
|  |  | ||||||
|  * ,-----------------------------------------.      .-----------------------------------------. |  * ,-----------------------------------------.      .-----------------------------------------. | ||||||
| * | NAV  |      |      | Up   |      |Gui-> |      | MwU  | MS_UL| MS_U |MS_UR |      |Ms Norm| | * | NAV  |      |      | Up   |      |Gui-> |      | MwU  | MS_UL| MS_U |MS_UR |      |Ms Norm| | ||||||
| @@ -102,7 +101,7 @@ Right hand nav keys work pretty well chorded with the Right hand Hi Key | |||||||
| * `------------------------------------------------------------------------------------------' | * `------------------------------------------------------------------------------------------' | ||||||
| */ | */ | ||||||
|  |  | ||||||
| [_NAV] = KEYMAP(  | [_NAV] = KEYMAP( | ||||||
|   TG(_NAV), KC_NO,         KC_NO,    KC_UP,       KC_NO,     RGUI(KC_RIGHT),            KC_WH_U,  M(MUL), KC_MS_U,   M(MUR), KC_NO, KC_ACL2, |   TG(_NAV), KC_NO,         KC_NO,    KC_UP,       KC_NO,     RGUI(KC_RIGHT),            KC_WH_U,  M(MUL), KC_MS_U,   M(MUR), KC_NO, KC_ACL2, | ||||||
|   KC_TRNS, RGUI(KC_LEFT),  KC_LEFT,  KC_DOWN,     KC_RIGHT,  LCTL(KC_E),                KC_BTN3,  KC_MS_L,  KC_MS_U,   KC_MS_R,  KC_NO, KC_ACL1, |   KC_TRNS, RGUI(KC_LEFT),  KC_LEFT,  KC_DOWN,     KC_RIGHT,  LCTL(KC_E),                KC_BTN3,  KC_MS_L,  KC_MS_U,   KC_MS_R,  KC_NO, KC_ACL1, | ||||||
|   KC_TRNS, LCTL(KC_A),     LGUI(KC_X),RGUI(KC_C), RGUI(KC_V),KC_NO,         KC_ENTER,   KC_WH_D,  M(MDL), KC_MS_D,  M(MDR),  KC_UP, KC_ACL0, |   KC_TRNS, LCTL(KC_A),     LGUI(KC_X),RGUI(KC_C), RGUI(KC_V),KC_NO,         KC_ENTER,   KC_WH_D,  M(MDL), KC_MS_D,  M(MDR),  KC_UP, KC_ACL0, | ||||||
| @@ -111,7 +110,7 @@ Right hand nav keys work pretty well chorded with the Right hand Hi Key | |||||||
|  |  | ||||||
| /* FKEYS - Funtion keys & mac stuff | /* FKEYS - Funtion keys & mac stuff | ||||||
|  * ,-----------------------------------------.      .-----------------------------------------. |  * ,-----------------------------------------.      .-----------------------------------------. | ||||||
|  * | FKEYS| F1   | F2   | F3   |  F4  | F5   |      | F6   | F7   | F8   | F9   | F10  | Ctrl |  |  * | FKEYS| F1   | F2   | F3   |  F4  | F5   |      | F6   | F7   | F8   | F9   | F10  | Ctrl | | ||||||
|  * |------+------+------+------+------+------|      |------+------+------+------+------+------| |  * |------+------+------+------+------+------|      |------+------+------+------+------+------| | ||||||
|  * |      |      |      |      |      |      |      |  F11 | F12  |  F13 | F14  |  F15 | Alt  | |  * |      |      |      |      |      |      |      |  F11 | F12  |  F13 | F14  |  F15 | Alt  | | ||||||
|  * |------+------+------+------+------+------|------+------+------+------+------+------+------| |  * |------+------+------+------+------+------|------+------+------+------+------+------+------| | ||||||
| @@ -120,9 +119,9 @@ Right hand nav keys work pretty well chorded with the Right hand Hi Key | |||||||
|  * |    . |RGBTog|  .   |      | LO   | Bspc |/     |      | HI   |      |      |      |      | |  * |    . |RGBTog|  .   |      | LO   | Bspc |/     |      | HI   |      |      |      |      | | ||||||
|  * `------------------------------------------------------------------------------------------' |  * `------------------------------------------------------------------------------------------' | ||||||
|  * |  * | ||||||
|  */  |  */ | ||||||
|   |  | ||||||
| [_FKEYS] = KEYMAP(  | [_FKEYS] = KEYMAP( | ||||||
|   TG(_FKEYS),KC_F1,    KC_F2,   KC_F3,      KC_F4,     KC_F5,               KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,    KC_RCTL, |   TG(_FKEYS),KC_F1,    KC_F2,   KC_F3,      KC_F4,     KC_F5,               KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,    KC_RCTL, | ||||||
|   KC_TRNS,   KC_NO,    KC_NO,   KC_NO,      KC_NO,     KC_NO,               KC_F11,   KC_F12,   KC_F13,    KC_F14,  KC_F15,    KC_LALT , |   KC_TRNS,   KC_NO,    KC_NO,   KC_NO,      KC_NO,     KC_NO,               KC_F11,   KC_F12,   KC_F13,    KC_F14,  KC_F15,    KC_LALT , | ||||||
|   TO(_QW),  KC_NO,     KC_NO,   KC_NO,      KC_NO,     KC_NO,    KC_TRNS,   KC_NO,    KC_NO,    KC_NO,      KC_NO,   KC_NO,    KC_DEL, |   TO(_QW),  KC_NO,     KC_NO,   KC_NO,      KC_NO,     KC_NO,    KC_TRNS,   KC_NO,    KC_NO,    KC_NO,      KC_NO,   KC_NO,    KC_DEL, | ||||||
| @@ -140,7 +139,7 @@ Right hand nav keys work pretty well chorded with the Right hand Hi Key | |||||||
|  * |------+------+------+------+------+------+  //  +------+------+------+------+------+------| |  * |------+------+------+------+------+------+  //  +------+------+------+------+------+------| | ||||||
|  * |    . |   .  |  .   | GUI  |  LO  |   .  |/     | Spc  |  HI  | GUI  |  M0  |  /   |LSFT | |  * |    . |   .  |  .   | GUI  |  LO  |   .  |/     | Spc  |  HI  | GUI  |  M0  |  /   |LSFT | | ||||||
|  * `------------------------------------------------------------------------------------------' |  * `------------------------------------------------------------------------------------------' | ||||||
|  *  |  * | ||||||
|  */ |  */ | ||||||
|  |  | ||||||
| [_TRNS] = { | [_TRNS] = { | ||||||
| @@ -226,12 +225,12 @@ void LayerLEDSet(uint8_t layr) { | |||||||
|         break; |         break; | ||||||
|         case _LW: |         case _LW: | ||||||
|             // deep purple |             // deep purple | ||||||
|             rgblight_setrgb(20,0,35);  |             rgblight_setrgb(20,0,35); | ||||||
|             break;   |             break; | ||||||
|         case _HI: |         case _HI: | ||||||
|             // light blue |             // light blue | ||||||
|            rgblight_setrgb(0,20,20);  |            rgblight_setrgb(0,20,20); | ||||||
|             break;     |             break; | ||||||
|         case _NAV: |         case _NAV: | ||||||
|             // Yellowy orange |             // Yellowy orange | ||||||
|             rgblight_setrgb(25,20,0); // brighter |             rgblight_setrgb(25,20,0); // brighter | ||||||
| @@ -239,14 +238,14 @@ void LayerLEDSet(uint8_t layr) { | |||||||
|         case _FKEYS: |         case _FKEYS: | ||||||
|          // RED |          // RED | ||||||
|            rgblight_setrgb(20,0,0); // brighter |            rgblight_setrgb(20,0,0); // brighter | ||||||
|             break;   |             break; | ||||||
|         default: |         default: | ||||||
|             rgblight_setrgb(20,2,20);//error |             rgblight_setrgb(20,2,20);//error | ||||||
|             break; |             break; | ||||||
|     } |     } | ||||||
|   |  | ||||||
|  return; |  return; | ||||||
|    |  | ||||||
| } | } | ||||||
|  |  | ||||||
| void matrix_init_user(void) { | void matrix_init_user(void) { | ||||||
| @@ -271,5 +270,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||||||
| void led_set_user(uint8_t usb_led) { | void led_set_user(uint8_t usb_led) { | ||||||
|  |  | ||||||
| } | } | ||||||
|  |  | ||||||
|  |  | ||||||
|   | |||||||
| @@ -14,11 +14,6 @@ | |||||||
|  * along with this program.  If not, see <http://www.gnu.org/licenses/>. |  * along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||||
|  */ |  */ | ||||||
|  |  | ||||||
| #ifndef CONFIG_USER_H | #pragma once | ||||||
| #define CONFIG_USER_H |  | ||||||
|  |  | ||||||
| #include "../../config.h" |  | ||||||
|  |  | ||||||
| // place overrides here | // place overrides here | ||||||
|  |  | ||||||
| #endif |  | ||||||
|   | |||||||
| @@ -13,7 +13,7 @@ | |||||||
|  * You should have received a copy of the GNU General Public License |  * You should have received a copy of the GNU General Public License | ||||||
|  * along with this program.  If not, see <http://www.gnu.org/licenses/>. |  * along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||||
|  */ |  */ | ||||||
| #include "woodpad.h" | #include QMK_KEYBOARD_H | ||||||
|  |  | ||||||
| // Each layer gets a name for readability, which is then used in the keymap matrix below. | // Each layer gets a name for readability, which is then used in the keymap matrix below. | ||||||
| // The underscores don't mean anything - you can have a layer called STUFF or any other name. | // The underscores don't mean anything - you can have a layer called STUFF or any other name. | ||||||
| @@ -86,7 +86,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||||||
| 			layer_off(_ADJUST); | 			layer_off(_ADJUST); | ||||||
| 		} | 		} | ||||||
| 		numlock_down = false; | 		numlock_down = false; | ||||||
| 	  }  | 	  } | ||||||
|       return false; |       return false; | ||||||
|       break; |       break; | ||||||
| 	  case KC_LALT: | 	  case KC_LALT: | ||||||
|   | |||||||
| @@ -14,7 +14,6 @@ | |||||||
|  * along with this program.  If not, see <http://www.gnu.org/licenses/>. |  * along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||||
|  */ |  */ | ||||||
| #include QMK_KEYBOARD_H | #include QMK_KEYBOARD_H | ||||||
| #include "hecomi.h" |  | ||||||
|  |  | ||||||
| // Defines the keycodes used by our macros in process_record_user | // Defines the keycodes used by our macros in process_record_user | ||||||
| enum custom_keycodes { | enum custom_keycodes { | ||||||
|   | |||||||
| @@ -18,8 +18,7 @@ You should have received a copy of the GNU General Public License | |||||||
| along with this program.  If not, see <http://www.gnu.org/licenses/>. | along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||||
| */ | */ | ||||||
|  |  | ||||||
| #ifndef CONFIG_USER_H | #pragma once | ||||||
| #define CONFIG_USER_H |  | ||||||
|  |  | ||||||
| // place overrides here | // place overrides here | ||||||
|  |  | ||||||
| @@ -42,5 +41,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | |||||||
|    //#define RGBLIGHT_EFFECT_RGB_TEST |    //#define RGBLIGHT_EFFECT_RGB_TEST | ||||||
|    //#define RGBLIGHT_EFFECT_ALTERNATING |    //#define RGBLIGHT_EFFECT_ALTERNATING | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
| #endif /* CONFIG_USER_H */ |  | ||||||
|   | |||||||
| @@ -18,8 +18,9 @@ You should have received a copy of the GNU General Public License | |||||||
| along with this program.  If not, see <http://www.gnu.org/licenses/>. | along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||||
| */ | */ | ||||||
|  |  | ||||||
| #ifndef CONFIG_USER_H | #pragma once | ||||||
| #define CONFIG_USER_H |  | ||||||
|  | // place overrides here | ||||||
|  |  | ||||||
| /* Use I2C or Serial, not both */ | /* Use I2C or Serial, not both */ | ||||||
|  |  | ||||||
| @@ -31,5 +32,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | |||||||
| #define MASTER_LEFT | #define MASTER_LEFT | ||||||
| // #define _MASTER_RIGHT | // #define _MASTER_RIGHT | ||||||
| // #define EE_HANDS | // #define EE_HANDS | ||||||
|  |  | ||||||
| #endif |  | ||||||
|   | |||||||
| @@ -18,8 +18,7 @@ You should have received a copy of the GNU General Public License | |||||||
| along with this program.  If not, see <http://www.gnu.org/licenses/>. | along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||||
| */ | */ | ||||||
|  |  | ||||||
| #ifndef CONFIG_USER_H | #pragma once | ||||||
| #define CONFIG_USER_H |  | ||||||
|  |  | ||||||
| // place overrides here | // place overrides here | ||||||
|  |  | ||||||
| @@ -37,5 +36,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | |||||||
|    //#define RGBLIGHT_EFFECT_RGB_TEST |    //#define RGBLIGHT_EFFECT_RGB_TEST | ||||||
|    //#define RGBLIGHT_EFFECT_ALTERNATING |    //#define RGBLIGHT_EFFECT_ALTERNATING | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
| #endif /* CONFIG_USER_H */ |  | ||||||
|   | |||||||
| @@ -14,7 +14,7 @@ | |||||||
|  * You should have received a copy of the GNU General Public License |  * You should have received a copy of the GNU General Public License | ||||||
|  * along with this program.  If not, see <http://www.gnu.org/licenses/>. |  * along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||||
|  */ |  */ | ||||||
| #include "hid_liber.h" | #include QMK_KEYBOARD_H | ||||||
|  |  | ||||||
| // Each layer gets a name for readability, which is then used in the keymap matrix below. | // Each layer gets a name for readability, which is then used in the keymap matrix below. | ||||||
| // The underscores don't mean anything - you can have a layer called STUFF or any other name. | // The underscores don't mean anything - you can have a layer called STUFF or any other name. | ||||||
|   | |||||||
| @@ -1 +1,3 @@ | |||||||
| #include "../../config.h" | #pragma once | ||||||
|  |  | ||||||
|  | // place overrides here | ||||||
|   | |||||||
| @@ -18,8 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | |||||||
| */ | */ | ||||||
|  |  | ||||||
| #include QMK_KEYBOARD_H | #include QMK_KEYBOARD_H | ||||||
| #include "action_layer.h" |  | ||||||
| #include "rgblight.h" |  | ||||||
|  |  | ||||||
| #define ______ KC_TRNS | #define ______ KC_TRNS | ||||||
| #define _DEFLT 0 | #define _DEFLT 0 | ||||||
| @@ -113,7 +111,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||||||
|         _______, _______, _______, _______, _______, _______, _______,S(KC_NUHS),S(KC_NUBS),KC_HOME, KC_END, _______, \ |         _______, _______, _______, _______, _______, _______, _______,S(KC_NUHS),S(KC_NUBS),KC_HOME, KC_END, _______, \ | ||||||
|         BL_STEP, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY    \ |         BL_STEP, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY    \ | ||||||
|     ), |     ), | ||||||
|      |  | ||||||
|     /* Fn |     /* Fn | ||||||
|      * ,-----------------------------------------------------------------------------------. |      * ,-----------------------------------------------------------------------------------. | ||||||
|      * |      |      |  £   |      |      |      |      |      |      |      |      |      | |      * |      |      |  £   |      |      |      |      |      |      |      |      |      | | ||||||
|   | |||||||
| @@ -1,4 +1,4 @@ | |||||||
| #include "k_type.h" | #include QMK_KEYBOARD_H | ||||||
|  |  | ||||||
| const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|     [0] = KEYMAP( |     [0] = KEYMAP( | ||||||
|   | |||||||
| @@ -14,11 +14,6 @@ | |||||||
|  * along with this program.  If not, see <http://www.gnu.org/licenses/>. |  * along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||||
|  */ |  */ | ||||||
|  |  | ||||||
| #ifndef CONFIG_USER_H | #pragma once | ||||||
| #define CONFIG_USER_H |  | ||||||
|  |  | ||||||
| #include "../../config.h" |  | ||||||
|  |  | ||||||
| // place overrides here | // place overrides here | ||||||
|  |  | ||||||
| #endif |  | ||||||
|   | |||||||
| @@ -14,11 +14,6 @@ | |||||||
|  * along with this program.  If not, see <http://www.gnu.org/licenses/>. |  * along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||||
|  */ |  */ | ||||||
|  |  | ||||||
| #ifndef CONFIG_USER_H | #pragma once | ||||||
| #define CONFIG_USER_H |  | ||||||
|  |  | ||||||
| #include "config_common.h" |  | ||||||
|  |  | ||||||
| // place overrides here | // place overrides here | ||||||
|  |  | ||||||
| #endif |  | ||||||
|   | |||||||
| @@ -14,11 +14,6 @@ | |||||||
|  * along with this program.  If not, see <http://www.gnu.org/licenses/>. |  * along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||||
|  */ |  */ | ||||||
|  |  | ||||||
| #ifndef CONFIG_USER_H | #pragma once | ||||||
| #define CONFIG_USER_H |  | ||||||
|  |  | ||||||
| #include "config_common.h" |  | ||||||
|  |  | ||||||
| // place overrides here | // place overrides here | ||||||
|  |  | ||||||
| #endif |  | ||||||
|   | |||||||
| @@ -1,6 +1,3 @@ | |||||||
| #ifndef CONFIG_USER_H | #pragma once | ||||||
| #define CONFIG_USER_H |  | ||||||
|  |  | ||||||
| #include "../../config.h" | // place overrides here | ||||||
|  |  | ||||||
| #endif |  | ||||||
|   | |||||||
| @@ -1,8 +1,3 @@ | |||||||
| #ifndef CONFIG_USER_H | #pragma once | ||||||
| #define CONFIG_USER_H |  | ||||||
|  |  | ||||||
| #include "../../config.h" |  | ||||||
|  |  | ||||||
| // place overrides here | // place overrides here | ||||||
|  |  | ||||||
| #endif |  | ||||||
|   | |||||||
| @@ -14,11 +14,6 @@ | |||||||
|  * along with this program.  If not, see <http://www.gnu.org/licenses/>. |  * along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||||
|  */ |  */ | ||||||
|  |  | ||||||
| #ifndef CONFIG_USER_H | #pragma once | ||||||
| #define CONFIG_USER_H |  | ||||||
|  |  | ||||||
| #include "config_common.h" |  | ||||||
|  |  | ||||||
| // place overrides here | // place overrides here | ||||||
|  |  | ||||||
| #endif |  | ||||||
|   | |||||||
| @@ -14,11 +14,6 @@ | |||||||
|  * along with this program.  If not, see <http://www.gnu.org/licenses/>. |  * along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||||
|  */ |  */ | ||||||
|  |  | ||||||
| #ifndef CONFIG_USER_H | #pragma once | ||||||
| #define CONFIG_USER_H |  | ||||||
|  |  | ||||||
| #include "../../config.h" |  | ||||||
|  |  | ||||||
| // place overrides here | // place overrides here | ||||||
|  |  | ||||||
| #endif |  | ||||||
|   | |||||||
| @@ -14,11 +14,6 @@ | |||||||
|  * along with this program.  If not, see <http://www.gnu.org/licenses/>. |  * along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||||
|  */ |  */ | ||||||
|  |  | ||||||
| #ifndef CONFIG_USER_H | #pragma once | ||||||
| #define CONFIG_USER_H |  | ||||||
|  |  | ||||||
| #include "../../config.h" |  | ||||||
|  |  | ||||||
| // place overrides here | // place overrides here | ||||||
|  |  | ||||||
| #endif |  | ||||||
|   | |||||||
| @@ -14,11 +14,6 @@ | |||||||
|  * along with this program.  If not, see <http://www.gnu.org/licenses/>. |  * along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||||
|  */ |  */ | ||||||
|  |  | ||||||
| #ifndef CONFIG_USER_H | #pragma once | ||||||
| #define CONFIG_USER_H |  | ||||||
|  |  | ||||||
| #include "../../config.h" |  | ||||||
|  |  | ||||||
| // place overrides here | // place overrides here | ||||||
|  |  | ||||||
| #endif |  | ||||||
|   | |||||||
| @@ -1,7 +1,5 @@ | |||||||
| // Below layout is based upon /u/That-Canadian's planck layout | // Below layout is based upon /u/That-Canadian's planck layout | ||||||
| #include "launchpad.h" | #include QMK_KEYBOARD_H | ||||||
| #include "action_layer.h" |  | ||||||
| #include "eeconfig.h" |  | ||||||
|  |  | ||||||
| extern keymap_config_t keymap_config; | extern keymap_config_t keymap_config; | ||||||
|  |  | ||||||
| @@ -21,9 +19,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||||||
|  |  | ||||||
| /* Qwerty | /* Qwerty | ||||||
|  * ,-------------. |  * ,-------------. | ||||||
|  * |   1  |  2   |   |  * |   1  |  2   | | ||||||
|  * |------+------| |  * |------+------| | ||||||
|  * |   3  |  4   |  |  * |   3  |  4   | | ||||||
|  * |------+------| |  * |------+------| | ||||||
|  * |   5  |  6   | |  * |   5  |  6   | | ||||||
|  * |------+------| |  * |------+------| | ||||||
| @@ -39,9 +37,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||||||
|  |  | ||||||
| /* Function | /* Function | ||||||
|  * ,-------------. |  * ,-------------. | ||||||
|  * |   Q  |CALDEL|   |  * |   Q  |CALDEL| | ||||||
|  * |------+------| |  * |------+------| | ||||||
|  * |   A  |TSKMGR|  |  * |   A  |TSKMGR| | ||||||
|  * |------+------| |  * |------+------| | ||||||
|  * |   Z  |  X   | |  * |   Z  |  X   | | ||||||
|  * |------+------| |  * |------+------| | ||||||
| @@ -58,5 +56,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||||||
| }; | }; | ||||||
|  |  | ||||||
| void matrix_init_user(void) { | void matrix_init_user(void) { | ||||||
|      |  | ||||||
| } | } | ||||||
|   | |||||||
| @@ -1,8 +1,3 @@ | |||||||
| #ifndef CONFIG_USER_H | #pragma once | ||||||
| #define CONFIG_USER_H |  | ||||||
|  |  | ||||||
| #include "../../config.h" |  | ||||||
|  |  | ||||||
| // place overrides here | // place overrides here | ||||||
|  |  | ||||||
| #endif |  | ||||||
|   | |||||||
| @@ -1,8 +1,3 @@ | |||||||
| #ifndef CONFIG_USER_H | #pragma once | ||||||
| #define CONFIG_USER_H |  | ||||||
|  |  | ||||||
| #include "../../config.h" |  | ||||||
|  |  | ||||||
| // place overrides here | // place overrides here | ||||||
|  |  | ||||||
| #endif |  | ||||||
|   | |||||||
| @@ -1,8 +1,3 @@ | |||||||
| #ifndef CONFIG_USER_H | #pragma once | ||||||
| #define CONFIG_USER_H |  | ||||||
|  |  | ||||||
| #include "../../config.h" |  | ||||||
|  |  | ||||||
| // place overrides here | // place overrides here | ||||||
|  |  | ||||||
| #endif |  | ||||||
|   | |||||||
| @@ -1,8 +1,3 @@ | |||||||
| #ifndef CONFIG_USER_H | #pragma once | ||||||
| #define CONFIG_USER_H |  | ||||||
|  |  | ||||||
| #include "../../config.h" |  | ||||||
|  |  | ||||||
| // place overrides here | // place overrides here | ||||||
|  |  | ||||||
| #endif |  | ||||||
|   | |||||||
| @@ -1,7 +1,4 @@ | |||||||
|  | #include QMK_KEYBOARD_H | ||||||
| #include "m10a.h" |  | ||||||
| #include "action_layer.h" |  | ||||||
| #include "eeconfig.h" |  | ||||||
|  |  | ||||||
| extern keymap_config_t keymap_config; | extern keymap_config_t keymap_config; | ||||||
|  |  | ||||||
|   | |||||||
| @@ -13,8 +13,7 @@ You should have received a copy of the GNU General Public License | |||||||
| along with this program.  If not, see <http://www.gnu.org/licenses/>. | along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||||
| */ | */ | ||||||
|  |  | ||||||
| #include "mechmini.h" | #include QMK_KEYBOARD_H | ||||||
| #include "quantum.h" |  | ||||||
|  |  | ||||||
| #define _BL  0   // base layer | #define _BL  0   // base layer | ||||||
| #define _FN1 1  // function layer 1 | #define _FN1 1  // function layer 1 | ||||||
|   | |||||||
| @@ -14,10 +14,9 @@ | |||||||
|  * along with this program.  If not, see <http://www.gnu.org/licenses/>. |  * along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||||
|  */ |  */ | ||||||
|  |  | ||||||
| #ifndef CONFIG_USER_H | #pragma once | ||||||
| #define CONFIG_USER_H |  | ||||||
|  |  | ||||||
| #include "../../config.h" | // place overrides here | ||||||
|  |  | ||||||
| // place overrides here | // place overrides here | ||||||
| #define MUSIC_MASK (keycode != KC_NO) | #define MUSIC_MASK (keycode != KC_NO) | ||||||
| @@ -30,5 +29,3 @@ | |||||||
|                                   SONG(DVORAK_SOUND) \ |                                   SONG(DVORAK_SOUND) \ | ||||||
|                                 } |                                 } | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
| #endif |  | ||||||
|   | |||||||
| @@ -13,7 +13,7 @@ | |||||||
|  * You should have received a copy of the GNU General Public License |  * You should have received a copy of the GNU General Public License | ||||||
|  * along with this program.  If not, see <http://www.gnu.org/licenses/>. |  * along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||||
|  */ |  */ | ||||||
| #include "meira.h" | #include QMK_KEYBOARD_H | ||||||
| #include "lighting.h" | #include "lighting.h" | ||||||
|  |  | ||||||
| #ifdef RGBLIGHT_ENABLE | #ifdef RGBLIGHT_ENABLE | ||||||
|   | |||||||
| @@ -13,7 +13,7 @@ | |||||||
|  * You should have received a copy of the GNU General Public License |  * You should have received a copy of the GNU General Public License | ||||||
|  * along with this program.  If not, see <http://www.gnu.org/licenses/>. |  * along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||||
|  */ |  */ | ||||||
| #include "meishi.h" | #include QMK_KEYBOARD_H | ||||||
|  |  | ||||||
| const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
| [0] = LAYOUT( /* Base */ | [0] = LAYOUT( /* Base */ | ||||||
|   | |||||||
| @@ -14,11 +14,6 @@ | |||||||
|  * along with this program.  If not, see <http://www.gnu.org/licenses/>. |  * along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||||
|  */ |  */ | ||||||
|  |  | ||||||
| #ifndef CONFIG_USER_H | #pragma once | ||||||
| #define CONFIG_USER_H |  | ||||||
|  |  | ||||||
| #include "config_common.h" |  | ||||||
|  |  | ||||||
| // place overrides here | // place overrides here | ||||||
|  |  | ||||||
| #endif |  | ||||||
|   | |||||||
| @@ -1,8 +1,3 @@ | |||||||
| #ifndef CONFIG_USER_H | #pragma once | ||||||
| #define CONFIG_USER_H |  | ||||||
|  |  | ||||||
| #include "../../config.h" |  | ||||||
|  |  | ||||||
| // place overrides here | // place overrides here | ||||||
|  |  | ||||||
| #endif |  | ||||||
| @@ -1,5 +1,6 @@ | |||||||
| #ifndef CONFIG_USER_H | #pragma once | ||||||
| #define CONFIG_USER_H |  | ||||||
|  | // place overrides here | ||||||
|  |  | ||||||
| #define TAPPING_TERM 200 | #define TAPPING_TERM 200 | ||||||
|  |  | ||||||
| @@ -7,5 +8,3 @@ | |||||||
| #define RGBLIGHT_HUE_STEP 12 | #define RGBLIGHT_HUE_STEP 12 | ||||||
| #define RGBLIGHT_SAT_STEP 15 | #define RGBLIGHT_SAT_STEP 15 | ||||||
| #define RGBLIGHT_VAL_STEP 18 | #define RGBLIGHT_VAL_STEP 18 | ||||||
|  |  | ||||||
| #endif |  | ||||||
|   | |||||||
| @@ -1,9 +1,9 @@ | |||||||
| #include "mt980.h" | #include QMK_KEYBOARD_H | ||||||
|  |  | ||||||
| const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|  |  | ||||||
|   [0] = LAYOUT( |   [0] = LAYOUT( | ||||||
|     KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_NO,              KC_INS,   KC_PSCR,  KC_PGUP,  KC_PGDN,  |     KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_NO,              KC_INS,   KC_PSCR,  KC_PGUP,  KC_PGDN, | ||||||
|     KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_BSPC,  KC_NLCK,  KC_PSLS,  KC_PAST,  KC_PMNS, |     KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_BSPC,  KC_NLCK,  KC_PSLS,  KC_PAST,  KC_PMNS, | ||||||
|     KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,            KC_P7,    KC_P8,    KC_P9,    KC_PPLS, |     KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,            KC_P7,    KC_P8,    KC_P9,    KC_PPLS, | ||||||
|     KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_ENT,                       KC_P4,    KC_P5,    KC_P6,    KC_PPLS, |     KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_ENT,                       KC_P4,    KC_P5,    KC_P6,    KC_PPLS, | ||||||
| @@ -11,11 +11,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||||||
|     KC_LCTL,  KC_LGUI,  KC_LALT,                      KC_SPC,                                 KC_RALT,  MO(1),    KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT,            KC_P0,    KC_PDOT,  KC_PENT), |     KC_LCTL,  KC_LGUI,  KC_LALT,                      KC_SPC,                                 KC_RALT,  MO(1),    KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT,            KC_P0,    KC_PDOT,  KC_PENT), | ||||||
|  |  | ||||||
|   [1] = LAYOUT( |   [1] = LAYOUT( | ||||||
|     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_PAUSE, KC_SLCK,  KC_HOME,  KC_END,    |     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_PAUSE, KC_SLCK,  KC_HOME,  KC_END, | ||||||
|     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,  RGB_TOG,  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,  RGB_TOG,  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,  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,  RGB_VAI,            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,  RGB_VAI,            KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, | ||||||
|     KC_TRNS,  KC_TRNS,  KC_TRNS,                      RESET,                                  KC_TRNS,  KC_TRNS,  KC_TRNS,  RGB_RMOD, RGB_VAD,  RGB_MOD,            KC_TRNS,  KC_TRNS,  KC_TRNS)   |     KC_TRNS,  KC_TRNS,  KC_TRNS,                      RESET,                                  KC_TRNS,  KC_TRNS,  KC_TRNS,  RGB_RMOD, RGB_VAD,  RGB_MOD,            KC_TRNS,  KC_TRNS,  KC_TRNS) | ||||||
|  |  | ||||||
| }; | }; | ||||||
|   | |||||||
| @@ -14,11 +14,6 @@ | |||||||
|  * along with this program.  If not, see <http://www.gnu.org/licenses/>. |  * along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||||
|  */ |  */ | ||||||
|  |  | ||||||
| #ifndef CONFIG_USER_H | #pragma once | ||||||
| #define CONFIG_USER_H |  | ||||||
|  |  | ||||||
| #include "config_common.h" |  | ||||||
|  |  | ||||||
| // place overrides here | // place overrides here | ||||||
|  |  | ||||||
| #endif |  | ||||||
|   | |||||||
| @@ -1,5 +1,4 @@ | |||||||
| #include QMK_KEYBOARD_H | #include QMK_KEYBOARD_H | ||||||
| #include "action_layer.h" |  | ||||||
|  |  | ||||||
| const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|  |  | ||||||
|   | |||||||
| @@ -19,10 +19,7 @@ You should have received a copy of the GNU General Public License | |||||||
| along with this program.  If not, see <http://www.gnu.org/licenses/>. | along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||||
| */ | */ | ||||||
|  |  | ||||||
| #ifndef CONFIG_USER_H | #pragma once | ||||||
| #define CONFIG_USER_H |  | ||||||
|  |  | ||||||
| #include "config_common.h" |  | ||||||
|  |  | ||||||
| /* Use I2C or Serial, not both */ | /* Use I2C or Serial, not both */ | ||||||
|  |  | ||||||
| @@ -44,6 +41,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | |||||||
|                                   SONG(DVORAK_SOUND) \ |                                   SONG(DVORAK_SOUND) \ | ||||||
|                                 } |                                 } | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
|  |  | ||||||
| #endif |  | ||||||
|   | |||||||
| @@ -14,11 +14,6 @@ | |||||||
|  * along with this program.  If not, see <http://www.gnu.org/licenses/>. |  * along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||||
|  */ |  */ | ||||||
|  |  | ||||||
| #ifndef CONFIG_USER_H | #pragma once | ||||||
| #define CONFIG_USER_H |  | ||||||
|  |  | ||||||
| #include "../../config.h" |  | ||||||
|  |  | ||||||
| // place overrides here | // place overrides here | ||||||
|  |  | ||||||
| #endif |  | ||||||
|   | |||||||
| @@ -1,7 +1,4 @@ | |||||||
| #ifndef CONFIG_USER_H | #pragma once | ||||||
| #define CONFIG_USER_H |  | ||||||
|  |  | ||||||
| #include "config_common.h" |  | ||||||
|  |  | ||||||
| #ifdef AUDIO_ENABLE | #ifdef AUDIO_ENABLE | ||||||
|     #define STARTUP_SONG SONG(PREONIC_SOUND) |     #define STARTUP_SONG SONG(PREONIC_SOUND) | ||||||
| @@ -38,5 +35,3 @@ | |||||||
|  |  | ||||||
| /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */ | /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */ | ||||||
| //#define MIDI_TONE_KEYCODE_OCTAVES 2 | //#define MIDI_TONE_KEYCODE_OCTAVES 2 | ||||||
|  |  | ||||||
| #endif |  | ||||||
| @@ -14,11 +14,6 @@ | |||||||
|  * along with this program.  If not, see <http://www.gnu.org/licenses/>. |  * along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||||
|  */ |  */ | ||||||
|  |  | ||||||
| #ifndef CONFIG_USER_H | #pragma once | ||||||
| #define CONFIG_USER_H |  | ||||||
|  |  | ||||||
| #include "config_common.h" |  | ||||||
|  |  | ||||||
| // place overrides here | // place overrides here | ||||||
|  |  | ||||||
| #endif |  | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License | |||||||
| along with this program.  If not, see <http://www.gnu.org/licenses/>. | along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||||
| */ | */ | ||||||
|  |  | ||||||
| #include "bmini.h" | #include QMK_KEYBOARD_H | ||||||
|  |  | ||||||
| const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|     [0] = KEYMAP( |     [0] = KEYMAP( | ||||||
|   | |||||||
| @@ -19,13 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | |||||||
| #define KEYMAP_COMMON_H | #define KEYMAP_COMMON_H | ||||||
|  |  | ||||||
| #include "quantum.h" | #include "quantum.h" | ||||||
|  | #include "bmini.h" | ||||||
| #ifdef KEYBOARD_ps2avrGB_bfake |  | ||||||
|   #include "bfake.h" |  | ||||||
| #endif |  | ||||||
|  |  | ||||||
| #ifdef KEYBOARD_ps2avrGB_bmini_x2 |  | ||||||
|   #include "bmini_x2.h" |  | ||||||
| #endif |  | ||||||
|  |  | ||||||
| #endif | #endif | ||||||
|   | |||||||
| @@ -14,11 +14,6 @@ | |||||||
|  * along with this program.  If not, see <http://www.gnu.org/licenses/>. |  * along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||||
|  */ |  */ | ||||||
|  |  | ||||||
| #ifndef CONFIG_USER_H | #pragma once | ||||||
| #define CONFIG_USER_H |  | ||||||
|  |  | ||||||
| #include "../../config.h" |  | ||||||
|  |  | ||||||
| // place overrides here | // place overrides here | ||||||
|  |  | ||||||
| #endif |  | ||||||
|   | |||||||
| @@ -14,11 +14,6 @@ | |||||||
|  * along with this program.  If not, see <http://www.gnu.org/licenses/>. |  * along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||||
|  */ |  */ | ||||||
|  |  | ||||||
| #ifndef CONFIG_USER_H | #pragma once | ||||||
| #define CONFIG_USER_H |  | ||||||
|  |  | ||||||
| #include "../../config.h" |  | ||||||
|  |  | ||||||
| // place overrides here | // place overrides here | ||||||
|  |  | ||||||
| #endif |  | ||||||
|   | |||||||
| @@ -14,11 +14,6 @@ | |||||||
|  * along with this program.  If not, see <http://www.gnu.org/licenses/>. |  * along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||||
|  */ |  */ | ||||||
|  |  | ||||||
| #ifndef CONFIG_USER_H | #pragma once | ||||||
| #define CONFIG_USER_H |  | ||||||
|  |  | ||||||
| #include "config_common.h" |  | ||||||
|  |  | ||||||
| // place overrides here | // place overrides here | ||||||
|  |  | ||||||
| #endif |  | ||||||
|   | |||||||
| @@ -13,7 +13,7 @@ | |||||||
|  * You should have received a copy of the GNU General Public License |  * You should have received a copy of the GNU General Public License | ||||||
|  * along with this program.  If not, see <http://www.gnu.org/licenses/>. |  * along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||||
|  */ |  */ | ||||||
| #include "scrabblepad.h" | #include QMK_KEYBOARD_H | ||||||
|  |  | ||||||
| const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
| [0] = LAYOUT( /* Base */ | [0] = LAYOUT( /* Base */ | ||||||
|   | |||||||
| @@ -14,11 +14,6 @@ | |||||||
|  * along with this program.  If not, see <http://www.gnu.org/licenses/>. |  * along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||||
|  */ |  */ | ||||||
|  |  | ||||||
| #ifndef CONFIG_USER_H | #pragma once | ||||||
| #define CONFIG_USER_H |  | ||||||
|  |  | ||||||
| #include "config_common.h" |  | ||||||
|  |  | ||||||
| // place overrides here | // place overrides here | ||||||
|  |  | ||||||
| #endif |  | ||||||
|   | |||||||
| @@ -14,11 +14,6 @@ | |||||||
|  * along with this program.  If not, see <http://www.gnu.org/licenses/>. |  * along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||||
|  */ |  */ | ||||||
|  |  | ||||||
| #ifndef CONFIG_USER_H | #pragma once | ||||||
| #define CONFIG_USER_H |  | ||||||
|  |  | ||||||
| #include "config_common.h" |  | ||||||
|  |  | ||||||
| // place overrides here | // place overrides here | ||||||
|  |  | ||||||
| #endif |  | ||||||
|   | |||||||
| @@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public License | |||||||
| along with this program.  If not, see <http://www.gnu.org/licenses/>. | along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||||
| */ | */ | ||||||
| #include QMK_KEYBOARD_H | #include QMK_KEYBOARD_H | ||||||
| #include "action_layer.h" |  | ||||||
|  |  | ||||||
| enum layers { | enum layers { | ||||||
|   _LAYER0, |   _LAYER0, | ||||||
|   | |||||||
| @@ -1,7 +1,6 @@ | |||||||
| #ifndef CONFIG_USER_H | #pragma once | ||||||
| #define CONFIG_USER_H |  | ||||||
|  |  | ||||||
| #include "../../config.h" | // place overrides here | ||||||
|  |  | ||||||
| /* | /* | ||||||
|  * MIDI options |  * MIDI options | ||||||
| @@ -25,5 +24,3 @@ | |||||||
|  |  | ||||||
| /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */ | /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */ | ||||||
| //#define MIDI_TONE_KEYCODE_OCTAVES 2 | //#define MIDI_TONE_KEYCODE_OCTAVES 2 | ||||||
|  |  | ||||||
| #endif |  | ||||||
| @@ -1,9 +1,4 @@ | |||||||
| #include "subatomic.h" | #include QMK_KEYBOARD_H | ||||||
| #include "action_layer.h" |  | ||||||
| #include "eeconfig.h" |  | ||||||
| #ifdef AUDIO_ENABLE |  | ||||||
|   #include "audio.h" |  | ||||||
| #endif |  | ||||||
|  |  | ||||||
| // Each layer gets a name for readability, which is then used in the keymap matrix below. | // Each layer gets a name for readability, which is then used in the keymap matrix below. | ||||||
| // The underscores don't mean anything - you can have a layer called STUFF or any other name. | // The underscores don't mean anything - you can have a layer called STUFF or any other name. | ||||||
|   | |||||||
| @@ -1 +1,3 @@ | |||||||
| #include "../../config.h" | #pragma once | ||||||
|  |  | ||||||
|  | // place overrides here | ||||||
|   | |||||||
| @@ -1,5 +1,4 @@ | |||||||
| #include QMK_KEYBOARD_H | #include QMK_KEYBOARD_H | ||||||
| #include "rgblight.h" |  | ||||||
|  |  | ||||||
| //Layer definitions | //Layer definitions | ||||||
| #define _BL 0 | #define _BL 0 | ||||||
|   | |||||||
| @@ -1,7 +1,7 @@ | |||||||
| // this is the style you want to emulate. | // this is the style you want to emulate. | ||||||
| // This is the canonical layout file for the Quantum project. If you want to add another keyboard, | // This is the canonical layout file for the Quantum project. If you want to add another keyboard, | ||||||
|  |  | ||||||
| #include "telophase.h" | #include QMK_KEYBOARD_H | ||||||
|  |  | ||||||
| // Each layer gets a name for readability, which is then used in the keymap matrix below. | // Each layer gets a name for readability, which is then used in the keymap matrix below. | ||||||
| // The underscores don't mean anything - you can have a layer called STUFF or any other name. | // The underscores don't mean anything - you can have a layer called STUFF or any other name. | ||||||
| @@ -15,7 +15,7 @@ enum telophase_layers | |||||||
| 	_ADJUST, | 	_ADJUST, | ||||||
| }; | }; | ||||||
|  |  | ||||||
| enum telophase_keycodes  | enum telophase_keycodes | ||||||
| { | { | ||||||
|   LOWER = SAFE_RANGE, |   LOWER = SAFE_RANGE, | ||||||
|   RAISE, |   RAISE, | ||||||
| @@ -97,4 +97,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||||||
| void matrix_scan_user(void) { | void matrix_scan_user(void) { | ||||||
| 		return; | 		return; | ||||||
| }; | }; | ||||||
|  |  | ||||||
|   | |||||||
| @@ -1,7 +1,6 @@ | |||||||
| #include QMK_KEYBOARD_H | #include QMK_KEYBOARD_H | ||||||
|  |  | ||||||
| #ifdef AUDIO_ENABLE | #ifdef AUDIO_ENABLE | ||||||
|   #include "audio.h" |  | ||||||
|   float  tone_caps[][2]  = SONG( CAPS_LOCK_ON_SOUND ); |   float  tone_caps[][2]  = SONG( CAPS_LOCK_ON_SOUND ); | ||||||
|   float  tone_taps[][2]     = SONG( E__NOTE( _A6 ) ); |   float  tone_taps[][2]     = SONG( E__NOTE( _A6 ) ); | ||||||
| #endif | #endif | ||||||
|   | |||||||
| @@ -1,8 +1,3 @@ | |||||||
| #ifndef CONFIG_USER_H | #pragma once | ||||||
| #define CONFIG_USER_H |  | ||||||
|  |  | ||||||
| #include "../../config.h" |  | ||||||
|  |  | ||||||
| // place overrides here | // place overrides here | ||||||
|  |  | ||||||
| #endif |  | ||||||
| @@ -1,6 +1,4 @@ | |||||||
| #include QMK_KEYBOARD_H | #include QMK_KEYBOARD_H | ||||||
| #include "action_layer.h" |  | ||||||
| #include "eeconfig.h" |  | ||||||
|  |  | ||||||
| extern keymap_config_t keymap_config; | extern keymap_config_t keymap_config; | ||||||
|  |  | ||||||
|   | |||||||
Some files were not shown because too many files have changed in this diff Show More
		Reference in New Issue
	
	Block a user