Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
QMK Bot 2021-01-01 23:27:44 +00:00
commit ddfb558591

View File

@ -39,8 +39,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
* ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
* *
*/ */
#define MATRIX_ROW_PINS { F7, F6, F5, F4, F1, F0 } #define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, F7 }
#define MATRIX_COL_PINS { C7, D6, B7 ,B6, B5, E6, C6, D0, D1, D3, D2, B1, B2 } #define MATRIX_COL_PINS { B2, B1, D2, D3, D1, D0, C6, E6, B5, B6, B7, D6, C7 }
#define UNUSED_PINS #define UNUSED_PINS
/* COL2ROW, ROW2COL */ /* COL2ROW, ROW2COL */
@ -59,6 +59,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Locking resynchronize hack */ /* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE #define LOCKING_RESYNC_ENABLE
/* Hardware LED pins*/
#define LED_CAPS_LOCK_PIN D4
#define LED_NUM_LOCK_PIN D2
#define LED_PIN_ON_STATE 1
/* If defined, GRAVE_ESC will always act as ESC when CTRL is held. /* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
* This is useful for the Windows task manager shortcut (ctrl+shift+esc). * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
*/ */