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

4 years ago · 4957a633e9
parent bfa04efada 796ededd59
commit 4957a633e9
2 changed files with 8 additions and 0 deletions
--- 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
--- 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