From 07f5147621b431371241fe7c018ceb40545afa16 Mon Sep 17 00:00:00 2001 From: jack <0x6A73@pm.me> Date: Sat, 28 May 2022 23:09:42 -0600 Subject: [PATCH] Fixup iron165r2 (#17119) * initial * revert some defines * formatting * apply changes * update readme * suggestion --- keyboards/smithrune/iron165r2/f072/rules.mk | 20 ++++++++++++++++++++ keyboards/smithrune/iron165r2/f411/rules.mk | 21 +++++++++++++++++++++ keyboards/smithrune/iron165r2/readme.md | 8 ++++---- keyboards/smithrune/iron165r2/rules.mk | 18 ------------------ 4 files changed, 45 insertions(+), 22 deletions(-) delete mode 100644 keyboards/smithrune/iron165r2/rules.mk diff --git a/keyboards/smithrune/iron165r2/f072/rules.mk b/keyboards/smithrune/iron165r2/f072/rules.mk index dfaf85650d..016b8c2c1e 100644 --- a/keyboards/smithrune/iron165r2/f072/rules.mk +++ b/keyboards/smithrune/iron165r2/f072/rules.mk @@ -1,4 +1,24 @@ # MCU name MCU = STM32F072 + +# Bootloader selection +BOOTLOADER = stm32-dfu + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite +MOUSEKEY_ENABLE = no # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = yes # Commands for debug and configuration +NKRO_ENABLE = yes # USB Nkey Rollover +RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output +LTO_ENABLE = no +ENCODER_ENABLE = no BACKLIGHT_ENABLE = yes BACKLIGHT_DRIVER = pwm + +# Enter lower-power sleep mode when on the ChibiOS idle thread +OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/keyboards/smithrune/iron165r2/f411/rules.mk b/keyboards/smithrune/iron165r2/f411/rules.mk index 19ac363e7d..598edffe64 100644 --- a/keyboards/smithrune/iron165r2/f411/rules.mk +++ b/keyboards/smithrune/iron165r2/f411/rules.mk @@ -1,5 +1,26 @@ +# MCU name MCU = STM32F411 + +# Bootloader selection +BOOTLOADER = stm32-dfu + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite +MOUSEKEY_ENABLE = no # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = yes # Commands for debug and configuration +NKRO_ENABLE = yes # USB Nkey Rollover +RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output +LTO_ENABLE = no +ENCODER_ENABLE = no EEPROM_DRIVER = i2c BACKLIGHT_ENABLE = yes BACKLIGHT_DRIVER = pwm WS2812_DRIVER = pwm + +# Enter lower-power sleep mode when on the ChibiOS idle thread +OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/keyboards/smithrune/iron165r2/readme.md b/keyboards/smithrune/iron165r2/readme.md index 2bbf31bdeb..2fc913ff73 100644 --- a/keyboards/smithrune/iron165r2/readme.md +++ b/keyboards/smithrune/iron165r2/readme.md @@ -26,13 +26,13 @@ The 165R2 PCB was prototyped and tested using two microcontrollers: STM32F072 an After checking what PCB you own and setting up your build environment, you can compile the Iron 165R2 default keymap by using one of the options below. - make smithrune/iron165r2/165r2_f072:default - make smithrune/iron165r2/165r2_f411:default + make smithrune/iron165r2/f072:default + make smithrune/iron165r2/f411:default And use dfu-util in the command line or through a GUI like QMK toolbox to upload the firmware to the PCB. To directly flash the PCB after it is put into a DFU state, use: - make smithrune/iron165r2/165r2_f072:default:flash - make smithrune/iron165r2/165r2_f411:default:flash + make smithrune/iron165r2/f072:default:flash + make smithrune/iron165r2/f411:default:flash See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/smithrune/iron165r2/rules.mk b/keyboards/smithrune/iron165r2/rules.mk deleted file mode 100644 index 272814ce9e..0000000000 --- a/keyboards/smithrune/iron165r2/rules.mk +++ /dev/null @@ -1,18 +0,0 @@ -# Bootloader selection -BOOTLOADER = stm32-dfu - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # USB Nkey Rollover -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = no -ENCODER_ENABLE = no -# Enter lower-power sleep mode when on the ChibiOS idle thread -OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRU