diff options
| author | ishtob <ishtob@gmail.com> | 2018-08-27 17:10:22 -0400 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2018-08-27 17:10:22 -0400 |
| commit | 2410f023598af65a551b42f569a2703a5621bdca (patch) | |
| tree | 94b7a2f8d602ad689b562c8cea8b2abf7b0cb452 /keyboards/planck/rev6 | |
| parent | c63d9ee0d563228f1b5b7e1f1f54a5b541a90429 (diff) | |
Fixes STM32F303XC timer issue for Planck Rev 6 (#3777)
* Adding my personal planck keymap
* Adding readme.md to my keymap
* Create my userspace
add users/ishtob/
* Moved macros off keymap
macros now exsists in my userspace, moved them off keyboard specific keymaps
* Create my userspace
add users/ishtob/
* rebase from main QMK repo
* fixed compile error with planck rev6 keymap
* fixed compile error with planck rev6 keymap
* Revert "Merge branch 'master' of https://github.com/ishtob/qmk_firmware"
This reverts commit 6c8a9a6eec7ec311802338ea361099612182465d, reversing
changes made to 5c598d9a53a7f794d5be283ac40ca97631ae5578.
* fixed issue where compile errors if private macro file is not present
* Revert "fixed issue where compile errors if private macro file is not present"
This reverts commit e0035df48ffb9a95aa94e8339c58ef539e0449cf.
* Fixed STM32 timer issue with Planck Rev6 with tap mods
* Revert "fixed compile error with planck rev6 keymap"
This reverts commit 5c598d9a53a7f794d5be283ac40ca97631ae5578.
* Revert "Revert "fixed compile error with planck rev6 keymap""
This reverts commit c36896ca718f8b9bb3c653d7532797e9129477e3.
* Fixed compile issues with my personal userspace and keymap utilizing the userspace
Diffstat (limited to 'keyboards/planck/rev6')
| -rw-r--r-- | keyboards/planck/rev6/chconf.h | 4 | ||||
| -rw-r--r-- | keyboards/planck/rev6/halconf.h | 2 | ||||
| -rw-r--r-- | keyboards/planck/rev6/mcuconf.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/keyboards/planck/rev6/chconf.h b/keyboards/planck/rev6/chconf.h index b52ca7d2c8..1d9f12ff1f 100644 --- a/keyboards/planck/rev6/chconf.h +++ b/keyboards/planck/rev6/chconf.h @@ -41,14 +41,14 @@ * @brief System time counter resolution. * @note Allowed values are 16 or 32 bits. */ -#define CH_CFG_ST_RESOLUTION 16 +#define CH_CFG_ST_RESOLUTION 32 /** * @brief System tick frequency. * @details Frequency of the system timer that drives the system ticks. This * setting also defines the system tick time unit. */ -#define CH_CFG_ST_FREQUENCY 10000 +#define CH_CFG_ST_FREQUENCY 100000 /** * @brief Time delta constant for the tick-less mode. diff --git a/keyboards/planck/rev6/halconf.h b/keyboards/planck/rev6/halconf.h index 5e5d70219e..8fe8e0c6f5 100644 --- a/keyboards/planck/rev6/halconf.h +++ b/keyboards/planck/rev6/halconf.h @@ -111,7 +111,7 @@ * @brief Enables the PWM subsystem. */ #if !defined(HAL_USE_PWM) || defined(__DOXYGEN__) -#define HAL_USE_PWM TRUE +#define HAL_USE_PWM FALSE #endif /** diff --git a/keyboards/planck/rev6/mcuconf.h b/keyboards/planck/rev6/mcuconf.h index 2d27bee4e6..7c3c6e570c 100644 --- a/keyboards/planck/rev6/mcuconf.h +++ b/keyboards/planck/rev6/mcuconf.h @@ -225,7 +225,7 @@ * ST driver system settings. */ #define STM32_ST_IRQ_PRIORITY 8 -#define STM32_ST_USE_TIMER 4 +#define STM32_ST_USE_TIMER 2 /* * UART driver system settings. |