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

2021-01-30 13:15:13 -08:00
parent 051c0774f8 d02c4c5241
commit 3af97ef6a2
45 changed files with 208 additions and 2 deletions
--- a/keyboards/ergodox_ez/rules.mk
+++ b/keyboards/ergodox_ez/rules.mk
@@ -41,3 +41,7 @@ SRC += matrix.c \
 QUANTUM_LIB_SRC += i2c_master.c

 LAYOUTS = ergodox
+
+# Disable unsupported hardware
+AUDIO_SUPPORTED = no
+BACKLIGHT_SUPPORTED = no