summaryrefslogtreecommitdiff
path: root/keyboards/converter
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-05-10 12:26:23 +0000
committerQMK Bot <hello@qmk.fm>2022-05-10 12:26:23 +0000
commit4957a633e922a09660d4fc60f4367a0ebe84d500 (patch)
tree5bf58583741c662d60b022c6fcd8474613be2d81 /keyboards/converter
parentbfa04efada377b7cac2cfcb92e8cf50ef4202b0a (diff)
parent796ededd5950e0378a9466288fbbdc219251f968 (diff)
downloadqmk_firmware-4957a633e922a09660d4fc60f4367a0ebe84d500.tar.gz
qmk_firmware-4957a633e922a09660d4fc60f4367a0ebe84d500.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/converter')
-rw-r--r--keyboards/converter/a1200/mistress1200/config.h5
-rw-r--r--keyboards/converter/a1200/mistress1200/rules.mk3
2 files changed, 8 insertions, 0 deletions
diff --git a/keyboards/converter/a1200/mistress1200/config.h b/keyboards/converter/a1200/mistress1200/config.h
index 2ae2525398..123d6165d6 100644
--- a/keyboards/converter/a1200/mistress1200/config.h
+++ b/keyboards/converter/a1200/mistress1200/config.h
@@ -49,6 +49,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define LED_CAPS_LOCK_PIN B0
#define LED_PIN_ON_STATE 0
+#define TAPPING_TOGGLE 3
+
+#undef LOCKING_SUPPORT_ENABLE
+#undef LOCKING_RESYNC_ENABLE
+#define LAYER_STATE_8BIT
/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
#define DEBOUNCE 5
diff --git a/keyboards/converter/a1200/mistress1200/rules.mk b/keyboards/converter/a1200/mistress1200/rules.mk
index 56aa5d9ba9..90c20bafc9 100644
--- a/keyboards/converter/a1200/mistress1200/rules.mk
+++ b/keyboards/converter/a1200/mistress1200/rules.mk
@@ -17,3 +17,6 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
LTO_ENABLE = yes
+SPACE_CADET_ENABLE = no
+GRAVE_ESC_ENABLE = no
+MAGIC_ENABLE = no