Merge remote-tracking branch 'qmk 0.17.0' into firmware21

This commit is contained in:
Drashna Jael're
2022-05-29 15:38:33 -07:00
337 changed files with 14741 additions and 2516 deletions

View File

@@ -154,9 +154,11 @@
#define FIRMWARE_VERSION_SIZE 17
#define DYNAMIC_KEYMAP_EEPROM_ADDR (EECONFIG_SIZE + FIRMWARE_VERSION_SIZE)
#define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 16383
#define DYNAMIC_KEYMAP_LAYER_COUNT 8
#define EEPROM_I2C_24LC128
#ifdef EEPROM_I2C
# define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 16383
# define DYNAMIC_KEYMAP_LAYER_COUNT 8
#endif
#define AUDIO_PIN A5
#define AUDIO_PIN_ALT A4

View File

@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[MDIA] = LAYOUT_moonlander(
LED_LEVEL,_______,_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,
LED_LEVEL,_______,_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
_______, _______, _______, KC_MS_U, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY,
_______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MNXT, _______, _______,