aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEthan Madden <crazeh.monkeh@gmail.com>2018-09-27 18:09:23 -0700
committerDrashna Jaelre <drashna@live.com>2018-09-27 18:09:23 -0700
commit246d539f295c70846aa4ecaf9cfbe79b959bf3c7 (patch)
treecfa6a71fc382005225437db93406f9b31b3b6845
parenta65085a89354e89ddd3517aa63c74ef6dd32ca8b (diff)
downloadqmk_firmware-246d539f295c70846aa4ecaf9cfbe79b959bf3c7.tar.gz
qmk_firmware-246d539f295c70846aa4ecaf9cfbe79b959bf3c7.zip
Keymap: add clicky support to jetpacktuxedo keymap (#3990)
controlled by dip 3 with pitch modulated by the knob
-rw-r--r--keyboards/planck/keymaps/jetpacktuxedo/config.h2
-rw-r--r--keyboards/planck/keymaps/jetpacktuxedo/keymap.c13
2 files changed, 15 insertions, 0 deletions
diff --git a/keyboards/planck/keymaps/jetpacktuxedo/config.h b/keyboards/planck/keymaps/jetpacktuxedo/config.h
index f216dc02d..7efe97a57 100644
--- a/keyboards/planck/keymaps/jetpacktuxedo/config.h
+++ b/keyboards/planck/keymaps/jetpacktuxedo/config.h
@@ -2,6 +2,7 @@
2 2
3#ifdef AUDIO_ENABLE 3#ifdef AUDIO_ENABLE
4 #define STARTUP_SONG SONG(PLANCK_SOUND) 4 #define STARTUP_SONG SONG(PLANCK_SOUND)
5 #define AUDIO_CLICKY
5#endif 6#endif
6 7
7/* 8/*
@@ -30,3 +31,4 @@
30 31
31// Most tactile encoders have detents every 4 stages 32// Most tactile encoders have detents every 4 stages
32#define ENCODER_RESOLUTION 4 33#define ENCODER_RESOLUTION 4
34
diff --git a/keyboards/planck/keymaps/jetpacktuxedo/keymap.c b/keyboards/planck/keymaps/jetpacktuxedo/keymap.c
index 2994c0c07..132405686 100644
--- a/keyboards/planck/keymaps/jetpacktuxedo/keymap.c
+++ b/keyboards/planck/keymaps/jetpacktuxedo/keymap.c
@@ -189,6 +189,13 @@ uint8_t muse_offset = 70;
189uint16_t muse_tempo = 20; 189uint16_t muse_tempo = 20;
190 190
191void encoder_update(bool clockwise) { 191void encoder_update(bool clockwise) {
192 if (is_clicky_on()) {
193 if (clockwise) {
194 clicky_freq_up();
195 } else {
196 clicky_freq_down();
197 }
198 } else
192 if (muse_mode) { 199 if (muse_mode) {
193 if (IS_LAYER_ON(_RAISE)) { 200 if (IS_LAYER_ON(_RAISE)) {
194 if (clockwise) { 201 if (clockwise) {
@@ -248,6 +255,12 @@ void dip_update(uint8_t index, bool active) {
248 stop_all_notes(); 255 stop_all_notes();
249 #endif 256 #endif
250 } 257 }
258 case 2:
259 if (active) {
260 clicky_on();
261 } else {
262 clicky_off();
263 }
251 } 264 }
252} 265}
253 266