summaryrefslogtreecommitdiffstats
path: root/quantum
diff options
context:
space:
mode:
Diffstat (limited to 'quantum')
-rw-r--r--quantum/quantum.c16
-rw-r--r--quantum/quantum.h4
-rw-r--r--quantum/quantum_keycodes.h49
3 files changed, 50 insertions, 19 deletions
diff --git a/quantum/quantum.c b/quantum/quantum.c
index 376578ade..cb4d5ee80 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -47,6 +47,9 @@ extern backlight_config_t backlight_config;
#include "process_midi.h"
#endif
+#ifdef HAPTIC_ENABLE
+ #include "haptic.h"
+#endif
#ifdef ENCODER_ENABLE
#include "encoder.h"
@@ -179,6 +182,9 @@ void reset_keyboard(void) {
shutdown_user();
wait_ms(250);
#endif
+#ifdef HAPTIC_ENABLE
+ haptic_shutdown();
+#endif
// this is also done later in bootloader.c - not sure if it's neccesary here
#ifdef BOOTLOADER_CATERINA
*(uint16_t *)0x0800 = 0x7777; // these two are a-star-specific
@@ -257,6 +263,9 @@ bool process_record_quantum(keyrecord_t *record) {
#if defined(AUDIO_ENABLE) && defined(AUDIO_CLICKY)
process_clicky(keycode, record) &&
#endif //AUDIO_CLICKY
+ #ifdef HAPTIC_ENABLE
+ process_haptic(keycode, record) &&
+ #endif //HAPTIC_ENABLE
process_record_kb(keycode, record) &&
#if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_KEYPRESSES)
process_rgb_matrix(keycode, record) &&
@@ -1049,6 +1058,9 @@ void matrix_init_quantum() {
#if defined(UNICODE_ENABLE) || defined(UNICODEMAP_ENABLE) || defined(UCIS_ENABLE)
unicode_input_mode_init();
#endif
+ #ifdef HAPTIC_ENABLE
+ haptic_init();
+ #endif
matrix_init_kb();
}
@@ -1091,6 +1103,10 @@ void matrix_scan_quantum() {
encoder_read();
#endif
+ #ifdef HAPTIC_ENABLE
+ haptic_task();
+ #endif
+
matrix_scan_kb();
}
#if defined(BACKLIGHT_ENABLE) && defined(BACKLIGHT_PIN)
diff --git a/quantum/quantum.h b/quantum/quantum.h
index c6acf83e5..d2c5862f8 100644
--- a/quantum/quantum.h
+++ b/quantum/quantum.h
@@ -139,6 +139,10 @@ extern uint32_t default_layer_state;
#include "hd44780.h"
#endif
+#ifdef HAPTIC_ENABLE
+ #include "haptic.h"
+#endif
+
//Function substitutions to ease GPIO manipulation
#ifdef __AVR__
#define PIN_ADDRESS(p, offset) _SFR_IO8(ADDRESS_BASE + (p >> PORT_SHIFTER) + offset)
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h
index 0462291c2..00c84cbf5 100644
--- a/quantum/quantum_keycodes.h
+++ b/quantum/quantum_keycodes.h
@@ -446,25 +446,36 @@ enum quantum_keycodes {
KC_LOCK,
#endif
-#ifdef TERMINAL_ENABLE
- TERM_ON,
- TERM_OFF,
-#endif
-
- EEPROM_RESET,
-
- UNICODE_MODE_FORWARD,
- UNICODE_MODE_REVERSE,
-
- UNICODE_MODE_OSX,
- UNICODE_MODE_LNX,
- UNICODE_MODE_WIN,
- UNICODE_MODE_BSD,
- UNICODE_MODE_WINC,
-
- // always leave at the end
- SAFE_RANGE
-};
+ #ifdef TERMINAL_ENABLE
+ TERM_ON,
+ TERM_OFF,
+ #endif
+
+ EEPROM_RESET,
+
+ UNICODE_MODE_FORWARD,
+ UNICODE_MODE_REVERSE,
+
+ UNICODE_MODE_OSX,
+ UNICODE_MODE_LNX,
+ UNICODE_MODE_WIN,
+ UNICODE_MODE_BSD,
+ UNICODE_MODE_WINC,
+
+ HPT_ON,
+ HPT_OFF,
+ HPT_TOG,
+ HPT_RST,
+ HPT_FBK,
+ HPT_BUZ,
+ HPT_MODI,
+ HPT_MODD,
+ HPT_DWLI,
+ HPT_DWLD,
+
+ // always leave at the end
+ SAFE_RANGE
+ };
// Ability to use mods in layouts
#define LCTL(kc) (QK_LCTL | (kc))