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

This commit is contained in:
QMK Bot 2020-12-15 17:27:06 +00:00
commit 55f681a723

View file

@ -37,7 +37,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B7, D4, B1, B0, B5, B4, D7, D6, B3 } #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B7, D4, B1, B0, B5, B4, D7, D6, B3 }
#define UNUSED_PINS #define UNUSED_PINS
#define LED_NUM_LOCK_PIN B2 #define LED_CAPS_LOCK_PIN B2
#define LED_PIN_ON_STATE 0 #define LED_PIN_ON_STATE 0
#define BACKLIGHT_PIN B6 #define BACKLIGHT_PIN B6