Fix MATRIX_X_PINS_RIGHT ARM compilation (#6395)

* Add my plaid keymap

* Move planck / plaid keymaps to common layout folder

keyboards/mechmini/v2/keymaps/wsturgiss/config.h

@@ -0,0 +1,11 @@
+/* tapdance */
+#define TAPPING_TERM 180 
+
+/* space cadet stuff */
+#define LSPO_KEY KC_9
+#define RSPC_KEY KC_0
+#define DISABLE_SPACE_CADET_ROLLOVER
+
+/* leader stuff */
+#define LEADER_TIMEOUT 400
+#define LEADER_PER_KEY_TIMING 300

keyboards/mechmini/v2/keymaps/wsturgiss/keymap.c

@@ -0,0 +1,106 @@
+#include QMK_KEYBOARD_H
+
+#define base 0
+#define raise 1 
+#define lower 2
+
+//Tap Dance Declarations
+enum {
+  TD_SEMI_QUOT = 0,
+  TD_COMM_MINUS = 1,
+  TD_DOT_EQUAL = 2,
+  TD_SLASH_BACKSLASH = 3
+};
+
+//Tap Dance Definitions
+qk_tap_dance_action_t tap_dance_actions[] = {
+  //Tap once for ;, twice for ' -not using this currently
+  [TD_SEMI_QUOT]  = ACTION_TAP_DANCE_DOUBLE(KC_SCLN, KC_QUOT),
+  //Tap once for , twice for -
+  [TD_COMM_MINUS]  = ACTION_TAP_DANCE_DOUBLE(KC_COMM, KC_MINUS),
+  //Tap once for . twice for =
+  [TD_DOT_EQUAL]  = ACTION_TAP_DANCE_DOUBLE(KC_DOT, KC_EQUAL),
+  //Tap once for / twice for '\'
+  [TD_SLASH_BACKSLASH]  = ACTION_TAP_DANCE_DOUBLE(KC_SLSH, KC_BSLS)
+};
+
+#define CTRL_ESC CTL_T(KC_ESC)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[base] = LAYOUT_2u_space_ortho(
+		KC_TAB,     KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_BSPC,
+		CTRL_ESC,   KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_ENT,
+		KC_LSPO,    KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     TD(1),    TD(2),    TD(3),    KC_RSPC,
+		KC_LCTL,    KC_LEAD,  KC_LALT,  KC_LGUI,  MO(1),        KC_SPC,         MO(2),    KC_VOLD,  KC_MPLY,  KC_VOLU,  KC_GRV),
+
+	[raise] = LAYOUT_2u_space_ortho(
+		_______,    KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_DEL,
+		_______,    _______,  _______,  _______,  _______,  _______,  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RIGHT, KC_QUOT,  _______,
+		_______,    KC_HOME,  KC_END,   _______,  _______,  _______,  _______,  _______,  KC_LBRC,  KC_RBRC,  _______,  _______,  
+		_______,    _______,  _______,  _______,  _______,      _______,        _______,  KC_MPRV,  _______,  KC_MNXT,  EEP_RST),
+
+	[lower] = LAYOUT_2u_space_ortho(
+		_______,    KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     _______,
+		_______,    RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_VAD,  _______,  _______,  KC_4,     KC_5,     KC_6,   KC_KP_PLUS, _______,
+		_______,    RGB_SAI,  RGB_SAD,  RGB_HUI,  RGB_HUD,  _______,  _______,  KC_1,     KC_2,     KC_3,  KC_KP_MINUS, _______,
+		_______,    _______,  _______,  _______,  _______,      _______,        _______,  KC_0,     _______,  _______,  _______)
+
+
+};
+
+//Leader maps
+
+
+LEADER_EXTERNS();
+
+void matrix_scan_user(void) {
+  LEADER_DICTIONARY() {
+    leading = false;
+    leader_end();
+
+    SEQ_ONE_KEY(KC_F) {
+      // Anything you can do in a macro.
+      SEND_STRING("QMK is awesome.");
+    }
+    //tableflip (LEADER - TF)
+    SEQ_TWO_KEYS(KC_T, KC_F) {
+        set_unicode_input_mode(UC_OSX);
+        send_unicode_hex_string("0028 30CE 0CA0 75CA 0CA0 0029 30CE 5F61 253B 2501 253B");
+    }
+    //screencap (LEADER - SC)
+    SEQ_TWO_KEYS(KC_S, KC_C) {
+      SEND_STRING(SS_LGUI(SS_LSFT(SS_TAP(X_4))));
+    }
+    //screencap (LEADER - TM)
+    SEQ_TWO_KEYS(KC_T, KC_M) {
+        set_unicode_input_mode(UC_OSX);
+        send_unicode_hex_string("2122");
+    }
+    /*
+    SEQ_THREE_KEYS(KC_D, KC_D, KC_S) {
+      SEND_STRING("https://start.duckduckgo.com"SS_TAP(X_ENTER));
+    }
+    */
+  }
+}
+
+//change colors and rgb modes on layer change
+uint32_t layer_state_set_user(uint32_t state) {
+    switch (biton32(state)) {
+    case raise:
+        rgblight_mode_noeeprom(1);
+        rgblight_setrgb(0xc7, 0x00, 0xf4);
+        break;
+    case lower:
+        rgblight_mode_noeeprom(1);
+        rgblight_setrgb(0x00, 0xa3, 0x0d);
+        break;
+    default: // for any other layers, or the default layer
+        rgblight_mode_noeeprom(5);
+        rgblight_setrgb(0xFF, 0xB6, 0x00);
+        break;
+    }
+  return state;
+};
+

