masq
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
ishtob 2018-08-27 17:10:22 -04:00 committed by Jack Humbert
parent c63d9ee0d5
commit 2410f02359
6 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
keyboards/planck/keymaps/ishtob/keymap.c
View File

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

1
keyboards/planck/keymaps/ishtob/rule.mk
View File

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

4
keyboards/planck/rev6/chconf.h
View File

@ -41,14 +41,14 @@
* @brief System time counter resolution. * @brief System time counter resolution.
* @note Allowed values are 16 or 32 bits. * @note Allowed values are 16 or 32 bits.
*/ */
#define CH_CFG_ST_RESOLUTION 16 #define CH_CFG_ST_RESOLUTION 32
/** /**
* @brief System tick frequency. * @brief System tick frequency.
* @details Frequency of the system timer that drives the system ticks. This * @details Frequency of the system timer that drives the system ticks. This
* setting also defines the system tick time unit. * 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. * @brief Time delta constant for the tick-less mode.

2
keyboards/planck/rev6/halconf.h
View File

@ -111,7 +111,7 @@
* @brief Enables the PWM subsystem. * @brief Enables the PWM subsystem.
*/ */
#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__) #if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)
#define HAL_USE_PWM TRUE #define HAL_USE_PWM FALSE
#endif #endif
/** /**

2
keyboards/planck/rev6/mcuconf.h
View File

@ -225,7 +225,7 @@
* ST driver system settings. * ST driver system settings.
*/ */
#define STM32_ST_IRQ_PRIORITY 8 #define STM32_ST_IRQ_PRIORITY 8
#define STM32_ST_USE_TIMER 4 #define STM32_ST_USE_TIMER 2
/* /*
* UART driver system settings. * UART driver system settings.

2
users/ishtob/rules.mk
View File

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