diff options
| author | QMK Bot <hello@qmk.fm> | 2021-06-08 09:49:23 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-06-08 09:49:23 +0000 |
| commit | 13defb0befa31110e70fafbeeb26bd6883472c86 (patch) | |
| tree | 6d35884f908326ddf696fb4d08957341a8946e16 /keyboards/handwired/co60 | |
| parent | 84e691717cd8a49b345ec35aa2a2374bebce07f0 (diff) | |
| parent | 9dcd03b6ca512126231478131796c093d237067f (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/handwired/co60')
| -rw-r--r-- | keyboards/handwired/co60/rev6/config.h | 6 | ||||
| -rw-r--r-- | keyboards/handwired/co60/rev6/rules.mk | 3 | ||||
| -rw-r--r-- | keyboards/handwired/co60/rev7/config.h | 6 | ||||
| -rw-r--r-- | keyboards/handwired/co60/rev7/rules.mk | 3 |
4 files changed, 6 insertions, 12 deletions
diff --git a/keyboards/handwired/co60/rev6/config.h b/keyboards/handwired/co60/rev6/config.h index 79c64e7353..c142d10f29 100644 --- a/keyboards/handwired/co60/rev6/config.h +++ b/keyboards/handwired/co60/rev6/config.h @@ -25,12 +25,6 @@ #define MANUFACTURER John M Daly #define PRODUCT CO60 rev6 -/* Address for jumping to bootloader on STM32 chips. */ -/* It is chip dependent, the correct number can be looked up here: - * http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf - */ -#define STM32_BOOTLOADER_ADDRESS 0x1FFFD800 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/handwired/co60/rev6/rules.mk b/keyboards/handwired/co60/rev6/rules.mk index f4e7ae924d..5c26d9a30d 100644 --- a/keyboards/handwired/co60/rev6/rules.mk +++ b/keyboards/handwired/co60/rev6/rules.mk @@ -2,6 +2,9 @@ MCU = STM32F303 BOARD = QMK_PROTON_C +# Bootloader selection +BOOTLOADER = stm32-dfu + # Build Options # comment out to disable the options. # diff --git a/keyboards/handwired/co60/rev7/config.h b/keyboards/handwired/co60/rev7/config.h index 20e62472b7..16fa7cb4c5 100644 --- a/keyboards/handwired/co60/rev7/config.h +++ b/keyboards/handwired/co60/rev7/config.h @@ -26,12 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define MANUFACTURER John M Daly #define PRODUCT CO60 rev7 -/* Address for jumping to bootloader on STM32 chips. */ -/* It is chip dependent, the correct number can be looked up here: - * http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf - */ -#define STM32_BOOTLOADER_ADDRESS 0x1FFFD800 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/handwired/co60/rev7/rules.mk b/keyboards/handwired/co60/rev7/rules.mk index 3e15f073ff..25e7a2bf1b 100644 --- a/keyboards/handwired/co60/rev7/rules.mk +++ b/keyboards/handwired/co60/rev7/rules.mk @@ -2,6 +2,9 @@ MCU = STM32F303 BOARD = QMK_PROTON_C +# Bootloader selection +BOOTLOADER = stm32-dfu + # Use SPI for RGB underglow: WS2812_DRIVER = spi |