keyboards/mechmini/v2/keymaps/wsturgiss/rules.mk

@@ -0,0 +1,11 @@
+BOOTMAGIC_ENABLE = yes	# Virtual DIP switch configuration(+1000)
+CONSOLE_ENABLE = no	# Console for debug(+400)
+COMMAND_ENABLE = no    # Commands for debug and configuration
+SLEEP_LED_ENABLE = yes  # Breathing sleep LED during USB suspend
+NKRO_ENABLE = yes		# USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
+AUDIO_ENABLE = no
+RGBLIGHT_ENABLE = yes
+TAP_DANCE_ENABLE = yes
+UNICODE_ENABLE = yes
+LEADER_ENABLE = yes

keyboards/planck/ez/config.h

@@ -138,3 +138,14 @@
 #define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL
 
 #define RGB_MATRIX_KEYPRESSES
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+
+#define IGNORE_MOD_TAP_INTERRUPT
+
+#define TAPPING_TOGGLE  1
+
+#define MOUSEKEY_INTERVAL       20
+#define MOUSEKEY_DELAY          0
+#define MOUSEKEY_TIME_TO_MAX    60
+#define MOUSEKEY_MAX_SPEED      7
+#define MOUSEKEY_WHEEL_DELAY 0

keyboards/planck/keymaps/jarred/keymap.c

