diff options
| author | QMK Bot <hello@qmk.fm> | 2021-03-15 01:19:36 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-03-15 01:19:36 +0000 |
| commit | 998c58e89be0a0bd86e564185967b7ad0fde0f26 (patch) | |
| tree | 4da8542406e0b3ff913207f62c1a2a5fe7911a73 /keyboards | |
| parent | 35db567c9cee9f065b1c50ecdb66e616d25f0a1b (diff) | |
| parent | 0779c34db8ba0bf7141712377b1db467394f940f (diff) | |
| download | qmk_firmware-998c58e89be0a0bd86e564185967b7ad0fde0f26.tar.gz qmk_firmware-998c58e89be0a0bd86e564185967b7ad0fde0f26.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards')
| -rw-r--r-- | keyboards/7c8/framework/keymaps/via/rules.mk | 3 | ||||
| -rw-r--r-- | keyboards/latin47ble/config.h | 2 | ||||
| -rw-r--r-- | keyboards/latin64ble/config.h | 1 | ||||
| -rw-r--r-- | keyboards/latinpadble/config.h | 2 | ||||
| -rw-r--r-- | keyboards/spaceman/pancake/feather/config.h | 4 | ||||
| -rw-r--r-- | keyboards/tokyokeyboard/alix40/config.h | 2 | ||||
| -rw-r--r-- | keyboards/ymd75/keymaps/via/rules.mk | 3 |
7 files changed, 14 insertions, 3 deletions
diff --git a/keyboards/7c8/framework/keymaps/via/rules.mk b/keyboards/7c8/framework/keymaps/via/rules.mk index 036bd6d1c3..9905283151 100644 --- a/keyboards/7c8/framework/keymaps/via/rules.mk +++ b/keyboards/7c8/framework/keymaps/via/rules.mk @@ -1 +1,2 @@ -VIA_ENABLE = yes
\ No newline at end of file +VIA_ENABLE = yes +LEADER_ENABLE = no diff --git a/keyboards/latin47ble/config.h b/keyboards/latin47ble/config.h index 716ab52f5d..f9f94d0dbf 100644 --- a/keyboards/latin47ble/config.h +++ b/keyboards/latin47ble/config.h @@ -121,3 +121,5 @@ //#define NO_ACTION_ONESHOT //#define NO_ACTION_MACRO //#define NO_ACTION_FUNCTION + +#define VIA_HAS_BROKEN_KEYCODES diff --git a/keyboards/latin64ble/config.h b/keyboards/latin64ble/config.h index ddae1e1499..68e8e7b293 100644 --- a/keyboards/latin64ble/config.h +++ b/keyboards/latin64ble/config.h @@ -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 diff --git a/keyboards/latinpadble/config.h b/keyboards/latinpadble/config.h index 9c055d9b75..5381bf91cc 100644 --- a/keyboards/latinpadble/config.h +++ b/keyboards/latinpadble/config.h @@ -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 diff --git a/keyboards/spaceman/pancake/feather/config.h b/keyboards/spaceman/pancake/feather/config.h index eac91a5ada..e72b25f3db 100644 --- a/keyboards/spaceman/pancake/feather/config.h +++ b/keyboards/spaceman/pancake/feather/config.h @@ -23,4 +23,6 @@ #define AdafruitBleResetPin D4 #define AdafruitBleCSPin B4 -#define AdafruitBleIRQPin E6
\ No newline at end of file +#define AdafruitBleIRQPin E6 + +#define VIA_HAS_BROKEN_KEYCODES diff --git a/keyboards/tokyokeyboard/alix40/config.h b/keyboards/tokyokeyboard/alix40/config.h index ec6f98d549..113412e95a 100644 --- a/keyboards/tokyokeyboard/alix40/config.h +++ b/keyboards/tokyokeyboard/alix40/config.h @@ -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 diff --git a/keyboards/ymd75/keymaps/via/rules.mk b/keyboards/ymd75/keymaps/via/rules.mk index 43061db1dd..152460f304 100644 --- a/keyboards/ymd75/keymaps/via/rules.mk +++ b/keyboards/ymd75/keymaps/via/rules.mk @@ -1,2 +1,3 @@ VIA_ENABLE = yes -LTO_ENABLE = yes
\ No newline at end of file +LTO_ENABLE = yes +KEY_LOCK_ENABLE = no |