summaryrefslogtreecommitdiffstats
path: root/keyboards/hadron/hadron.h
diff options
context:
space:
mode:
authorishtob <ishtob@gmail.com>2018-12-04 17:04:57 +0100
committerDrashna Jaelre <drashna@live.com>2018-12-04 17:04:57 +0100
commit4099536c0e7a099b181a80e483b4b95f389b5a7e (patch)
tree311c8a15013cce5ee9275fe8654c9b52dc9ca1e2 /keyboards/hadron/hadron.h
parent4bb28d2df092408a7a0e32a8d8ab47b7f4008fcd (diff)
downloadqmk_firmware-4099536c0e7a099b181a80e483b4b95f389b5a7e.tar.gz
qmk_firmware-4099536c0e7a099b181a80e483b4b95f389b5a7e.tar.xz
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 'keyboards/hadron/hadron.h')
-rw-r--r--keyboards/hadron/hadron.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/keyboards/hadron/hadron.h b/keyboards/hadron/hadron.h
index a165f4c5c..426face6f 100644
--- a/keyboards/hadron/hadron.h
+++ b/keyboards/hadron/hadron.h
@@ -7,7 +7,9 @@
#ifdef SUBPROJECT_ver2
#include "ver2.h"
#endif
-
+#ifdef SUBPROJECT_ver3
+ #include "ver3.h"
+#endif
#include "quantum.h"