~ruther/qmk_firmware: Fixes STM32F303XC timer issue for Planck Rev 6 (#3777)

2410f023598af65a551b42f569a2703a5621bdca — ishtob 7 years ago c63d9ee

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

patch browse .tar.gz

6 files changed, 7 insertions(+), 6 deletions(-)

M keyboards/planck/keymaps/ishtob/keymap.c
M keyboards/planck/keymaps/ishtob/rule.mk
M keyboards/planck/rev6/chconf.h
M keyboards/planck/rev6/halconf.h
M keyboards/planck/rev6/mcuconf.h
M users/ishtob/rules.mk

M keyboards/planck/keymaps/ishtob/keymap.c => keyboards/planck/keymaps/ishtob/keymap.c +2 -0

@@ 327,7 327,9 @@ void matrix_init_keymap(void) {
 
 void startup_user()
 {
+    #ifdef RGB_MATRIX_ENABLE
     rgblight_mode(RGB_MATRIX_CYCLE_ALL);
+    #endif //RGB_matrix
     wait_ms(20); // gets rid of tick
     PLAY_NOTE_ARRAY(tone_startup, false, 0);
 }

M keyboards/planck/keymaps/ishtob/rule.mk => keyboards/planck/keymaps/ishtob/rule.mk +0 -1

@@ 12,7 12,6 @@ COMMAND_ENABLE = yes    # Commands for debug and configuration
 NKRO_ENABLE = yes	    # USB Nkey Rollover
 CUSTOM_MATRIX = yes # Custom matrix file
 AUDIO_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
 ENCODER_ENABLE = yes
 # SERIAL_LINK_ENABLE = yes

M keyboards/planck/rev6/chconf.h => keyboards/planck/rev6/chconf.h +2 -2

@@ 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.

M keyboards/planck/rev6/halconf.h => keyboards/planck/rev6/halconf.h +1 -1

@@ 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
 
 /**

M keyboards/planck/rev6/mcuconf.h => keyboards/planck/rev6/mcuconf.h +1 -1

@@ 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.

M users/ishtob/rules.mk => users/ishtob/rules.mk +1 -1

@@ 1,5 1,5 @@
 SRC += ishtob.c
-ifneq ($(wildcard $(USER_PATH)/macros_private.c),"")
+ifneq ("$(wildcard $(USER_PATH)/macros_private.c)","")
   SRC += macros_private.c
 endif
 ifeq ($(strip $(NO_SECRETS)), yes)