mh
/
qmk_firmware
mirror of https://github.com/qmk/qmk_firmware/
1
0
Fork 0
Code Issues 0 Projects 0 Releases 1.6k Wiki Activity
Browse Source

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

pull/17974/head
QMK Bot 1 year ago
parent
5021cf58ad e44b6242b7
commit
904df296b0
13 changed files with 11 additions and 15 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +0
    -2
      keyboards/acheron/apollo/87h/gamma/config.h
  2. +0
    -13
      keyboards/acheron/apollo/87h/gamma/mcuconf.h
  3. +1
    -0
      keyboards/acheron/apollo/87h/gamma/rules.mk
  4. +1
    -0
      keyboards/bastardkb/charybdis/3x5/keymaps/drashna/rules.mk
  5. +1
    -0
      keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/rules.mk
  6. +1
    -0
      keyboards/handwired/onekey/blackpill_f411_tinyuf2/rules.mk
  7. +1
    -0
      keyboards/mechwild/bbs/rules.mk
  8. +1
    -0
      keyboards/mlego/m60_split/rev1/rules.mk
  9. +1
    -0
      keyboards/phoenix/rules.mk
  10. +1
    -0
      keyboards/xelus/rs108/rules.mk
  11. +1
    -0
      keyboards/xelus/rs60/rev2/rules.mk
  12. +1
    -0
      keyboards/xelus/valor_frl_tkl/rev2_0/rules.mk
  13. +1
    -0
      keyboards/xelus/valor_frl_tkl/rev2_1/rules.mk

+ 0
- 2
keyboards/acheron/apollo/87h/gamma/config.h View File

@ -44,8 +44,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
#define STM32_HSECLK 8000000
// RGB Matrix defines
#define DRIVER_ADDR_1 0b0110000


+ 0
- 13
keyboards/acheron/apollo/87h/gamma/mcuconf.h View File

@ -17,19 +17,6 @@
#pragma once
#include_next <mcuconf.h>
#undef STM32_PLLM_VALUE
#undef STM32_PLLN_VALUE
#undef STM32_PLLP_VALUE
#undef STM32_PLLQ_VALUE
#undef STM32_PPRE1
#undef STM32_PPRE2
#define STM32_PLLM_VALUE 4
#define STM32_PLLN_VALUE 96
#define STM32_PLLP_VALUE 2
#define STM32_PLLQ_VALUE 4
#define STM32_PPRE1 STM32_PPRE1_DIV2
#define STM32_PPRE2 STM32_PPRE2_DIV1
#undef STM32_I2C_USE_I2C1
#define STM32_I2C_USE_I2C1 TRUE


+ 1
- 0
keyboards/acheron/apollo/87h/gamma/rules.mk View File

@ -1,5 +1,6 @@
# MCU name
MCU = STM32F411
BOARD = GENERIC_STM32_F411XE
# Bootloader selection
BOOTLOADER = stm32-dfu


+ 1
- 0
keyboards/bastardkb/charybdis/3x5/keymaps/drashna/rules.mk View File

@ -1,5 +1,6 @@
# MCU name
MCU = STM32F411
BOARD = BLACKPILL_STM32_F411
# Bootloader selection
# BOOTLOADER = stm32-dfu


+ 1
- 0
keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/rules.mk View File

@ -3,6 +3,7 @@
# MCU name
MCU = STM32F411
BOARD = BLACKPILL_STM32_F411
# Bootloader selection
BOOTLOADER = tinyuf2


+ 1
- 0
keyboards/handwired/onekey/blackpill_f411_tinyuf2/rules.mk View File

@ -1,5 +1,6 @@
# MCU name
MCU = STM32F411
BOARD = BLACKPILL_STM32_F411
# Bootloader selection
BOOTLOADER = tinyuf2


+ 1
- 0
keyboards/mechwild/bbs/rules.mk View File

@ -1,5 +1,6 @@
# MCU name
MCU = STM32F401
BOARD = BLACKPILL_STM32_F401
# Bootloader selection
BOOTLOADER = stm32-dfu


+ 1
- 0
keyboards/mlego/m60_split/rev1/rules.mk View File

@ -1,5 +1,6 @@
# MCU name
MCU = STM32F401
BOARD = BLACKPILL_STM32_F401
# Bootloader selection
BOOTLOADER = tinyuf2


+ 1
- 0
keyboards/phoenix/rules.mk View File

@ -1,5 +1,6 @@
# MCU name
MCU = STM32F401
BOARD = BLACKPILL_STM32_F401
# Bootloader selection
BOOTLOADER = stm32-dfu


+ 1
- 0
keyboards/xelus/rs108/rules.mk View File

@ -1,5 +1,6 @@
# MCU name
MCU = STM32F401
BOARD = GENERIC_STM32_F401XC
# Bootloader selection
BOOTLOADER = stm32-dfu


+ 1
- 0
keyboards/xelus/rs60/rev2/rules.mk View File

@ -1,5 +1,6 @@
# MCU name
MCU = STM32F401
BOARD = GENERIC_STM32_F401XC
# Bootloader selection
BOOTLOADER = stm32-dfu


+ 1
- 0
keyboards/xelus/valor_frl_tkl/rev2_0/rules.mk View File

@ -1,5 +1,6 @@
# MCU name
MCU = STM32F411
BOARD = GENERIC_STM32_F401XC
# Bootloader selection
BOOTLOADER = stm32-dfu


+ 1
- 0
keyboards/xelus/valor_frl_tkl/rev2_1/rules.mk View File

@ -1,5 +1,6 @@
# MCU name
MCU = STM32F401
BOARD = GENERIC_STM32_F401XC
# Bootloader selection
BOOTLOADER = stm32-dfu


Write Preview
Loading…
Cancel
Save