summaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-07-17 12:03:31 +0000
committerQMK Bot <hello@qmk.fm>2022-07-17 12:03:31 +0000
commita1fb1405e4d838f7e0450dbfce83976d7e861855 (patch)
treef9ba11472ebf806e6a26c998864ac95409af5edb /keyboards
parent859c1a6fc9dce534737e5c66bb20240a41873069 (diff)
parent37cd5ad810ac297a8cf1a66bd0f7f51b3606617c (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/converter/m0110_usb/config.h3
-rw-r--r--keyboards/handwired/minorca/config.h6
-rw-r--r--keyboards/handwired/promethium/keymaps/default/config.h6
-rw-r--r--keyboards/momoka_ergo/config.h7
4 files changed, 1 insertions, 21 deletions
diff --git a/keyboards/converter/m0110_usb/config.h b/keyboards/converter/m0110_usb/config.h
index f980217b81..c612327ecf 100644
--- a/keyboards/converter/m0110_usb/config.h
+++ b/keyboards/converter/m0110_usb/config.h
@@ -42,9 +42,6 @@ Ported to QMK by Techsock <info@techsock.com>
get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_LALT) | MOD_BIT(KC_LCTL)) \
)
-/* boot magic key */
-#define BOOTMAGIC_KEY_SALT KC_M
-
/* ports */
#define M0110_CLOCK_PORT PORTD
#define M0110_CLOCK_PIN PIND
diff --git a/keyboards/handwired/minorca/config.h b/keyboards/handwired/minorca/config.h
index e987ba67f0..77b624c6ff 100644
--- a/keyboards/handwired/minorca/config.h
+++ b/keyboards/handwired/minorca/config.h
@@ -67,9 +67,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define NO_ACTION_LAYER
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT
-
-/* bootmagic salt key */
-#define BOOTMAGIC_KEY_SALT KC_ESC
-
-/* skip bootmagic and eeconfig */
-#define BOOTMAGIC_KEY_SKIP KC_SPACE
diff --git a/keyboards/handwired/promethium/keymaps/default/config.h b/keyboards/handwired/promethium/keymaps/default/config.h
index 0630fd43e3..1e5e8906ed 100644
--- a/keyboards/handwired/promethium/keymaps/default/config.h
+++ b/keyboards/handwired/promethium/keymaps/default/config.h
@@ -2,12 +2,6 @@
#define PRIYADI_PROMETHIUM
-/* bootmagic salt key */
-#define BOOTMAGIC_KEY_SALT KC_ESC
-
-/* skip bootmagic and eeconfig */
-#define BOOTMAGIC_KEY_SKIP KC_SPACE
-
#define RGBSPS_ENABLE
#define RGBSPS_DEMO_ENABLE
diff --git a/keyboards/momoka_ergo/config.h b/keyboards/momoka_ergo/config.h
index e8fe01f504..08c92e9899 100644
--- a/keyboards/momoka_ergo/config.h
+++ b/keyboards/momoka_ergo/config.h
@@ -116,12 +116,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Bootmagic Lite key configuration */
//#define BOOTMAGIC_LITE_ROW 0
//#define BOOTMAGIC_LITE_COLUMN 0
-#define BOOTMAGIC_KEY_SALT KC_RSFT||KC_LSFT
-#define BOOTMAGIC_KEY_SKIP KC_ESC
-#define BOOTMAGIC_KEY_EEPROM_CLEAR KC_NO
-#define OOTMAGIC_KEY_BOOTLOADER KC_RCTL||KC_LCTL
-#define BOOTMAGIC_KEY_EE_HANDS_LEFT KC_T
-#define BOOTMAGIC_KEY_EE_HANDS_RIGHT KC_Y
+
#define USE_SERIAL
#define SPLIT_USB_DETECT
#define EE_HANDS