diff options
| author | ishtob <ishtob@gmail.com> | 2018-12-04 11:04:57 -0500 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2018-12-04 08:04:57 -0800 |
| commit | 4099536c0e7a099b181a80e483b4b95f389b5a7e (patch) | |
| tree | 311c8a15013cce5ee9275fe8654c9b52dc9ca1e2 /tmk_core/common/keyboard.c | |
| parent | 4bb28d2df092408a7a0e32a8d8ab47b7f4008fcd (diff) | |
| download | qmk_firmware-4099536c0e7a099b181a80e483b4b95f389b5a7e.tar.gz qmk_firmware-4099536c0e7a099b181a80e483b4b95f389b5a7e.zip | |
adding Hadron v3 keyboard, QWIIC devices support, haptic feedback support (#4462)
* add initial support for hadron ver3
* add initial support for hadron ver3
* pull qwiic support for micro_led to be modified for use in hadron's 64x24 ssd1306 oled display
* initial work on OLED using qwiic driver
* early work to get 128x32 oled working by redefining qwiic micro oled parameters. Currently working, but would affect qwiic's micro oled functionality
* moved oled defines to config.h and added ifndef to micro_oled driver
* WORKING :D - note, still work in progress to get the start location correct on the 128x32 display.
* added equation to automatically calculate display offset based on screen width
* adding time-out timer to oled display
* changed read lock staus via read_led_state
* lock indications fixes
* Added scroll lock indication to oled
* add support for DRV2605 haptic driver
* Improve readabiity of DRV2605 driver.
-added typedef for waveform library
-added unions for registers
* Update keyboards/hadron/ver2/keymaps/default/config.h
Co-Authored-By: ishtob <ishtob@gmail.com>
* Update keyboards/hadron/ver2/keymaps/default/config.h
Co-Authored-By: ishtob <ishtob@gmail.com>
* Update keyboards/hadron/ver2/keymaps/default/config.h
Co-Authored-By: ishtob <ishtob@gmail.com>
* Update keyboards/hadron/ver2/keymaps/default/config.h
Co-Authored-By: ishtob <ishtob@gmail.com>
* Fixes for PR
* PR fixes
* fix old persistent layer function to use new set_single_persistent_default_layer
* fix issues with changing makefile defines that broken per-key haptic pulse
* Comment fixes
* Add definable parameter and auto-calibration based on motor choice
Diffstat (limited to 'tmk_core/common/keyboard.c')
| -rw-r--r-- | tmk_core/common/keyboard.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/tmk_core/common/keyboard.c b/tmk_core/common/keyboard.c index a6a5fb56b..6f659b244 100644 --- a/tmk_core/common/keyboard.c +++ b/tmk_core/common/keyboard.c | |||
| @@ -72,6 +72,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 72 | #ifdef HD44780_ENABLE | 72 | #ifdef HD44780_ENABLE |
| 73 | # include "hd44780.h" | 73 | # include "hd44780.h" |
| 74 | #endif | 74 | #endif |
| 75 | #ifdef QWIIC_ENABLE | ||
| 76 | # include "qwiic.h" | ||
| 77 | #endif | ||
| 75 | 78 | ||
| 76 | #ifdef MATRIX_HAS_GHOST | 79 | #ifdef MATRIX_HAS_GHOST |
| 77 | extern const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS]; | 80 | extern const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS]; |
| @@ -161,6 +164,9 @@ bool is_keyboard_master(void) { | |||
| 161 | void keyboard_init(void) { | 164 | void keyboard_init(void) { |
| 162 | timer_init(); | 165 | timer_init(); |
| 163 | matrix_init(); | 166 | matrix_init(); |
| 167 | #ifdef QWIIC_ENABLE | ||
| 168 | qwiic_init(); | ||
| 169 | #endif | ||
| 164 | #ifdef PS2_MOUSE_ENABLE | 170 | #ifdef PS2_MOUSE_ENABLE |
| 165 | ps2_mouse_init(); | 171 | ps2_mouse_init(); |
| 166 | #endif | 172 | #endif |
| @@ -270,6 +276,10 @@ void keyboard_task(void) | |||
| 270 | 276 | ||
| 271 | MATRIX_LOOP_END: | 277 | MATRIX_LOOP_END: |
| 272 | 278 | ||
| 279 | #ifdef QWIIC_ENABLE | ||
| 280 | qwiic_task(); | ||
| 281 | #endif | ||
| 282 | |||
| 273 | #ifdef MOUSEKEY_ENABLE | 283 | #ifdef MOUSEKEY_ENABLE |
| 274 | // mousekey repeat & acceleration | 284 | // mousekey repeat & acceleration |
| 275 | mousekey_task(); | 285 | mousekey_task(); |