@@ -1,34 +0,0 @@
-/* Copyright 2018 Jarred Steenvoorden
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "planck.h"
-#include "jarred.h"
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_QW] = LAYOUT_planck_grid_wrapper(QWERTY_4x12),
-    [_GAME] = LAYOUT_planck_grid_wrapper(GAME_4x12),
-    [_LW] = LAYOUT_planck_grid_wrapper(LOWER_4x12),
-    [_NV] = LAYOUT_planck_grid_wrapper(NAV_4x12),
-    [_NP] = LAYOUT_planck_grid_wrapper(NUMPAD_4x12),
-    [_MS] = LAYOUT_planck_grid_wrapper(MOUSE_4x12)
-};
-
-#ifdef RGB_MATRIX_H
-void rgb_matrix_indicators_user(void) {
-    // Disable light in middle of 2U position
-    rgb_matrix_set_color(42, 0, 0, 0);
-}
-#endif

keyboards/planck/keymaps/jarred/readme.md

@@ -1,9 +0,0 @@
-# Jarred's Planck Layout
-
-Check out [user space readme](../../../../users/jarred/readme.md) for more info
-
-# Build
-
-```
-make planck/rev4:jarred:dfu
-```

keyboards/unikorn/readme.md

@@ -26,7 +26,11 @@ Flashing
 
 ps2avr(GB) boards use an atmega32a microcontroller and a different bootloader. It is not flashable using the regular QMK methods. 
 
-**Reset Key:** Short the two holes labeled `FW_JP` beside the Tab key. At this time there is no reset key to press.   
+**Reset Key:** Short the two holes labeled `FW_JP` underneath the PCB, beside the Tab key while plugging in the keyboard. 
+
+Do not confuse this with the LED holes of the switch in the `Tab` position. `FW_JP` is not reachable from the top as the plate blocks access to it. 
+
+It is recommended to program a `RESET` key in your keymap.   
 
 Windows: 
 1. Download [HIDBootFlash](http://vusb.wikidot.com/project:hidbootflash).

layouts/community/ortho_4x12/jarred/keymap.c

@@ -0,0 +1,22 @@
+#include QMK_KEYBOARD_H
+#include "jarred.h"
+
+#define LAYOUT_ortho_4x12_wrapper(...) LAYOUT_ortho_4x12(__VA_ARGS__)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_QW] = LAYOUT_ortho_4x12_wrapper(QWERTY_4x12),
+    [_GAME] = LAYOUT_ortho_4x12_wrapper(GAME_4x12),
+    [_LW] = LAYOUT_ortho_4x12_wrapper(LOWER_4x12),
+    [_NV] = LAYOUT_ortho_4x12_wrapper(NAV_4x12),
+    [_NP] = LAYOUT_ortho_4x12_wrapper(NUMPAD_4x12),
+    [_MS] = LAYOUT_ortho_4x12_wrapper(MOUSE_4x12)
+};
+
+#ifdef RGB_MATRIX_ENABLE
+void rgb_matrix_indicators_user(void) {
+    #ifdef KEYBOARD_planck_light
+    // Disable light in middle of 2U position of Planck Light
+    rgb_matrix_set_color(42, 0, 0, 0);
+    #endif
+}
+#endif

layouts/community/ortho_4x12/jarred/readme.md

@@ -0,0 +1,22 @@
+# Jarred's ortho 4x12 keymap
+
+[User space](../../../../users/jarred/readme.md)
+
+Boards used on:
+- [Planck](../../../../keyboards/planck/readme.md)
+- [Plaid](../../../../keyboards/plaid/readme.md)
+
+# Plaid build notes
+
+Enter Bootloader:
+Press Reset / Press Boot / Release Reset / Release Boot
+
+Install libusbK driver for usbasp:
+https://zadig.akeo.ie/
+
+make plaid:jarred:program
+
+Press Reset
+
+https://github.com/hsgw/plaid/blob/master/doc/en/bootloader.md
+https://github.com/hsgw/plaid/blob/master/doc/en/firmware.md

quantum/split_common/matrix.c

@@ -253,13 +253,13 @@ void matrix_init(void) {
   // Set pinout for right half if pinout for that half is defined
   if (!isLeftHand) {
 #ifdef MATRIX_ROW_PINS_RIGHT
-    const uint8_t row_pins_right[MATRIX_ROWS] = MATRIX_ROW_PINS_RIGHT;
+    const pin_t row_pins_right[MATRIX_ROWS] = MATRIX_ROW_PINS_RIGHT;
     for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
       row_pins[i] = row_pins_right[i];
     }
 #endif
 #ifdef MATRIX_COL_PINS_RIGHT
-    const uint8_t col_pins_right[MATRIX_COLS] = MATRIX_COL_PINS_RIGHT;
+    const pin_t col_pins_right[MATRIX_COLS] = MATRIX_COL_PINS_RIGHT;
     for (uint8_t i = 0; i < MATRIX_COLS; i++) {
       col_pins[i] = col_pins_right[i];
     }

users/jarred/jarred.h

@@ -50,6 +50,7 @@ enum {
 
 // Wrappers
 #define LAYOUT_planck_grid_wrapper(...)      LAYOUT_planck_grid(__VA_ARGS__)
+#define LAYOUT_plaid_grid_wrapper(...)      LAYOUT_plaid_grid(__VA_ARGS__)
 #define LAYOUT_atreus62_grid_wrapper(...)      LAYOUT(__VA_ARGS__)
 #define LAYOUT_ergotravel_grid_wrapper(...)      LAYOUT(__VA_ARGS__)
 

users/jarred/readme.md

@@ -2,4 +2,13 @@
 
 Keymaps:
 
-- [Planck](../../keyboards/planck/keymaps/jarred/readme.md)
+- [Ortho 4x12](../../layouts/community/ortho_4x12/jarred/readme.md)
+
+- [CRKBD](../../keyboards/crkbd/keymaps/jarred/readme.md)
+- [Atreus 62](../../keyboards/ergotravel/keymaps/jarred/readme.md)
+- [ErgoTravel](../../keyboards/ergotravel/keymaps/jarred/readme.md)
+- [xd75](../../keyboards/xd75/keymaps/jarred/readme.md)
+
+- [satan](../../keyboards/satan/keymaps/jarred/readme.md)
+- [dz60](../../keyboards/dz60/keymaps/jarred/readme.md)
+- [org60](../../keyboards/org60/keymaps/jarred/readme.md)