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/keymaps | |
| parent | c63d9ee0d563228f1b5b7e1f1f54a5b541a90429 (diff) | |
| download | qmk_firmware-2410f023598af65a551b42f569a2703a5621bdca.tar.gz qmk_firmware-2410f023598af65a551b42f569a2703a5621bdca.zip | |
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/keymaps')
| -rw-r--r-- | keyboards/planck/keymaps/ishtob/keymap.c | 2 | ||||
| -rwxr-xr-x | keyboards/planck/keymaps/ishtob/rule.mk | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/keyboards/planck/keymaps/ishtob/keymap.c b/keyboards/planck/keymaps/ishtob/keymap.c index 36720c4c3e..86c5555da3 100644 --- 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 index c8940c3b40..c0d38aaa14 100755 --- 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 |