diff options
| author | MechMerlin <30334081+mechmerlin@users.noreply.github.com> | 2019-09-25 12:55:27 -0700 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2019-09-25 12:55:27 -0700 |
| commit | 0850a8cb634febb92314af5a65a11e58b123e86f (patch) | |
| tree | 34f3a19d2ba9f6c2820aa8cc438b238c16adf707 /keyboards/massdrop | |
| parent | c61d7d7cb001498e6edf09a9ebc6124c1fe6ed97 (diff) | |
65 ansi blocker everywhere (everywhere I can find) (#6805)
* e6.5 actually already had a 65_ansi_blocker LAYOUT macro, so just had to enable in rules.
* Add the 65_ansi_blocker LAYOUT macro and enable in rules.mk
* rename LAYOUT macro in .h and in the keymap.c as it was only a default keymap. Also enable in rules.mk
* rename but also had to define the existing LAYOUT macro as the new one to prevent breakage of existing keymaps
* add 65_ansi_blocker support for vinta
* forgot to update the info.json on these
* add new default layout 65_ansi_blocker support to alt
* add 65_ansi_blocker support
* undo changes
Diffstat (limited to 'keyboards/massdrop')
| -rw-r--r-- | keyboards/massdrop/alt/alt.h | 4 | ||||
| -rw-r--r-- | keyboards/massdrop/alt/info.json | 2 | ||||
| -rw-r--r-- | keyboards/massdrop/alt/keymaps/default/keymap.c | 4 | ||||
| -rw-r--r-- | keyboards/massdrop/alt/rules.mk | 2 |
4 files changed, 8 insertions, 4 deletions
diff --git a/keyboards/massdrop/alt/alt.h b/keyboards/massdrop/alt/alt.h index 8dfed8d2d6..f1adcd67c7 100644 --- a/keyboards/massdrop/alt/alt.h +++ b/keyboards/massdrop/alt/alt.h @@ -9,7 +9,7 @@ #include "usb/udi_cdc.h" #include "usb/usb2422.h" -#define LAYOUT( \ +#define LAYOUT_65_ansi_blocker( \ K01, K02, K03, K04, K05, K06, K07, K08, K09, K10, K11, K12, K13, K14, K15, \ K16, K17, K18, K19, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K30, \ K31, K32, K33, K34, K35, K36, K37, K38, K39, K40, K41, K42, K43, K44, K45, \ @@ -32,3 +32,5 @@ dprintf(name " enabled\r\n"); \ } \ } + +#define LAYOUT LAYOUT_65_ansi_blocker // Ensure that user made existing keymaps do not break. diff --git a/keyboards/massdrop/alt/info.json b/keyboards/massdrop/alt/info.json index 8f85bece21..965b232fcd 100644 --- a/keyboards/massdrop/alt/info.json +++ b/keyboards/massdrop/alt/info.json @@ -5,7 +5,7 @@ "width": 16, "height": 5, "layouts": { - "LAYOUT": { + "LAYOUT_65_ansi_blocker": { "layout": [ {"label":"ESCAPE", "x":0, "y":0}, {"label":"1", "x":1, "y":0}, diff --git a/keyboards/massdrop/alt/keymaps/default/keymap.c b/keyboards/massdrop/alt/keymaps/default/keymap.c index f6f79ad91e..f1e9400331 100644 --- a/keyboards/massdrop/alt/keymaps/default/keymap.c +++ b/keyboards/massdrop/alt/keymaps/default/keymap.c @@ -15,14 +15,14 @@ enum alt_keycodes { keymap_config_t keymap_config; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( + [0] = LAYOUT_65_ansi_blocker( KC_ESC, 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_DEL, \ 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_HOME, \ 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_PGUP, \ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, \ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT \ ), - [1] = LAYOUT( + [1] = LAYOUT_65_ansi_blocker( KC_GRV, 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_MUTE, \ _______, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, U_T_AUTO,U_T_AGCR,_______, KC_PSCR, KC_SLCK, KC_PAUS, _______, KC_END, \ _______, RGB_RMOD,RGB_VAD, RGB_MOD, RGB_HUD, RGB_SAD, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, \ diff --git a/keyboards/massdrop/alt/rules.mk b/keyboards/massdrop/alt/rules.mk index aa45c68056..3da2610f68 100644 --- a/keyboards/massdrop/alt/rules.mk +++ b/keyboards/massdrop/alt/rules.mk @@ -34,3 +34,5 @@ AUTO_SHIFT_ENABLE = no # Auto Shift # Custom RGB matrix handling RGB_MATRIX_ENABLE = custom + +LAYOUTS = 65_ansi_blocker |