diff options
| author | QMK Bot <hello@qmk.fm> | 2021-04-26 02:52:29 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-04-26 02:52:29 +0000 |
| commit | 5168af9a9bd0693cd5bddd4a07bea464015b5e5a (patch) | |
| tree | 7d66f2fb99f24c4b151ffec2e6d554b373c614b2 /keyboards | |
| parent | 61a1915cce620cfa732389d0601ff30e34962e60 (diff) | |
| parent | 2f47bafd6a9c648daa4cfc11d5b1f15e32be3fc8 (diff) | |
| download | qmk_firmware-5168af9a9bd0693cd5bddd4a07bea464015b5e5a.tar.gz qmk_firmware-5168af9a9bd0693cd5bddd4a07bea464015b5e5a.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards')
| -rw-r--r-- | keyboards/melgeek/mj61/rev2/rules.mk | 1 | ||||
| -rw-r--r-- | keyboards/monarch/halconf.h | 27 | ||||
| -rw-r--r-- | keyboards/monarch/mcuconf.h | 28 | ||||
| -rw-r--r-- | keyboards/monarch/rules.mk | 2 |
4 files changed, 58 insertions, 0 deletions
diff --git a/keyboards/melgeek/mj61/rev2/rules.mk b/keyboards/melgeek/mj61/rev2/rules.mk index a4c0558052..31a770cfbb 100644 --- a/keyboards/melgeek/mj61/rev2/rules.mk +++ b/keyboards/melgeek/mj61/rev2/rules.mk @@ -1,5 +1,6 @@ # MCU name MCU = STM32F303 +BOARD = QMK_PROTON_C # Build Options # change yes to no to disable diff --git a/keyboards/monarch/halconf.h b/keyboards/monarch/halconf.h new file mode 100644 index 0000000000..c4a89408af --- /dev/null +++ b/keyboards/monarch/halconf.h @@ -0,0 +1,27 @@ +/* Copyright 2020 QMK + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +/* + * This file was auto-generated by: + * `qmk chibios-confmigrate -i keyboards/xelus/valor_frl_tkl/halconf.h -r platforms/chibios/common/configs/halconf.h` + */ + +#pragma once + +#define HAL_USE_PWM TRUE + +#include_next <halconf.h> + diff --git a/keyboards/monarch/mcuconf.h b/keyboards/monarch/mcuconf.h new file mode 100644 index 0000000000..c16c3889a6 --- /dev/null +++ b/keyboards/monarch/mcuconf.h @@ -0,0 +1,28 @@ +/* Copyright 2020 QMK + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +/* + * This file was auto-generated by: + * `qmk chibios-confmigrate -i keyboards/xelus/valor_frl_tkl/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h` + */ + +#pragma once + +#include_next <mcuconf.h> + +#undef STM32_PWM_USE_TIM3 +#define STM32_PWM_USE_TIM3 TRUE + diff --git a/keyboards/monarch/rules.mk b/keyboards/monarch/rules.mk index 5536d53345..22ec091e74 100644 --- a/keyboards/monarch/rules.mk +++ b/keyboards/monarch/rules.mk @@ -19,5 +19,7 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes +BACKLIGHT_DRIVER = pwm + # Enter lower-power sleep mode when on the ChibiOS idle thread OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE |