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

This commit is contained in:
QMK Bot
2022-08-28 19:55:56 +00:00
32 changed files with 718 additions and 299 deletions

View File

@@ -75,7 +75,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define I2C1_SCL_PAL_MODE 4
#define I2C1_SDA_PAL_MODE 4
#define I2C1_CLOCK_SPEED 400000
#define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_2
#define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_16_9
/* encoder config */
#define ENCODERS_PAD_A \

View File

@@ -24,7 +24,7 @@ void matrix_scan_sub_kb(void) {
}
}
void bootmagic_lite(void) {
__attribute__((weak)) void bootmagic_lite(void) {
// We need multiple scans because debouncing can't be turned off.
matrix_scan();
#if defined(DEBOUNCE) && DEBOUNCE > 0

View File

@@ -28,3 +28,9 @@
#define CHARYBDIS_SNIPING_DPI_CONFIG_STEP 200
#define ENCODER_DEFAULT_POS 0x3
#define BOOTMAGIC_LITE_EEPROM_ROW 1
#define BOOTMAGIC_LITE_EEPROM_COLUMN 0
#define BOOTMAGIC_LITE_EEPROM_ROW_RIGHT 7
#define BOOTMAGIC_LITE_EEPROM_COLUMN_RIGHT 5