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

This commit is contained in:
QMK Bot 2022-07-17 12:03:31 +00:00
commit a1fb1405e4
4 changed files with 1 additions and 21 deletions

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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