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

This commit is contained in:
QMK Bot
2021-03-15 01:19:36 +00:00
11 changed files with 395 additions and 3 deletions

View File

@@ -1 +1,2 @@
VIA_ENABLE = yes
VIA_ENABLE = yes
LEADER_ENABLE = no

View File

@@ -121,3 +121,5 @@
//#define NO_ACTION_ONESHOT
//#define NO_ACTION_MACRO
//#define NO_ACTION_FUNCTION
#define VIA_HAS_BROKEN_KEYCODES

View File

@@ -47,5 +47,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.*/
#define RGBLIGHT_ANIMATIONS // Run RGB animations
#define VIA_HAS_BROKEN_KEYCODES

View File

@@ -99,3 +99,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.*/
#define ENCODERS_PAD_B { F7 }
#define ENCODER_RESOLUTION 4
#define VIA_HAS_BROKEN_KEYCODES

View File

@@ -23,4 +23,6 @@
#define AdafruitBleResetPin D4
#define AdafruitBleCSPin B4
#define AdafruitBleIRQPin E6
#define AdafruitBleIRQPin E6
#define VIA_HAS_BROKEN_KEYCODES

View File

@@ -69,3 +69,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define AdafruitBleCSPin B4
#define AdafruitBleIRQPin E6
#define BATTERY_LEVEL_PIN B6
#define VIA_HAS_BROKEN_KEYCODES

View File

@@ -1,2 +1,3 @@
VIA_ENABLE = yes
LTO_ENABLE = yes
LTO_ENABLE = yes
KEY_LOCK_ENABLE = no