Fixes STM32F303XC timer issue for Planck Rev 6 (qmk#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 6c8a9a6, reversing changes made to 5c598d9. * 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 e0035df. * Fixed STM32 timer issue with Planck Rev6 with tap mods * Revert "fixed compile error with planck rev6 keymap" This reverts commit 5c598d9. * Revert "Revert "fixed compile error with planck rev6 keymap"" This reverts commit c36896c. * Fixed compile issues with my personal userspace and keymap utilizing the userspace
sekigon-gonnoc · Aug 27, 2018 · 2410f02 · 2410f02
1 parent c63d9ee
commit 2410f02
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/keyboards/planck/keymaps/ishtob/keymap.c b/keyboards/planck/keymaps/ishtob/keymap.c
@@ -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);
 }

diff --git a/keyboards/planck/keymaps/ishtob/rule.mk b/keyboards/planck/keymaps/ishtob/rule.mk
@@ -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
 

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

diff --git a/users/ishtob/rules.mk b/users/ishtob/rules.mk
@@ -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)