diff options
| author | Priyadi Iman Nurcahyo <priyadi@priyadi.net> | 2017-02-13 08:03:07 +0700 |
|---|---|---|
| committer | Priyadi Iman Nurcahyo <priyadi@priyadi.net> | 2017-02-13 08:03:07 +0700 |
| commit | c68e596f32c5d450a714627871408407e9988ef7 (patch) | |
| tree | 1ddd19fc28409370e191d2dbde844b2fa68a5125 | |
| parent | a0c2305bd1153d9d578d73effd33896c2dbc26c8 (diff) | |
| download | qmk_firmware-c68e596f32c5d450a714627871408407e9988ef7.tar.gz qmk_firmware-c68e596f32c5d450a714627871408407e9988ef7.zip | |
Implement faux-clicky feature
| -rw-r--r-- | build_keyboard.mk | 5 | ||||
| -rw-r--r-- | keyboards/planck/keymaps/priyadi/Makefile | 3 | ||||
| -rw-r--r-- | keyboards/planck/keymaps/priyadi/keymap.c | 4 | ||||
| -rw-r--r-- | quantum/fauxclicky.c | 68 | ||||
| -rw-r--r-- | quantum/fauxclicky.h | 87 | ||||
| -rw-r--r-- | quantum/template/rules.mk | 1 | ||||
| -rw-r--r-- | tmk_core/common/action.c | 13 | ||||
| -rw-r--r-- | tmk_core/common/keyboard.c | 6 |
8 files changed, 184 insertions, 3 deletions
diff --git a/build_keyboard.mk b/build_keyboard.mk index 2c64e93a2..c8e82cf0e 100644 --- a/build_keyboard.mk +++ b/build_keyboard.mk | |||
| @@ -161,6 +161,11 @@ ifeq ($(strip $(AUDIO_ENABLE)), yes) | |||
| 161 | SRC += $(QUANTUM_DIR)/audio/luts.c | 161 | SRC += $(QUANTUM_DIR)/audio/luts.c |
| 162 | endif | 162 | endif |
| 163 | 163 | ||
| 164 | ifeq ($(strip $(FAUXCLICKY_ENABLE)), yes) | ||
| 165 | OPT_DEFS += -DFAUXCLICKY_ENABLE | ||
| 166 | SRC += $(QUANTUM_DIR)/fauxclicky.c | ||
| 167 | endif | ||
| 168 | |||
| 164 | ifeq ($(strip $(UCIS_ENABLE)), yes) | 169 | ifeq ($(strip $(UCIS_ENABLE)), yes) |
| 165 | OPT_DEFS += -DUCIS_ENABLE | 170 | OPT_DEFS += -DUCIS_ENABLE |
| 166 | UNICODE_ENABLE = yes | 171 | UNICODE_ENABLE = yes |
diff --git a/keyboards/planck/keymaps/priyadi/Makefile b/keyboards/planck/keymaps/priyadi/Makefile index 336608b8c..27c2638e2 100644 --- a/keyboards/planck/keymaps/priyadi/Makefile +++ b/keyboards/planck/keymaps/priyadi/Makefile | |||
| @@ -10,12 +10,13 @@ COMMAND_ENABLE = no # Commands for debug and configuration | |||
| 10 | NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work | 10 | NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work |
| 11 | BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality | 11 | BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality |
| 12 | MIDI_ENABLE = no # MIDI controls | 12 | MIDI_ENABLE = no # MIDI controls |
| 13 | AUDIO_ENABLE = yes # Audio output on port C6 | 13 | AUDIO_ENABLE = no # Audio output on port C6 |
| 14 | UNICODE_ENABLE = no # Unicode | 14 | UNICODE_ENABLE = no # Unicode |
| 15 | UNICODEMAP_ENABLE = yes # Unicode map | 15 | UNICODEMAP_ENABLE = yes # Unicode map |
| 16 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID | 16 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID |
| 17 | RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. | 17 | RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. |
| 18 | API_SYSEX_ENABLE = no | 18 | API_SYSEX_ENABLE = no |
| 19 | FAUXCLICKY_ENABLE = yes | ||
| 19 | 20 | ||
| 20 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE | 21 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE |
| 21 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | 22 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend |
diff --git a/keyboards/planck/keymaps/priyadi/keymap.c b/keyboards/planck/keymaps/priyadi/keymap.c index 2e979221a..13668fd10 100644 --- a/keyboards/planck/keymaps/priyadi/keymap.c +++ b/keyboards/planck/keymaps/priyadi/keymap.c | |||
| @@ -268,8 +268,8 @@ const uint32_t PROGMEM unicode_map[] = { | |||
| 268 | 268 | ||
| 269 | 269 | ||
| 270 | // hybrid right-gui & scroll lock (mapped to Compose in OS) | 270 | // hybrid right-gui & scroll lock (mapped to Compose in OS) |
| 271 | #undef KC_RCTL | 271 | #undef KC_RALT |
| 272 | #define KC_RCTL MT(MOD_LCTL, KC_SLCK) | 272 | #define KC_RALT MT(MOD_RALT, KC_SLCK) |
| 273 | 273 | ||
| 274 | // keymaps | 274 | // keymaps |
| 275 | 275 | ||
diff --git a/quantum/fauxclicky.c b/quantum/fauxclicky.c new file mode 100644 index 000000000..13273e705 --- /dev/null +++ b/quantum/fauxclicky.c | |||
| @@ -0,0 +1,68 @@ | |||
| 1 | /* | ||
| 2 | Copyright 2017 Priyadi Iman Nurcahyo | ||
| 3 | |||
| 4 | This program is free software: you can redistribute it and/or modify | ||
| 5 | it under the terms of the GNU General Public License as published by | ||
| 6 | the Free Software Foundation, either version 2 of the License, or | ||
| 7 | (at your option) any later version. | ||
| 8 | This program is distributed in the hope that it will be useful, | ||
| 9 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 10 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 11 | GNU General Public License for more details. | ||
| 12 | You should have received a copy of the GNU General Public License | ||
| 13 | along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 14 | */ | ||
| 15 | |||
| 16 | #include <avr/interrupt.h> | ||
| 17 | #include <avr/io.h> | ||
| 18 | #include <timer.h> | ||
| 19 | #include <fauxclicky.h> | ||
| 20 | #include <stdbool.h> | ||
| 21 | #include <musical_notes.h> | ||
| 22 | |||
| 23 | __attribute__ ((weak)) | ||
| 24 | float fauxclicky_pressed_note[2] = MUSICAL_NOTE(_F3, 2); | ||
| 25 | __attribute__ ((weak)) | ||
| 26 | float fauxclicky_released_note[2] = MUSICAL_NOTE(_A3, 2); | ||
| 27 | __attribute__ ((weak)) | ||
| 28 | float fauxclicky_beep_note[2] = MUSICAL_NOTE(_C3, 2); | ||
| 29 | |||
| 30 | bool fauxclicky_enabled = true; | ||
| 31 | uint16_t note_start = 0; | ||
| 32 | bool note_playing = false; | ||
| 33 | uint16_t note_period = 0; | ||
| 34 | |||
| 35 | void fauxclicky_init() | ||
| 36 | { | ||
| 37 | // Set port PC6 (OC3A and /OC4A) as output | ||
| 38 | DDRC |= _BV(PORTC6); | ||
| 39 | |||
| 40 | // TCCR3A / TCCR3B: Timer/Counter #3 Control Registers | ||
| 41 | TCCR3A = (0 << COM3A1) | (0 << COM3A0) | (1 << WGM31) | (0 << WGM30); | ||
| 42 | TCCR3B = (1 << WGM33) | (1 << WGM32) | (0 << CS32) | (1 << CS31) | (0 << CS30); | ||
| 43 | } | ||
| 44 | |||
| 45 | void fauxclicky_stop() | ||
| 46 | { | ||
| 47 | FAUXCLICKY_DISABLE_OUTPUT; | ||
| 48 | note_playing = false; | ||
| 49 | } | ||
| 50 | |||
| 51 | void fauxclicky_play(float note[2]) { | ||
| 52 | if (!fauxclicky_enabled) return; | ||
| 53 | if (note_playing) fauxclicky_stop(); | ||
| 54 | FAUXCLICKY_TIMER_PERIOD = (uint16_t)(((float)F_CPU) / (note[0] * FAUXCLICKY_CPU_PRESCALER)); | ||
| 55 | FAUXCLICKY_DUTY_CYCLE = (uint16_t)((((float)F_CPU) / (note[0] * FAUXCLICKY_CPU_PRESCALER)) / 2); | ||
| 56 | note_playing = true; | ||
| 57 | note_period = (note[1] / 16) * (60 / (float)FAUXCLICKY_TEMPO) * 100; // check this | ||
| 58 | note_start = timer_read(); | ||
| 59 | FAUXCLICKY_ENABLE_OUTPUT; | ||
| 60 | } | ||
| 61 | |||
| 62 | void fauxclicky_check() { | ||
| 63 | if (!note_playing) return; | ||
| 64 | |||
| 65 | if (timer_elapsed(note_start) > note_period) { | ||
| 66 | fauxclicky_stop(); | ||
| 67 | } | ||
| 68 | } | ||
diff --git a/quantum/fauxclicky.h b/quantum/fauxclicky.h new file mode 100644 index 000000000..6cfc291c0 --- /dev/null +++ b/quantum/fauxclicky.h | |||
| @@ -0,0 +1,87 @@ | |||
| 1 | /* | ||
| 2 | Copyright 2017 Priyadi Iman Nurcahyo | ||
| 3 | |||
| 4 | This program is free software: you can redistribute it and/or modify | ||
| 5 | it under the terms of the GNU General Public License as published by | ||
| 6 | the Free Software Foundation, either version 2 of the License, or | ||
| 7 | (at your option) any later version. | ||
| 8 | This program is distributed in the hope that it will be useful, | ||
| 9 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 10 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 11 | GNU General Public License for more details. | ||
| 12 | You should have received a copy of the GNU General Public License | ||
| 13 | along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 14 | */ | ||
| 15 | |||
| 16 | #ifdef AUDIO_ENABLE | ||
| 17 | #error "AUDIO_ENABLE and FAUXCLICKY_ENABLE cannot be both enabled" | ||
| 18 | #endif | ||
| 19 | |||
| 20 | #include "musical_notes.h" | ||
| 21 | |||
| 22 | __attribute__ ((weak)) | ||
| 23 | float fauxclicky_pressed_note[2]; | ||
| 24 | __attribute__ ((weak)) | ||
| 25 | float fauxclicky_released_note[2]; | ||
| 26 | __attribute__ ((weak)) | ||
| 27 | float fauxclicky_beep_note[2]; | ||
| 28 | |||
| 29 | // | ||
| 30 | // tempo in BPM | ||
| 31 | // | ||
| 32 | |||
| 33 | #ifndef FAUXCLICKY_TEMPO | ||
| 34 | #define FAUXCLICKY_TEMPO TEMPO_DEFAULT | ||
| 35 | #endif | ||
| 36 | |||
| 37 | // beep on press | ||
| 38 | #define FAUXCLICKY_ACTION_PRESS fauxclicky_play(fauxclicky_pressed_note) | ||
| 39 | |||
| 40 | // beep on release | ||
| 41 | #define FAUXCLICKY_ACTION_RELEASE fauxclicky_play(fauxclicky_released_note) | ||
| 42 | |||
| 43 | // general purpose beep | ||
| 44 | #define FAUXCLICKY_BEEP fauxclicky_play(fauxclicky_beep_note) | ||
| 45 | |||
| 46 | // enable | ||
| 47 | #define FAUXCLICKY_ON fauxclicky_enabled = true | ||
| 48 | |||
| 49 | // disable | ||
| 50 | #define FAUXCLICKY_OFF do { \ | ||
| 51 | fauxclicky_enabled = false; \ | ||
| 52 | fauxclicky_stop(); \ | ||
| 53 | } while (0) | ||
| 54 | |||
| 55 | // | ||
| 56 | // pin configuration | ||
| 57 | // | ||
| 58 | |||
| 59 | #ifndef FAUXCLICKY_CPU_PRESCALER | ||
| 60 | #define FAUXCLICKY_CPU_PRESCALER 8 | ||
| 61 | #endif | ||
| 62 | |||
| 63 | #ifndef FAUXCLICKY_ENABLE_OUTPUT | ||
| 64 | #define FAUXCLICKY_ENABLE_OUTPUT TCCR3A |= _BV(COM3A1); | ||
| 65 | #endif | ||
| 66 | |||
| 67 | #ifndef FAUXCLICKY_DISABLE_OUTPUT | ||
| 68 | #define FAUXCLICKY_DISABLE_OUTPUT TCCR3A &= ~(_BV(COM3A1) | _BV(COM3A0)); | ||
| 69 | #endif | ||
| 70 | |||
| 71 | #ifndef FAUXCLICKY_TIMER_PERIOD | ||
| 72 | #define FAUXCLICKY_TIMER_PERIOD ICR3 | ||
| 73 | #endif | ||
| 74 | |||
| 75 | #ifndef FAUXCLICKY_DUTY_CYCLE | ||
| 76 | #define FAUXCLICKY_DUTY_CYCLE OCR3A | ||
| 77 | #endif | ||
| 78 | |||
| 79 | // | ||
| 80 | // definitions | ||
| 81 | // | ||
| 82 | |||
| 83 | void fauxclicky_init(void); | ||
| 84 | void fauxclicky_stop(void); | ||
| 85 | void fauxclicky_play(float note[2]); | ||
| 86 | void fauxclicky_check(void); | ||
| 87 | |||
diff --git a/quantum/template/rules.mk b/quantum/template/rules.mk index 55898147d..bad3387bf 100644 --- a/quantum/template/rules.mk +++ b/quantum/template/rules.mk | |||
| @@ -65,3 +65,4 @@ MIDI_ENABLE ?= no # MIDI controls | |||
| 65 | UNICODE_ENABLE ?= no # Unicode | 65 | UNICODE_ENABLE ?= no # Unicode |
| 66 | BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID | 66 | BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID |
| 67 | AUDIO_ENABLE ?= no # Audio output on port C6 | 67 | AUDIO_ENABLE ?= no # Audio output on port C6 |
| 68 | FAUXCLICKY_ENABLE ?= no # Use buzzer to emulate clicky switches | ||
diff --git a/tmk_core/common/action.c b/tmk_core/common/action.c index f03670a7f..94de36918 100644 --- a/tmk_core/common/action.c +++ b/tmk_core/common/action.c | |||
| @@ -33,6 +33,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 33 | #include "nodebug.h" | 33 | #include "nodebug.h" |
| 34 | #endif | 34 | #endif |
| 35 | 35 | ||
| 36 | #ifdef FAUXCLICKY_ENABLE | ||
| 37 | #include <fauxclicky.h> | ||
| 38 | #endif | ||
| 36 | 39 | ||
| 37 | void action_exec(keyevent_t event) | 40 | void action_exec(keyevent_t event) |
| 38 | { | 41 | { |
| @@ -41,6 +44,16 @@ void action_exec(keyevent_t event) | |||
| 41 | dprint("EVENT: "); debug_event(event); dprintln(); | 44 | dprint("EVENT: "); debug_event(event); dprintln(); |
| 42 | } | 45 | } |
| 43 | 46 | ||
| 47 | #ifdef FAUXCLICKY_ENABLE | ||
| 48 | if (IS_PRESSED(event)) { | ||
| 49 | FAUXCLICKY_ACTION_PRESS; | ||
| 50 | } | ||
| 51 | if (IS_RELEASED(event)) { | ||
| 52 | FAUXCLICKY_ACTION_RELEASE; | ||
| 53 | } | ||
| 54 | fauxclicky_check(); | ||
| 55 | #endif | ||
| 56 | |||
| 44 | #ifdef ONEHAND_ENABLE | 57 | #ifdef ONEHAND_ENABLE |
| 45 | if (!IS_NOEVENT(event)) { | 58 | if (!IS_NOEVENT(event)) { |
| 46 | process_hand_swap(&event); | 59 | process_hand_swap(&event); |
diff --git a/tmk_core/common/keyboard.c b/tmk_core/common/keyboard.c index 3aa82231b..eac1f1dd8 100644 --- a/tmk_core/common/keyboard.c +++ b/tmk_core/common/keyboard.c | |||
| @@ -51,6 +51,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 51 | #ifdef RGBLIGHT_ENABLE | 51 | #ifdef RGBLIGHT_ENABLE |
| 52 | # include "rgblight.h" | 52 | # include "rgblight.h" |
| 53 | #endif | 53 | #endif |
| 54 | #ifdef FAUXCLICKY_ENABLE | ||
| 55 | # include "fauxclicky.h" | ||
| 56 | #endif | ||
| 54 | #ifdef SERIAL_LINK_ENABLE | 57 | #ifdef SERIAL_LINK_ENABLE |
| 55 | # include "serial_link/system/serial_link.h" | 58 | # include "serial_link/system/serial_link.h" |
| 56 | #endif | 59 | #endif |
| @@ -108,6 +111,9 @@ void keyboard_init(void) { | |||
| 108 | #ifdef RGBLIGHT_ENABLE | 111 | #ifdef RGBLIGHT_ENABLE |
| 109 | rgblight_init(); | 112 | rgblight_init(); |
| 110 | #endif | 113 | #endif |
| 114 | #ifdef FAUXCLICKY_ENABLE | ||
| 115 | fauxclicky_init(); | ||
| 116 | #endif | ||
| 111 | #if defined(NKRO_ENABLE) && defined(FORCE_NKRO) | 117 | #if defined(NKRO_ENABLE) && defined(FORCE_NKRO) |
| 112 | keymap_config.nkro = 1; | 118 | keymap_config.nkro = 1; |
| 113 | #endif | 119 | #endif |
